Merge lp:~dandrader/qtmir/fixIsPidFocused into lp:qtmir

[Daniel d'Andrada]

DBusFocusInfo.isPidFocused: search sessions recursively

* Are there any related MPs required for this MP to build/function as expected? Please list.
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?
Not applicable

[lp:~dandrader/qtmir/fixIsPidFocused]

551. By Daniel d'Andrada on 2016-08-25

Fix indentation

[Gerry Boland (gerboland)]

- Q_FOREACH (Application* application, m_applications) {
+ for (Application* application : m_applications) {
not a blocker, just a hint the original *might* be better. Ref:
http://www.dvratil.cz/2015/06/qt-containers-and-c11-range-based-loops/

Other than that, code looks ok

review: Approve

[lp:~dandrader/qtmir/fixIsPidFocused]

552. By Daniel d'Andrada on 2016-08-25

I hate Q_FOREACH

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

PASSED: Continuous integration, rev:550
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/349/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2671
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2699
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2566/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2566
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2566/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/modules/Unity/Application/dbusfocusinfo.cpp'
--- src/modules/Unity/Application/dbusfocusinfo.cpp	2016-07-05 13:26:14 +0000
+++ src/modules/Unity/Application/dbusfocusinfo.cpp	2016-08-25 15:28:41 +0000
@@ -71,19 +71,25 @@
 SessionInterface* DBusFocusInfo::findSessionWithPid(const QSet<pid_t> &pidSet)
 {
     Q_FOREACH (Application* application, m_applications) {
-        auto session = application->session();
-        if (pidSet.contains(session->pid())) {
-            return session;
-        }
-        SessionInterface *chosenChildSession = nullptr;
-        session->foreachChildSession([&](SessionInterface* childSession) {
-            if (pidSet.contains(childSession->pid())) {
-                chosenChildSession = childSession;
-            }
-        });
-        if (chosenChildSession) {
-            return chosenChildSession;
+        SessionInterface *sessionWithPid = findSessionWithPid(application->session(), pidSet);
+        if (sessionWithPid) {
+            return sessionWithPid;
         }
     }
     return nullptr;
 }
+
+SessionInterface* DBusFocusInfo::findSessionWithPid(SessionInterface* session, const QSet<pid_t> &pidSet)
+{
+    if (pidSet.contains(session->pid())) {
+        return session;
+    }
+
+    SessionInterface *sessionWithPid = nullptr;
+    session->foreachChildSession([&](SessionInterface* childSession) {
+        if (!sessionWithPid) {
+            sessionWithPid = findSessionWithPid(childSession, pidSet);
+        }
+    });
+    return sessionWithPid;
+}

=== modified file 'src/modules/Unity/Application/dbusfocusinfo.h'
--- src/modules/Unity/Application/dbusfocusinfo.h	2016-07-01 16:15:54 +0000
+++ src/modules/Unity/Application/dbusfocusinfo.h	2016-08-25 15:28:41 +0000
@@ -45,6 +45,7 @@
 private:
     QSet<pid_t> fetchAssociatedPids(pid_t pid);
     SessionInterface* findSessionWithPid(const QSet<pid_t> &pidSet);
+    SessionInterface* findSessionWithPid(SessionInterface* session, const QSet<pid_t> &pidSet);
 
     const QList<Application*> &m_applications;