Changeset 98902 in vbox

Timestamp:

Mar 10, 2023 2:20:21 PM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Simplify UISession creation and prepare procedures.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (4 diffs)
• UISession.cpp (modified) (4 diffs)
• UISession.h (modified) (3 diffs)

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

@@ -172 +172 @@
     /* Create machine UI: */
     new UIMachine;
+
     /* Make sure it's prepared: */
     if (!s_pInstance->prepare())
@@ -180 +181 @@
         return false;
     }
+
     /* True by default: */
     return true;
@@ -1456 +1458 @@
 bool UIMachine::prepare()
 {
-    /* Try to create session UI: */
-    if (!UISession::create(m_pSession, this))
+    /* Create session UI: */
+    m_pSession = new UISession(this);
+    AssertPtrReturn(uisession(), false);
+    /* And make sure it's prepared: */
+    if (!uisession()->prepare())
         return false;
-    AssertPtrReturn(uisession(), false);
 
     /* Prepare stuff: */
@@ -1813 +1817 @@
 {
     /* Destroy session UI if exists: */
-    if (uisession())
-        UISession::destroy(m_pSession);
+    delete m_pSession;
+    m_pSession = 0;
 }
 

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

@@ -105 +105 @@
 #endif
 
-/* static */
-bool UISession::create(UISession *&pSession, UIMachine *pMachine)
-{
-    /* Make sure NULL pointer passed: */
-    AssertReturn(!pSession, false);
-
-    /* Create session UI: */
-    pSession = new UISession(pMachine);
-    AssertPtrReturn(pSession, false);
-
-    /* Make sure it's prepared: */
-    if (!pSession->prepare())
-    {
-        /* Destroy session UI otherwise: */
-        destroy(pSession);
-        /* False in that case: */
+UISession::UISession(UIMachine *pMachine)
+    : QObject(pMachine)
+    /* Base variables: */
+    , m_pMachine(pMachine)
+    , m_pConsoleEventhandler(0)
+    /* Common variables: */
+    , m_enmMachineStatePrevious(KMachineState_Null)
+    , m_enmMachineState(KMachineState_Null)
+    /* Guest additions flags: */
+    , m_ulGuestAdditionsRunLevel(0)
+    , m_fIsGuestSupportsGraphics(false)
+    , m_fIsGuestSupportsSeamless(false)
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    /* Debug UI stuff: */
+    , m_pDbgGui(0)
+    , m_pDbgGuiVT(0)
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+{
+}
+
+bool UISession::prepare()
+{
+    /* Prepare COM stuff: */
+    if (!prepareSession())
         return false;
-    }
+
+    /* Cache media early if requested: */
+    if (uiCommon().agressiveCaching())
+        recacheMachineMedia();
+
+    /* Prepare GUI stuff: */
+    prepareNotificationCenter();
+    prepareConsoleEventHandlers();
+    prepareFramebuffers();
+    prepareConnections();
+    prepareSignalHandling();
 
     /* True by default: */
     return true;
-}
-
-/* static */
-void UISession::destroy(UISession *&pSession)
-{
-    /* Make sure valid pointer passed: */
-    AssertPtrReturnVoid(pSession);
-
-    /* Delete session: */
-    delete pSession;
-    pSession = 0;
 }
 
@@ -2232 +2239 @@
     cleanupConsoleEventHandlers();
     cleanupNotificationCenter();
-    cleanupSession();
+    cleanupCOMStuff();
 }
 
@@ -2322 +2329 @@
     /* Close Runtime UI independent of snapshot restoring state: */
     uimachine()->closeRuntimeUI();
-}
-
-UISession::UISession(UIMachine *pMachine)
-    : QObject(pMachine)
-    /* Base variables: */
-    , m_pMachine(pMachine)
-    , m_pConsoleEventhandler(0)
-    /* Common variables: */
-    , m_enmMachineStatePrevious(KMachineState_Null)
-    , m_enmMachineState(KMachineState_Null)
-    /* Guest additions flags: */
-    , m_ulGuestAdditionsRunLevel(0)
-    , m_fIsGuestSupportsGraphics(false)
-    , m_fIsGuestSupportsSeamless(false)
-#ifdef VBOX_WITH_DEBUGGER_GUI
-    /* Debug UI stuff: */
-    , m_pDbgGui(0)
-    , m_pDbgGuiVT(0)
-#endif /* VBOX_WITH_DEBUGGER_GUI */
-{
-}
-
-UISession::~UISession()
-{
-}
-
-bool UISession::prepare()
-{
-    /* Prepare COM stuff: */
-    if (!prepareSession())
-        return false;
-
-    /* Cache media early if requested: */
-    if (uiCommon().agressiveCaching())
-        recacheMachineMedia();
-
-    /* Prepare GUI stuff: */
-    prepareNotificationCenter();
-    prepareConsoleEventHandlers();
-    prepareFramebuffers();
-    prepareConnections();
-    prepareSignalHandling();
-
-    /* True by default: */
-    return true;
 }
 
@@ -2547 +2509 @@
 }
 
-void UISession::cleanupSession()
+void UISession::cleanupCOMStuff()
 {
     /* Detach debugger: */

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

@@ -146 +146 @@
 public:
 
-    /** Constructs session UI passing @a pMachine to the constructor.
-      * @param  pSession  Brings the pointer to the session UI being constructed.
+    /** Constructs session UI passing @a pMachine to the base-class.
       * @param  pMachine  Brings the machine UI reference. */
-    static bool create(UISession *&pSession, UIMachine *pMachine);
-    /** Destructs session UI.
-      * @param  pSession  Brings the pointer to the session UI being destructed. */
-    static void destroy(UISession *&pSession);
+    UISession(UIMachine *pMachine);
 
     /** @name General stuff.
      ** @{ */
+        /** Prepares everything. */
+        bool prepare();
         /** Performs session UI intialization. */
         bool initialize();
@@ -648 +646 @@
 private:
 
-    /** Constructs session UI passing @a pMachine to the base-class.
-      * @param  pMachine  Brings the machine UI reference. */
-    UISession(UIMachine *pMachine);
-    /** Destructs session UI. */
-    virtual ~UISession() RT_OVERRIDE;
-
     /** @name Prepare/cleanup cascade.
      ** @{ */
-        /** Prepares everything. */
-        bool prepare();
         /** Prepares COM session. */
         bool prepareSession();
@@ -677 +667 @@
         /** Cleanups notification-center. */
         void cleanupNotificationCenter();
-        /** Cleanups COM session. */
-        void cleanupSession();
+        /** Cleanups COM stuff. */
+        void cleanupCOMStuff();
     /** @} */