VirtualBox

Ignore:
Timestamp:
Sep 5, 2019 12:45:46 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
133128
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r80601 r80606  
    893893    m_pKeyboardHandler = pKeyboardHandler;
    894894    /* 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);
    897897}
    898898
     
    902902    m_pMouseHandler = pMouseHandler;
    903903    /* 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);
    906906}
    907907
     
    12611261    pDockSettingsMenu->addActions(pDockPreviewModeGroup->actions());
    12621262
    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);
    12671265
    12681266    /* Get dock icon disable overlay action: */
     
    12711269    pDockIconDisableOverlay->setChecked(gEDataManager->dockIconDisableOverlay(uiCommon().managedVMUuid()));
    12721270    /* 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);
    12771274    /* Add dock icon disable overlay action to the dock settings menu: */
    12781275    pDockSettingsMenu->addAction(pDockIconDisableOverlay);
     
    13041301        }
    13051302        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);
    13081305    }
    13091306
     
    14181415        }
    14191416        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);
    14221419    }
    14231420    else
     
    14541451    m_fIsHidLedsSyncEnabled = gEDataManager->hidLedsSyncState(uiCommon().managedVMUuid());
    14551452    /* 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);
    14571454#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
    14581455    /* HID LEDs sync initialization: */
     
    14971494{
    14981495    /* 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);
    15011498
    15021499    /* 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);
    15051502
    15061503    /* 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);
    15151510#ifdef VBOX_WS_MAC
    1516     disconnect(uisession(), SIGNAL(sigShowWindows()), this, SLOT(sltShowWindows()));
     1511    disconnect(uisession(), &UISession::sigShowWindows, this, &UIMachineLogic::sltShowWindows);
    15171512#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);
    15201514
    15211515    /* 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);
    15251519
    15261520    /* We should stop notify about frame-buffer events: */
    1527     disconnect(this, SIGNAL(sigFrameBufferResize()), uisession(), SIGNAL(sigFrameBufferResize()));
     1521    disconnect(this, &UIMachineLogic::sigFrameBufferResize, uisession(), &UISession::sigFrameBufferResize);
    15281522}
    15291523
     
    24452439        UIDownloaderAdditions *pDl = UIDownloaderAdditions::create();
    24462440        /* 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);
    24482442        /* Start downloading: */
    24492443        pDl->start();
     
    29272921            pAction->setChecked(machine().GetClipboardMode() == mode);
    29282922        }
    2929         connect(m_pSharedClipboardActions, SIGNAL(triggered(QAction*)),
    2930                 this, SLOT(sltChangeSharedClipboardType(QAction*)));
     2923        connect(m_pSharedClipboardActions, &QActionGroup::triggered, this, &UIMachineLogic::sltChangeSharedClipboardType);
    29312924    }
    29322925    /* Subsequent runs: */
     
    29522945            pAction->setChecked(machine().GetDnDMode() == mode);
    29532946        }
    2954         connect(m_pDragAndDropActions, SIGNAL(triggered(QAction*)),
    2955                 this, SLOT(sltChangeDragAndDropType(QAction*)));
     2947        connect(m_pDragAndDropActions, &QActionGroup::triggered, this, &UIMachineLogic::sltChangeDragAndDropType);
    29562948    }
    29572949    /* Subsequent runs: */
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