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

Timestamp:

Oct 21, 2010 11:28:06 AM (15 years ago)

Author:

vboxsync

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

66868

Message:

Main: API change, merge IMachine::getSnapshot() with findSnapshot()

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxMedium.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• selector/VBoxSnapshotsWgt.cpp (modified) (4 diffs)

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

@@ -208 +208 @@
                     }
 
-                    CSnapshot snapshot = machine.GetSnapshot (*jt);
+                    CSnapshot snapshot = machine.FindSnapshot(*jt);
                     if (!snapshot.isNull())           // can be NULL while takeSnaphot is in progress
                     {

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

@@ -994 +994 @@
     /* Search for the max available filter index. */
     QString strNameTemplate = QApplication::translate("UIMachineLogic", "Snapshot %1");
-    int iMaxSnapshotIndex = searchMaxSnapshotIndex(machine, machine.GetSnapshot(QString()), strNameTemplate);
+    int iMaxSnapshotIndex = searchMaxSnapshotIndex(machine, machine.FindSnapshot(QString()), strNameTemplate);
     dlg.mLeName->setText(strNameTemplate.arg(++ iMaxSnapshotIndex));
 

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

@@ -507 +507 @@
     if (item)
     {
-        CSnapshot snap = item->snapshotId().isNull() ? CSnapshot() : mMachine.GetSnapshot (item->snapshotId());
+        CSnapshot snap = item->snapshotId().isNull()    ? CSnapshot() : mMachine.FindSnapshot(item->snapshotId());
         if (!snap.isNull() && snap.isOk() && snap.GetName() != item->text (0))
             snap.SetName (item->text (0));
@@ -521 +521 @@
     QString snapId = item->snapshotId();
     AssertReturn (!snapId.isNull(), (void) 0);
-    CSnapshot snapshot = mMachine.GetSnapshot (snapId);
+    CSnapshot snapshot = mMachine.FindSnapshot(snapId);
 
     if (!vboxProblem().askAboutSnapshotRestoring (snapshot.GetName()))
@@ -556 +556 @@
     QString snapId = item->snapshotId();
     AssertReturn (!snapId.isNull(), (void) 0);
-    CSnapshot snapshot = mMachine.GetSnapshot (snapId);
+    CSnapshot snapshot = mMachine.FindSnapshot(snapId);
 
     if (!vboxProblem().askAboutSnapshotDeleting (snapshot.GetName()))
@@ -779 +779 @@
     if (mMachine.GetSnapshotCount() > 0)
     {
-        CSnapshot snapshot = mMachine.GetSnapshot (QString::null);
+        CSnapshot snapshot = mMachine.FindSnapshot(QString::null);
 
         populateSnapshots (snapshot, 0);