Changeset 91412 in vbox for trunk/src/VBox

Timestamp:

Sep 27, 2021 4:42:23 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: A bit of refactoring for New Cloud VM wizard; Get rid of excessive includes and adjust prepare cascade stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm

Files:

• UIWizardNewCloudVMPageExpert.cpp (modified) (4 diffs)
• UIWizardNewCloudVMPageExpert.h (modified) (1 diff)
• UIWizardNewCloudVMPageProperties.cpp (modified) (5 diffs)
• UIWizardNewCloudVMPageProperties.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp

@@ -27 +27 @@
 #include "QIToolButton.h"
 #include "UICloudNetworkingStuff.h"
+#include "UIFormEditorWidget.h"
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
@@ -49 +50 @@
     , m_pSourceImageList(0)
     , m_pSettingsCnt(0)
+    , m_pFormEditor(0)
 {
     /* Prepare main layout: */
@@ -183 +185 @@
                     const int iTotalHeight = 8 * iSectionHeight;
                     m_pFormEditor->setMinimumSize(QSize(iTotalWidth, iTotalHeight));
-                    /* Setup connections: */
-                    connect(m_pFormEditor, &UIFormEditorWidget::sigProgressStarted,
-                            this, &UIWizardNewCloudVMPageExpert::sigProgressStarted);
-                    connect(m_pFormEditor, &UIFormEditorWidget::sigProgressChange,
-                            this, &UIWizardNewCloudVMPageExpert::sigProgressChange);
-                    connect(m_pFormEditor, &UIFormEditorWidget::sigProgressFinished,
-                            this, &UIWizardNewCloudVMPageExpert::sigProgressFinished);
 
                     /* Add into layout: */
@@ -216 +211 @@
     connect(m_pSourceImageList, &QListWidget::currentRowChanged,
             this, &UIWizardNewCloudVMPageExpert::sltHandleSourceImageChange);
+    connect(m_pFormEditor, &UIFormEditorWidget::sigProgressStarted,
+            this, &UIWizardNewCloudVMPageExpert::sigProgressStarted);
+    connect(m_pFormEditor, &UIFormEditorWidget::sigProgressChange,
+            this, &UIWizardNewCloudVMPageExpert::sigProgressChange);
+    connect(m_pFormEditor, &UIFormEditorWidget::sigProgressFinished,
+            this, &UIWizardNewCloudVMPageExpert::sigProgressFinished);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h

@@ -114 +114 @@
 
     /** Holds the settings container instance. */
-    QGroupBox                 *m_pSettingsCnt;
+    QGroupBox          *m_pSettingsCnt;
     /** Holds the Form Editor widget instance. */
-    UIFormEditorWidgetPointer  m_pFormEditor;
+    UIFormEditorWidget *m_pFormEditor;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageProperties.cpp

@@ -22 +22 @@
 /* GUI includes: */
 #include "QIRichTextLabel.h"
+#include "UIFormEditorWidget.h"
 #include "UIMessageCenter.h"
 #include "UIWizardNewCloudVM.h"
@@ -34 +35 @@
 *********************************************************************************************************************************/
 
-void UIWizardNewCloudVMProperties::refreshFormPropertiesTable(UIFormEditorWidgetPointer pFormEditor,
+void UIWizardNewCloudVMProperties::refreshFormPropertiesTable(UIFormEditorWidget *pFormEditor,
                                                               const CVirtualSystemDescriptionForm &comForm)
 {
     /* Sanity check: */
-    AssertPtrReturnVoid(pFormEditor.data());
+    AssertPtrReturnVoid(pFormEditor);
     AssertReturnVoid(comForm.isNotNull());
 
@@ -51 +52 @@
 
 UIWizardNewCloudVMPageProperties::UIWizardNewCloudVMPageProperties()
+    : m_pLabel(0)
+    , m_pFormEditor(0)
 {
     /* Prepare main layout: */
@@ -71 +74 @@
             if (iDefaultSectionHeight > 0)
                 m_pFormEditor->setMinimumHeight(8 * iDefaultSectionHeight);
-            /* Setup connections: */
-            connect(m_pFormEditor, &UIFormEditorWidget::sigProgressStarted,
-                    this, &UIWizardNewCloudVMPageProperties::sigProgressStarted);
-            connect(m_pFormEditor, &UIFormEditorWidget::sigProgressChange,
-                    this, &UIWizardNewCloudVMPageProperties::sigProgressChange);
-            connect(m_pFormEditor, &UIFormEditorWidget::sigProgressFinished,
-                    this, &UIWizardNewCloudVMPageProperties::sigProgressFinished);
 
             /* Add into layout: */
@@ -83 +79 @@
         }
     }
+
+    /* Setup connections: */
+    connect(m_pFormEditor, &UIFormEditorWidget::sigProgressStarted,
+            this, &UIWizardNewCloudVMPageProperties::sigProgressStarted);
+    connect(m_pFormEditor, &UIFormEditorWidget::sigProgressChange,
+            this, &UIWizardNewCloudVMPageProperties::sigProgressChange);
+    connect(m_pFormEditor, &UIFormEditorWidget::sigProgressFinished,
+            this, &UIWizardNewCloudVMPageProperties::sigProgressFinished);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageProperties.h

@@ -23 +23 @@
 
 /* GUI includes: */
-#include "UIFormEditorWidget.h"
 #include "UINativeWizardPage.h"
 
 /* COM includes: */
-#include "COMEnums.h"
-#include "CCloudClient.h"
-#include "CVirtualSystemDescription.h"
 #include "CVirtualSystemDescriptionForm.h"
 
 /* Forward declarations: */
 class QIRichTextLabel;
+class UIFormEditorWidget;
 class UIWizardNewCloudVM;
 
@@ -40 +37 @@
 {
     /** Refreshes @a pFormEditor on the basis of comForm specified. */
-    void refreshFormPropertiesTable(UIFormEditorWidgetPointer pFormEditor, const CVirtualSystemDescriptionForm &comForm);
+    void refreshFormPropertiesTable(UIFormEditorWidget *pFormEditor, const CVirtualSystemDescriptionForm &comForm);
 }
 
@@ -82 +79 @@
 
     /** Holds the Form Editor widget instance. */
-    UIFormEditorWidgetPointer  m_pFormEditor;
+    UIFormEditorWidget *m_pFormEditor;
 };