Changeset 46848 in vbox

Timestamp:

Jun 27, 2013 2:41:40 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Overall GUI cleanup: Few more things for Qt version less than 4.7.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIBootTable.cpp (modified) (1 diff)
• wizards/clonevm/UIWizardCloneVMPageBasic2.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp

@@ -81 +81 @@
     int w = h;
 #if QT_VERSION < 0x040700
-# ifdef Q_WS_MAC
-    int left, top, right, bottom;
-    getContentsMargins(&left, &top, &right, &bottom);
-    h += top + bottom;
-    w += left + right;
-# else /* Q_WS_MAC */
-    w += 4;
-# endif /* !Q_WS_MAC */
+    w += 4; // WTF?
 #endif /* QT_VERSION < 0x040700 */
     setFixedSize(sizeHintForColumn(0) + w,

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp

@@ -75 +75 @@
 {
     setFinalPage(pButton != m_pFullCloneRadio);
+#if QT_VERSION < 0x040700
     /* On older Qt versions the content of the current page isn't updated when
      * using setFinalPage. So switch back and for to simulate it. */
-#if QT_VERSION < 0x040700
     wizard()->back();
     wizard()->next();
-#endif
+#endif /* QT_VERSION < 0x040700 */
 }