1 files changed, 17 insertions, 31 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h
index ba49945715..9955616919 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h
@@ -49,49 +49,35 @@
 
 QT_BEGIN_NAMESPACE
 
-class QEglFSKmsDevice;
+class QKmsDevice;
+class QKmsScreenConfig;
 
 Q_EGLFS_EXPORT Q_DECLARE_LOGGING_CATEGORY(qLcEglfsKmsDebug)
 
 class Q_EGLFS_EXPORT QEglFSKmsIntegration : public QEglFSDeviceIntegration
 {
 public:
-    enum VirtualDesktopLayout {
-        VirtualDesktopLayoutHorizontal,
-        VirtualDesktopLayoutVertical
-    };
-
     QEglFSKmsIntegration();
+    ~QEglFSKmsIntegration();
 
-    void platformInit() Q_DECL_OVERRIDE;
-    void platformDestroy() Q_DECL_OVERRIDE;
-    EGLNativeDisplayType platformDisplay() const Q_DECL_OVERRIDE;
-    bool usesDefaultScreen() Q_DECL_OVERRIDE;
-    void screenInit() Q_DECL_OVERRIDE;
-    QSurfaceFormat surfaceFormatFor(const QSurfaceFormat &inputFormat) const Q_DECL_OVERRIDE;
-    bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE;
-    void waitForVSync(QPlatformSurface *surface) const Q_DECL_OVERRIDE;
-    bool supportsPBuffers() const Q_DECL_OVERRIDE;
-
-    virtual bool hwCursor() const;
-    virtual bool separateScreens() const;
-    virtual VirtualDesktopLayout virtualDesktopLayout() const;
-    QMap<QString, QVariantMap> outputSettings() const;
+    void platformInit() override;
+    void platformDestroy() override;
+    EGLNativeDisplayType platformDisplay() const override;
+    bool usesDefaultScreen() override;
+    void screenInit() override;
+    QSurfaceFormat surfaceFormatFor(const QSurfaceFormat &inputFormat) const override;
+    bool hasCapability(QPlatformIntegration::Capability cap) const override;
+    void waitForVSync(QPlatformSurface *surface) const override;
+    bool supportsPBuffers() const override;
 
-    QEglFSKmsDevice *device() const;
+    QKmsDevice *device() const;
+    QKmsScreenConfig *screenConfig() const;
 
 protected:
-    virtual QEglFSKmsDevice *createDevice(const QString &devicePath) = 0;
-
-    void loadConfig();
+    virtual QKmsDevice *createDevice() = 0;
 
-    QEglFSKmsDevice *m_device;
-    bool m_hwCursor;
-    bool m_pbuffers;
-    bool m_separateScreens;
-    VirtualDesktopLayout m_virtualDesktopLayout;
-    QString m_devicePath;
-    QMap<QString, QVariantMap> m_outputSettings;
+    QKmsDevice *m_device;
+    QKmsScreenConfig *m_screenConfig;
 };
 
 QT_END_NAMESPACE