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

Timestamp:

Oct 8, 2014 12:24:10 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #5): Better encapsulation for UIMachine (part #2).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -221 +221 @@
     : mValid (false)
     , mSelectorWnd (NULL)
-    , m_pVirtualMachine(0)
     , m_fSeparateProcess(false)
     , m_pMediumEnumerator(0)
@@ -374 +373 @@
 }
 
-QWidget* VBoxGlobal::activeMachineWindow()
-{
-    /* Null if that is NOT console-process or machine not yet created: */
-    if (!isVMConsoleProcess() || !m_pVirtualMachine)
-        return 0;
-    /* Active machine-window otherwise: */
-    return m_pVirtualMachine->activeWindow();
-}
-
+UIMachine* VBoxGlobal::virtualMachine() const
+{
+    return gpMachine;
+}
+
+QWidget* VBoxGlobal::activeMachineWindow() const
+{
+    if (isVMConsoleProcess() && gpMachine && gpMachine->activeWindow())
+        return gpMachine->activeWindow();
+    return 0;
+}
 
 /**
@@ -4246 +4247 @@
         mSelectorWnd = NULL;
     }
-
-    if (m_pVirtualMachine)
-    {
-        delete m_pVirtualMachine;
-        m_pVirtualMachine = NULL;
-    }
+    if (gpMachine)
+        UIMachine::destroy();
 
     /* Cleanup medium-enumerator: */

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

@@ -111 +111 @@
 
     /** Returns current virtual machine. */
-    UIMachine* virtualMachine() const { return m_pVirtualMachine; }
-    /** Defines current virtual @a pMachine. */
-    void setVirtualMachine(UIMachine *pMachine) { m_pVirtualMachine = pMachine; }
-
-    QWidget* activeMachineWindow();
+    UIMachine* virtualMachine() const;
+    /** Returns currently active virtual machine window. */
+    QWidget* activeMachineWindow() const;
 
     bool is3DAvailableWorker() const;
@@ -437 +435 @@
 
     UISelectorWindow *mSelectorWnd;
-    UIMachine *m_pVirtualMachine;
 
     /** Holds whether GUI is separate (from VM) process. */

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

@@ -97 +97 @@
 
 /* static */
+UIMachine* UIMachine::m_spInstance = 0;
+
+/* static */
 bool UIMachine::startMachine(const QString &strID)
 {
@@ -136 +139 @@
 
     /* Create machine UI: */
-    UIMachine *pMachine = new UIMachine;
-
+    new UIMachine;
     /* Prepare machine UI: */
-    return pMachine->prepare();
+    return m_spInstance->prepare();
+}
+
+/* static */
+void UIMachine::destroy()
+{
+    /* Cleanup machine UI: */
+    m_spInstance->cleanup();
+    /* Destroy machine UI: */
+    delete m_spInstance;
+    m_spInstance = 0;
 }
 
@@ -195 +207 @@
     , m_pVisualState(0)
 {
-    /* Make sure VBoxGlobal is aware of VM creation: */
-    vboxGlobal().setVirtualMachine(this);
+    m_spInstance = this;
 }
 
 UIMachine::~UIMachine()
 {
-    /* Make sure VBoxGlobal is aware of VM destruction: */
-    vboxGlobal().setVirtualMachine(0);
-
-    /* Cleanup machine UI: */
-    cleanup();
+    m_spInstance = 0;
 }
 
@@ -335 +342 @@
     m_session.detach();
 
-    /* Make sure VBoxGlobal is aware of VM destruction: */
-    vboxGlobal().setVirtualMachine(0);
-
     /* Quit application: */
     QApplication::quit();

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

@@ -51 +51 @@
       * @return true if machine was started, false otherwise. */
     static bool startMachine(const QString &strID);
+    /** Static destructor. */
+    static void destroy();
+    /** Static instance. */
+    static UIMachine* instance() { return m_spInstance; }
 
     /** Returns UI session instance. */
@@ -89 +93 @@
     void enterInitialVisualState();
 
+    /** Static instance. */
+    static UIMachine* m_spInstance;
+
     /** Holds the session instance. */
     CSession m_session;
@@ -101 +108 @@
     /** Holds current visual state. */
     UIVisualState *m_pVisualState;
-
-    /* Temporary access: */
-    friend class VBoxGlobal;
 };
 
+#define gpMachine UIMachine::instance()
+
 #endif /* !___UIMachine_h___ */

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

@@ -678 +678 @@
         if (!pWidget->isHidden())
             pWidget->hide();
-        /* Restart this slot asynchronously: */
+        /* Restart this slot: */
         emit sigCloseRuntimeUI();
         return;
@@ -684 +684 @@
 
     /* Finally close the Runtime UI: */
-    m_pMachine->deleteLater();
+    UIMachine::destroy();
 }