Changeset 57805 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 17, 2015 3:01:21 PM (10 years ago)

Author:

vboxsync

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

102750

Message:

FE/Qt: Small cleanup related to UIMachine.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (3 diffs)
• runtime/UISession.cpp (modified) (1 diff)

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

@@ -456 +456 @@
 
     return *mSelectorWnd;
-}
-
-UIMachine* VBoxGlobal::virtualMachine() const
-{
-    return gpMachine;
 }
 

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

@@ -177 +177 @@
     UISelectorWindow &selectorWnd();
 
-    /** Returns current virtual machine. */
-    UIMachine* virtualMachine() const;
     /** Returns currently active virtual machine window. */
     QWidget* activeMachineWindow() const;

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

@@ -45 +45 @@
 bool UIMachine::startMachine(const QString &strID)
 {
-    /* Some restrictions: */
-    AssertMsgReturn(vboxGlobal().isValid(), ("VBoxGlobal is invalid.."), false);
-    AssertMsgReturn(!vboxGlobal().virtualMachine(), ("Machine already started.."), false);
+    /* Make sure machine is not created: */
+    AssertReturn(!m_spInstance, false);
 
     /* Restore current snapshot if requested: */
@@ -98 +97 @@
 bool UIMachine::create()
 {
-    /* Make sure machine is null pointer: */
-    AssertReturn(m_spInstance == 0, false);
+    /* Make sure machine is not created: */
+    AssertReturn(!m_spInstance, false);
 
     /* Create machine UI: */
@@ -118 +117 @@
 void UIMachine::destroy()
 {
-    /* Make sure machine is valid pointer: */
-    AssertReturnVoid(m_spInstance != 0);
+    /* Make sure machine is created: */
+    AssertPtrReturnVoid(m_spInstance);
 
     /* Cleanup machine UI: */

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

@@ -1983 +1983 @@
 static void signalHandlerSIGUSR1(int sig, siginfo_t * /* pInfo */, void * /*pSecret */)
 {
-    /* only SIGUSR1 is interesting */
+    /* Only SIGUSR1 is interesting: */
     if (sig == SIGUSR1)
-        if (UIMachine *pMachine = vboxGlobal().virtualMachine())
-            pMachine->uisession()->machineLogic()->keyboardHandler()->releaseAllPressedKeys();
+        if (gpMachine)
+            gpMachine->uisession()->machineLogic()->keyboardHandler()->releaseAllPressedKeys();
 }
 #endif /* VBOX_GUI_WITH_KEYS_RESET_HANDLER */