VirtualBox

Changeset 98427 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Feb 2, 2023 9:59:21 AM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
155674
Message:

Merging r155592 and r155593 from gui4 branch: FE/Qt: Runtime UI: More cleanup for UISession; A bit of reordering for UIMachine code.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:mergeinfo

      •  

        old new  
        1919/branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3:79645-79692
        21 /branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513,155526-155527,155559,155572,155576-155577
         21/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513,155526-155527,155559,155572,155576-155577,155592-155593
        2222/trunk/src:92342,154921

  • trunk/src/VBox

    • Property svn:mergeinfo

      •  

        old new  
        1919/branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3/src/VBox:79645-79692
        21 /branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513,155526-155527,155559,155572,155576-155577
         21/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513,155526-155527,155559,155572,155576-155577,155592-155593

  • trunk/src/VBox/Frontends

    • Property svn:mergeinfo

      •  

        old new  
        1616/branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        1717/branches/dsen/gui3/src/VBox/Frontends:79645-79692
        18 /branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513,155526-155527,155559,155572,155576-155577
         18/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155513,155526-155527,155559,155572,155576-155577,155592-155593

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

    r98425 r98427  
    862862
    863863    /* Prepare stuff: */
     864    prepareBranding();
    864865    prepareSessionConnections();
    865866    prepareActions();
    866867    prepareScreens();
    867     prepareBranding();
    868868    prepareKeyboard();
    869869    prepareClose();
    … …  
    885885    /* True by default: */
    886886    return true;
     887}
     888
     889void UIMachine::prepareBranding()
     890{
     891    /* Acquire user machine-window icon: */
     892    QIcon icon = generalIconPool().userMachineIcon(uisession()->machine());
     893    /* Use the OS type icon if user one was not set: */
     894    if (icon.isNull())
     895        icon = generalIconPool().guestOSTypeIcon(uisession()->machine().GetOSTypeId());
     896    /* Use the default icon if nothing else works: */
     897    if (icon.isNull())
     898        icon = QIcon(":/VirtualBox_48px.png");
     899    /* Store the icon dynamically: */
     900    m_pMachineWindowIcon = new QIcon(icon);
     901
     902#ifndef VBOX_WS_MAC
     903    /* Load user's machine-window name postfix: */
     904    const QUuid uMachineID = uiCommon().managedVMUuid();
     905    m_strMachineWindowNamePostfix = gEDataManager->machineWindowNamePostfix(uMachineID);
     906#endif /* !VBOX_WS_MAC */
    887907}
    888908
    … …  
    942962}
    943963
     964void UIMachine::prepareActions()
     965{
     966    /* Create action-pool: */
     967    m_pActionPool = UIActionPool::create(UIActionPoolType_Runtime);
     968    if (actionPool())
     969    {
     970        /* Make sure action-pool knows guest-screen count: */
     971        actionPool()->toRuntime()->setGuestScreenCount(uisession()->frameBuffers().size());
     972        /* Update action restrictions: */
     973        updateActionRestrictions();
     974
     975#ifdef VBOX_WS_MAC
     976        /* Create Mac OS X menu-bar: */
     977        m_pMenuBar = new QMenuBar;
     978        if (m_pMenuBar)
     979        {
     980            /* Configure Mac OS X menu-bar: */
     981            connect(gEDataManager, &UIExtraDataManager::sigMenuBarConfigurationChange,
     982                    this, &UIMachine::sltHandleMenuBarConfigurationChange);
     983            /* Update Mac OS X menu-bar: */
     984            updateMenu();
     985        }
     986#endif /* VBOX_WS_MAC */
     987
     988        /* Get machine ID: */
     989        const QUuid uMachineID = uiCommon().managedVMUuid();
     990        Q_UNUSED(uMachineID);
     991
     992#ifdef VBOX_WS_MAC
     993        /* User-element (Menu-bar and Dock) options: */
     994        {
     995            const bool fDisabled = gEDataManager->guiFeatureEnabled(GUIFeatureType_NoUserElements);
     996            if (fDisabled)
     997                UICocoaApplication::instance()->hideUserElements();
     998        }
     999#else /* !VBOX_WS_MAC */
     1000        /* Menu-bar options: */
     1001        {
     1002            const bool fEnabledGlobally = !gEDataManager->guiFeatureEnabled(GUIFeatureType_NoMenuBar);
     1003            const bool fEnabledForMachine = gEDataManager->menuBarEnabled(uMachineID);
     1004            const bool fEnabled = fEnabledGlobally && fEnabledForMachine;
     1005            actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings)->setEnabled(fEnabled);
     1006            actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->blockSignals(true);
     1007            actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->setChecked(fEnabled);
     1008            actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->blockSignals(false);
     1009        }
     1010#endif /* !VBOX_WS_MAC */
     1011
     1012        /* View options: */
     1013        const bool fGuestScreenAutoresize = gEDataManager->guestScreenAutoResizeEnabled(uMachineID);
     1014        actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->blockSignals(true);
     1015        actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->setChecked(fGuestScreenAutoresize);
     1016        actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->blockSignals(false);
     1017
     1018        /* Input options: */
     1019        const bool fMouseIntegrated = isMouseIntegrated(); // no e-data for now ..
     1020        actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)->blockSignals(true);
     1021        actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)->setChecked(fMouseIntegrated);
     1022        actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)->blockSignals(false);
     1023
     1024        /* Device options: */
     1025        actionPool()->action(UIActionIndexRT_M_Devices_S_UpgradeGuestAdditions)->setEnabled(false);
     1026
     1027        /* Status-bar options: */
     1028        {
     1029            const bool fEnabledGlobally = !gEDataManager->guiFeatureEnabled(GUIFeatureType_NoStatusBar);
     1030            const bool fEnabledForMachine = gEDataManager->statusBarEnabled(uMachineID);
     1031            const bool fEnabled = fEnabledGlobally && fEnabledForMachine;
     1032            actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings)->setEnabled(fEnabled);
     1033            actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->blockSignals(true);
     1034            actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->setChecked(fEnabled);
     1035            actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->blockSignals(false);
     1036        }
     1037    }
     1038}
     1039
    9441040void UIMachine::prepareScreens()
    9451041{
    … …  
    10311127}
    10321128
    1033 void UIMachine::prepareBranding()
    1034 {
    1035     /* Acquire user machine-window icon: */
    1036     QIcon icon = generalIconPool().userMachineIcon(uisession()->machine());
    1037     /* Use the OS type icon if user one was not set: */
    1038     if (icon.isNull())
    1039         icon = generalIconPool().guestOSTypeIcon(uisession()->machine().GetOSTypeId());
    1040     /* Use the default icon if nothing else works: */
    1041     if (icon.isNull())
    1042         icon = QIcon(":/VirtualBox_48px.png");
    1043     /* Store the icon dynamically: */
    1044     m_pMachineWindowIcon = new QIcon(icon);
    1045 
    1046 #ifndef VBOX_WS_MAC
    1047     /* Load user's machine-window name postfix: */
    1048     const QUuid uMachineID = uiCommon().managedVMUuid();
    1049     m_strMachineWindowNamePostfix = gEDataManager->machineWindowNamePostfix(uMachineID);
    1050 #endif /* !VBOX_WS_MAC */
    1051 }
    1052 
    1053 void UIMachine::prepareActions()
    1054 {
    1055     /* Create action-pool: */
    1056     m_pActionPool = UIActionPool::create(UIActionPoolType_Runtime);
    1057     if (actionPool())
    1058     {
    1059         /* Make sure action-pool knows guest-screen count: */
    1060         actionPool()->toRuntime()->setGuestScreenCount(uisession()->frameBuffers().size());
    1061         /* Update action restrictions: */
    1062         updateActionRestrictions();
    1063 
    1064 #ifdef VBOX_WS_MAC
    1065         /* Create Mac OS X menu-bar: */
    1066         m_pMenuBar = new QMenuBar;
    1067         if (m_pMenuBar)
    1068         {
    1069             /* Configure Mac OS X menu-bar: */
    1070             connect(gEDataManager, &UIExtraDataManager::sigMenuBarConfigurationChange,
    1071                     this, &UIMachine::sltHandleMenuBarConfigurationChange);
    1072             /* Update Mac OS X menu-bar: */
    1073             updateMenu();
    1074         }
    1075 #endif /* VBOX_WS_MAC */
    1076 
    1077         /* Get machine ID: */
    1078         const QUuid uMachineID = uiCommon().managedVMUuid();
    1079         Q_UNUSED(uMachineID);
    1080 
    1081 #ifdef VBOX_WS_MAC
    1082         /* User-element (Menu-bar and Dock) options: */
    1083         {
    1084             const bool fDisabled = gEDataManager->guiFeatureEnabled(GUIFeatureType_NoUserElements);
    1085             if (fDisabled)
    1086                 UICocoaApplication::instance()->hideUserElements();
    1087         }
    1088 #else /* !VBOX_WS_MAC */
    1089         /* Menu-bar options: */
    1090         {
    1091             const bool fEnabledGlobally = !gEDataManager->guiFeatureEnabled(GUIFeatureType_NoMenuBar);
    1092             const bool fEnabledForMachine = gEDataManager->menuBarEnabled(uMachineID);
    1093             const bool fEnabled = fEnabledGlobally && fEnabledForMachine;
    1094             actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings)->setEnabled(fEnabled);
    1095             actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->blockSignals(true);
    1096             actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->setChecked(fEnabled);
    1097             actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->blockSignals(false);
    1098         }
    1099 #endif /* !VBOX_WS_MAC */
    1100 
    1101         /* View options: */
    1102         const bool fGuestScreenAutoresize = gEDataManager->guestScreenAutoResizeEnabled(uMachineID);
    1103         actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->blockSignals(true);
    1104         actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->setChecked(fGuestScreenAutoresize);
    1105         actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->blockSignals(false);
    1106 
    1107         /* Input options: */
    1108         const bool fMouseIntegrated = isMouseIntegrated(); // no e-data for now ..
    1109         actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)->blockSignals(true);
    1110         actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)->setChecked(fMouseIntegrated);
    1111         actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)->blockSignals(false);
    1112 
    1113         /* Device options: */
    1114         actionPool()->action(UIActionIndexRT_M_Devices_S_UpgradeGuestAdditions)->setEnabled(false);
    1115 
    1116         /* Status-bar options: */
    1117         {
    1118             const bool fEnabledGlobally = !gEDataManager->guiFeatureEnabled(GUIFeatureType_NoStatusBar);
    1119             const bool fEnabledForMachine = gEDataManager->statusBarEnabled(uMachineID);
    1120             const bool fEnabled = fEnabledGlobally && fEnabledForMachine;
    1121             actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings)->setEnabled(fEnabled);
    1122             actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->blockSignals(true);
    1123             actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->setChecked(fEnabled);
    1124             actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->blockSignals(false);
    1125         }
    1126     }
    1127 }
    1128 
    11291129void UIMachine::prepareKeyboard()
    11301130{
    … …  
    11881188}
    11891189
     1190void UIMachine::cleanupScreens()
     1191{
     1192#ifdef VBOX_WS_MAC
     1193    /* Remove display reconfiguration callback: */
     1194    CGDisplayRemoveReconfigurationCallback(cgDisplayReconfigurationCallback, this);
     1195#endif /* VBOX_WS_MAC */
     1196}
     1197
    11901198void UIMachine::cleanupActions()
    11911199{
    … …  
    12081216}
    12091217
    1210 void UIMachine::cleanupScreens()
    1211 {
    1212 #ifdef VBOX_WS_MAC
    1213     /* Remove display reconfiguration callback: */
    1214     CGDisplayRemoveReconfigurationCallback(cgDisplayReconfigurationCallback, this);
    1215 #endif /* VBOX_WS_MAC */
    1216 }
    1217 
    12181218void UIMachine::cleanupSession()
    12191219{
    … …  
    12301230    /* Cleanup stuff: */
    12311231    cleanupMachineLogic();
    1232     cleanupBranding();
    12331232    cleanupScreens();
    12341233    cleanupActions();
     1234    cleanupBranding();
    12351235
    12361236    /* Cleanup session UI: */

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

    r98425 r98427  
    489489    /** Prepare routine. */
    490490    bool prepare();
     491    /** Prepare routine: Branding. */
     492    void prepareBranding();
    491493    /** Prepare routine: Session connection stuff. */
    492494    void prepareSessionConnections();
     495    /** Prepare routine: Actions stuff. */
     496    void prepareActions();
    493497    /** Prepare routine: Screens stuff. */
    494498    void prepareScreens();
    495     /** Prepare routine: Branding. */
    496     void prepareBranding();
    497     /** Prepare routine: Actions stuff. */
    498     void prepareActions();
    499499    /** Prepare routine: Keyboard stuff. */
    500500    void prepareKeyboard();
    … …  
    506506    /** Cleanup routine: Machine-logic stuff. */
    507507    void cleanupMachineLogic();
     508    /** Cleanup routine: Screens stuff. */
     509    void cleanupScreens();
    508510    /** Cleanup routine: Actions stuff. */
    509511    void cleanupActions();
    510512    /** Cleanup routine: Branding. */
    511513    void cleanupBranding();
    512     /** Cleanup routine: Screens stuff. */
    513     void cleanupScreens();
    514514    /** Cleanup routine: Session stuff. */
    515515    void cleanupSession();

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

    r98426 r98427  
    126126        UINotificationMessage::remindAboutAutoCapture();
    127127
    128     m_machineState = machine().GetState();
     128    m_enmMachineState = machine().GetState();
    129129
    130130    /* Apply debug settings from the command line. */
    … …  
    342342}
    343343
    344 void UISession::sltStateChange(KMachineState state)
     344void UISession::sltStateChange(KMachineState enmState)
    345345{
    346346    /* Check if something had changed: */
    347     if (m_machineState != state)
     347    if (m_enmMachineState != enmState)
    348348    {
    349349        /* Store new data: */
    350         m_machineStatePrevious = m_machineState;
    351         m_machineState = state;
     350        m_enmMachineStatePrevious = m_enmMachineState;
     351        m_enmMachineState = enmState;
    352352
    353353        /* Notify listeners about machine state changed: */
    … …  
    393393    , m_pConsoleEventhandler(0)
    394394    /* Common variables: */
    395     , m_machineStatePrevious(KMachineState_Null)
    396     , m_machineState(KMachineState_Null)
     395    , m_enmMachineStatePrevious(KMachineState_Null)
     396    , m_enmMachineState(KMachineState_Null)
    397397    /* Guest additions flags: */
    398398    , m_ulGuestAdditionsRunLevel(0)
    … …  
    430430{
    431431    /* Open session: */
    432     m_session = uiCommon().openSession(uiCommon().managedVMUuid(),
    433                                          uiCommon().isSeparateProcess()
    434                                        ? KLockType_Shared
    435                                        : KLockType_VM);
    436     if (m_session.isNull())
     432    m_comSession = uiCommon().openSession(uiCommon().managedVMUuid(),
     433                                            uiCommon().isSeparateProcess()
     434                                          ? KLockType_Shared
     435                                          : KLockType_VM);
     436    if (m_comSession.isNull())
    437437        return false;
    438438
    439439    /* Get machine: */
    440     m_machine = m_session.GetMachine();
    441     if (m_machine.isNull())
     440    m_comMachine = m_comSession.GetMachine();
     441    if (m_comMachine.isNull())
    442442        return false;
    443443
    444444    /* Get console: */
    445     m_console = m_session.GetConsole();
    446     if (m_console.isNull())
     445    m_comConsole = m_comSession.GetConsole();
     446    if (m_comConsole.isNull())
    447447        return false;
    448448
    449449    /* Get display: */
    450     m_display = m_console.GetDisplay();
    451     if (m_display.isNull())
     450    m_comDisplay = m_comConsole.GetDisplay();
     451    if (m_comDisplay.isNull())
    452452        return false;
    453453
    454454    /* Get guest: */
    455     m_guest = m_console.GetGuest();
    456     if (m_guest.isNull())
     455    m_comGuest = m_comConsole.GetGuest();
     456    if (m_comGuest.isNull())
    457457        return false;
    458458
    459459    /* Get mouse: */
    460     m_mouse = m_console.GetMouse();
    461     if (m_mouse.isNull())
     460    m_comMouse = m_comConsole.GetMouse();
     461    if (m_comMouse.isNull())
    462462        return false;
    463463
    464464    /* Get keyboard: */
    465     m_keyboard = m_console.GetKeyboard();
    466     if (m_keyboard.isNull())
     465    m_comKeyboard = m_comConsole.GetKeyboard();
     466    if (m_comKeyboard.isNull())
    467467        return false;
    468468
    469469    /* Get debugger: */
    470     m_debugger = m_console.GetDebugger();
    471     if (m_debugger.isNull())
     470    m_comDebugger = m_comConsole.GetDebugger();
     471    if (m_comDebugger.isNull())
    472472        return false;
    473473
    … …  
    476476
    477477    /* Update machine-state: */
    478     m_machineState = machine().GetState();
     478    m_enmMachineState = machine().GetState();
    479479
    480480    /* True by default: */
    … …  
    601601{
    602602    /* Detach debugger: */
    603     if (!m_debugger.isNull())
    604         m_debugger.detach();
     603    if (!m_comDebugger.isNull())
     604        m_comDebugger.detach();
    605605
    606606    /* Detach keyboard: */
    607     if (!m_keyboard.isNull())
    608         m_keyboard.detach();
     607    if (!m_comKeyboard.isNull())
     608        m_comKeyboard.detach();
    609609
    610610    /* Detach mouse: */
    611     if (!m_mouse.isNull())
    612         m_mouse.detach();
     611    if (!m_comMouse.isNull())
     612        m_comMouse.detach();
    613613
    614614    /* Detach guest: */
    615     if (!m_guest.isNull())
    616         m_guest.detach();
     615    if (!m_comGuest.isNull())
     616        m_comGuest.detach();
    617617
    618618    /* Detach display: */
    619     if (!m_display.isNull())
    620         m_display.detach();
     619    if (!m_comDisplay.isNull())
     620        m_comDisplay.detach();
    621621
    622622    /* Detach console: */
    623     if (!m_console.isNull())
    624         m_console.detach();
     623    if (!m_comConsole.isNull())
     624        m_comConsole.detach();
    625625
    626626    /* Detach machine: */
    627     if (!m_machine.isNull())
    628         m_machine.detach();
     627    if (!m_comMachine.isNull())
     628        m_comMachine.detach();
    629629
    630630    /* Close session: */
    631     if (!m_session.isNull() && uiCommon().isVBoxSVCAvailable())
    632     {
    633         m_session.UnlockMachine();
    634         m_session.detach();
     631    if (!m_comSession.isNull() && uiCommon().isVBoxSVCAvailable())
     632    {
     633        m_comSession.UnlockMachine();
     634        m_comSession.detach();
    635635    }
    636636}

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

    r98426 r98427  
    163163     ** @{ */
    164164        /** Returns the session instance. */
    165         CSession &session() { return m_session; }
     165        CSession &session() { return m_comSession; }
    166166        /** Returns the session's machine instance. */
    167         CMachine &machine() { return m_machine; }
     167        CMachine &machine() { return m_comMachine; }
    168168        /** Returns the session's console instance. */
    169         CConsole &console() { return m_console; }
     169        CConsole &console() { return m_comConsole; }
    170170        /** Returns the console's display instance. */
    171         CDisplay &display() { return m_display; }
     171        CDisplay &display() { return m_comDisplay; }
    172172        /** Returns the console's guest instance. */
    173         CGuest &guest() { return m_guest; }
     173        CGuest &guest() { return m_comGuest; }
    174174        /** Returns the console's mouse instance. */
    175         CMouse &mouse() { return m_mouse; }
     175        CMouse &mouse() { return m_comMouse; }
    176176        /** Returns the console's keyboard instance. */
    177         CKeyboard &keyboard() { return m_keyboard; }
     177        CKeyboard &keyboard() { return m_comKeyboard; }
    178178        /** Returns the console's debugger instance. */
    179         CMachineDebugger &debugger() { return m_debugger; }
     179        CMachineDebugger &debugger() { return m_comDebugger; }
    180180    /** @} */
    181181
    … …  
    192192     ** @{ */
    193193        /** Returns previous machine state. */
    194         KMachineState machineStatePrevious() const { return m_machineStatePrevious; }
     194        KMachineState machineStatePrevious() const { return m_enmMachineStatePrevious; }
    195195        /** Returns machine state. */
    196         KMachineState machineState() const { return m_machineState; }
     196        KMachineState machineState() const { return m_enmMachineState; }
    197197
    198198        /** Resets previous state to be the same as current one. */
    199         void forgetPreviousMachineState() { m_machineStatePrevious = m_machineState; }
     199        void forgetPreviousMachineState() { m_enmMachineStatePrevious = m_enmMachineState; }
    200200
    201201        /** Returns whether VM is in one of saved states. */
    … …  
    372372
    373373        /** Holds the session instance. */
    374         CSession         m_session;
     374        CSession          m_comSession;
    375375        /** Holds the session's machine instance. */
    376         CMachine         m_machine;
     376        CMachine          m_comMachine;
    377377        /** Holds the session's console instance. */
    378         CConsole         m_console;
     378        CConsole          m_comConsole;
    379379        /** Holds the console's display instance. */
    380         CDisplay         m_display;
     380        CDisplay          m_comDisplay;
    381381        /** Holds the console's guest instance. */
    382         CGuest           m_guest;
     382        CGuest            m_comGuest;
    383383        /** Holds the console's mouse instance. */
    384         CMouse           m_mouse;
     384        CMouse            m_comMouse;
    385385        /** Holds the console's keyboard instance. */
    386         CKeyboard        m_keyboard;
     386        CKeyboard         m_comKeyboard;
    387387        /** Holds the console's debugger instance. */
    388         CMachineDebugger m_debugger;
     388        CMachineDebugger  m_comDebugger;
    389389    /** @} */
    390390
    … …  
    392392     ** @{ */
    393393        /** Holds the previous machine state. */
    394         KMachineState  m_machineStatePrevious;
     394        KMachineState  m_enmMachineStatePrevious;
    395395        /** Holds the actual machine state. */
    396         KMachineState  m_machineState;
     396        KMachineState  m_enmMachineState;
    397397    /** @} */
    398398
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette