Changeset 64440 in vbox for trunk

Timestamp:

Oct 27, 2016 2:52:13 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8636: Desktop-widget watchdog: Split the code with proper QT_VERSION ifdefs since r111568 allows to avoid moc conflicts related to QT_VERSION.

Location:

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

Files:

• UIDesktopWidgetWatchdog.cpp (modified) (6 diffs)
• UIDesktopWidgetWatchdog.h (modified) (1 diff)

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

@@ -284 +284 @@
 #endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 
+#if QT_VERSION < 0x050000
+
 void UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged(int cHostScreenCount)
 {
-    Q_UNUSED(cHostScreenCount);
-
-#if QT_VERSION < 0x050000
 //    printf("UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged(%d)\n", cHostScreenCount);
 
@@ -298 +297 @@
     /* Notify listeners: */
     emit sigHostScreenCountChanged(cHostScreenCount);
-#endif /* QT_VERSION < 0x050000 */
-}
+}
+
+#else /* QT_VERSION >= 0x050000 */
 
 void UIDesktopWidgetWatchdog::sltHostScreenAdded(QScreen *pHostScreen)
 {
-    Q_UNUSED(pHostScreen);
-
-#if QT_VERSION >= 0x050000
 //    printf("UIDesktopWidgetWatchdog::sltHostScreenAdded(%d)\n", screenCount());
 
@@ -315 +312 @@
     /* Notify listeners: */
     emit sigHostScreenCountChanged(screenCount());
-#endif /* QT_VERSION >= 0x050000 */
 }
 
 void UIDesktopWidgetWatchdog::sltHostScreenRemoved(QScreen *pHostScreen)
 {
-    Q_UNUSED(pHostScreen);
-
-#if QT_VERSION >= 0x050000
 //    printf("UIDesktopWidgetWatchdog::sltHostScreenRemoved(%d)\n", screenCount());
 
@@ -332 +325 @@
     /* Notify listeners: */
     emit sigHostScreenCountChanged(screenCount());
+}
+
 #endif /* QT_VERSION >= 0x050000 */
-}
 
 void UIDesktopWidgetWatchdog::sltHandleHostScreenResized(int iHostScreenIndex)
@@ -385 +379 @@
 {
     /* Prepare connections: */
+#if QT_VERSION < 0x050000
     connect(QApplication::desktop(), 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(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(sltHandleHostScreenWorkAreaResized(int)));
@@ -400 +397 @@
 {
     /* Cleanup connections: */
+#if QT_VERSION < 0x050000
     disconnect(QApplication::desktop(), 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(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(sltHandleHostScreenResized(int)));
     disconnect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(sltHandleHostScreenWorkAreaResized(int)));

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

@@ -108 +108 @@
 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. */
     void sltHandleHostScreenResized(int iHostScreenIndex);
-
     /** Handles work-area resize for the host-screen with @a iHostScreenIndex. */
     void sltHandleHostScreenWorkAreaResized(int iHostScreenIndex);