VirtualBox

Changeset 80600 in vbox


Ignore:
Timestamp:
Sep 5, 2019 8:43:16 AM (5 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:8938. Converting connection syntax in UIMachineLogic. part 1.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r79641 r80600  
    963963{
    964964    /* We should watch for VBoxSVC availability changes: */
    965     connect(&uiCommon(), SIGNAL(sigVBoxSVCAvailabilityChange()),
    966             this, SLOT(sltHandleVBoxSVCAvailabilityChange()));
     965    connect(&uiCommon(), &UICommon::sigVBoxSVCAvailabilityChange,
     966            this, &UIMachineLogic::sltHandleVBoxSVCAvailabilityChange);
    967967
    968968    /* We should watch for requested modes: */
    969     connect(uisession(), SIGNAL(sigInitialized()), this, SLOT(sltCheckForRequestedVisualStateType()), Qt::QueuedConnection);
    970     connect(uisession(), SIGNAL(sigAdditionsStateChange()), this, SLOT(sltCheckForRequestedVisualStateType()));
     969    connect(uisession(), &UISession::sigInitialized, this, &UIMachineLogic::sltCheckForRequestedVisualStateType, Qt::QueuedConnection);
     970    connect(uisession(), &UISession::sigAdditionsStateChange, this, &UIMachineLogic::sltCheckForRequestedVisualStateType);
    971971
    972972    /* We should watch for console events: */
    973     connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
    974     connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged()));
    975     connect(uisession(), SIGNAL(sigMouseCapabilityChange()), this, SLOT(sltMouseCapabilityChanged()));
    976     connect(uisession(), SIGNAL(sigKeyboardLedsChange()), this, SLOT(sltKeyboardLedsChanged()));
    977     connect(uisession(), SIGNAL(sigUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &)),
    978             this, SLOT(sltUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &)));
    979     connect(uisession(), SIGNAL(sigRuntimeError(bool, const QString &, const QString &)),
    980             this, SLOT(sltRuntimeError(bool, const QString &, const QString &)));
     973    connect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineLogic::sltMachineStateChanged);
     974    connect(uisession(), &UISession::sigAdditionsStateActualChange, this, &UIMachineLogic::sltAdditionsStateChanged);
     975    connect(uisession(), &UISession::sigMouseCapabilityChange, this, &UIMachineLogic::sltMouseCapabilityChanged);
     976    connect(uisession(), &UISession::sigKeyboardLedsChange, this, &UIMachineLogic::sltKeyboardLedsChanged);
     977    connect(uisession(), &UISession::sigUSBDeviceStateChange, this, &UIMachineLogic::sltUSBDeviceStateChange);
     978    connect(uisession(), &UISession::sigRuntimeError, this, &UIMachineLogic::sltRuntimeError);
    981979#ifdef VBOX_WS_MAC
    982     connect(uisession(), SIGNAL(sigShowWindows()), this, SLOT(sltShowWindows()));
     980    connect(uisession(), &UISession::sigShowWindows, this, &UIMachineLogic::sltShowWindows);
    983981#endif /* VBOX_WS_MAC */
    984     connect(uisession(), SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
    985             this, SLOT(sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)));
     982    connect(uisession(), &UISession::sigGuestMonitorChange, this, &UIMachineLogic::sltGuestMonitorChange);
    986983
    987984    /* We should watch for host-screen-change events: */
    988     connect(uisession(), SIGNAL(sigHostScreenCountChange()), this, SLOT(sltHostScreenCountChange()));
    989     connect(uisession(), SIGNAL(sigHostScreenGeometryChange()), this, SLOT(sltHostScreenGeometryChange()));
    990     connect(uisession(), SIGNAL(sigHostScreenAvailableAreaChange()), this, SLOT(sltHostScreenAvailableAreaChange()));
     985    connect(uisession(), &UISession::sigHostScreenCountChange, this, &UIMachineLogic::sltHostScreenCountChange);
     986    connect(uisession(), &UISession::sigHostScreenGeometryChange, this, &UIMachineLogic::sltHostScreenGeometryChange);
     987    connect(uisession(), &UISession::sigHostScreenAvailableAreaChange, this, &UIMachineLogic::sltHostScreenAvailableAreaChange);
    991988
    992989    /* We should notify about frame-buffer events: */
    993     connect(this, SIGNAL(sigFrameBufferResize()), uisession(), SIGNAL(sigFrameBufferResize()));
     990    connect(this, &UIMachineLogic::sigFrameBufferResize, uisession(), &UISession::sigFrameBufferResize);
    994991}
    995992
    … …  
    10891086{
    10901087    /* 'Application' actions connection: */
    1091     connect(actionPool()->action(UIActionIndex_M_Application_S_Preferences), SIGNAL(triggered()),
    1092             this, SLOT(sltShowGlobalPreferences()), Qt::UniqueConnection);
    1093     connect(actionPool()->action(UIActionIndex_M_Application_S_Close), SIGNAL(triggered()),
    1094             this, SLOT(sltClose()), Qt::QueuedConnection);
     1088    connect(actionPool()->action(UIActionIndex_M_Application_S_Preferences), &UIAction::triggered,
     1089            this, &UIMachineLogic::sltShowGlobalPreferences, Qt::UniqueConnection);
     1090    connect(actionPool()->action(UIActionIndex_M_Application_S_Close), &UIAction::triggered,
     1091            this, &UIMachineLogic::sltClose, Qt::QueuedConnection);
    10951092
    10961093    /* 'Machine' actions connections: */
    1097     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Settings), SIGNAL(triggered()),
    1098             this, SLOT(sltOpenVMSettingsDialog()));
    1099     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_TakeSnapshot), SIGNAL(triggered()),
    1100             this, SLOT(sltTakeSnapshot()));
    1101     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowInformation), SIGNAL(triggered()),
    1102             this, SLOT(sltShowInformationDialog()));
    1103     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowFileManager), SIGNAL(triggered()),
    1104             this, SLOT(sltShowFileManagerDialog()));
    1105     connect(actionPool()->action(UIActionIndexRT_M_Machine_T_Pause), SIGNAL(toggled(bool)),
    1106             this, SLOT(sltPause(bool)));
    1107     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Reset), SIGNAL(triggered()),
    1108             this, SLOT(sltReset()));
    1109     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Detach), SIGNAL(triggered()),
    1110             this, SLOT(sltDetach()), Qt::QueuedConnection);
    1111     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_SaveState), SIGNAL(triggered()),
    1112             this, SLOT(sltSaveState()), Qt::QueuedConnection);
    1113     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Shutdown), SIGNAL(triggered()),
    1114             this, SLOT(sltShutdown()));
    1115     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_PowerOff), SIGNAL(triggered()),
    1116             this, SLOT(sltPowerOff()), Qt::QueuedConnection);
     1094    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Settings), &UIAction::triggered,
     1095            [=](){ UIMachineLogic::sltOpenVMSettingsDialog();});
     1096    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_TakeSnapshot), &UIAction::triggered,
     1097            this, &UIMachineLogic::sltTakeSnapshot);
     1098    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowInformation), &UIAction::triggered,
     1099            this, &UIMachineLogic::sltShowInformationDialog);
     1100    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowFileManager), &UIAction::triggered,
     1101            this, &UIMachineLogic::sltShowFileManagerDialog);
     1102    connect(actionPool()->action(UIActionIndexRT_M_Machine_T_Pause), &UIAction::toggled,
     1103            this, &UIMachineLogic::sltPause);
     1104    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Reset), &UIAction::triggered,
     1105            this, &UIMachineLogic::sltReset);
     1106    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Detach), &UIAction::triggered,
     1107            this, &UIMachineLogic::sltDetach, Qt::QueuedConnection);
     1108    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_SaveState), &UIAction::triggered,
     1109            this, &UIMachineLogic::sltSaveState, Qt::QueuedConnection);
     1110    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Shutdown), &UIAction::triggered,
     1111            this, &UIMachineLogic::sltShutdown);
     1112    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_PowerOff), &UIAction::triggered,
     1113            this, &UIMachineLogic::sltPowerOff, Qt::QueuedConnection);
    11171114
    11181115    /* 'View' actions connections: */
    11191116#ifndef VBOX_WS_MAC
    1120     connect(actionPool()->action(UIActionIndexRT_M_View_S_MinimizeWindow), SIGNAL(triggered()),
    1121             this, SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
     1117    connect(actionPool()->action(UIActionIndexRT_M_View_S_MinimizeWindow), &UIAction::triggered,
     1118            this, &UIMachineLogic::sltMinimizeActiveMachineWindow, Qt::QueuedConnection);
    11221119#endif /* !VBOX_WS_MAC */
    1123     connect(actionPool()->action(UIActionIndexRT_M_View_S_AdjustWindow), SIGNAL(triggered()),
    1124             this, SLOT(sltAdjustMachineWindows()));
    1125     connect(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize), SIGNAL(toggled(bool)),
    1126             this, SLOT(sltToggleGuestAutoresize(bool)));
    1127     connect(actionPool()->action(UIActionIndexRT_M_View_S_TakeScreenshot), SIGNAL(triggered()),
    1128             this, SLOT(sltTakeScreenshot()));
    1129     connect(actionPool()->action(UIActionIndexRT_M_View_M_Recording_S_Settings), SIGNAL(triggered()),
    1130             this, SLOT(sltOpenRecordingOptions()));
    1131     connect(actionPool()->action(UIActionIndexRT_M_View_M_Recording_T_Start), SIGNAL(toggled(bool)),
    1132             this, SLOT(sltToggleRecording(bool)));
    1133     connect(actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer), SIGNAL(toggled(bool)),
    1134             this, SLOT(sltToggleVRDE(bool)));
     1120    connect(actionPool()->action(UIActionIndexRT_M_View_S_AdjustWindow), &UIAction::triggered,
     1121            this, &UIMachineLogic::sltAdjustMachineWindows);
     1122    connect(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize), &UIAction::toggled,
     1123            this, &UIMachineLogic::sltToggleGuestAutoresize);
     1124    connect(actionPool()->action(UIActionIndexRT_M_View_S_TakeScreenshot), &UIAction::triggered,
     1125            this, &UIMachineLogic::sltTakeScreenshot);
     1126    connect(actionPool()->action(UIActionIndexRT_M_View_M_Recording_S_Settings), &UIAction::triggered,
     1127            this, &UIMachineLogic::sltOpenRecordingOptions);
     1128    connect(actionPool()->action(UIActionIndexRT_M_View_M_Recording_T_Start), &UIAction::toggled,
     1129            this, &UIMachineLogic::sltToggleRecording);
     1130    connect(actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer), &UIAction::toggled,
     1131            this, &UIMachineLogic::sltToggleVRDE);
    11351132
    11361133    /* 'Input' actions connections: */
    1137     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_Settings), SIGNAL(triggered()),
    1138             this, SLOT(sltShowKeyboardSettings()));
    1139     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_SoftKeyboard), SIGNAL(triggered()),
    1140             this, SLOT(sltShowSoftKeyboard()));
    1141     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCAD), SIGNAL(triggered()),
    1142             this, SLOT(sltTypeCAD()));
     1134    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_Settings), &UIAction::triggered,
     1135            this, &UIMachineLogic::sltShowKeyboardSettings);
     1136    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_SoftKeyboard), &UIAction::triggered,
     1137            this, &UIMachineLogic::sltShowSoftKeyboard);
     1138    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCAD), &UIAction::triggered,
     1139            this, &UIMachineLogic::sltTypeCAD);
    11431140#ifdef VBOX_WS_X11
    1144     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCABS), SIGNAL(triggered()),
    1145             this, SLOT(sltTypeCABS()));
     1141    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCABS), &UIAction::triggered,
     1142            this, &UIMachineLogic::sltTypeCABS);
    11461143#endif /* VBOX_WS_X11 */
    1147     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak), SIGNAL(triggered()),
    1148             this, SLOT(sltTypeCtrlBreak()));
    1149     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert), SIGNAL(triggered()),
    1150             this, SLOT(sltTypeInsert()));
    1151     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypePrintScreen), SIGNAL(triggered()),
    1152             this, SLOT(sltTypePrintScreen()));
    1153     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeAltPrintScreen), SIGNAL(triggered()),
    1154             this, SLOT(sltTypeAltPrintScreen()));
    1155     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_T_TypeHostKeyCombo), SIGNAL(toggled(bool)),
    1156             this, SLOT(sltTypeHostKeyComboPressRelease(bool)));
    1157     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration), SIGNAL(toggled(bool)),
    1158             this, SLOT(sltToggleMouseIntegration(bool)));
     1144    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak), &UIAction::triggered,
     1145            this, &UIMachineLogic::sltTypeCtrlBreak);
     1146    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert), &UIAction::triggered,
     1147            this, &UIMachineLogic::sltTypeInsert);
     1148    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypePrintScreen), &UIAction::triggered,
     1149            this, &UIMachineLogic::sltTypePrintScreen);
     1150    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeAltPrintScreen), &UIAction::triggered,
     1151            this, &UIMachineLogic::sltTypeAltPrintScreen);
     1152    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_T_TypeHostKeyCombo), &UIAction::toggled,
     1153            this, &UIMachineLogic::sltTypeHostKeyComboPressRelease);
     1154    connect(actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration), &UIAction::toggled,
     1155            this, &UIMachineLogic::sltToggleMouseIntegration);
    11591156
    11601157    /* 'Devices' actions connections: */
    1161     connect(actionPool(), SIGNAL(sigNotifyAboutMenuPrepare(int, QMenu*)), this, SLOT(sltHandleMenuPrepare(int, QMenu*)));
    1162     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_HardDrives_S_Settings), SIGNAL(triggered()),
    1163             this, SLOT(sltOpenStorageSettingsDialog()));
     1158    connect(actionPool(), &UIActionPool::sigNotifyAboutMenuPrepare, this, &UIMachineLogic::sltHandleMenuPrepare);
     1159    connect(actionPool()->action(UIActionIndexRT_M_Devices_M_HardDrives_S_Settings), &UIAction::triggered,
     1160            this, &UIMachineLogic::sltOpenStorageSettingsDialog);
    11641161    connect(actionPool()->action(UIActionIndexRT_M_Devices_M_Audio_T_Output), &UIAction::toggled,
    11651162            this, &UIMachineLogic::sltToggleAudioOutput);
    11661163    connect(actionPool()->action(UIActionIndexRT_M_Devices_M_Audio_T_Input), &UIAction::toggled,
    11671164            this, &UIMachineLogic::sltToggleAudioInput);
    1168     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_Network_S_Settings), SIGNAL(triggered()),
    1169             this, SLOT(sltOpenNetworkSettingsDialog()));
    1170     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_USBDevices_S_Settings), SIGNAL(triggered()),
    1171             this, SLOT(sltOpenUSBDevicesSettingsDialog()));
    1172     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings), SIGNAL(triggered()),
    1173             this, SLOT(sltOpenSharedFoldersSettingsDialog()));
    1174     connect(actionPool()->action(UIActionIndexRT_M_Devices_S_InstallGuestTools), SIGNAL(triggered()),
    1175             this, SLOT(sltInstallGuestAdditions()));
     1165    connect(actionPool()->action(UIActionIndexRT_M_Devices_M_Network_S_Settings), &UIAction::triggered,
     1166            this, &UIMachineLogic::sltOpenNetworkSettingsDialog);
     1167    connect(actionPool()->action(UIActionIndexRT_M_Devices_M_USBDevices_S_Settings), &UIAction::triggered,
     1168            this, &UIMachineLogic::sltOpenUSBDevicesSettingsDialog);
     1169    connect(actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings), &UIAction::triggered,
     1170            this, &UIMachineLogic::sltOpenSharedFoldersSettingsDialog);
     1171    connect(actionPool()->action(UIActionIndexRT_M_Devices_S_InstallGuestTools), &UIAction::triggered,
     1172            this, &UIMachineLogic::sltInstallGuestAdditions);
    11761173
    11771174#ifdef VBOX_WITH_DEBUGGER_GUI
    11781175    /* 'Debug' actions connections: */
    1179     connect(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowStatistics), SIGNAL(triggered()),
    1180             this, SLOT(sltShowDebugStatistics()));
    1181     connect(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowCommandLine), SIGNAL(triggered()),
    1182             this, SLOT(sltShowDebugCommandLine()));
    1183     connect(actionPool()->action(UIActionIndexRT_M_Debug_T_Logging), SIGNAL(toggled(bool)),
    1184             this, SLOT(sltLoggingToggled(bool)));
    1185     connect(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowLogDialog), SIGNAL(triggered()),
    1186             this, SLOT(sltShowLogDialog()));
    1187     connect(actionPool()->action(UIActionIndexRT_M_Debug_S_GuestControlConsole), SIGNAL(triggered()),
    1188             this, SLOT(sltShowGuestControlConsoleDialog()));
     1176    connect(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowStatistics), &UIAction::triggered,
     1177            this, &UIMachineLogic::sltShowDebugStatistics);
     1178    connect(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowCommandLine), &UIAction::triggered,
     1179            this, &UIMachineLogic::sltShowDebugCommandLine);
     1180    connect(actionPool()->action(UIActionIndexRT_M_Debug_T_Logging), &UIAction::toggled,
     1181            this, &UIMachineLogic::sltLoggingToggled);
     1182    connect(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowLogDialog), &UIAction::triggered,
     1183            this, &UIMachineLogic::sltShowLogDialog);
     1184    connect(actionPool()->action(UIActionIndexRT_M_Debug_S_GuestControlConsole), &UIAction::triggered,
     1185            this, &UIMachineLogic::sltShowGuestControlConsoleDialog);
    11891186#endif /* VBOX_WITH_DEBUGGER_GUI */
    11901187
    11911188#ifdef VBOX_WS_MAC
    11921189    /* 'Window' action connections: */
    1193     connect(actionPool()->action(UIActionIndex_M_Window_S_Minimize), SIGNAL(triggered()),
    1194             this, SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
     1190    connect(actionPool()->action(UIActionIndex_M_Window_S_Minimize), &UIAction::triggered,
     1191            this, &UIMachineLogic::sltMinimizeActiveMachineWindow, Qt::QueuedConnection);
    11951192#endif /* VBOX_WS_MAC */
    11961193}
Note: See TracChangeset for help on using the changeset viewer.

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