git.iko.soy/unity8
on xenial help sign in
Remove enums and properties that doesn't exist in the real ApplicationManager
7f8c6efDaniel d'Andrada
tests/mocks/Unity/Application/ApplicationManager.cpp−15
compare with xenial
unifiedsplit
@@ -198,21 +198,6 @@ void ApplicationManager::move(int from, int to) {
198 }
198 }
199}
199}
200
200
201−int ApplicationManager::sideStageWidth() const
202−{
203− return 0;
204−}
205−
206−ApplicationManager::StageHint ApplicationManager::stageHint() const
207−{
208− return MainStage;
209−}
210−
211−ApplicationManager::FormFactorHint ApplicationManager::formFactorHint() const
212−{
213− return PhoneFormFactor;
214−}
215−
216ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
201ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
217 const QStringList &arguments)
202 const QStringList &arguments)
218{
203{
tests/mocks/Unity/Application/ApplicationManager.h−32
@@ -31,20 +31,10 @@ using namespace unity::shell::application;
31
31
32class ApplicationManager : public ApplicationManagerInterface {
32class ApplicationManager : public ApplicationManagerInterface {
33 Q_OBJECT
33 Q_OBJECT
34− Q_ENUMS(Role)
35− Q_ENUMS(StageHint)
36− Q_ENUMS(FormFactorHint)
37− Q_ENUMS(FavoriteApplication)
38 Q_FLAGS(ExecFlags)
34 Q_FLAGS(ExecFlags)
39
35
40 Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
36 Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
41
37
42− Q_PROPERTY(int sideStageWidth READ sideStageWidth)
43− Q_PROPERTY(StageHint stageHint READ stageHint)
44− Q_PROPERTY(FormFactorHint formFactorHint READ formFactorHint)
45−
46− Q_PROPERTY(bool fake READ fake CONSTANT)
47−
48 public:
38 public:
49 ApplicationManager(QObject *parent = nullptr);
39 ApplicationManager(QObject *parent = nullptr);
50 virtual ~ApplicationManager();
40 virtual ~ApplicationManager();
@@ -55,33 +45,12 @@ class ApplicationManager : public ApplicationManagerInterface {
55 RoleSession = RoleFocused+1,
45 RoleSession = RoleFocused+1,
56 RoleFullscreen,
46 RoleFullscreen,
57 };
47 };
58− enum Role {
59− Dash, Default, Indicators, Notifications, Greeter, Launcher, OnScreenKeyboard,
60− ShutdownDialog
61− };
62− enum StageHint {
63− MainStage, IntegrationStage, ShareStage, ContentPickingStage,
64− SideStage, ConfigurationStage
65− };
66− enum FormFactorHint {
67− DesktopFormFactor, PhoneFormFactor, TabletFormFactor
68− };
69− enum FavoriteApplication {
70− CameraApplication, GalleryApplication, BrowserApplication, ShareApplication,
71− PhoneApplication, DialerApplication, MessagingApplication, AddressbookApplication
72− };
73 enum Flag {
48 enum Flag {
74 NoFlag = 0x0,
49 NoFlag = 0x0,
75 ForceMainStage = 0x1,
50 ForceMainStage = 0x1,
76 };
51 };
77 Q_DECLARE_FLAGS(ExecFlags, Flag)
52 Q_DECLARE_FLAGS(ExecFlags, Flag)
78
53
79− int sideStageWidth() const;
80− StageHint stageHint() const;
81− FormFactorHint formFactorHint() const;
82−
83− bool fake() { return true; }
84−
85 // QAbstractItemModel methods.
54 // QAbstractItemModel methods.
86 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
55 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
87 QVariant data(const QModelIndex& index, int role) const override;
56 QVariant data(const QModelIndex& index, int role) const override;
@@ -114,7 +83,6 @@ class ApplicationManager : public ApplicationManagerInterface {
114 bool isEmpty() const;
83 bool isEmpty() const;
115
84
116 Q_SIGNALS:
85 Q_SIGNALS:
117− void focusRequested(FavoriteApplication favoriteApplication);
118 void focusRequested(const QString &appId);
86 void focusRequested(const QString &appId);
119 void emptyChanged(bool empty);
87 void emptyChanged(bool empty);
120
88