Changeset 80606 in vbox for trunk/src/VBox/Frontends/VirtualBox
- Timestamp:
- Sep 5, 2019 12:45:46 PM (6 years ago)
- svn:sync-xref-src-repo-rev:
- 133128
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
r80601 r80606 893 893 m_pKeyboardHandler = pKeyboardHandler; 894 894 /* Connect to session: */ 895 connect(m_pKeyboardHandler, SIGNAL(sigStateChange(int)),896 uisession(), SLOT(setKeyboardState(int)));895 connect(m_pKeyboardHandler, &UIKeyboardHandler::sigStateChange, 896 uisession(), &UISession::setKeyboardState); 897 897 } 898 898 … … 902 902 m_pMouseHandler = pMouseHandler; 903 903 /* Connect to session: */ 904 connect(m_pMouseHandler, SIGNAL(sigStateChange(int)),905 uisession(), SLOT(setMouseState(int)));904 connect(m_pMouseHandler, &UIMouseHandler::sigStateChange, 905 uisession(), &UISession::setMouseState); 906 906 } 907 907 … … 1261 1261 pDockSettingsMenu->addActions(pDockPreviewModeGroup->actions()); 1262 1262 1263 connect(pDockPreviewModeGroup, SIGNAL(triggered(QAction*)), 1264 this, SLOT(sltDockPreviewModeChanged(QAction*))); 1265 connect(gEDataManager, SIGNAL(sigDockIconAppearanceChange(bool)), 1266 this, SLOT(sltChangeDockIconUpdate(bool))); 1263 connect(pDockPreviewModeGroup, &QActionGroup::triggered, this, &UIMachineLogic::sltDockPreviewModeChanged); 1264 connect(gEDataManager, &UIExtraDataManager::sigDockIconAppearanceChange, this, &UIMachineLogic::sltChangeDockIconUpdate); 1267 1265 1268 1266 /* Get dock icon disable overlay action: */ … … 1271 1269 pDockIconDisableOverlay->setChecked(gEDataManager->dockIconDisableOverlay(uiCommon().managedVMUuid())); 1272 1270 /* Connect dock icon disable overlay related signals: */ 1273 connect(pDockIconDisableOverlay, SIGNAL(triggered(bool)), 1274 this, SLOT(sltDockIconDisableOverlayChanged(bool))); 1275 connect(gEDataManager, SIGNAL(sigDockIconOverlayAppearanceChange(bool)), 1276 this, SLOT(sltChangeDockIconOverlayAppearance(bool))); 1271 connect(pDockIconDisableOverlay, &QAction::triggered, this, &UIMachineLogic::sltDockIconDisableOverlayChanged); 1272 connect(gEDataManager, &UIExtraDataManager::sigDockIconOverlayAppearanceChange, 1273 this, &UIMachineLogic::sltChangeDockIconOverlayAppearance); 1277 1274 /* Add dock icon disable overlay action to the dock settings menu: */ 1278 1275 pDockSettingsMenu->addAction(pDockIconDisableOverlay); … … 1304 1301 } 1305 1302 pDockSettingsMenu->addActions(m_pDockPreviewSelectMonitorGroup->actions()); 1306 connect(m_pDockPreviewSelectMonitorGroup, SIGNAL(triggered(QAction*)),1307 this, SLOT(sltDockPreviewMonitorChanged(QAction*)));1303 connect(m_pDockPreviewSelectMonitorGroup, &QActionGroup::triggered, 1304 this, &UIMachineLogic::sltDockPreviewMonitorChanged); 1308 1305 } 1309 1306 … … 1418 1415 } 1419 1416 pDockSettingsMenu->addActions(m_pDockPreviewSelectMonitorGroup->actions()); 1420 connect(m_pDockPreviewSelectMonitorGroup, SIGNAL(triggered(QAction*)),1421 this, SLOT(sltDockPreviewMonitorChanged(QAction*)));1417 connect(m_pDockPreviewSelectMonitorGroup, &QActionGroup::triggered, 1418 this, &UIMachineLogic::sltDockPreviewMonitorChanged); 1422 1419 } 1423 1420 else … … 1454 1451 m_fIsHidLedsSyncEnabled = gEDataManager->hidLedsSyncState(uiCommon().managedVMUuid()); 1455 1452 /* Subscribe to extra-data changes to be able to enable/disable feature dynamically: */ 1456 connect(gEDataManager, SIGNAL(sigHidLedsSyncStateChange(bool)), this, SLOT(sltHidLedsSyncStateChanged(bool)));1453 connect(gEDataManager, &UIExtraDataManager::sigHidLedsSyncStateChange, this, &UIMachineLogic::sltHidLedsSyncStateChanged); 1457 1454 #endif /* VBOX_WS_MAC || VBOX_WS_WIN */ 1458 1455 /* HID LEDs sync initialization: */ … … 1497 1494 { 1498 1495 /* We should stop watching for VBoxSVC availability changes: */ 1499 disconnect(&uiCommon(), SIGNAL(sigVBoxSVCAvailabilityChange()),1500 this, SLOT(sltHandleVBoxSVCAvailabilityChange()));1496 disconnect(&uiCommon(), &UICommon::sigVBoxSVCAvailabilityChange, 1497 this, &UIMachineLogic::sltHandleVBoxSVCAvailabilityChange); 1501 1498 1502 1499 /* We should stop watching for requested modes: */ 1503 disconnect(uisession(), SIGNAL(sigInitialized()), this, SLOT(sltCheckForRequestedVisualStateType()));1504 disconnect(uisession(), SIGNAL(sigAdditionsStateChange()), this, SLOT(sltCheckForRequestedVisualStateType()));1500 disconnect(uisession(), &UISession::sigInitialized, this, &UIMachineLogic::sltCheckForRequestedVisualStateType); 1501 disconnect(uisession(), &UISession::sigAdditionsStateChange, this, &UIMachineLogic::sltCheckForRequestedVisualStateType); 1505 1502 1506 1503 /* We should stop watching for console events: */ 1507 disconnect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged())); 1508 disconnect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged())); 1509 disconnect(uisession(), SIGNAL(sigMouseCapabilityChange()), this, SLOT(sltMouseCapabilityChanged())); 1510 disconnect(uisession(), SIGNAL(sigKeyboardLedsChange()), this, SLOT(sltKeyboardLedsChanged())); 1511 disconnect(uisession(), SIGNAL(sigUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &)), 1512 this, SLOT(sltUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &))); 1513 disconnect(uisession(), SIGNAL(sigRuntimeError(bool, const QString &, const QString &)), 1514 this, SLOT(sltRuntimeError(bool, const QString &, const QString &))); 1504 disconnect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineLogic::sltMachineStateChanged); 1505 disconnect(uisession(), &UISession::sigAdditionsStateActualChange, this, &UIMachineLogic::sltAdditionsStateChanged); 1506 disconnect(uisession(), &UISession::sigMouseCapabilityChange, this, &UIMachineLogic::sltMouseCapabilityChanged); 1507 disconnect(uisession(), &UISession::sigKeyboardLedsChange, this, &UIMachineLogic::sltKeyboardLedsChanged); 1508 disconnect(uisession(), &UISession::sigUSBDeviceStateChange, this, &UIMachineLogic::sltUSBDeviceStateChange); 1509 disconnect(uisession(), &UISession::sigRuntimeError, this, &UIMachineLogic::sltRuntimeError); 1515 1510 #ifdef VBOX_WS_MAC 1516 disconnect(uisession(), SIGNAL(sigShowWindows()), this, SLOT(sltShowWindows()));1511 disconnect(uisession(), &UISession::sigShowWindows, this, &UIMachineLogic::sltShowWindows); 1517 1512 #endif /* VBOX_WS_MAC */ 1518 disconnect(uisession(), SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)), 1519 this, SLOT(sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect))); 1513 disconnect(uisession(), &UISession::sigGuestMonitorChange, this, &UIMachineLogic::sltGuestMonitorChange); 1520 1514 1521 1515 /* We should stop watching for host-screen-change events: */ 1522 disconnect(uisession(), SIGNAL(sigHostScreenCountChange()), this, SLOT(sltHostScreenCountChange()));1523 disconnect(uisession(), SIGNAL(sigHostScreenGeometryChange()), this, SLOT(sltHostScreenGeometryChange()));1524 disconnect(uisession(), SIGNAL(sigHostScreenAvailableAreaChange()), this, SLOT(sltHostScreenAvailableAreaChange()));1516 disconnect(uisession(), &UISession::sigHostScreenCountChange, this, &UIMachineLogic::sltHostScreenCountChange); 1517 disconnect(uisession(), &UISession::sigHostScreenGeometryChange, this, &UIMachineLogic::sltHostScreenGeometryChange); 1518 disconnect(uisession(), &UISession::sigHostScreenAvailableAreaChange, this, &UIMachineLogic::sltHostScreenAvailableAreaChange); 1525 1519 1526 1520 /* We should stop notify about frame-buffer events: */ 1527 disconnect(this, SIGNAL(sigFrameBufferResize()), uisession(), SIGNAL(sigFrameBufferResize()));1521 disconnect(this, &UIMachineLogic::sigFrameBufferResize, uisession(), &UISession::sigFrameBufferResize); 1528 1522 } 1529 1523 … … 2445 2439 UIDownloaderAdditions *pDl = UIDownloaderAdditions::create(); 2446 2440 /* After downloading finished => propose to install the Additions: */ 2447 connect(pDl, SIGNAL(sigDownloadFinished(const QString&)), uisession(), SLOT(sltInstallGuestAdditionsFrom(const QString&)));2441 connect(pDl, &UIDownloaderAdditions::sigDownloadFinished, uisession(), &UISession::sltInstallGuestAdditionsFrom); 2448 2442 /* Start downloading: */ 2449 2443 pDl->start(); … … 2927 2921 pAction->setChecked(machine().GetClipboardMode() == mode); 2928 2922 } 2929 connect(m_pSharedClipboardActions, SIGNAL(triggered(QAction*)), 2930 this, SLOT(sltChangeSharedClipboardType(QAction*))); 2923 connect(m_pSharedClipboardActions, &QActionGroup::triggered, this, &UIMachineLogic::sltChangeSharedClipboardType); 2931 2924 } 2932 2925 /* Subsequent runs: */ … … 2952 2945 pAction->setChecked(machine().GetDnDMode() == mode); 2953 2946 } 2954 connect(m_pDragAndDropActions, SIGNAL(triggered(QAction*)), 2955 this, SLOT(sltChangeDragAndDropType(QAction*))); 2947 connect(m_pDragAndDropActions, &QActionGroup::triggered, this, &UIMachineLogic::sltChangeDragAndDropType); 2956 2948 } 2957 2949 /* Subsequent runs: */
Note:
See TracChangeset
for help on using the changeset viewer.