Merge lp:~aacid/unity8/noMoveEmpty into lp:unity8

[Albert Astals Cid]

mock: Remove empty property and move invokable

They are not part of the interface

 * Are there any related MPs required for this MP to build/function as expected?
No, but it kind of goes together with https://code.launchpad.net/~aacid/qtmir/remove_non_interface_things/+merge/320600

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2869
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3488/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4605
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2785
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2785
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4633
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4460
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4460/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4460
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4460/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4460
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4460/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4460
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4460/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4460
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4460/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4460
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4460/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3488/rebuild

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

And there I was going to use it :/

https://code.launchpad.net/~lukas-kde/unity8/betterSessionManagement/+merge/316212

[Lukáš Tinkl (lukas-kde)]

LGTM, makes sense, CI passing too

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Yes

review: Approve

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2017-02-24 15:43:46 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2017-03-22 09:00:55 +0000
@@ -172,7 +172,6 @@
 
     endInsertRows();
     Q_EMIT countChanged();
-    if (count() == 1) Q_EMIT emptyChanged(isEmpty()); // was empty but not anymore
 
     return true;
 }
@@ -189,7 +188,6 @@
         endRemoveRows();
         m_modelBusy = false;
         Q_EMIT countChanged();
-        if (isEmpty()) Q_EMIT emptyChanged(isEmpty());
         DEBUG_MSG(application->appId() << " after: " << qPrintable(toString()));
     }
 }
@@ -502,11 +500,6 @@
     return appIds;
 }
 
-bool ApplicationManager::isEmpty() const
-{
-    return m_runningApplications.isEmpty();
-}
-
 ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)
 {
     for (ApplicationInfo *app : m_runningApplications) {

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2016-12-07 11:19:17 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2017-03-22 09:00:55 +0000
@@ -40,7 +40,6 @@
 class ApplicationManager : public ApplicationManagerInterface {
     Q_OBJECT
 
-    Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
     Q_PROPERTY(QStringList availableApplications READ availableApplications NOTIFY availableApplicationsChanged)
 
  public:
@@ -56,8 +55,6 @@
     Q_INVOKABLE ApplicationInfo *findApplication(const QString &appId) const override;
     unity::shell::application::ApplicationInfoInterface *findApplicationWithSurface(unity::shell::application::MirSurfaceInterface* surface) const override;
 
-    Q_INVOKABLE void move(int from, int to);
-
     // Application control methods
     Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
     Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
@@ -71,17 +68,15 @@
 
     QModelIndex findIndex(ApplicationInfo* application);
 
-    bool isEmpty() const;
-
  Q_SIGNALS:
     void focusRequested(const QString &appId);
-    void emptyChanged(bool empty);
     void availableApplicationsChanged(QStringList list);
 
  private Q_SLOTS:
     void raiseApp(const QString &appId);
 
  private:
+    void move(int from, int to);
     bool add(ApplicationInfo *application);
     void remove(ApplicationInfo* application);
     void buildListOfAvailableApplications();