MythMainWindow: Move QWidget inheritance into MythUIScreenBounds

- which allows MythUIScreenBounds to use QObject functionality
MythTV · Oct 10, 2020 · 68e85b9 · 68e85b9
1 parent 6fcd24e
commit 68e85b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
@@ -131,7 +131,6 @@ MythNotificationCenter *GetNotificationCenter(void)
 }
 
 MythMainWindow::MythMainWindow(const bool useDB)
-  : QWidget(nullptr)
 {
     m_display = MythDisplay::Create();
 

diff --git a/mythtv/libs/libmythui/mythmainwindow.h b/mythtv/libs/libmythui/mythmainwindow.h
@@ -2,7 +2,6 @@
 #define MYTHMAINWINDOW_H_
 
 // Qt
-#include <QWidget>
 #include <QTimer>
 
 // MythTV
@@ -32,9 +31,10 @@ class MythMainWindowPrivate;
 class MythPainterWindow;
 class MythRender;
 
-class MUI_PUBLIC MythMainWindow : public QWidget, public MythUIScreenBounds
+class MUI_PUBLIC MythMainWindow : public MythUIScreenBounds
 {
     Q_OBJECT
+
     friend class MythPainterWindowOpenGL;
     friend class MythPainterWindowVulkan;
     friend class MythPainterWindowQt;

diff --git a/mythtv/libs/libmythui/mythuiscreenbounds.h b/mythtv/libs/libmythui/mythuiscreenbounds.h
@@ -2,15 +2,17 @@
 #define MYTHUISCREENBOUNDS_H
 
 // Qt
-#include <QRect>
+#include <QWidget>
 
 // MythTV
 #include "mythuiexp.h"
 
 class MythDisplay;
 
-class MUI_PUBLIC MythUIScreenBounds
+class MUI_PUBLIC MythUIScreenBounds : public QWidget
 {
+    Q_OBJECT
+
   public:
     static bool  GeometryIsOverridden();
     static void  ParseGeometryOverride(const QString& Geometry);