381ee36 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Remove empty property and move invokable

381ee36Albert Astals Cid10 years ago

tests/mocks/Unity/Application/ApplicationManager.cpp−7

compare with xenial

unifiedsplit

@@ -172,7 +172,6 @@ bool ApplicationManager::add(ApplicationInfo *application) {

172

173 endInsertRows();

174 Q_EMIT countChanged();

175− if (count() == 1) Q_EMIT emptyChanged(isEmpty()); // was empty but not anymore

176

175

177 return true;

176 return true;

178}

177}

@@ -189,7 +188,6 @@ void ApplicationManager::remove(ApplicationInfo *application) {

189 endRemoveRows();

188 endRemoveRows();

190 m_modelBusy = false;

189 m_modelBusy = false;

191 Q_EMIT countChanged();

190 Q_EMIT countChanged();

192− if (isEmpty()) Q_EMIT emptyChanged(isEmpty());

193 DEBUG_MSG(application->appId() << " after: " << qPrintable(toString()));

191 DEBUG_MSG(application->appId() << " after: " << qPrintable(toString()));

194 }

192 }

195}

193}

@@ -502,11 +500,6 @@ QStringList ApplicationManager::availableApplications()

502 return appIds;

500 return appIds;

503}

501}

504

502

505−bool ApplicationManager::isEmpty() const

506−{

507− return m_runningApplications.isEmpty();

508−}

509−

510ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)

503ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)

511{

504{

512 for (ApplicationInfo *app : m_runningApplications) {

505 for (ApplicationInfo *app : m_runningApplications) {

tests/mocks/Unity/Application/ApplicationManager.h+1−6

@@ -40,7 +40,6 @@ using namespace unity::shell::application;

40class ApplicationManager : public ApplicationManagerInterface {

41 Q_OBJECT

43− Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)

44 Q_PROPERTY(QStringList availableApplications READ availableApplications NOTIFY availableApplicationsChanged)

43 Q_PROPERTY(QStringList availableApplications READ availableApplications NOTIFY availableApplicationsChanged)

46 public:

45 public:

@@ -56,8 +55,6 @@ class ApplicationManager : public ApplicationManagerInterface {

56 Q_INVOKABLE ApplicationInfo *findApplication(const QString &appId) const override;

55 Q_INVOKABLE ApplicationInfo *findApplication(const QString &appId) const override;

57 unity::shell::application::ApplicationInfoInterface *findApplicationWithSurface(unity::shell::application::MirSurfaceInterface* surface) const override;

56 unity::shell::application::ApplicationInfoInterface *findApplicationWithSurface(unity::shell::application::MirSurfaceInterface* surface) const override;

59− Q_INVOKABLE void move(int from, int to);

60−

61 // Application control methods

58 // Application control methods

62 Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;

59 Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;

63 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;

60 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;

@@ -71,17 +68,15 @@ class ApplicationManager : public ApplicationManagerInterface {

72 QModelIndex findIndex(ApplicationInfo* application);

69 QModelIndex findIndex(ApplicationInfo* application);

74− bool isEmpty() const;

75−

76 Q_SIGNALS:

71 Q_SIGNALS:

77 void focusRequested(const QString &appId);

72 void focusRequested(const QString &appId);

78− void emptyChanged(bool empty);

79 void availableApplicationsChanged(QStringList list);

73 void availableApplicationsChanged(QStringList list);

81 private Q_SLOTS:

75 private Q_SLOTS:

82 void raiseApp(const QString &appId);

76 void raiseApp(const QString &appId);

84 private:

78 private:

79+ void move(int from, int to);

85 bool add(ApplicationInfo *application);

80 bool add(ApplicationInfo *application);

86 void remove(ApplicationInfo* application);

81 void remove(ApplicationInfo* application);

87 void buildListOfAvailableApplications();

82 void buildListOfAvailableApplications();