Changeset 93995 in vbox

Timestamp:

Feb 28, 2022 9:31:59 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: QLayout::setMargin (removed in 6) -> QLayout::setContentsMargins (4.3+). bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIRichTextLabel.cpp (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• widgets/UIFilmContainer.cpp (modified) (2 diffs)
• widgets/UILineTextEdit.cpp (modified) (1 diff)
• widgets/UIProgressDialog.cpp (modified) (2 diffs)
• wizards/importappliance/UIWizardImportApp.cpp (modified) (1 diff)

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

@@ -38 +38 @@
     {
         /* Configure layout: */
-        pMainLayout->setMargin(0);
+        pMainLayout->setContentsMargins(0, 0, 0, 0);
 
         /* Create text-browser: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -491 +491 @@
     /* Create main-layout: */
     m_pMainLayout = new QGridLayout(centralWidget());
-    m_pMainLayout->setMargin(0);
+    m_pMainLayout->setContentsMargins(0, 0, 0, 0);
     m_pMainLayout->setSpacing(0);
 

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

@@ -241 +241 @@
         {
             /* Configure widget-layout: */
-            pWidgetLayout->setMargin(0);
+            pWidgetLayout->setContentsMargins(0, 0, 0, 0);
 #ifdef VBOX_WS_MAC
-            pWidgetLayout->setSpacing(5);
+            pWidgetLayout->setContentsMargins(5, 5, 5, 5);
 #else
             pWidgetLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2);
@@ -293 +293 @@
     {
         /* Configure layout: */
-        m_pMainLayout->setMargin(0);
+        m_pMainLayout->setContentsMargins(0, 0, 0, 0);
         m_pMainLayout->setSpacing(0);
     }

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

@@ -38 +38 @@
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    pMainLayout->setMargin(12);
+    pMainLayout->setContentsMargins(12, 12, 12, 12);
 
     /* We need a text editor */

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

@@ -282 +282 @@
         {
             /* Configure layout: */
-            pDescriptionLayout->setMargin(0);
+            pDescriptionLayout->setContentsMargins(0, 0, 0, 0);
 
             /* Add stretch: */
@@ -309 +309 @@
             {
                 /* Configure layout: */
-                pProgressLayout->setMargin(0);
+                pProgressLayout->setContentsMargins(0, 0, 0, 0);
 
                 /* Create progress-bar: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp

@@ -49 +49 @@
         /* Create widgets: */
         QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-            pMainLayout->setMargin(12);
+            pMainLayout->setContentsMargins(12, 12, 12, 12);
             m_pCaption = new QLabel(this);
                 m_pCaption->setWordWrap(true);