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

Timestamp:

Apr 6, 2011 3:48:47 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Just some settings dialog API renaming.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• selector/VBoxSelectorWnd.cpp (modified) (2 diffs)
• settings/UISettingsDialog.h (modified) (1 diff)
• settings/UISettingsDialogSpecific.cpp (modified) (11 diffs)
• settings/UISettingsDialogSpecific.h (modified) (4 diffs)

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

@@ -967 +967 @@
                                                          sharedMachine, session().GetConsole(),
                                                          strCategory, QString());
-    pDlg->getFrom();
+    pDlg->loadData();
 
     /* Show VM settings dialog: */
@@ -973 +973 @@
     {
         /* If dialog was accepted => save changed settings: */
-        pDlg->putBackTo();
+        pDlg->saveData();
         sharedMachine.SaveSettings();
         /* If settings were failed to be saved => show the error: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -596 +596 @@
 
     UISettingsDialog *dlg = new UISettingsDialogGlobal(this, SettingsDialogType_Offline);
-    dlg->getFrom();
+    dlg->loadData();
 
     if (dlg->exec() == QDialog::Accepted)
-        dlg->putBackTo();
+        dlg->saveData();
 
     delete dlg;
@@ -735 +735 @@
 
     UISettingsDialog *pDlg = new UISettingsDialogMachine(this, dialogType, machine, console, strCategory, strControl);
-    pDlg->getFrom();
+    pDlg->loadData();
 
     if (pDlg->exec() == QDialog::Accepted)
     {
-        pDlg->putBackTo();
+        pDlg->saveData();
 
         machine.SaveSettings();

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -49 +49 @@
 
     /* Save/Load interface: */
-    virtual void getFrom() = 0;
-    virtual void putBackTo() = 0;
+    virtual void loadData() = 0;
+    virtual void saveData() = 0;
 
 protected slots:

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

@@ -300 +300 @@
     for (int iPageIndex = GLSettingsPage_General; iPageIndex < GLSettingsPage_MAX; ++iPageIndex)
     {
-        if (isAvailable(iPageIndex))
+        if (isPageAvailable(iPageIndex))
         {
             UISettingsPage *pSettingsPage = 0;
@@ -386 +386 @@
 }
 
-void UISettingsDialogGlobal::getFrom()
+void UISettingsDialogGlobal::loadData()
 {
     /* Prepare global data: */
@@ -403 +403 @@
 }
 
-void UISettingsDialogGlobal::putBackTo()
+void UISettingsDialogGlobal::saveData()
 {
     /* Get properties and settings: */
@@ -470 +470 @@
 }
 
-bool UISettingsDialogGlobal::isAvailable(int id)
+bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
 {
     /* Show the host error message for particular group if present.
      * We don't use the generic cannotLoadGlobalConfig()
      * call here because we want this message to be suppressible: */
-    switch (id)
+    switch (iPageId)
     {
         case GLSettingsPage_USB:
@@ -528 +528 @@
     for (int iPageIndex = VMSettingsPage_General; iPageIndex < VMSettingsPage_MAX; ++iPageIndex)
     {
-        if (isAvailable(iPageIndex))
+        if (isPageAvailable(iPageIndex))
         {
             UISettingsPage *pSettingsPage = 0;
@@ -681 +681 @@
 }
 
-void UISettingsDialogMachine::getFrom()
+void UISettingsDialogMachine::loadData()
 {
     /* Prepare machine data: */
@@ -701 +701 @@
 }
 
-void UISettingsDialogMachine::putBackTo()
+void UISettingsDialogMachine::saveData()
 {
     /* Prepare machine data: */
@@ -981 +981 @@
 }
 
-bool UISettingsDialogMachine::isAvailable(int id)
+bool UISettingsDialogMachine::isPageAvailable(int iPageId)
 {
     if (m_machine.isNull())
@@ -989 +989 @@
      * We don't use the generic cannotLoadMachineSettings()
      * call here because we want this message to be suppressible. */
-    switch (id)
+    switch (iPageId)
     {
         case VMSettingsPage_Serial:
         {
             /* Depends on ports availability: */
-            if (!isAvailable(VMSettingsPage_Ports))
+            if (!isPageAvailable(VMSettingsPage_Ports))
                 return false;
             break;
@@ -1001 +1001 @@
         {
             /* Depends on ports availability: */
-            if (!isAvailable(VMSettingsPage_Ports))
+            if (!isPageAvailable(VMSettingsPage_Ports))
                 return false;
             /* But for now this page is always disabled: */
@@ -1009 +1009 @@
         {
             /* Depends on ports availability: */
-            if (!isAvailable(VMSettingsPage_Ports))
+            if (!isPageAvailable(VMSettingsPage_Ports))
                 return false;
             /* Get the USB controller object: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

@@ -47 +47 @@
 protected:
 
-    void getFrom();
-    void putBackTo();
+    void loadData();
+    void saveData();
 
     void retranslateUi();
@@ -56 +56 @@
 private:
 
-    bool isAvailable(int id);
+    bool isPageAvailable(int iPageId);
 };
 
@@ -88 +88 @@
 protected:
 
-    void getFrom();
-    void putBackTo();
+    void loadData();
+    void saveData();
 
     void retranslateUi();
@@ -106 +106 @@
 private:
 
-    bool isAvailable(int id);
+    bool isPageAvailable(int iPageId);
 
     CMachine m_machine;