Changeset 7623 in vbox

Timestamp:

Mar 28, 2008 10:41:47 AM (17 years ago)

Author:

vboxsync

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

29124

Message:

FE/Qt4: Added Qt 4.2 support function for setContentsMargins.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxUtils.h (modified) (1 diff)
• src/QIMessageBox.cpp (modified) (5 diffs)
• src/VBoxConsoleWnd.cpp (modified) (5 diffs)
• src/VBoxSelectorWnd.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxUtils.h

@@ -219 +219 @@
 #endif // __VBoxUtils_h__
 
+/* Qt 4.2.0 support function */
+inline void setLayoutMargin (QLayout *aLayout, int aMargin)
+{
+#if QT_VERSION < 0x040200
+    /* Deprecated since > 4.2 */
+    aLayout->setMargin (aMargin);
+#else
+    /* New since > 4.2 */
+    aLayout->setContentsMargins (aMargin, aMargin, aMargin, aMargin);
+#endif 
+}
+

trunk/src/VBox/Frontends/VirtualBox4/src/QIMessageBox.cpp

@@ -20 +20 @@
 #include "VBoxDefs.h"
 #include "QIRichLabel.h"
+#include "VBoxUtils.h"
 
 /* Qt includes */
@@ -54 +55 @@
 
     QVBoxLayout *layout = new QVBoxLayout (this);
-    layout->setMargin (11);
+    setLayoutMargin (layout, 11);
     layout->setSpacing (10);
     layout->setSizeConstraint (QLayout::SetMinimumSize);
@@ -61 +62 @@
 
     QHBoxLayout *hLayout = new QHBoxLayout (main);
-    hLayout->setContentsMargins (0, 0, 0, 0);
+    setLayoutMargin (hLayout, 0);
     hLayout->setSpacing (10);
     layout->addWidget (main);
@@ -75 +76 @@
 
     QVBoxLayout* messageVBoxLayout = new QVBoxLayout();
-    messageVBoxLayout->setContentsMargins (0, 0, 0, 0);
+    setLayoutMargin (messageVBoxLayout, 0);
     messageVBoxLayout->setSpacing (10);
     hLayout->addLayout (messageVBoxLayout);
@@ -95 +96 @@
 
     QVBoxLayout* detailsVBoxLayout = new QVBoxLayout(mDetailsVBox);
-    detailsVBoxLayout->setContentsMargins (0, 0, 0, 0);
+    setLayoutMargin (detailsVBoxLayout, 0);
     detailsVBoxLayout->setSpacing (10);
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -29 +29 @@
 #include "QIStatusBar.h"
 #include "QIHotKeyEdit.h"
+#include "VBoxUtils.h"
 
 /* Qt includes */
@@ -396 +397 @@
     QWidget *indicatorBox = new QWidget ();
     QHBoxLayout *indicatorBoxHLayout = new QHBoxLayout (indicatorBox);
-    indicatorBoxHLayout->setContentsMargins (0, 0, 0, 0);
+    setLayoutMargin (indicatorBoxHLayout, 0);
     indicatorBoxHLayout->setSpacing (5);
     /* i/o devices */
@@ -464 +465 @@
     hostkey_hbox = new QWidget();
     QHBoxLayout *hostkeyHBoxLayout = new QHBoxLayout (hostkey_hbox);
-    hostkeyHBoxLayout->setContentsMargins (0, 0, 0, 0);
+    setLayoutMargin (hostkeyHBoxLayout, 0);
     hostkeyHBoxLayout->setSpacing (3);
     indicatorBoxHLayout->addWidget (hostkey_hbox);
@@ -651 +652 @@
         setCentralWidget (new QWidget (this));
         QGridLayout *pMainLayout = new QGridLayout(centralWidget());
-        pMainLayout->setContentsMargins (0, 0, 0, 0);
+        setLayoutMargin (pMainLayout, 0);
         pMainLayout->setSpacing (0);
 
@@ -3445 +3446 @@
     /* Setup main dialog's layout */
     QVBoxLayout *mainLayout = new QVBoxLayout (this);
-    mainLayout->setContentsMargins (10, 10, 10, 10);
+    setLayoutMargin (mainLayout, 10);
     mainLayout->setSpacing (10);
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -29 +29 @@
 #include "VBoxGlobalSettingsDlg.h"
 #include "VBoxVMLogViewer.h"
+#include "VBoxUtils.h"
 
 #ifdef Q_WS_X11
@@ -245 +246 @@
     QVBoxLayout *vMainLayout = new QVBoxLayout (this);
     vMainLayout->setSpacing (10);
-    vMainLayout->setContentsMargins (0, 0, 0, 0);
+    setLayoutMargin (vMainLayout, 0);
 
     /* mBrowser */
@@ -453 +454 @@
         new QHBoxLayout (centralWidget());
     centralLayout->setSpacing (9);
-    centralLayout->setContentsMargins (5, 5, 5, 5);
+    setLayoutMargin (centralLayout, 5);
 
     /* left vertical box */