Changeset 24564 in vbox

Timestamp:

Nov 10, 2009 7:08:40 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: VBoxConsoleWND: Take Snapshot name generation now takes into account whole snapshots tree.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (2 diffs)

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

@@ -212 +212 @@
 };
 Q_DECLARE_METATYPE (MountTarget);
+
+int searchMaxSnapshotIndex (const CMachine &aMachine, const CSnapshot &aSnapshot, const QString &aNameTemplate)
+{
+    int maxIndex = 0;
+    QRegExp regExp (QString ("^") + aNameTemplate.arg ("([0-9]+)") + QString ("$"));
+    if (!aSnapshot.isNull())
+    {
+        /* Check the current snapshot name */
+        QString name = aSnapshot.GetName();
+        int pos = regExp.indexIn (name);
+        if (pos != -1)
+            maxIndex = regExp.cap (1).toInt() > maxIndex ? regExp.cap (1).toInt() : maxIndex;
+        /* Traversing all the snapshot children */
+        foreach (const CSnapshot &child, aSnapshot.GetChildren())
+        {
+            int maxIndexOfChildren = searchMaxSnapshotIndex (aMachine, child, aNameTemplate);
+            maxIndex = maxIndexOfChildren > maxIndex ? maxIndexOfChildren : maxIndex;
+        }
+    }
+    return maxIndex;
+}
 
 /** \class VBoxConsoleWnd
@@ -2010 +2031 @@
 
     /* search for the max available filter index */
-    int maxSnapShotIndex = 0;
-    QString snapShotName = tr ("Snapshot %1");
-    QRegExp regExp (QString ("^") + snapShotName.arg ("([0-9]+)") + QString ("$"));
-    CSnapshot index = machine.GetSnapshot (QString::null);
-    while (!index.isNull())
-    {
-        /* Check the current snapshot name */
-        QString name = index.GetName();
-        int pos = regExp.indexIn (name);
-        if (pos != -1)
-            maxSnapShotIndex = regExp.cap (1).toInt() > maxSnapShotIndex ?
-                               regExp.cap (1).toInt() : maxSnapShotIndex;
-        /* Traversing to the next child */
-        CSnapshotVector c = index.GetChildren();
-        if (c.size() > 0)
-            index = c [0];
-        else
-            break;
-    }
-    dlg.mLeName->setText (snapShotName.arg (maxSnapShotIndex + 1));
+    QString nameTemplate = tr ("Snapshot %1");
+    int maxSnapshotIndex = searchMaxSnapshotIndex (machine, machine.GetSnapshot (QString()), nameTemplate);
+    dlg.mLeName->setText (nameTemplate.arg (++ maxSnapshotIndex));
 
     if (dlg.exec() == QDialog::Accepted)