Changeset 62990 in vbox for trunk/src

Timestamp:

Aug 4, 2016 1:58:32 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109599

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 05): Qt5 migration, e.g. QDesktopWidget screen count change signal is no more reliable (at least under XCB), using QApplication screen add/remove signals instead.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIDesktopWidgetWatchdog.cpp (modified) (5 diffs)
• UIDesktopWidgetWatchdog.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp

@@ -23 +23 @@
 # include <QApplication>
 # include <QDesktopWidget>
+# if QT_VERSION >= 0x050000
+#  include <QScreen>
+# endif /* QT_VERSION >= 0x050000 */
 
 /* GUI includes: */
@@ -140 +143 @@
 }
 
+#if QT_VERSION < 0x050000
+
 void UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged(int cHostScreenCount)
 {
@@ -147 +152 @@
     updateHostScreenConfiguration(cHostScreenCount);
 }
+
+#else /* QT_VERSION >= 0x050000 */
+
+void UIDesktopWidgetWatchdog::sltHostScreenAdded(QScreen *pHostScreen)
+{
+//    printf("UIDesktopWidgetWatchdog::sltHostScreenAdded(%d)\n", m_pDesktopWidget->screenCount());
+
+    /* Update host-screen configuration: */
+    updateHostScreenConfiguration();
+}
+
+void UIDesktopWidgetWatchdog::sltHostScreenRemoved(QScreen *pHostScreen)
+{
+//    printf("UIDesktopWidgetWatchdog::sltHostScreenRemoved(%d)\n", m_pDesktopWidget->screenCount());
+
+    /* Update host-screen configuration: */
+    updateHostScreenConfiguration();
+}
+
+#endif /* QT_VERSION >= 0x050000 */
 
 void UIDesktopWidgetWatchdog::sltHandleHostScreenResized(int iHostScreenIndex)
@@ -173 +198 @@
 {
     /* Prepare connections: */
+#if QT_VERSION < 0x050000
     connect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int)));
+#else /* QT_VERSION >= 0x050000 */
+    connect(qApp, SIGNAL(screenAdded(QScreen *)), this, SLOT(sltHostScreenAdded(QScreen *)));
+    connect(qApp, SIGNAL(screenRemoved(QScreen *)), this, SLOT(sltHostScreenRemoved(QScreen *)));
+#endif /* QT_VERSION >= 0x050000 */
     connect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
 
@@ -183 +213 @@
 {
     /* Cleanup connections: */
+#if QT_VERSION < 0x050000
     disconnect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltHandleHostScreenCountChanged(int)));
+#else /* QT_VERSION >= 0x050000 */
+    disconnect(qApp, SIGNAL(screenAdded(QScreen *)), this, SLOT(sltHostScreenAdded(QScreen *)));
+    disconnect(qApp, SIGNAL(screenRemoved(QScreen *)), this, SLOT(sltHostScreenRemoved(QScreen *)));
+#endif /* QT_VERSION >= 0x050000 */
     disconnect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.h

@@ -26 +26 @@
 /* Forward declarations: */
 class QDesktopWidget;
+#if QT_VERSION >= 0x050000
+class QScreen;
+#endif /* QT_VERSION >= 0x050000 */
 
 /** QObject extension used as
@@ -50 +53 @@
 private slots:
 
+#if QT_VERSION < 0x050000
     /** Handles host-screen count change to @a cHostScreenCount. */
     void sltHandleHostScreenCountChanged(int cHostScreenCount);
+#else /* QT_VERSION >= 0x050000 */
+    /** Handles @a pHostScreen adding. */
+    void sltHostScreenAdded(QScreen *pHostScreen);
+    /** Handles @a pHostScreen removing. */
+    void sltHostScreenRemoved(QScreen *pHostScreen);
+#endif /* QT_VERSION >= 0x050000 */
 
     /** Handles resize for the host-screen with @a iHostScreenIndex. */