Merge lp:~alan-griffiths/miral/remove-some-modules-Unity-Application-dependence-on-libmirserver-dev into lp:miral

[Alan Griffiths]

application_manager.cpp no longer needs libmiral-dev

[lp:~alan-griffiths/miral/remove-some-modules-Unity-Application-dependence-on-libmirserver-dev]

428. By Alan Griffiths on 2016-10-28

Add missing files

[Gerry Boland (gerboland)]

Change looks good, I approve of it.

I would quibble about the style of mirapplication.h/cpp - Qt prefers camelCase over under_score function naming - but as this feels temporary I won't block on it

review: Approve

=== modified file 'miral-qt/src/modules/Unity/Application/CMakeLists.txt'
--- miral-qt/src/modules/Unity/Application/CMakeLists.txt	2016-10-28 11:57:11 +0000
+++ miral-qt/src/modules/Unity/Application/CMakeLists.txt	2016-10-28 16:23:58 +0000
@@ -72,11 +72,9 @@
     settings_interface.h
     )
 
-set_source_files_properties(application_manager.cpp PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
 # SurfaceObserver unecessarily uses public inheritance from mir::scene::SurfaceObserver
 set_source_files_properties(mirsurface.cpp          PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
 set_source_files_properties(mirbuffersgtexture.cpp  PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
-set_source_files_properties(session.cpp             PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
 
 add_library(unityapplicationplugin SHARED
     ${QMLMIRPLUGIN_SRC}

=== modified file 'miral-qt/src/modules/Unity/Application/application_manager.cpp'
--- miral-qt/src/modules/Unity/Application/application_manager.cpp	2016-10-03 12:45:25 +0000
+++ miral-qt/src/modules/Unity/Application/application_manager.cpp	2016-10-28 16:23:58 +0000
@@ -31,12 +31,9 @@
 #include "nativeinterface.h"
 #include "sessionauthorizer.h"
 #include "logging.h"
+#include "mirapplication.h"
 
 // mir
-#include <mir/scene/session.h>
-#include <mir/scene/surface.h>
-#include <mir/graphics/display.h>
-#include <mir/graphics/display_buffer.h>
 #include <mir/geometry/rectangles.h>
 
 // Qt
@@ -580,14 +577,9 @@
 
 Application* ApplicationManager::findApplicationWithSession(const std::shared_ptr<ms::Session> &session)
 {
-    return findApplicationWithSession(session.get());
-}
-
-Application* ApplicationManager::findApplicationWithSession(const ms::Session *session)
-{
     if (!session)
         return nullptr;
-    return findApplicationWithPid(session->process_id());
+    return findApplicationWithPid(pid_of(session));
 }
 
 Application* ApplicationManager::findApplicationWithPid(const pid_t pid) const

=== modified file 'miral-qt/src/modules/Unity/Application/application_manager.h'
--- miral-qt/src/modules/Unity/Application/application_manager.h	2016-09-30 14:04:24 +0000
+++ miral-qt/src/modules/Unity/Application/application_manager.h	2016-10-28 16:23:58 +0000
@@ -122,7 +122,7 @@
     void setFocused(Application *application);
     void add(Application *application);
     void remove(Application* application);
-    Application* findApplicationWithSession(const mir::scene::Session *session);
+
     QModelIndex findIndex(Application* application);
     void resumeApplication(Application *application);
     QString toString() const;

=== modified file 'miral-qt/src/modules/Unity/Application/session.cpp'
--- miral-qt/src/modules/Unity/Application/session.cpp	2016-10-10 11:11:50 +0000
+++ miral-qt/src/modules/Unity/Application/session.cpp	2016-10-28 16:23:58 +0000
@@ -24,9 +24,7 @@
 
 // mirserver
 #include "logging.h"
-
-// mir
-#include <mir/scene/session.h>
+#include "mirapplication.h"
 
 // Qt
 #include <QPainter>
@@ -119,7 +117,7 @@
 
 QString Session::name() const
 {
-    return QString::fromStdString(m_session->name());
+    return QString::fromStdString(name_of(m_session));
 }
 
 std::shared_ptr<ms::Session> Session::session() const
@@ -291,7 +289,7 @@
 {
     DEBUG_MSG << " state=" << sessionStateToString(m_state);
     if (m_state == Running) {
-        session()->set_lifecycle_state(mir_lifecycle_state_will_suspend);
+        apply_lifecycle_state_to(session(), mir_lifecycle_state_will_suspend);
         m_suspendTimer->start();
 
         foreachPromptSession([this](const qtmir::PromptSession &promptSession) {
@@ -324,7 +322,7 @@
         }
     }
 
-    session()->set_lifecycle_state(mir_lifecycle_state_resumed);
+    apply_lifecycle_state_to(session(), mir_lifecycle_state_resumed);
 
     foreachPromptSession([this](const qtmir::PromptSession &promptSession) {
         m_promptSessionManager->resumePromptSession(promptSession);
@@ -542,7 +540,7 @@
 
 pid_t Session::pid() const
 {
-    return m_session->process_id();
+    return pid_of(m_session);
 }
 
 void Session::setSuspendTimer(AbstractTimer *timer)

=== modified file 'miral-qt/src/platforms/mirserver/CMakeLists.txt'
--- miral-qt/src/platforms/mirserver/CMakeLists.txt	2016-10-28 09:51:07 +0000
+++ miral-qt/src/platforms/mirserver/CMakeLists.txt	2016-10-28 16:23:58 +0000
@@ -96,6 +96,7 @@
     screen.cpp
     screenwindow.cpp
     screensmodel.cpp
+    mirapplication.cpp mirapplication.h
     mirserverintegration.cpp
     miropenglcontext.cpp
     offscreensurface.cpp

=== added file 'miral-qt/src/platforms/mirserver/mirapplication.cpp'
--- miral-qt/src/platforms/mirserver/mirapplication.cpp	1970-01-01 00:00:00 +0000
+++ miral-qt/src/platforms/mirserver/mirapplication.cpp	2016-10-28 16:23:58 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mirapplication.h"
+
+#include <mir/scene/session.h>
+
+std::string qtmir::name_of(const miral::Application &application)
+{
+    return application->name();
+}
+
+pid_t qtmir::pid_of(const miral::Application &application)
+{
+    return application->process_id();
+}
+
+void qtmir::apply_lifecycle_state_to(const miral::Application &application, MirLifecycleState state)
+{
+    application->set_lifecycle_state(state);
+}

=== added file 'miral-qt/src/platforms/mirserver/mirapplication.h'
--- miral-qt/src/platforms/mirserver/mirapplication.h	1970-01-01 00:00:00 +0000
+++ miral-qt/src/platforms/mirserver/mirapplication.h	2016-10-28 16:23:58 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QTMIR_MIRAPPLICATION_H
+#define QTMIR_MIRAPPLICATION_H
+
+#include <miral/application.h>
+
+#include <mir_toolkit/common.h>
+
+#include <string>
+
+namespace qtmir
+{
+    std::string name_of(const miral::Application &application);
+    pid_t pid_of(const miral::Application &application);
+
+    void apply_lifecycle_state_to(const miral::Application &application, MirLifecycleState state);
+}
+
+#endif //QTMIR_MIRAPPLICATION_H