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

Timestamp:

Apr 26, 2012 3:57:29 AM (13 years ago)

Author:

vboxsync

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

77627

Message:

FE/Qt: Little VBoxGlobal cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• runtime/UIMachine.cpp (modified) (2 diffs)

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

@@ -441 +441 @@
 }
 
-
-QWidget *VBoxGlobal::vmWindow()
-{
-    if (isVMConsoleProcess())
-    {
-        if (m_pVirtualMachine)
-            return m_pVirtualMachine->mainWindow();
-    }
-    return NULL;
-}
-
-bool VBoxGlobal::createVirtualMachine(const CSession &session)
-{
-    if (!m_pVirtualMachine && !session.isNull())
-    {
-        UIMachine *pVirtualMachine = new UIMachine(&m_pVirtualMachine, session);
-        Assert(pVirtualMachine == m_pVirtualMachine);
-        NOREF(pVirtualMachine);
-        return true;
-    }
-    return false;
+bool VBoxGlobal::startMachine(const QString &strMachineId)
+{
+    /* Some restrictions: */
+    AssertMsg(mValid, ("VBoxGlobal is invalid"));
+    AssertMsg(!m_pVirtualMachine, ("Machine already started"));
+
+    /* Create session: */
+    CSession session = vboxGlobal().openSession(strMachineId);
+    if (session.isNull())
+        return false;
+
+    /* Start virtual machine: */
+    UIMachine *pVirtualMachine = new UIMachine(&m_pVirtualMachine, session);
+    Assert(pVirtualMachine == m_pVirtualMachine);
+    Q_UNUSED(pVirtualMachine);
+    return true;
 }
 
@@ -467 +462 @@
 {
     return m_pVirtualMachine;
+}
+
+QWidget* VBoxGlobal::vmWindow()
+{
+    if (isVMConsoleProcess() && m_pVirtualMachine)
+        return m_pVirtualMachine->mainWindow();
+    return 0;
 }
 
@@ -2263 +2265 @@
 
     return session;
-}
-
-/**
- *  Starts a machine with the given ID.
- */
-bool VBoxGlobal::startMachine(const QString &strId)
-{
-    AssertReturn(mValid, false);
-
-    CSession session = vboxGlobal().openSession(strId);
-    if (session.isNull())
-        return false;
-
-    return createVirtualMachine(session);
 }
 

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

@@ -142 +142 @@
     UISelectorWindow &selectorWnd();
 
-    QWidget *vmWindow();
-
-    bool createVirtualMachine(const CSession &session);
+    /* VM stuff: */
+    bool startMachine(const QString &strMachineId);
     UIMachine* virtualMachine();
-
-    /* main window handle storage */
-    void setMainWindow (QWidget *aMainWindow) { mMainWindow = aMainWindow; }
-    QWidget *mainWindow() const { return mMainWindow; }
+    QWidget* vmWindow();
+
+    /* Main application window storage: */
+    void setMainWindow(QWidget *pMainWindow) { mMainWindow = pMainWindow; }
+    QWidget* mainWindow() const { return mMainWindow; }
 
     bool is3DAvailable() const { return m3DAvailable; }
@@ -598 +598 @@
     CSession openExistingSession(const QString &aId) { return openSession (aId, true); }
 
-    bool startMachine(const QString &strId);
-
     void startEnumeratingMedia();
 

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

@@ -382 +382 @@
     , m_pVisualState(0)
 {
-    /* Storing self: */
+    /* Store self pointer: */
     if (m_ppThis)
         *m_ppThis = this;
 
-    /* Create UISession object: */
+    /* Create UI session: */
     m_pSession = new UISession(this, m_session);
 
@@ -406 +406 @@
     /* Save machine settings: */
     saveMachineSettings();
-    /* Erase itself pointer: */
-    *m_ppThis = 0;
-    /* Delete uisession children in backward direction: */
+
+    /* Delete visual state: */
     delete m_pVisualState;
     m_pVisualState = 0;
+
+    /* Delete UI session: */
     delete m_pSession;
     m_pSession = 0;
+
+    /* Free session finally: */
     m_session.UnlockMachine();
     m_session.detach();
+
+    /* Clear self pointer: */
+    *m_ppThis = 0;
+
     /* Quit application: */
     QApplication::quit();