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

Timestamp:

Mar 7, 2023 11:20:37 AM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Get rid of remaining UISession usage in UIMachineLogic.

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (7 diffs)
• UIMachineLogic.h (modified) (2 diffs)

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

@@ -1051 +1051 @@
 {
     uisession()->powerOff(fIncludingDiscard);
+}
+
+void UIMachine::sltInstallGuestAdditionsFrom(const QString &strSource)
+{
+    uisession()->sltInstallGuestAdditionsFrom(strSource);
+}
+
+void UIMachine::sltMountDVDAdHoc(const QString &strSource)
+{
+    uisession()->sltMountDVDAdHoc(strSource);
 }
 

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

@@ -711 +711 @@
 public slots:
 
+    /** @name Guest additions stuff.
+     ** @{ */
+        /** Handles request to install guest additions image.
+          * @param  strSource  Brings the source of image being installed. */
+        void sltInstallGuestAdditionsFrom(const QString &strSource);
+        /** Mounts DVD adhoc.
+          * @param  strSource  Brings the source of image being mounted. */
+        void sltMountDVDAdHoc(const QString &strSource);
+    /** @} */
+
     /** @name Keyboard stuff.
      ** @{ */

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

@@ -68 +68 @@
 #include "UIMouseHandler.h"
 #include "UINotificationCenter.h"
-#include "UISession.h"
 #include "UISettingsDialogSpecific.h"
 #include "UISoftKeyboard.h"
@@ -258 +257 @@
     sltAdditionsStateChanged();
     sltMouseCapabilityChanged();
-}
-
-UISession *UIMachineLogic::uisession() const
-{
-    return uimachine()->uisession();
 }
 
@@ -592 +586 @@
 void UIMachineLogic::sltKeyboardLedsChanged()
 {
-    /* Here we have to update host LED lock states using values provided by UISession:
+    /* Here we have to update host LED lock states using values provided by UIMachine:
      * [bool] uimachine() -> isNumLock(), isCapsLock(), isScrollLock() can be used for that. */
 
@@ -2309 +2303 @@
     {
         if (fOnlyMount)
-            return uisession()->sltMountDVDAdHoc(strAdditions);
+            return uimachine()->sltMountDVDAdHoc(strAdditions);
         else
-            return uisession()->sltInstallGuestAdditionsFrom(strAdditions);
+            return uimachine()->sltInstallGuestAdditionsFrom(strAdditions);
     }
 
@@ -2333 +2327 @@
                 {
                     if (fOnlyMount)
-                        return uisession()->sltMountDVDAdHoc(strPath);
+                        return uimachine()->sltMountDVDAdHoc(strPath);
                     else
-                        return uisession()->sltInstallGuestAdditionsFrom(strPath);
+                        return uimachine()->sltInstallGuestAdditionsFrom(strPath);
                 }
             }
@@ -2353 +2347 @@
         if (fOnlyMount)
             connect(pNotification, &UINotificationDownloaderGuestAdditions::sigGuestAdditionsDownloaded,
-                    uisession(), &UISession::sltMountDVDAdHoc);
+                    uimachine(), &UIMachine::sltMountDVDAdHoc);
         else
             connect(pNotification, &UINotificationDownloaderGuestAdditions::sigGuestAdditionsDownloaded,
-                    uisession(), &UISession::sltInstallGuestAdditionsFrom);
+                    uimachine(), &UIMachine::sltInstallGuestAdditionsFrom);
         /* Append and start notification: */
         gpNotificationCenter->append(pNotification);
@@ -2529 +2523 @@
     /* Here we have to store host LED lock states. */
 
-    /* Here we have to update host LED lock states using values provided by UISession registry.
-     * [bool] uisession() -> isNumLock(), isCapsLock(), isScrollLock() can be used for that. */
+    /* Here we have to update host LED lock states using values provided by UIMachine registry.
+     * [bool] uimachine() -> isNumLock(), isCapsLock(), isScrollLock() can be used for that. */
 
     if (!uimachine()->isHidLedsSyncEnabled())

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

@@ -41 +41 @@
 class QActionGroup;
 class QIManagerDialog;
-class UISession;
 class UIActionPool;
 class UIKeyboardHandler;
@@ -92 +91 @@
     /** Returns machine UI reference.  */
     UIMachine *uimachine() const { return m_pMachine; }
-    /** Returns session UI reference.  */
-    UISession *uisession() const;
     /** Returns action-pool reference.  */
     UIActionPool *actionPool() const;