Changeset 46831 in vbox for trunk

Timestamp:

Jun 27, 2013 12:03:39 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Overall GUI cleanup: Removing old layout hack for Qt 4.2.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxLicenseViewer.cpp (modified) (2 diffs)
• extensions/QIAdvancedSlider.cpp (modified) (2 diffs)
• extensions/QIArrowSplitter.cpp (modified) (3 diffs)
• extensions/QILabelSeparator.cpp (modified) (2 diffs)
• extensions/QIMessageBox.cpp (modified) (3 diffs)
• extensions/QIRichToolButton.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (3 diffs)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• settings/VBoxSettingsSelector.cpp (modified) (4 diffs)
• widgets/VBoxWarningPane.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp

@@ -23 +23 @@
 #include "VBoxLicenseViewer.h"
 #include "QIDialogButtonBox.h"
-#include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
 
@@ -59 +58 @@
     QVBoxLayout *mainLayout = new QVBoxLayout (this);
     mainLayout->setSpacing (10);
-    VBoxGlobal::setLayoutMargin (mainLayout, 10);
+    mainLayout->setContentsMargins(10, 10, 10, 10);
     mainLayout->addWidget (mLicenseText);
     mainLayout->addWidget (dbb);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp

@@ -19 +19 @@
 
 #include "QIAdvancedSlider.h"
-#include "VBoxGlobal.h"
 
 /* Qt includes */
@@ -263 +262 @@
 
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    VBoxGlobal::setLayoutMargin(pMainLayout, 0);
+    pMainLayout->setContentsMargins(0, 0, 0, 0);
     m_pSlider = new CPrivateSlider(fOrientation, this);
     pMainLayout->addWidget(m_pSlider);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp

@@ -19 +19 @@
 
 /* VBox includes */
-#include "VBoxGlobal.h"
 #include "QIArrowSplitter.h"
 
 /* Qt includes */
+#include <QApplication>
 #include <QHBoxLayout>
 #include <QKeyEvent>
@@ -35 +35 @@
 {
     /* Setup main-layout */
-    VBoxGlobal::setLayoutMargin (mMainLayout, 0);
+    mMainLayout->setContentsMargins(0, 0, 0, 0);
     mMainLayout->setSpacing(3);
 
@@ -49 +49 @@
     /* Setup button layout */
     QHBoxLayout *buttonLayout = new QHBoxLayout();
-    VBoxGlobal::setLayoutMargin (buttonLayout, 0);
+    buttonLayout->setContentsMargins(0, 0, 0, 0);
     buttonLayout->setSpacing (0);
     buttonLayout->addWidget (mSwitchButton);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp

@@ -24 +24 @@
 /* Local includes */
 #include "QILabelSeparator.h"
-#include "VBoxGlobal.h"
 
 QILabelSeparator::QILabelSeparator (QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = 0 */)
@@ -73 +72 @@
 
     QHBoxLayout *pLayout = new QHBoxLayout (this);
-    VBoxGlobal::setLayoutMargin (pLayout, 0);
+    pLayout->setContentsMargins(0, 0, 0, 0);
     pLayout->addWidget (mLabel);
     pLayout->addWidget (separator, Qt::AlignBottom);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp

@@ -33 +33 @@
 #include "QIArrowSplitter.h"
 #include "QIDialogButtonBox.h"
-#include "VBoxGlobal.h"
+
+/* Other VBox includes: */
+#include <VBox/sup.h>
 
 QIMessageBox::QIMessageBox(const QString &strCaption, const QString &strMessage, AlertIconType iconType,
@@ -202 +204 @@
         pMainLayout->setSpacing(15);
 #else /* !Q_WS_MAC */
-        VBoxGlobal::setLayoutMargin(pMainLayout, 11);
+        pMainLayout->setContentsMargins(11, 11, 11, 11);
         pMainLayout->setSpacing(10);
 #endif /* !Q_WS_MAC */
@@ -211 +213 @@
             pMainLayout->addLayout(pTopLayout);
             /* Configure layout: */
-            VBoxGlobal::setLayoutMargin(pTopLayout, 0);
+            pTopLayout->setContentsMargins(0, 0, 0, 0);
             pTopLayout->setSpacing(10);
             /* Create icon-label: */

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp

@@ -19 +19 @@
 
 /* VBox includes */
-#include "VBoxGlobal.h"
 #include "QIRichToolButton.h"
 
 /* Qt includes */
+#include <QApplication>
 #include <QLabel>
 #include <QHBoxLayout>
@@ -64 +64 @@
     /* Setup main-layout */
     QHBoxLayout *mainLayout = new QHBoxLayout (this);
-    VBoxGlobal::setLayoutMargin (mainLayout, 0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setSpacing (0);
     mainLayout->addWidget (mButton);

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

@@ -343 +343 @@
     static QList <QPair <QString, QString> > DVDBackends();
     static QList <QPair <QString, QString> > FloppyBackends();
-
-    /* Qt 4.2.0 support function */
-    static inline void setLayoutMargin (QLayout *aLayout, int aMargin)
-    {
-#if QT_VERSION < 0x040300
-        /* Deprecated since > 4.2 */
-        aLayout->setMargin (aMargin);
-#else
-        /* New since > 4.2 */
-        aLayout->setContentsMargins (aMargin, aMargin, aMargin, aMargin);
-#endif
-    }
 
     static QString documentsPath();

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -190 +190 @@
 
         QHBoxLayout *layout = new QHBoxLayout (this);
-        VBoxGlobal::setLayoutMargin (layout, 0);
+        layout->setContentsMargins(0, 0, 0, 0);
         layout->addWidget (mText);
         layout->addWidget (mProgressBar);
@@ -367 +367 @@
     mToolBar->setMacToolbar();
     /* No spacing/margin on the mac */
-    VBoxGlobal::setLayoutMargin (mainLayout, 0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->insertSpacing (0, 10);
 #else /* MAC_LEOPARD_STYLE */
@@ -374 +374 @@
     /* Set spacing/margin like in the selector window */
     mainLayout->setSpacing (5);
-    VBoxGlobal::setLayoutMargin (mainLayout, 5);
+    mainLayout->setContentsMargins(5, 5, 5, 5);
 #endif /* MAC_LEOPARD_STYLE */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -240 +240 @@
     QWidget *pIndicatorBox = new QWidget;
     QHBoxLayout *pIndicatorBoxHLayout = new QHBoxLayout(pIndicatorBox);
-    VBoxGlobal::setLayoutMargin(pIndicatorBoxHLayout, 0);
+    pIndicatorBoxHLayout->setContentsMargins(0, 0, 0, 0);
     pIndicatorBoxHLayout->setSpacing(5);
     bool fAtLeastOneAddedToLeftSection = false;
@@ -335 +335 @@
             if (QHBoxLayout *pContainerLayoutHostkey = new QHBoxLayout(pContainerWidgetHostkey))
             {
-                VBoxGlobal::setLayoutMargin(pContainerLayoutHostkey, 0);
+                pContainerLayoutHostkey->setContentsMargins(0, 0, 0, 0);
                 pContainerLayoutHostkey->setSpacing(3);
                 m_pNameHostkey = new QLabel(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo()));

trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp

@@ -21 +21 @@
 #include <QHeaderView>
 #include <QTabWidget>
+#include <QLayout>
+#include <QAction>
 
 /* Local includes */
 #include "VBoxSettingsSelector.h"
 #include "UISettingsPage.h"
-#include "VBoxGlobal.h"
 #include "UIToolBar.h"
 #include "QITreeWidget.h"
@@ -231 +232 @@
         twitem->setIcon (treeWidget_Category, item->icon());
         aPage->setContentsMargins (0, 0, 0, 0);
-        VBoxGlobal::setLayoutMargin (aPage->layout(), 0);
+        aPage->layout()->setContentsMargins(0, 0, 0, 0);
         result = aPage;
     }
@@ -424 +425 @@
         mTbSelector->addAction (item->action());
         aPage->setContentsMargins (0, 0, 0, 0);
-        VBoxGlobal::setLayoutMargin (aPage->layout(), 0);
+        aPage->layout()->setContentsMargins(0, 0, 0, 0);
         result = aPage;
     }
@@ -446 +447 @@
             QTabWidget *tabWidget = parent->tabWidget();
             aPage->setContentsMargins (9, 5, 9, 9);
-            VBoxGlobal::setLayoutMargin (aPage->layout(), 0);
+            aPage->layout()->setContentsMargins(0, 0, 0, 0);
             QIcon icon1 (aSmallIcon);
             if (!aSmallIconDisabled.isEmpty())

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

@@ -23 +23 @@
 /* Local includes */
 #include "VBoxWarningPane.h"
-#include "VBoxGlobal.h"
 
 VBoxWarningPane::VBoxWarningPane(QWidget *pParent)
@@ -29 +28 @@
 {
     QHBoxLayout *pLayout = new QHBoxLayout(this);
-    VBoxGlobal::setLayoutMargin(pLayout, 0);
+    pLayout->setContentsMargins(0, 0, 0, 0);
     pLayout->addWidget(&m_icon);
     pLayout->addWidget(&m_label);