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

Timestamp:

Oct 21, 2010 10:45:26 AM (15 years ago)

Author:

vboxsync

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

66862

Message:

Main: API change, merge IVirtualBox::getMachine() with findMachine()

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxMediaManagerDlg.cpp (modified) (2 diffs)
• VBoxMedium.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (2 diffs)
• selector/VBoxSelectorWnd.cpp (modified) (2 diffs)
• wizards/exportappliance/UIExportApplianceWzd.cpp (modified) (1 diff)

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

@@ -1137 +1137 @@
     for (QList <QString>::const_iterator it = machineIds.begin(); it != machineIds.end(); ++ it)
     {
-        CMachine m = mVBox.GetMachine (*it);
+        CMachine m = mVBox.FindMachine (*it);
         if (!mVBox.isOk())
             continue;
@@ -1187 +1187 @@
     else
     {
-        session = vboxGlobal().openSession (aMachineId);
+        session = vboxGlobal().openSession(aMachineId);
         if (session.isNull())
             return false;

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

@@ -191 +191 @@
             for (QVector <QString>::ConstIterator it = machineIds.begin(); it != machineIds.end(); ++ it)
             {
-                CMachine machine = vbox.GetMachine (*it);
+                CMachine machine = vbox.FindMachine(*it);
 
                 QString sName = machine.GetName();

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

@@ -2166 +2166 @@
     }
 
-    CMachine foundMachine = CVirtualBox(mVBox).GetMachine(aId);
+    CMachine foundMachine = CVirtualBox(mVBox).FindMachine(aId);
     if (!foundMachine.isNull())
     {
@@ -4803 +4803 @@
     if (bForceSeamless && !vmUuid.isEmpty())
     {
-        mVBox.GetMachine(vmUuid).SetExtraData(VBoxDefs::GUI_Seamless, "on");
+        mVBox.FindMachine(vmUuid).SetExtraData(VBoxDefs::GUI_Seamless, "on");
     }
     else if (bForceFullscreen && !vmUuid.isEmpty())
     {
-        mVBox.GetMachine(vmUuid).SetExtraData(VBoxDefs::GUI_Fullscreen, "on");
+        mVBox.FindMachine(vmUuid).SetExtraData(VBoxDefs::GUI_Fullscreen, "on");
     }
 

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

@@ -779 +779 @@
     }
 
-    CMachine foundMachine = vbox.GetMachine(id);
+    CMachine foundMachine = vbox.FindMachine(id);
     if (!foundMachine.isNull())
         foundMachine.LockMachine(session, KLockType_Write);
@@ -1407 +1407 @@
     {
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        CMachine m = vbox.GetMachine(strId);
+        CMachine m = vbox.FindMachine(strId);
         if (!m.isNull())
         {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp

@@ -254 +254 @@
         {
             /* Get the machine with the uuid */
-            CMachine m = vbox.GetMachine(uuid);
+            CMachine m = vbox.FindMachine(uuid);
             fResult = m.isOk();
             if (fResult)