Only pass mg::DisplayConfiguration to qtmir::Display, as that is all it needs

3 files changed, 6 insertions, 7 deletions

diff --git a/src/platforms/mirserver/display.cpp b/src/platforms/mirserver/display.cpp
index 538f921..7228f6e 100644
--- a/src/platforms/mirserver/display.cpp
+++ b/src/platforms/mirserver/display.cpp
@@ -28,10 +28,8 @@ namespace mg = mir::graphics;
 
 // TODO: Listen for display changes and update the list accordingly
 
-Display::Display(const QSharedPointer<MirServer> &server)
+Display::Display(const std::shared_ptr<mir::graphics::DisplayConfiguration> &displayConfig)
 {
-    std::shared_ptr<mir::graphics::DisplayConfiguration> displayConfig = server->the_display()->configuration();
-
     displayConfig->for_each_output([this](mg::DisplayConfigurationOutput const& output) {
         if (output.used) {
             auto screen = new Screen(output);
diff --git a/src/platforms/mirserver/display.h b/src/platforms/mirserver/display.h
index f84a820..bc77381 100644
--- a/src/platforms/mirserver/display.h
+++ b/src/platforms/mirserver/display.h
@@ -19,15 +19,15 @@
 #ifndef DISPLAY_H
 #define DISPLAY_H
 
-#include <QSharedPointer>
 #include <qpa/qplatformscreen.h>
+#include <memory>
 
-class MirServer;
+namespace mir { namespace graphics { class DisplayConfiguration; }}
 
 class Display
 {
 public:
-    Display(const QSharedPointer<MirServer> &server);
+    Display(const std::shared_ptr<mir::graphics::DisplayConfiguration> &displayConfig);
     virtual ~Display();
 
     QList<QPlatformScreen *> screens() const { return m_screens; }
diff --git a/src/platforms/mirserver/mirserverintegration.cpp b/src/platforms/mirserver/mirserverintegration.cpp
index e6ff1e7..ad33caa 100644
--- a/src/platforms/mirserver/mirserverintegration.cpp
+++ b/src/platforms/mirserver/mirserverintegration.cpp
@@ -40,6 +40,7 @@
 
 // Mir
 #include <mir/graphics/display.h>
+#include <mir/graphics/display_configuration.h>
 
 // local
 #include "clipboard.h"
@@ -171,7 +172,7 @@ void MirServerIntegration::initialize()
         exit(2);
     }
 
-    m_display = new Display(m_mirServer->mirServer());
+    m_display = new Display(m_mirServer->mirServer().data()->the_display()->configuration());
     m_nativeInterface = new NativeInterface(m_mirServer->mirServer());
 
     for (QPlatformScreen *screen : m_display->screens())