Merge lp:~aacid/qtmir/remove_non_interface_things into lp:qtmir

[Albert Astals Cid]

Remove empty property and move invokable

They are not part of the interface and not used by unity8 either

 * Are there any related MPs required for this MP to build/function as expected?
No

 * 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

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

PASSED: Continuous integration, rev:619
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/606/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4604
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4632
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4459
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4459/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4459
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4459/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4459
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4459/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4459
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4459/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4459
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4459/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4459
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4459/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

- qtmir::Application* findApplicationWithPid(const pid_t pid) const;
run this by Dednick, my memory suggests DBus menus require the pid. Though probably not since it's not Q_INVOKABLE

Rest looks good!

[Nick Dedekind (nick-dedekind)]

> - qtmir::Application* findApplicationWithPid(const pid_t pid) const;
> run this by Dednick, my memory suggests DBus menus require the pid. Though
> probably not since it's not Q_INVOKABLE

We dont use it for menus. We only use the "Surface Menus" (which use surfaceId)
But we "may" need something in the future when we start using "Application Menus" (which use pid)

>
> Rest looks good!

[Albert Astals Cid (aacid)]

> > - qtmir::Application* findApplicationWithPid(const pid_t pid) const;
> > run this by Dednick, my memory suggests DBus menus require the pid. Though
> > probably not since it's not Q_INVOKABLE
>
> We dont use it for menus. We only use the "Surface Menus" (which use
> surfaceId)
> But we "may" need something in the future when we start using "Application
> Menus" (which use pid)

We can add it later if needed, in this branch i'm just removing functions we don't need to close the entry points for the branch that adds the mutex handling to ApplicationManager.

>
> >
> > Rest looks good!

[Gerry Boland (gerboland)]

Yep, happy to remove it not being used ATM

review: Approve

[lp:~aacid/qtmir/remove_non_interface_things]

620. By Albert Astals Cid on 2017-03-24

Merge

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

PASSED: Continuous integration, rev:620
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/642/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4749
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4777
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4599
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4599/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4599
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4599/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4599
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4599/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4599
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4599/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4599
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4599/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4599
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4599/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2017-02-21 18:46:30 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2017-03-24 08:44:31 +0000
@@ -658,9 +658,6 @@
     m_applications.append(application);
     endInsertRows();
     Q_EMIT countChanged();
-    if (m_applications.size() == 1) {
-        Q_EMIT emptyChanged();
-    }
 
     m_modelUnderChange = false;
 
@@ -686,9 +683,6 @@
     m_applications.removeAt(index);
     endRemoveRows();
     Q_EMIT countChanged();
-    if (index == 0) {
-        Q_EMIT emptyChanged();
-    }
 
     disconnect(application, &Application::fullscreenChanged, this, 0);
     disconnect(application, &Application::focusedChanged, this, 0);
@@ -705,29 +699,6 @@
     DEBUG_MSG << "(appId=" << application->appId() << ") - after " << toString();
 }
 
-void ApplicationManager::move(int from, int to) {
-    qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::move - from=" << from << "to=" << to;
-    if (from == to) return;
-
-    Q_ASSERT(!m_modelUnderChange);
-    m_modelUnderChange = true;
-
-    if (from >= 0 && from < m_applications.size() && to >= 0 && to < m_applications.size()) {
-        QModelIndex parent;
-        /* When moving an item down, the destination index needs to be incremented
-           by one, as explained in the documentation:
-           http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
-
-        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
-        m_applications.move(from, to);
-        endMoveRows();
-    }
-
-    m_modelUnderChange = false;
-
-    qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::move after " << toString();
-}
-
 QModelIndex ApplicationManager::findIndex(Application* application)
 {
     for (int i = 0; i < m_applications.size(); ++i) {
@@ -763,17 +734,6 @@
     return nullptr;
 }
 
-Application *ApplicationManager::findApplication(qtmir::MirSurfaceInterface* surface)
-{
-    Q_FOREACH (Application *app, m_applications) {
-        if (app->session() == surface->session()) {
-            return app;
-        }
-    }
-    return nullptr;
-}
-
-
 void ApplicationManager::onSessionStarting(SessionInterface *qmlSession)
 {
     Application* application = findApplicationWithSession(qmlSession->session());

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2017-03-20 15:56:22 +0000
+++ src/modules/Unity/Application/application_manager.h	2017-03-24 08:44:31 +0000
@@ -61,9 +61,6 @@
 {
     Q_OBJECT
 
-    // TODO: Move to unity::shell::application::ApplicationManagerInterface
-    Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
-
 public:
     static ApplicationManager* create();
     static ApplicationManager* singleton();
@@ -89,13 +86,6 @@
     int rowCount(const QModelIndex & parent = QModelIndex()) const override;
     QVariant data(const QModelIndex & index, int role) const override;
 
-    Q_INVOKABLE void move(int from, int to);
-
-    bool isEmpty() const { return rowCount() == 0; }
-
-    const QList<Application*> &list() const { return m_applications; }
-    qtmir::Application* findApplicationWithPid(const pid_t pid) const;
-
     SessionInterface *findSession(const mir::scene::Session* session) const override;
 
 public Q_SLOTS:
@@ -109,14 +99,12 @@
     void onResumeRequested(const QString& appId);
     void onSessionStarting(SessionInterface *session);
 
-Q_SIGNALS:
-    void emptyChanged();
-
 private Q_SLOTS:
     void onAppDataChanged(const int role);
     void onApplicationClosing(Application *application);
 
 private:
+    qtmir::Application* findApplicationWithPid(const pid_t pid) const;
     Application* findApplicationWithSession(const std::shared_ptr<mir::scene::Session> &session);
     void setFocused(Application *application);
     void add(Application *application);
@@ -128,7 +116,6 @@
 
     Application* findApplicationWithPromptSession(const mir::scene::PromptSession* promptSession);
     Application *findClosingApplication(const QString &inputAppId) const;
-    Application *findApplication(MirSurfaceInterface* surface);
 
     QList<Application*> m_applications;
     DBusFocusInfo *m_dbusFocusInfo;