1 files changed, 19 insertions, 43 deletions

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
index fa331f0931..80bbb0c7f1 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
@@ -42,65 +42,42 @@
 #ifndef QEGLFSKMSSCREEN_H
 #define QEGLFSKMSSCREEN_H
 
-#include "qeglfskmsintegration.h"
 #include "private/qeglfsscreen_p.h"
 #include <QtCore/QList>
 #include <QtCore/QMutex>
 
-#include <xf86drm.h>
-#include <xf86drmMode.h>
+#include <QtKmsSupport/private/qkmsdevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QEglFSKmsDevice;
 class QEglFSKmsInterruptHandler;
 
-struct QEglFSKmsOutput
-{
-    QString name;
-    uint32_t connector_id;
-    uint32_t crtc_id;
-    QSizeF physical_size;
-    int mode; // index of selected mode in list below
-    bool mode_set;
-    drmModeCrtcPtr saved_crtc;
-    QList<drmModeModeInfo> modes;
-    int subpixel;
-    drmModePropertyPtr dpms_prop;
-    bool wants_plane;
-    uint32_t plane_id;
-    bool plane_set;
-};
-
 class Q_EGLFS_EXPORT QEglFSKmsScreen : public QEglFSScreen
 {
 public:
-    QEglFSKmsScreen(QEglFSKmsIntegration *integration,
-                    QEglFSKmsDevice *device,
-                    QEglFSKmsOutput output);
+    QEglFSKmsScreen(QKmsDevice *device, const QKmsOutput &output);
     ~QEglFSKmsScreen();
 
     void setVirtualPosition(const QPoint &pos);
 
-    QRect rawGeometry() const Q_DECL_OVERRIDE;
+    QRect rawGeometry() const override;
 
-    int depth() const Q_DECL_OVERRIDE;
-    QImage::Format format() const Q_DECL_OVERRIDE;
+    int depth() const override;
+    QImage::Format format() const override;
 
-    QSizeF physicalSize() const Q_DECL_OVERRIDE;
-    QDpi logicalDpi() const Q_DECL_OVERRIDE;
-    Qt::ScreenOrientation nativeOrientation() const Q_DECL_OVERRIDE;
-    Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE;
+    QSizeF physicalSize() const override;
+    QDpi logicalDpi() const override;
+    Qt::ScreenOrientation nativeOrientation() const override;
+    Qt::ScreenOrientation orientation() const override;
 
-    QString name() const Q_DECL_OVERRIDE;
+    QString name() const override;
 
-    qreal refreshRate() const Q_DECL_OVERRIDE;
+    qreal refreshRate() const override;
 
-    QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE { return m_siblings; }
+    QList<QPlatformScreen *> virtualSiblings() const override { return m_siblings; }
     void setVirtualSiblings(QList<QPlatformScreen *> sl) { m_siblings = sl; }
 
-    QEglFSKmsIntegration *integration() const { return m_integration; }
-    QEglFSKmsDevice *device() const { return m_device; }
+    QKmsDevice *device() const { return m_device; }
 
     void destroySurface();
 
@@ -108,19 +85,18 @@ public:
     virtual void flip();
     virtual void flipFinished();
 
-    QEglFSKmsOutput &output() { return m_output; }
+    QKmsOutput &output() { return m_output; }
     void restoreMode();
 
-    SubpixelAntialiasingType subpixelAntialiasingTypeHint() const Q_DECL_OVERRIDE;
+    SubpixelAntialiasingType subpixelAntialiasingTypeHint() const override;
 
-    QPlatformScreen::PowerState powerState() const Q_DECL_OVERRIDE;
-    void setPowerState(QPlatformScreen::PowerState state) Q_DECL_OVERRIDE;
+    QPlatformScreen::PowerState powerState() const override;
+    void setPowerState(QPlatformScreen::PowerState state) override;
 
 protected:
-    QEglFSKmsIntegration *m_integration;
-    QEglFSKmsDevice *m_device;
+    QKmsDevice *m_device;
 
-    QEglFSKmsOutput m_output;
+    QKmsOutput m_output;
     QPoint m_pos;
 
     QList<QPlatformScreen *> m_siblings;