← Back to branch summary

~robertcarr/unity/phablet-integrate-mir-no-sw-cursor

« back to all changes in this revision

Viewing changes to tests/mocks/Ubuntu/Application/ApplicationInfo.h

  • Committer: Tarmac
  • Author(s): Daniel d'Andrada
  • Date: 2013-04-30 17:25:47 UTC
  • mfrom: (641.1.4 ApplicationInfo)
  • Revision ID: tarmac-20130430172547-vgywjitu0rz1wrxl
Use real enum from ApplicationInfo instead of its counterfeit local version

Application from Ubuntu.Application got renamed to ApplicationInfo in the
real implementation to avoid conflict with the Application component from
QtQuick 2.0. Thus now we can use the enums from it.

Approved by PS Jenkins bot, Albert Astals Cid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mocks/Ubuntu/Application/ApplicationInfo.h
25
25
// A pretty dumb file. Just a container for properties.
26
26
// Implemented in C++ instead of QML just because of the enumerations
27
27
// See QTBUG-14861
28
 
class Application : public QObject {
 
28
class ApplicationInfo : public QObject {
29
29
    Q_OBJECT
30
30
    Q_ENUMS(Stage)
31
31
    Q_ENUMS(State)
51
51
    enum Stage { MainStage, SideStage };
52
52
    enum State { Starting, Running };
53
53
 
54
 
    Application(QObject *parent = NULL);
 
54
    ApplicationInfo(QObject *parent = NULL);
55
55
 
56
56
    #define IMPLEMENT_PROPERTY(name, Name, type) \
57
57
    public: \
98
98
    QQuickItem *m_parentItem;
99
99
};
100
100
 
101
 
Q_DECLARE_METATYPE(Application*)
 
101
Q_DECLARE_METATYPE(ApplicationInfo*)
102
102
 
103
103
#endif  // APPLICATION_H
104
104