Changeset 98607 in vbox

Timestamp:

Feb 16, 2023 4:02:34 PM (2 years ago)

Author:

vboxsync

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

155899

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CConsole wrapper usage step-by-step; Stuff related to ACPI shutdown.

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (3 diffs)
• UIMachineWindow.h (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (1 diff)

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

@@ -646 +646 @@
 }
 #endif /* VBOX_WITH_DEBUGGER_GUI */
+
+bool UIMachine::acquireWhetherGuestEnteredACPIMode(bool &fEntered)
+{
+    return uisession()->acquireWhetherGuestEnteredACPIMode(fEntered);
+}
 
 void UIMachine::detachUi()

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

@@ -490 +490 @@
         MachineCloseAction restrictedCloseActions() const { return m_restrictedCloseActions; }
 
+        /** Acquires whether guest @a fEntered ACPI mode. */
+        bool acquireWhetherGuestEnteredACPIMode(bool &fEntered);
+
         /** Detaches and closes Runtime UI. */
         void detachUi();

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

@@ -54 +54 @@
 
 /* COM includes: */
-#include "CConsole.h"
 #include "CGraphicsAdapter.h"
 #include "CSnapshot.h"
@@ -227 +226 @@
 }
 
-CConsole& UIMachineWindow::console() const
-{
-    return uisession()->console();
-}
-
 QString UIMachineWindow::machineName() const
 {
@@ -430 +424 @@
         /* Prepare close-dialog: */
         QWidget *pParentDlg = windowManager().realParentWindow(this);
+        bool fInACPIMode = false;
+        uimachine()->acquireWhetherGuestEnteredACPIMode(fInACPIMode);
         QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, machine(),
-                                                                  console().GetGuestEnteredACPIMode(),
+                                                                  fInACPIMode,
                                                                   restrictedCloseActions);
         /* Configure close-dialog: */

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

@@ -96 +96 @@
     /** Returns the session's machine reference. */
     CMachine& machine() const;
-    /** Returns the session's console reference. */
-    CConsole& console() const;
 
     /** Returns the machine name. */

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

@@ -792 +792 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
+bool UISession::acquireWhetherGuestEnteredACPIMode(bool &fEntered)
+{
+    CConsole comConsole = console();
+    const BOOL fGuestEntered = comConsole.GetGuestEnteredACPIMode();
+    const bool fSuccess = comConsole.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireConsoleParameter(comConsole);
+    else
+        fEntered = fGuestEntered == TRUE;
+    return fSuccess;
+}
+
 bool UISession::prepareToBeSaved()
 {
@@ -800 +812 @@
 bool UISession::prepareToBeShutdowned()
 {
-    const bool fValidMode = console().GetGuestEnteredACPIMode();
+    bool fValidMode = false;
+    acquireWhetherGuestEnteredACPIMode(fValidMode);
     if (!fValidMode)
         UINotificationMessage::cannotSendACPIToMachine();

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

@@ -392 +392 @@
     /** @name Close stuff.
      ** @{ */
+        /** Acquires whether guest @a fEntered ACPI mode. */
+        bool acquireWhetherGuestEnteredACPIMode(bool &fEntered);
+
         /** Prepares VM to be saved. */
         bool prepareToBeSaved();