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

Timestamp:

Feb 16, 2023 1:05:04 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Cleanup for arguments of mouse/keyboard wrappers.

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (3 diffs)
• UIMachineLogic.cpp (modified) (1 diff)
• UIMouseHandler.cpp (modified) (1 diff)
• UISession.cpp (modified) (4 diffs)
• UISession.h (modified) (4 diffs)

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

@@ -506 +506 @@
 }
 
-void UIMachine::putScancode(LONG iCode)
-{
-    uisession()->putScancode(iCode);
-}
-
-void UIMachine::putScancodes(const QVector<LONG> &codes)
-{
-    uisession()->putScancodes(codes);
-}
-
-void UIMachine::putCad()
-{
-    uisession()->putCad();
-}
-
-void UIMachine::releaseKeys()
-{
-    uisession()->releaseKeys();
-}
-
-void UIMachine::putUsageCode(LONG iUsageCode, LONG iUsagePage, BOOL fKeyRelease)
-{
-    uisession()->putUsageCode(iUsageCode, iUsagePage, fKeyRelease);
-}
-
-void UIMachine::putMouseEvent(LONG iDx, LONG iDy, LONG iDz, LONG iDw, LONG iButtonState)
-{
-    uisession()->putMouseEvent(iDx, iDy, iDz, iDw, iButtonState);
-}
-
-void UIMachine::putMouseEventAbsolute(LONG iX, LONG iY, LONG iDz, LONG iDw, LONG iButtonState)
-{
-    uisession()->putMouseEventAbsolute(iX, iY, iDz, iDw, iButtonState);
-}
-
-void UIMachine::putEventMultiTouch(LONG iCount, const QVector<LONG64> &contacts, BOOL fIsTouchScreen, ULONG uScanTime)
-{
-    uisession()->putEventMultiTouch(iCount, contacts, fIsTouchScreen, uScanTime);
-}
-
-void UIMachine::acquireDeviceActivity(const QVector<KDeviceType> &deviceTypes, QVector<KDeviceActivity> &states)
-{
-    uisession()->acquireDeviceActivity(deviceTypes, states);
+bool UIMachine::putScancode(LONG iCode)
+{
+    return uisession()->putScancode(iCode);
+}
+
+bool UIMachine::putScancodes(const QVector<LONG> &codes)
+{
+    return uisession()->putScancodes(codes);
+}
+
+bool UIMachine::putCAD()
+{
+    return uisession()->putCAD();
+}
+
+bool UIMachine::releaseKeys()
+{
+    return uisession()->releaseKeys();
+}
+
+bool UIMachine::putUsageCode(LONG iUsageCode, LONG iUsagePage, bool fKeyRelease)
+{
+    return uisession()->putUsageCode(iUsageCode, iUsagePage, fKeyRelease);
+}
+
+bool UIMachine::putMouseEvent(long iDx, long iDy, long iDz, long iDw, long iButtonState)
+{
+    return uisession()->putMouseEvent(iDx, iDy, iDz, iDw, iButtonState);
+}
+
+bool UIMachine::putMouseEventAbsolute(long iX, long iY, long iDz, long iDw, long iButtonState)
+{
+    return uisession()->putMouseEventAbsolute(iX, iY, iDz, iDw, iButtonState);
+}
+
+bool UIMachine::putEventMultiTouch(long iCount, const QVector<LONG64> &contacts, bool fIsTouchScreen, ulong uScanTime)
+{
+    return uisession()->putEventMultiTouch(iCount, contacts, fIsTouchScreen, uScanTime);
+}
+
+bool UIMachine::acquireDeviceActivity(const QVector<KDeviceType> &deviceTypes, QVector<KDeviceActivity> &states)
+{
+    return uisession()->acquireDeviceActivity(deviceTypes, states);
 }
 

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

@@ -346 +346 @@
 
         /** Sends a scan @a iCode to VM's keyboard. */
-        void putScancode(LONG iCode);
+        bool putScancode(LONG iCode);
         /** Sends a list of scan @a codes to VM's keyboard. */
-        void putScancodes(const QVector<LONG> &codes);
+        bool putScancodes(const QVector<LONG> &codes);
         /** Sends the CAD sequence to VM's keyboard. */
-        void putCad();
+        bool putCAD();
         /** Releases all keys. */
-        void releaseKeys();
+        bool releaseKeys();
         /** Sends a USB HID @a iUsageCode and @a iUsagePage to VM's keyboard.
           * The @a fKeyRelease flag is set when the key is being released. */
-        void putUsageCode(LONG iUsageCode, LONG iUsagePage, BOOL fKeyRelease);
+        bool putUsageCode(LONG iUsageCode, LONG iUsagePage, bool fKeyRelease);
     /** @} */
 
@@ -402 +402 @@
 
         /** Sends relative mouse move event to VM's mouse. */
-        void putMouseEvent(LONG iDx, LONG iDy, LONG iDz, LONG iDw, LONG iButtonState);
+        bool putMouseEvent(long iDx, long iDy, long iDz, long iDw, long iButtonState);
         /** Sends absolute mouse move event to VM's mouse. */
-        void putMouseEventAbsolute(LONG iX, LONG iY, LONG iDz, LONG iDw, LONG iButtonState);
+        bool putMouseEventAbsolute(long iX, long iY, long iDz, long iDw, long iButtonState);
         /** Sends multi-touch event to VM's mouse. */
-        void putEventMultiTouch(LONG iCount, const QVector<LONG64> &contacts, BOOL fIsTouchScreen, ULONG uScanTime);
+        bool putEventMultiTouch(long iCount, const QVector<LONG64> &contacts, bool fIsTouchScreen, ulong uScanTime);
     /** @} */
 
@@ -426 +426 @@
      ** @{ */
         /** Acquires device activity composing a vector of current @a states for device with @a deviceTypes specified. */
-        void acquireDeviceActivity(const QVector<KDeviceType> &deviceTypes, QVector<KDeviceActivity> &states);
+        bool acquireDeviceActivity(const QVector<KDeviceType> &deviceTypes, QVector<KDeviceActivity> &states);
 
         /** Acquires status info for hard disk indicator. */

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

@@ -2063 +2063 @@
 void UIMachineLogic::sltTypeCAD()
 {
-    uimachine()->putCad();
+    uimachine()->putCAD();
 }
 

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

@@ -1262 +1262 @@
                                     contacts,
                                     fTouchScreen,
-                                    (ULONG)RTTimeMilliTS());
+                                    RTTimeMilliTS());
 
     /* Eat by default? */

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

@@ -249 +249 @@
 bool UISession::setPause(bool fPause)
 {
+    CConsole comConsole = console();
     if (fPause)
-        console().Pause();
+        comConsole.Pause();
     else
-        console().Resume();
-
-    const bool fOk = console().isOk();
-    if (!fOk)
+        comConsole.Resume();
+    const bool fSuccess = comConsole.isOk();
+    if (!fSuccess)
     {
         if (fPause)
-            UINotificationMessage::cannotPauseMachine(console());
+            UINotificationMessage::cannotPauseMachine(comConsole);
         else
-            UINotificationMessage::cannotResumeMachine(console());
-    }
-
-    return fOk;
-}
-
-void UISession::putScancode(LONG iCode)
+            UINotificationMessage::cannotResumeMachine(comConsole);
+    }
+    return fSuccess;
+}
+
+bool UISession::putScancode(LONG iCode)
 {
     CKeyboard comKeyboard = keyboard();
     comKeyboard.PutScancode(iCode);
-    if (!comKeyboard.isOk())
+    const bool fSuccess = comKeyboard.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotChangeKeyboardParameter(comKeyboard);
-}
-
-void UISession::putScancodes(const QVector<LONG> &codes)
+    return fSuccess;
+}
+
+bool UISession::putScancodes(const QVector<LONG> &codes)
 {
     CKeyboard comKeyboard = keyboard();
     comKeyboard.PutScancodes(codes);
-    if (!comKeyboard.isOk())
+    const bool fSuccess = comKeyboard.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotChangeKeyboardParameter(comKeyboard);
-}
-
-void UISession::putCad()
+    return fSuccess;
+}
+
+bool UISession::putCAD()
 {
     CKeyboard comKeyboard = keyboard();
     comKeyboard.PutCAD();
-    if (!comKeyboard.isOk())
+    const bool fSuccess = comKeyboard.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotChangeKeyboardParameter(comKeyboard);
-}
-
-void UISession::releaseKeys()
+    return fSuccess;
+}
+
+bool UISession::releaseKeys()
 {
     CKeyboard comKeyboard = keyboard();
     comKeyboard.ReleaseKeys();
-    if (!comKeyboard.isOk())
+    const bool fSuccess = comKeyboard.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotChangeKeyboardParameter(comKeyboard);
-}
-
-void UISession::putUsageCode(LONG iUsageCode, LONG iUsagePage, BOOL fKeyRelease)
+    return fSuccess;
+}
+
+bool UISession::putUsageCode(LONG iUsageCode, LONG iUsagePage, bool fKeyRelease)
 {
     CKeyboard comKeyboard = keyboard();
     comKeyboard.PutUsageCode(iUsageCode, iUsagePage, fKeyRelease);
-    if (!comKeyboard.isOk())
+    const bool fSuccess = comKeyboard.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotChangeKeyboardParameter(comKeyboard);
-}
-
-BOOL UISession::getAbsoluteSupported()
+    return fSuccess;
+}
+
+bool UISession::getAbsoluteSupported()
 {
     return mouse().GetAbsoluteSupported();
 }
 
-BOOL UISession::getRelativeSupported()
+bool UISession::getRelativeSupported()
 {
     return mouse().GetRelativeSupported();
 }
 
-BOOL UISession::getTouchScreenSupported()
+bool UISession::getTouchScreenSupported()
 {
     return mouse().GetTouchScreenSupported();
 }
 
-BOOL UISession::getTouchPadSupported()
+bool UISession::getTouchPadSupported()
 {
     return mouse().GetTouchPadSupported();
 }
 
-BOOL UISession::getNeedsHostCursor()
+bool UISession::getNeedsHostCursor()
 {
     return mouse().GetNeedsHostCursor();
 }
 
-void UISession::putMouseEvent(LONG iDx, LONG iDy, LONG iDz, LONG iDw, LONG iButtonState)
+bool UISession::putMouseEvent(long iDx, long iDy, long iDz, long iDw, long iButtonState)
 {
     CMouse comMouse = mouse();
     comMouse.PutMouseEvent(iDx, iDy, iDz, iDw, iButtonState);
-    if (!comMouse.isOk())
+    const bool fSuccess = comMouse.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotChangeMouseParameter(comMouse);
-}
-
-void UISession::putMouseEventAbsolute(LONG iX, LONG iY, LONG iDz, LONG iDw, LONG iButtonState)
+    return fSuccess;
+}
+
+bool UISession::putMouseEventAbsolute(long iX, long iY, long iDz, long iDw, long iButtonState)
 {
     CMouse comMouse = mouse();
     comMouse.PutMouseEventAbsolute(iX, iY, iDz, iDw, iButtonState);
-    if (!comMouse.isOk())
+    const bool fSuccess = comMouse.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotChangeMouseParameter(comMouse);
-}
-
-void UISession::putEventMultiTouch(LONG iCount, const QVector<LONG64> &contacts, BOOL fIsTouchScreen, ULONG uScanTime)
+    return fSuccess;
+}
+
+bool UISession::putEventMultiTouch(long iCount, const QVector<LONG64> &contacts, bool fIsTouchScreen, ulong uScanTime)
 {
     CMouse comMouse = mouse();
     comMouse.PutEventMultiTouch(iCount, contacts, fIsTouchScreen, uScanTime);
-    if (!comMouse.isOk())
+    const bool fSuccess = comMouse.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotChangeMouseParameter(comMouse);
+    return fSuccess;
 }
 
@@ -372 +387 @@
 
     /* Also check whether we have something to update automatically: */
-    if (m_ulGuestAdditionsRunLevel < (ULONG)KAdditionsRunLevelType_Userland)
+    if (m_ulGuestAdditionsRunLevel < (ulong)KAdditionsRunLevelType_Userland)
         return false;
 
@@ -546 +561 @@
 }
 
-void UISession::acquireDeviceActivity(const QVector<KDeviceType> &deviceTypes, QVector<KDeviceActivity> &states)
+bool UISession::acquireDeviceActivity(const QVector<KDeviceType> &deviceTypes, QVector<KDeviceActivity> &states)
 {
     CConsole comConsole = console();
     states = comConsole.GetDeviceActivity(deviceTypes);
-    if (!comConsole.isOk())
+    const bool fSuccess = comConsole.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotAcquireConsoleParameter(comConsole);
+    return fSuccess;
 }
 
@@ -737 +754 @@
 {
     /* Acquire actual states: */
-    const ULONG ulGuestAdditionsRunLevel = guest().GetAdditionsRunLevel();
-    LONG64 lLastUpdatedIgnored;
-    const bool fIsGuestSupportsGraphics = guest().GetFacilityStatus(KAdditionsFacilityType_Graphics, lLastUpdatedIgnored)
+    const ulong ulGuestAdditionsRunLevel = guest().GetAdditionsRunLevel();
+    LONG64 iLastUpdatedIgnored;
+    const bool fIsGuestSupportsGraphics = guest().GetFacilityStatus(KAdditionsFacilityType_Graphics, iLastUpdatedIgnored)
                                         == KAdditionsFacilityStatus_Active;
-    const bool fIsGuestSupportsSeamless = guest().GetFacilityStatus(KAdditionsFacilityType_Seamless, lLastUpdatedIgnored)
+    const bool fIsGuestSupportsSeamless = guest().GetFacilityStatus(KAdditionsFacilityType_Seamless, iLastUpdatedIgnored)
                                         == KAdditionsFacilityStatus_Active;
 

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

@@ -235 +235 @@
      ** @{ */
         /** Sends a scan @a iCode to VM's keyboard. */
-        void putScancode(LONG iCode);
+        bool putScancode(LONG iCode);
         /** Sends a list of scan @a codes to VM's keyboard. */
-        void putScancodes(const QVector<LONG> &codes);
+        bool putScancodes(const QVector<LONG> &codes);
         /** Sends the CAD sequence to VM's keyboard. */
-        void putCad();
+        bool putCAD();
         /** Releases all keys. */
-        void releaseKeys();
+        bool releaseKeys();
         /** Sends a USB HID @a iUsageCode and @a iUsagePage to VM's keyboard.
           * The @a fKeyRelease flag is set when the key is being released. */
-        void putUsageCode(LONG iUsageCode, LONG iUsagePage, BOOL fKeyRelease);
+        bool putUsageCode(LONG iUsageCode, LONG iUsagePage, bool fKeyRelease);
     /** @} */
 
@@ -250 +250 @@
      ** @{ */
         /** Returns whether VM's mouse supports absolute coordinates. */
-        BOOL getAbsoluteSupported();
+        bool getAbsoluteSupported();
         /** Returns whether VM's mouse supports relative coordinates. */
-        BOOL getRelativeSupported();
+        bool getRelativeSupported();
         /** Returns whether VM's mouse supports touch screen device. */
-        BOOL getTouchScreenSupported();
+        bool getTouchScreenSupported();
         /** Returns whether VM's mouse supports touch pad device. */
-        BOOL getTouchPadSupported();
+        bool getTouchPadSupported();
         /** Returns whether VM's mouse requires host cursor. */
-        BOOL getNeedsHostCursor();
+        bool getNeedsHostCursor();
 
         /** Sends relative mouse move event to VM's mouse. */
-        void putMouseEvent(LONG iDx, LONG iDy, LONG iDz, LONG iDw, LONG iButtonState);
+        bool putMouseEvent(long iDx, long iDy, long iDz, long iDw, long iButtonState);
         /** Sends absolute mouse move event to VM's mouse. */
-        void putMouseEventAbsolute(LONG iX, LONG iY, LONG iDz, LONG iDw, LONG iButtonState);
+        bool putMouseEventAbsolute(long iX, long iY, long iDz, long iDw, long iButtonState);
         /** Sends multi-touch event to VM's mouse. */
-        void putEventMultiTouch(LONG iCount, const QVector<LONG64> &contacts, BOOL fIsTouchScreen, ULONG uScanTime);
+        bool putEventMultiTouch(long iCount, const QVector<LONG64> &contacts, bool fIsTouchScreen, ulong uScanTime);
     /** @} */
 
@@ -326 +326 @@
      ** @{ */
         /** Acquires device activity composing a vector of current @a states for device with @a deviceTypes specified. */
-        void acquireDeviceActivity(const QVector<KDeviceType> &deviceTypes, QVector<KDeviceActivity> &states);
+        bool acquireDeviceActivity(const QVector<KDeviceType> &deviceTypes, QVector<KDeviceActivity> &states);
 
         /** Acquires status info for hard disk indicator. */
@@ -512 +512 @@
      ** @{ */
         /** Holds the guest-additions run level. */
-        ULONG  m_ulGuestAdditionsRunLevel;
+        ulong  m_ulGuestAdditionsRunLevel;
         /** Holds whether guest-additions supports graphics. */
         bool   m_fIsGuestSupportsGraphics;