Changeset 63002 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 4, 2016 4:31:02 PM (8 years ago)

Author:

vboxsync

Message:

Burn fix for r109599 (moc isn't aware of QT_VERSION).

Location:

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

Files:

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

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

@@ -147 +147 @@
 }
 
+void UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged(int cHostScreenCount)
+{
+    Q_UNUSED(cHostScreenCount);
+
 #if QT_VERSION < 0x050000
-
-void UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged(int cHostScreenCount)
-{
 //    printf("UIDesktopWidgetWatchdog::sltHandleHostScreenCountChanged(%d)\n", cHostScreenCount);
 
     /* Update host-screen configuration: */
     updateHostScreenConfiguration(cHostScreenCount);
-}
-
-#else /* QT_VERSION >= 0x050000 */
+#endif /* QT_VERSION < 0x050000 */
+}
 
 void UIDesktopWidgetWatchdog::sltHostScreenAdded(QScreen *pHostScreen)
 {
+    Q_UNUSED(pHostScreen);
+
+#if QT_VERSION >= 0x050000
 //    printf("UIDesktopWidgetWatchdog::sltHostScreenAdded(%d)\n", screenCount());
 
     /* Update host-screen configuration: */
     updateHostScreenConfiguration();
+#endif /* QT_VERSION >= 0x050000 */
 }
 
 void UIDesktopWidgetWatchdog::sltHostScreenRemoved(QScreen *pHostScreen)
 {
+    Q_UNUSED(pHostScreen);
+
+#if QT_VERSION >= 0x050000
 //    printf("UIDesktopWidgetWatchdog::sltHostScreenRemoved(%d)\n", screenCount());
 
     /* Update host-screen configuration: */
     updateHostScreenConfiguration();
-}
-
 #endif /* QT_VERSION >= 0x050000 */
+}
 
 void UIDesktopWidgetWatchdog::sltHandleHostScreenResized(int iHostScreenIndex)
@@ -202 +208 @@
 {
     /* 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)));
 
@@ -217 +220 @@
 {
     /* 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)));
 

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

@@ -56 +56 @@
 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. */