Changeset 90066 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 6, 2021 1:13:41 PM (4 years ago)

Author:

vboxsync

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

145561

Message:

FE/Qt: bugref:9996: Some renaming

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UIVirtualCPUEditor.cpp (modified) (2 diffs)
• settings/editors/UIVirtualCPUEditor.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.h (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMHardwarePageBasic.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMHardwarePageBasic.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMNameOSTypePageBasic.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMUnattendedPageBasic.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.cpp

@@ -75 +75 @@
         m_pSpinBox->blockSignals(false);
     }
+    emit sigValueChanged(m_pSlider->value());
 }
 
@@ -85 +86 @@
         m_pSlider->blockSignals(false);
     }
+    emit sigValueChanged(m_pSpinBox->value());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.h

@@ -39 +39 @@
 {
     Q_OBJECT;
+
+ signals:
+
+    void sigValueChanged(int iValue);
 
 public:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -65 +65 @@
     , m_fSkipUnattendedInstall(false)
     , m_iCPUCount(1)
-    , m_iMemoryAmount(0)
+    , m_iMemorySize(0)
 
 {
@@ -771 +771 @@
 }
 
-int UIWizardNewVM::memoryAmount() const
-{
-    return m_iMemoryAmount;
-}
-
-void UIWizardNewVM::setMemoryCount(int iMemory)
-{
-    m_iMemoryAmount = iMemory;
+int UIWizardNewVM::memorySize() const
+{
+    return m_iMemorySize;
+}
+
+void UIWizardNewVM::setMemorySize(int iMemory)
+{
+    m_iMemorySize = iMemory;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -30 +30 @@
 #include "CMedium.h"
 
-#define parentWizardSet(functionName, value)                         \
+#define newVMWizardPropertySet(functionName, value)                  \
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard()); \
-    if (pWizard)                                                     \
-        pWizard->functionName(value);
+    if (!pWizard)                                                    \
+        pWizard->set##functionName(value)
 
 /** Container for unattended install related data. */
@@ -137 +137 @@
     void setCPUCount(int iCPUCount);
 
-    int memoryAmount() const;
-    void setMemoryCount(int iMemory);
+    int memorySize() const;
+    void setMemorySize(int iMemory);
 
 protected:
@@ -208 +208 @@
 
     int m_iCPUCount;
-    int m_iMemoryAmount;
+    int m_iMemorySize;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMHardwarePageBasic.cpp

@@ -40 +40 @@
     , m_pLabel(0)
 {
-    m_pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     prepare();
     qRegisterMetaType<CMedium>();
@@ -59 +58 @@
 void UIWizardNewVMHardwarePageBasic::createConnections()
 {
-    connect(m_pBaseMemoryEditor, &UIBaseMemoryEditor::sigValueChanged,
-            this, &UIWizardNewVMHardwarePageBasic::sltMemoryAmountChanged);
-
+    if (m_pBaseMemoryEditor)
+        connect(m_pBaseMemoryEditor, &UIBaseMemoryEditor::sigValueChanged,
+                this, &UIWizardNewVMHardwarePageBasic::sltMemorySizeChanged);
+    if (m_pVirtualCPUEditor)
+        connect(m_pVirtualCPUEditor, &UIVirtualCPUEditor::sigValueChanged,
+            this, &UIWizardNewVMHardwarePageBasic::sltCPUCountChanged);
 
 }
@@ -125 +127 @@
 }
 
-void UIWizardNewVMHardwarePageBasic::sltMemoryAmountChanged(int iValue)
+void UIWizardNewVMHardwarePageBasic::sltMemorySizeChanged(int iValue)
 {
-    Q_UNUSED(iValue);
+    newVMWizardPropertySet(MemorySize, iValue);
 }
 
 void UIWizardNewVMHardwarePageBasic::sltCPUCountChanged(int iCount)
 {
-    Q_UNUSED(iCount);
+    newVMWizardPropertySet(CPUCount, iCount);
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMHardwarePageBasic.h

@@ -61 +61 @@
 private slots:
 
-    void sltMemoryAmountChanged(int iValue);
+    void sltMemorySizeChanged(int iValue);
     void sltCPUCountChanged(int iCount);
 
@@ -75 +75 @@
     bool isComplete() const;
 
-    UIWizardNewVM *m_pWizard;
-
     /** @name Widgets
      * @{ */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePageBasic.cpp

@@ -481 +481 @@
 void UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilChanged(const QString &strGuestOSFamilyId)
 {
-    parentWizardSet(setGuestOSFamilyId, strGuestOSFamilyId);
+    newVMWizardPropertySet(GuestOSFamilyId, strGuestOSFamilyId);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPageBasic.cpp

@@ -179 +179 @@
 {
     disableEnableGAWidgets(fEnabled);
-    parentWizardSet(setInstallGuestAdditions, fEnabled);
+    newVMWizardPropertySet(InstallGuestAdditions, fEnabled);
     emit completeChanged();
 }
@@ -185 +185 @@
 void UIWizardNewVMUnattendedPageBasic::sltGAISOPathChanged(const QString &strPath)
 {
-    parentWizardSet(setGuestAdditionsISOPath, strPath);
+    newVMWizardPropertySet(GuestAdditionsISOPath, strPath);
     emit completeChanged();
 }
@@ -191 +191 @@
 void UIWizardNewVMUnattendedPageBasic::sltPasswordChanged(const QString &strPassword)
 {
-    parentWizardSet(setPassword, strPassword);
+    newVMWizardPropertySet(Password, strPassword);
     emit completeChanged();
 }
@@ -197 +197 @@
 void UIWizardNewVMUnattendedPageBasic::sltUserNameChanged(const QString &strUserName)
 {
-    parentWizardSet(setUserName, strUserName);
+    newVMWizardPropertySet(UserName, strUserName);
     emit completeChanged();
 }
@@ -211 +211 @@
 void UIWizardNewVMUnattendedPageBasic::sltHostnameChanged(const QString &strHostname)
 {
-    parentWizardSet(setHostname, strHostname);
+    newVMWizardPropertySet(Hostname, strHostname);
 }
 
 void UIWizardNewVMUnattendedPageBasic::sltProductKeyChanged(const QString &strProductKey)
 {
-    parentWizardSet(setProductKey, strProductKey);
+    newVMWizardPropertySet(ProductKey, strProductKey);
 }
 
 void UIWizardNewVMUnattendedPageBasic::sltStartHeadlessChanged(bool fStartHeadless)
 {
-    parentWizardSet(setStartHeadless, fStartHeadless);
+    newVMWizardPropertySet(StartHeadless, fStartHeadless);
 }