Changeset 6917 in vbox

Timestamp:

Feb 12, 2008 9:56:36 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Be verbose.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -415 +415 @@
 #endif
 
-    CSession openSession (const QUuid &id, bool aExisting = false);
+    CSession openSession (const QUuid &aId, bool aExisting = false);
+
+    /** Shortcut to openSession (aId, true). */
+    CSession openExistingSession (const QUuid &aId) { return openSession (aId, true); }
 
     bool startMachine (const QUuid &id);

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

@@ -1827 +1827 @@
  *  If this method succeeds, don't forget to close the returned session when
  *  it is no more necessary.
- */
-CSession VBoxGlobal::openSession (const QUuid &id, bool aExisting)
+ *
+ *  @param aId          Machine ID.
+ *  @param aExisting    @c true to open an existing session with the machine
+ *                      which is already running, @c false to open a new direct
+ *                      session.
+ */
+CSession VBoxGlobal::openSession (const QUuid &aId, bool aExisting /* = false */)
 {
     CSession session;
@@ -1838 +1843 @@
     }
 
-    aExisting ? mVBox.OpenExistingSession (session, id) :
-                        mVBox.OpenSession (session, id);
+    aExisting ? mVBox.OpenExistingSession (session, aId) :
+                mVBox.OpenSession (session, aId);
+
     if (!mVBox.isOk())
     {
-        CMachine machine = CVirtualBox (mVBox).GetMachine (id);
+        CMachine machine = CVirtualBox (mVBox).GetMachine (aId);
         vboxProblem().cannotOpenSession (mVBox, machine);
         session.detach();

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

@@ -975 +975 @@
     AssertMsgReturn (item, ("Item must be always selected here"), (void) 0);
 
-    CSession session = vboxGlobal().openSession (item->id(), true);
+    CSession session = vboxGlobal().openExistingSession (item->id());
     if (session.isNull())
         return;