on xenial help sign in
Remove enums and properties that doesn't exist in the real ApplicationManager

And which, therefore, are not used anywhere in unity8 Approved by: Albert Astals Cid

commit7f8c6efed6469421209fa169669c8872dc1fc837 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateMon 2 Mar 2015, 12:10 (12 years ago) parentdaa570887f587d
2 files changed−47
tests/mocks/Unity/Application/ApplicationManager.cpp−15 tests/mocks/Unity/Application/ApplicationManager.h−32
tests/mocks/Unity/Application/ApplicationManager.cpp−15
@@ -198,21 +198,6 @@ void ApplicationManager::move(int from, int to) {
198198 }
199199}
200200
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−
216201ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
217202 const QStringList &arguments)
218203{
tests/mocks/Unity/Application/ApplicationManager.h−32
@@ -31,20 +31,10 @@ using namespace unity::shell::application;
3131
3232class ApplicationManager : public ApplicationManagerInterface {
3333 Q_OBJECT
34− Q_ENUMS(Role)
35− Q_ENUMS(StageHint)
36− Q_ENUMS(FormFactorHint)
37− Q_ENUMS(FavoriteApplication)
3834 Q_FLAGS(ExecFlags)
3935
4036 Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
4137
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−
4838 public:
4939 ApplicationManager(QObject *parent = nullptr);
5040 virtual ~ApplicationManager();
@@ -55,33 +45,12 @@ class ApplicationManager : public ApplicationManagerInterface {
5545 RoleSession = RoleFocused+1,
5646 RoleFullscreen,
5747 };
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− };
7348 enum Flag {
7449 NoFlag = 0x0,
7550 ForceMainStage = 0x1,
7651 };
7752 Q_DECLARE_FLAGS(ExecFlags, Flag)
7853
79− int sideStageWidth() const;
80− StageHint stageHint() const;
81− FormFactorHint formFactorHint() const;
82−
83− bool fake() { return true; }
84−
8554 // QAbstractItemModel methods.
8655 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
8756 QVariant data(const QModelIndex& index, int role) const override;
@@ -114,7 +83,6 @@ class ApplicationManager : public ApplicationManagerInterface {
11483 bool isEmpty() const;
11584
11685 Q_SIGNALS:
117− void focusRequested(FavoriteApplication favoriteApplication);
11886 void focusRequested(const QString &appId);
11987 void emptyChanged(bool empty);
12088