git.iko.soy/unity8
on xenial help sign in
mock: Remove empty property and move invokable

They are not part of the interface Approved by: Lukáš Tinkl, Unity8 CI Bot

commitb93fd56b43148456e38298adafe937392fc9bea0 authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 28 Mar 2017, 21:43 (10 years ago) parent46bca5f381ee36
2 files changed+1−13
compare with xenial
unifiedsplit
tests/mocks/Unity/Application/ApplicationManager.cpp−7 tests/mocks/Unity/Application/ApplicationManager.h+1−6
tests/mocks/Unity/Application/ApplicationManager.cpp−7
@@ -172,7 +172,6 @@ bool ApplicationManager::add(ApplicationInfo *application) {
172172
173173 endInsertRows();
174174 Q_EMIT countChanged();
175− if (count() == 1) Q_EMIT emptyChanged(isEmpty()); // was empty but not anymore
176175
177176 return true;
178177}
@@ -189,7 +188,6 @@ void ApplicationManager::remove(ApplicationInfo *application) {
189188 endRemoveRows();
190189 m_modelBusy = false;
191190 Q_EMIT countChanged();
192− if (isEmpty()) Q_EMIT emptyChanged(isEmpty());
193191 DEBUG_MSG(application->appId() << " after: " << qPrintable(toString()));
194192 }
195193}
@@ -502,11 +500,6 @@ QStringList ApplicationManager::availableApplications()
502500 return appIds;
503501}
504502
505−bool ApplicationManager::isEmpty() const
506−{
507− return m_runningApplications.isEmpty();
508−}
509−
510503ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)
511504{
512505 for (ApplicationInfo *app : m_runningApplications) {
tests/mocks/Unity/Application/ApplicationManager.h+1−6
@@ -40,7 +40,6 @@ using namespace unity::shell::application;
4040class ApplicationManager : public ApplicationManagerInterface {
4141 Q_OBJECT
4242
43− Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
4443 Q_PROPERTY(QStringList availableApplications READ availableApplications NOTIFY availableApplicationsChanged)
4544
4645 public:
@@ -56,8 +55,6 @@ class ApplicationManager : public ApplicationManagerInterface {
5655 Q_INVOKABLE ApplicationInfo *findApplication(const QString &appId) const override;
5756 unity::shell::application::ApplicationInfoInterface *findApplicationWithSurface(unity::shell::application::MirSurfaceInterface* surface) const override;
5857
59− Q_INVOKABLE void move(int from, int to);
60−
6158 // Application control methods
6259 Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
6360 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
@@ -71,17 +68,15 @@ class ApplicationManager : public ApplicationManagerInterface {
7168
7269 QModelIndex findIndex(ApplicationInfo* application);
7370
74− bool isEmpty() const;
75−
7671 Q_SIGNALS:
7772 void focusRequested(const QString &appId);
78− void emptyChanged(bool empty);
7973 void availableApplicationsChanged(QStringList list);
8074
8175 private Q_SLOTS:
8276 void raiseApp(const QString &appId);
8377
8478 private:
79+ void move(int from, int to);
8580 bool add(ApplicationInfo *application);
8681 void remove(ApplicationInfo* application);
8782 void buildListOfAvailableApplications();