Tidy up code

7 files changed, 23 insertions, 26 deletions

diff --git a/src/modules/Unity/Application/mirsurfaceitem.cpp b/src/modules/Unity/Application/mirsurfaceitem.cpp
index bb2582f..2298f56 100644
--- a/src/modules/Unity/Application/mirsurfaceitem.cpp
+++ b/src/modules/Unity/Application/mirsurfaceitem.cpp
@@ -23,7 +23,6 @@
 #include "mirbuffersgtexture.h"
 #include "session.h"
 #include "mirsurfaceitem.h"
-#include "mirshell.h"
 #include "logging.h"
 #include "ubuntukeyboardinfo.h"
 
diff --git a/src/modules/Unity/Application/mirsurfacemanager.cpp b/src/modules/Unity/Application/mirsurfacemanager.cpp
index 183c3a5..5aa3122 100644
--- a/src/modules/Unity/Application/mirsurfacemanager.cpp
+++ b/src/modules/Unity/Application/mirsurfacemanager.cpp
@@ -31,7 +31,6 @@
 #include "nativeinterface.h"
 #include "mirserver.h"
 #include "sessionlistener.h"
-#include "mirshell.h"
 #include "logging.h"
 
 Q_LOGGING_CATEGORY(QTMIR_SURFACES, "qtmir.surfaces")
diff --git a/src/modules/Unity/Application/sessionmanager.cpp b/src/modules/Unity/Application/sessionmanager.cpp
index 75c4ba0..9b5e14f 100644
--- a/src/modules/Unity/Application/sessionmanager.cpp
+++ b/src/modules/Unity/Application/sessionmanager.cpp
@@ -26,7 +26,6 @@
 #include "nativeinterface.h"
 #include "mirserver.h"
 #include "sessionlistener.h"
-#include "mirshell.h"
 #include "logging.h"
 #include "promptsessionlistener.h"
 
diff --git a/src/platforms/mirserver/CMakeLists.txt b/src/platforms/mirserver/CMakeLists.txt
index 60abe20..2289f58 100644
--- a/src/platforms/mirserver/CMakeLists.txt
+++ b/src/platforms/mirserver/CMakeLists.txt
@@ -40,7 +40,7 @@ add_definitions(-DBYTE_ORDER=__BYTE_ORDER)
 
 set(MIRSERVER_QPA_PLUGIN_SRC
     ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp
-    mirshell.cpp
+    mirwindowmanager.cpp
     qteventfeeder.cpp
     plugin.cpp
     qmirserver.cpp
diff --git a/src/platforms/mirserver/mirserver.cpp b/src/platforms/mirserver/mirserver.cpp
index e90296a..f7bb74a 100644
--- a/src/platforms/mirserver/mirserver.cpp
+++ b/src/platforms/mirserver/mirserver.cpp
@@ -19,7 +19,7 @@
 #include "mirserver.h"
 
 // local
-#include "mirshell.h"
+#include "mirwindowmanager.h"
 #include "mirglconfig.h"
 #include "mirserverstatuslistener.h"
 #include "promptsessionlistener.h"
@@ -89,7 +89,7 @@ MirServer::MirServer(int argc, char const* argv[], QObject* parent)
     override_the_window_manager_builder([this](mir::shell::FocusController* /*focus_controller*/)
         -> std::shared_ptr<mir::shell::WindowManager>
         {
-            return std::make_shared<QtMirWindowManager>(the_shell_display_layout());
+            return std::make_shared<MirWindowManager>(the_shell_display_layout());
         });
 
     set_terminator([&](int)
diff --git a/src/platforms/mirserver/mirshell.cpp b/src/platforms/mirserver/mirwindowmanager.cpp
index d62c76c..a7bf2bc 100644
--- a/src/platforms/mirserver/mirshell.cpp
+++ b/src/platforms/mirserver/mirwindowmanager.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mirshell.h"
+#include "mirwindowmanager.h"
 #include "logging.h"
 #include "tracepoints.h" // generated from tracepoints.tp
 
@@ -27,21 +27,21 @@
 
 namespace ms = mir::scene;
 
-QtMirWindowManager::QtMirWindowManager(const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout) :
+MirWindowManager::MirWindowManager(const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout) :
     m_displayLayout{displayLayout}
 {
-    qCDebug(QTMIR_MIR_MESSAGES) << "QtMirWindowManager::QtMirWindowManager";
+    qCDebug(QTMIR_MIR_MESSAGES) << "MirWindowManager::MirWindowManager";
 }
 
-void QtMirWindowManager::add_session(std::shared_ptr<ms::Session> const& /*session*/)
+void MirWindowManager::add_session(std::shared_ptr<ms::Session> const& /*session*/)
 {
 }
 
-void QtMirWindowManager::remove_session(std::shared_ptr<ms::Session> const& /*session*/)
+void MirWindowManager::remove_session(std::shared_ptr<ms::Session> const& /*session*/)
 {
 }
 
-auto QtMirWindowManager::add_surface(
+auto MirWindowManager::add_surface(
     std::shared_ptr<ms::Session> const& session,
     ms::SurfaceCreationParameters const& requestParameters,
     std::function<mir::frontend::SurfaceId(std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& params)> const& build)
@@ -60,7 +60,7 @@ auto QtMirWindowManager::add_surface(
     m_displayLayout->size_to_output(rect);
     placedParameters.size = rect.size;
 
-    qCDebug(QTMIR_MIR_MESSAGES) << "QtMirWindowManager::add_surface(): size requested ("
+    qCDebug(QTMIR_MIR_MESSAGES) << "MirWindowManager::add_surface(): size requested ("
                                 << requestParameters.size.width.as_int() << "," << requestParameters.size.height.as_int() << ") and placed ("
                                 << placedParameters.size.width.as_int() << "," << placedParameters.size.height.as_int() << ")";
 
@@ -69,36 +69,36 @@ auto QtMirWindowManager::add_surface(
     return build(session, placedParameters);
 }
 
-void QtMirWindowManager::remove_surface(
+void MirWindowManager::remove_surface(
     std::shared_ptr<ms::Session> const& /*session*/,
     std::weak_ptr<ms::Surface> const& /*surface*/)
 {
 }
 
-void QtMirWindowManager::add_display(mir::geometry::Rectangle const& /*area*/)
+void MirWindowManager::add_display(mir::geometry::Rectangle const& /*area*/)
 {
 }
 
-void QtMirWindowManager::remove_display(mir::geometry::Rectangle const& /*area*/)
+void MirWindowManager::remove_display(mir::geometry::Rectangle const& /*area*/)
 {
 }
 
-bool QtMirWindowManager::handle_keyboard_event(MirKeyboardEvent const* /*event*/)
+bool MirWindowManager::handle_keyboard_event(MirKeyboardEvent const* /*event*/)
 {
     return false;
 }
 
-bool QtMirWindowManager::handle_touch_event(MirTouchEvent const* /*event*/)
+bool MirWindowManager::handle_touch_event(MirTouchEvent const* /*event*/)
 {
     return false;
 }
 
-bool QtMirWindowManager::handle_pointer_event(MirPointerEvent const* /*event*/)
+bool MirWindowManager::handle_pointer_event(MirPointerEvent const* /*event*/)
 {
     return false;
 }
 
-int QtMirWindowManager::set_surface_attribute(
+int MirWindowManager::set_surface_attribute(
     std::shared_ptr<ms::Session> const& /*session*/,
     std::shared_ptr<ms::Surface> const& surface,
     MirSurfaceAttrib attrib,
@@ -107,6 +107,6 @@ int QtMirWindowManager::set_surface_attribute(
     return surface->configure(attrib, value);
 }
 
-void QtMirWindowManager::modify_surface(const std::shared_ptr<mir::scene::Session>&, const std::shared_ptr<mir::scene::Surface>&, const mir::shell::SurfaceSpecification&)
+void MirWindowManager::modify_surface(const std::shared_ptr<mir::scene::Session>&, const std::shared_ptr<mir::scene::Surface>&, const mir::shell::SurfaceSpecification&)
 {
 }
diff --git a/src/platforms/mirserver/mirshell.h b/src/platforms/mirserver/mirwindowmanager.h
index a467bbe..3cf719d 100644
--- a/src/platforms/mirserver/mirshell.h
+++ b/src/platforms/mirserver/mirwindowmanager.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef QPAMIRSERVER_SHELL_H
-#define QPAMIRSERVER_SHELL_H
+#ifndef QPAMIRSERVER_WINDOW_MANAGER_H
+#define QPAMIRSERVER_WINDOW_MANAGER_H
 
 #include <mir/shell/window_manager.h>
 
@@ -27,13 +27,13 @@ namespace mir {
     }
 }
 
-class QtMirWindowManager : public QObject, public mir::shell::WindowManager
+class MirWindowManager : public QObject, public mir::shell::WindowManager
 {
 Q_OBJECT
 
 public:
 
-    QtMirWindowManager(const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout);
+    MirWindowManager(const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout);
 
     void add_session(std::shared_ptr<mir::scene::Session> const& session) override;
 
@@ -70,4 +70,4 @@ private:
     std::shared_ptr<mir::shell::DisplayLayout> const m_displayLayout;
 };
 
-#endif /* QPAMIRSERVER_SHELL_H */
+#endif /* QPAMIRSERVER_WINDOW_MANAGER_H */