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

Timestamp:

Mar 7, 2008 11:02:26 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Be simpler.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobal.cpp (modified) (1 diff)
• VBoxProblemReporter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -1878 +1878 @@
 
             for (QValueList <CMachine>::Iterator m = machines.begin();
-                 /* machines.end() means global config => manual loop break */ ;)
+                 m != machines.end(); ++ m)
             {
-                if (m == machines.end())
+                CSession session = openSession ((*m).GetId());
+                if (!session.isNull())
                 {
-                    if (isGlobalConverted)
-                    {
-                        if (rc == QIMessageBox::No)
-                            mVBox.SaveSettingsWithBackup();
-                        else
-                            mVBox.SaveSettings();
-
-                        if (!mVBox.isOk())
-                            vboxProblem().cannotSaveGlobalSettings (mVBox);
-                    }
+                    CMachine sm = session.GetMachine();
+                    if (rc == QIMessageBox::No)
+                        sm.SaveSettingsWithBackup();
+                    else
+                        sm.SaveSettings();
+                    ;
+                    if (!sm.isOk())
+                        vboxProblem().cannotSaveMachineSettings (sm);
+                    session.Close();
                 }
+            }
+
+            if (isGlobalConverted)
+            {
+                if (rc == QIMessageBox::No)
+                    mVBox.SaveSettingsWithBackup();
                 else
-                {
-                    CSession session = openSession ((*m).GetId());
-                    if (!session.isNull())
-                    {
-                        CMachine sm = session.GetMachine();
-                        if (rc == QIMessageBox::No)
-                            sm.SaveSettingsWithBackup();
-                        else
-                            sm.SaveSettings();
-                        ;
-                        if (!sm.isOk())
-                            vboxProblem().cannotSaveMachineSettings (sm);
-                        session.Close();
-                    }
-                }
-
-                if (m == machines.end())
-                    break;
-
-                ++ m;
+                    mVBox.SaveSettings();
+
+                if (!mVBox.isOk())
+                    vboxProblem().cannotSaveGlobalSettings (mVBox);
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -1656 +1656 @@
             "be possible to use these settings files with an older version of "
             "VirtualBox in the future);</li>"
-            "<li><b>Backup</b> to create backup copies of settings files in "
+            "<li><b>Backup</b> to create backup copies of the settings files in "
             "the old format before saving them in the new format;</li>"
-            "<li><b>Cancel</b> to not save the settings files now.<li>"
+            "<li><b>Cancel</b> to not save the auto-converted settings files "
+            "now.<li>"
             "</ul>"
             "<p>Note that if you select <b>Cancel</b>, the auto-converted "