VirtualBox

Changeset 80652 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
Sep 8, 2019 6:19:53 PM (5 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:8938. Converting connection syntaxes. contd.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/runtime
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    r76606 r80652  
    380380
    381381    /* Inform the MIME data object of any changes in the current action. */
    382     connect(pDrag, SIGNAL(actionChanged(Qt::DropAction)),
    383             m_pMIMEData, SLOT(sltDropActionChanged(Qt::DropAction)));
     382    connect(pDrag, &QDrag::actionChanged,
     383            m_pMIMEData, &UIDnDMIMEData::sltDropActionChanged);
    384384
    385385    /* Invoke this handler as data needs to be retrieved by our derived QMimeData class. */
    386     connect(m_pMIMEData, SIGNAL(sigGetData(Qt::DropAction, const QString&, QVariant::Type, QVariant&)),
    387             this, SLOT(sltGetData(Qt::DropAction, const QString&, QVariant::Type, QVariant&)));
     386    connect(m_pMIMEData, &UIDnDMIMEData::sigGetData,
     387            this, &UIDnDHandler::sltGetData);
    388388
    389389    /*
    … …  
    807807    return dropActs;
    808808}
    809 

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

    r80222 r80652  
    469469        setStateIcon(KDeviceActivity_Null,    UIIconPool::iconSet(":/nw_disabled_16px.png"));
    470470        /* Configure machine state-change listener: */
    471         connect(m_pSession, SIGNAL(sigMachineStateChange()),
    472                 this, SLOT(sltHandleMachineStateChange()));
     471        connect(m_pSession, &UISession::sigMachineStateChange,
     472                this, &UIIndicatorNetwork::sltHandleMachineStateChange);
    473473        /* Fetch maximum network adapters count: */
    474474        const CVirtualBox vbox = uiCommon().virtualBox();
    … …  
    480480        {
    481481            /* Configure auto-update timer: */
    482             connect(m_pTimerAutoUpdate, SIGNAL(timeout()), SLOT(sltUpdateNetworkIPs()));
     482            connect(m_pTimerAutoUpdate, &QTimer::timeout, this, &UIIndicatorNetwork::sltUpdateNetworkIPs);
    483483            /* Start timer immediately if machine is running: */
    484484            sltHandleMachineStateChange();
    … …  
    989989
    990990        /* Configure machine state-change listener: */
    991         connect(m_pSession, SIGNAL(sigMachineStateChange()),
    992                 this, SLOT(sltHandleMachineStateChange()));
     991        connect(m_pSession, &UISession::sigMachineStateChange,
     992                this, &UIIndicatorFeatures::sltHandleMachineStateChange);
    993993        m_pTimerAutoUpdate = new QTimer(this);
    994994        if (m_pTimerAutoUpdate)
    … …  
    11471147        setStateIcon(4, UIIconPool::iconSet(":/mouse_can_seamless_uncaptured_16px.png"));
    11481148        /* Configure connection: */
    1149         connect(pSession, SIGNAL(sigMouseStateChange(int)), this, SLOT(setState(int)));
     1149        connect(pSession, &UISession::sigMouseStateChange,
     1150                this, static_cast<void(UIIndicatorMouse::*)(int)>(&UIIndicatorMouse::setState));
    11501151        setState(pSession->mouseState());
    11511152        /* Translate finally: */
    … …  
    12251226        setStateIcon(7, UIIconPool::iconSet(":/hostkey_captured_pressed_checked_16px.png"));
    12261227        /* Configure connection: */
    1227         connect(pSession, SIGNAL(sigKeyboardStateChange(int)), this, SLOT(setState(int)));
     1228        connect(pSession, &UISession::sigKeyboardStateChange,
     1229                this, static_cast<void(UIIndicatorKeyboard::*)(int)>(&UIIndicatorKeyboard::setState));
    12281230        setState(pSession->keyboardState());
    12291231        /* Translate finally: */
    … …  
    12641266    {
    12651267        /* Make sure host-combination label will be updated: */
    1266         connect(gEDataManager, SIGNAL(sigRuntimeUIHostKeyCombinationChange()),
    1267                 this, SLOT(sltUpdateAppearance()));
     1268        connect(gEDataManager, &UIExtraDataManager::sigRuntimeUIHostKeyCombinationChange,
     1269                this, &UIIndicatorKeyboardExtension::sltUpdateAppearance);
    12681270        /* Translate finally: */
    12691271        retranslateUi();
    … …  
    14271429{
    14281430    /* Listen for the status-bar configuration changes: */
    1429     connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange(const QUuid &)),
    1430             this, SLOT(sltHandleConfigurationChange(const QUuid &)));
     1431    connect(gEDataManager, &UIExtraDataManager::sigStatusBarConfigurationChange,
     1432            this, &UIIndicatorsPool::sltHandleConfigurationChange);
    14311433}
    14321434
    … …  
    14561458    {
    14571459        /* Configure auto-update timer: */
    1458         connect(m_pTimerAutoUpdate, SIGNAL(timeout()),
    1459                 this, SLOT(sltAutoUpdateIndicatorStates()));
     1460        connect(m_pTimerAutoUpdate, &QTimer::timeout,
     1461                this, &UIIndicatorsPool::sltAutoUpdateIndicatorStates);
    14601462        setAutoUpdateIndicatorStates(true);
    14611463    }
    … …  
    15511553            }
    15521554            /* Configure indicator: */
    1553             connect(m_pool.value(indicatorType), SIGNAL(sigContextMenuRequest(QIStatusBarIndicator*, QContextMenuEvent*)),
    1554                     this, SLOT(sltContextMenuRequest(QIStatusBarIndicator*, QContextMenuEvent*)));
     1555            connect(m_pool.value(indicatorType), &QIStatusBarIndicator::sigContextMenuRequest,
     1556                    this, &UIIndicatorsPool::sltContextMenuRequest);
    15551557            /* Insert indicator into main-layout at proper position: */
    15561558            m_pMainLayout->insertWidget(indicatorPosition(indicatorType), m_pool.value(indicatorType));

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

    r79640 r80652  
    10091009
    10101010    /* Machine state-change updater: */
    1011     connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
     1011    connect(uisession(), &UISession::sigMachineStateChange, this, &UIKeyboardHandler::sltMachineStateChanged);
    10121012
    10131013    /* Pressed keys: */

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

    r79365 r80652  
    237237    /* Prepare async visual state type change handler: */
    238238    qRegisterMetaType<UIVisualStateType>();
    239     connect(this, SIGNAL(sigRequestAsyncVisualStateChange(UIVisualStateType)),
    240             this, SLOT(sltChangeVisualState(UIVisualStateType)),
     239    connect(this, &UIMachine::sigRequestAsyncVisualStateChange,
     240            this, &UIMachine::sltChangeVisualState,
    241241            Qt::QueuedConnection);
    242242

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

    r79365 r80652  
    821821{
    822822    /* Desktop resolution change (e.g. monitor hotplug): */
    823     connect(gpDesktop, SIGNAL(sigHostScreenResized(int)), this,
    824             SLOT(sltDesktopResized()));
     823    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenResized,
     824            this, &UIMachineView::sltDesktopResized);
    825825    /* Scale-factor change: */
    826     connect(gEDataManager, SIGNAL(sigScaleFactorChange(const QUuid &)),
    827             this, SLOT(sltHandleScaleFactorChange(const QUuid &)));
     826    connect(gEDataManager, &UIExtraDataManager::sigScaleFactorChange,
     827            this, &UIMachineView::sltHandleScaleFactorChange);
    828828    /* Scaling-optimization change: */
    829     connect(gEDataManager, SIGNAL(sigScalingOptimizationTypeChange(const QUuid &)),
    830             this, SLOT(sltHandleScalingOptimizationChange(const QUuid &)));
     829    connect(gEDataManager, &UIExtraDataManager::sigScalingOptimizationTypeChange,
     830            this, &UIMachineView::sltHandleScalingOptimizationChange);
    831831}
    832832
    … …  
    834834{
    835835    /* Machine state-change updater: */
    836     connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
     836    connect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineView::sltMachineStateChanged);
    837837}
    838838

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

    r79365 r80652  
    493493
    494494    /* Prepare 'View' actions connections: */
    495     connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    496             this, SLOT(sltChangeVisualStateToNormal()));
    497     connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    498             this, SLOT(sltChangeVisualStateToSeamless()));
    499     connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    500             this, SLOT(sltChangeVisualStateToScale()));
     495    connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &UIAction::triggered,
     496            this, &UIMachineLogicFullscreen::sltChangeVisualStateToNormal);
     497    connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &UIAction::triggered,
     498            this, &UIMachineLogicFullscreen::sltChangeVisualStateToSeamless);
     499    connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &UIAction::triggered,
     500            this, &UIMachineLogicFullscreen::sltChangeVisualStateToScale);
    501501}
    502502
    … …  
    532532    /* Listen for frame-buffer resize: */
    533533    foreach (UIMachineWindow *pMachineWindow, machineWindows())
    534         connect(pMachineWindow, SIGNAL(sigFrameBufferResize()),
    535                 this, SIGNAL(sigFrameBufferResize()));
     534        connect(pMachineWindow, &UIMachineWindow::sigFrameBufferResize,
     535                this, &UIMachineLogicFullscreen::sigFrameBufferResize);
    536536    emit sigFrameBufferResize();
    537537
    538538    /* Connect multi-screen layout change handler: */
    539     connect(m_pScreenLayout, SIGNAL(sigScreenLayoutChange()),
    540             this, SLOT(sltScreenLayoutChanged()));
     539    connect(m_pScreenLayout, &UIMultiScreenLayout::sigScreenLayoutChange,
     540            this, &UIMachineLogicFullscreen::sltScreenLayoutChanged);
    541541
    542542#ifdef VBOX_WS_MAC
    … …  
    548548        {
    549549            /* Logic => window signals: */
    550             connect(this, SIGNAL(sigNotifyAboutNativeFullscreenShouldBeEntered(UIMachineWindow*)),
    551                     pMachineWindow, SLOT(sltEnterNativeFullscreen(UIMachineWindow*)));
    552             connect(this, SIGNAL(sigNotifyAboutNativeFullscreenShouldBeExited(UIMachineWindow*)),
    553                     pMachineWindow, SLOT(sltExitNativeFullscreen(UIMachineWindow*)));
     550            connect(this, &UIMachineLogicFullscreen::sigNotifyAboutNativeFullscreenShouldBeEntered,
     551                    pMachineWindow, &UIMachineWindow::sltEnterNativeFullscreen);
     552            connect(this, &UIMachineLogicFullscreen::sigNotifyAboutNativeFullscreenShouldBeExited,
     553                    pMachineWindow, &UIMachineWindow::sltExitNativeFullscreen);
    554554            /* Window => logic signals: */
    555             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenWillEnter()),
    556                     this, SLOT(sltHandleNativeFullscreenWillEnter()),
     555            connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenWillEnter,
     556                    this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenWillEnter,
    557557                    Qt::QueuedConnection);
    558             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidEnter()),
    559                     this, SLOT(sltHandleNativeFullscreenDidEnter()),
     558            connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenDidEnter,
     559                    this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenDidEnter,
    560560                    Qt::QueuedConnection);
    561             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenWillExit()),
    562                     this, SLOT(sltHandleNativeFullscreenWillExit()),
     561            connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenWillExit,
     562                    this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenWillExit,
    563563                    Qt::QueuedConnection);
    564             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidExit()),
    565                     this, SLOT(sltHandleNativeFullscreenDidExit()),
     564            connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenDidExit,
     565                    this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit,
    566566                    Qt::QueuedConnection);
    567             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenFailToEnter()),
    568                     this, SLOT(sltHandleNativeFullscreenFailToEnter()),
     567            connect(pMachineWindow, &UIMachineWindow::sigNotifyAboutNativeFullscreenFailToEnter,
     568                    this, &UIMachineLogicFullscreen::sltHandleNativeFullscreenFailToEnter,
    569569                    Qt::QueuedConnection);
    570570        }
    … …  
    642642{
    643643    /* "View" actions disconnections: */
    644     disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    645                this, SLOT(sltChangeVisualStateToNormal()));
    646     disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    647                this, SLOT(sltChangeVisualStateToSeamless()));
    648     disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    649                this, SLOT(sltChangeVisualStateToScale()));
     644    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &QAction::triggered,
     645               this, &UIMachineLogicFullscreen::sltChangeVisualStateToNormal);
     646    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered,
     647               this, &UIMachineLogicFullscreen::sltChangeVisualStateToSeamless);
     648    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &QAction::triggered,
     649               this, &UIMachineLogicFullscreen::sltChangeVisualStateToScale);
    650650
    651651    /* Call to base-class: */
    … …  
    876876}
    877877#endif /* VBOX_WS_MAC */
    878 

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

    r76606 r80652  
    118118
    119119    /* Guest additions state-change updater: */
    120     connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged()));
     120    connect(uisession(), &UISession::sigAdditionsStateActualChange, this, &UIMachineViewFullscreen::sltAdditionsStateChanged);
    121121}
    122122
    … …  
    215215    return workingArea().size();
    216216}
    217 

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

    r79365 r80652  
    274274        /* Configure mini-toolbar: */
    275275        m_pMiniToolBar->addMenus(actionPool()->menus());
    276         connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()),
    277                 this, SLOT(sltShowMinimized()), Qt::QueuedConnection);
    278         connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
    279                 actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SLOT(trigger()));
    280         connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
    281                 actionPool()->action(UIActionIndex_M_Application_S_Close), SLOT(trigger()));
    282         connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutWindowActivationStolen()),
    283                 this, SLOT(sltRevokeWindowActivation()), Qt::QueuedConnection);
     276        connect(m_pMiniToolBar, &UIMiniToolBar::sigMinimizeAction,
     277                this, &UIMachineWindowFullscreen::sltShowMinimized, Qt::QueuedConnection);
     278        connect(m_pMiniToolBar, &UIMiniToolBar::sigExitAction,
     279                actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &UIAction::trigger);
     280        connect(m_pMiniToolBar, &UIMiniToolBar::sigCloseAction,
     281                actionPool()->action(UIActionIndex_M_Application_S_Close), &UIAction::trigger);
     282        connect(m_pMiniToolBar, &UIMiniToolBar::sigNotifyAboutWindowActivationStolen,
     283                this, &UIMachineWindowFullscreen::sltRevokeWindowActivation, Qt::QueuedConnection);
    284284    }
    285285}
    … …  
    609609}
    610610#endif /* VBOX_WS_WIN */
    611 

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

    r80576 r80652  
    249249    connect(machineLogic()->uisession(), &UISession::sigSharedFolderChange,
    250250            this, &UIMachineWindowNormal::sltSharedFolderChange);
    251     connect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()),
    252             this, SLOT(sltRecordingChange()));
     251    connect(machineLogic()->uisession(), &UISession::sigRecordingChange,
     252            this, &UIMachineWindowNormal::sltRecordingChange);
    253253    connect(machineLogic()->uisession(), &UISession::sigCPUExecutionCapChange,
    254254            this, &UIMachineWindowNormal::sltCPUExecutionCapChange);
    255     connect(machineLogic()->uisession(), SIGNAL(sigInitialized()),
    256             this, SLOT(sltHandleSessionInitialized()));
     255    connect(machineLogic()->uisession(), &UISession::sigInitialized,
     256            this, &UIMachineWindowNormal::sltHandleSessionInitialized);
    257257}
    258258
    … …  
    266266        /* Configure menu-bar: */
    267267        menuBar()->setContextMenuPolicy(Qt::CustomContextMenu);
    268         connect(menuBar(), SIGNAL(customContextMenuRequested(const QPoint&)),
    269                 this, SLOT(sltHandleMenuBarContextMenuRequest(const QPoint&)));
    270         connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QUuid &)),
    271                 this, SLOT(sltHandleMenuBarConfigurationChange(const QUuid &)));
     268        connect(menuBar(), &UIMenuBar::customContextMenuRequested,
     269                this, &UIMachineWindowNormal::sltHandleMenuBarContextMenuRequest);
     270        connect(gEDataManager, &UIExtraDataManager::sigMenuBarConfigurationChange,
     271                this, &UIMachineWindowNormal::sltHandleMenuBarConfigurationChange);
    272272        /* Update menu-bar: */
    273273        updateMenu();
    … …  
    287287        /* Configure status-bar: */
    288288        statusBar()->setContextMenuPolicy(Qt::CustomContextMenu);
    289         connect(statusBar(), SIGNAL(customContextMenuRequested(const QPoint&)),
    290                 this, SLOT(sltHandleStatusBarContextMenuRequest(const QPoint&)));
     289        connect(statusBar(), &QIStatusBar::customContextMenuRequested,
     290                this, &UIMachineWindowNormal::sltHandleStatusBarContextMenuRequest);
    291291        /* Create indicator-pool: */
    292292        m_pIndicatorsPool = new UIIndicatorsPool(machineLogic()->uisession());
    … …  
    294294        {
    295295            /* Configure indicator-pool: */
    296             connect(m_pIndicatorsPool, SIGNAL(sigContextMenuRequest(IndicatorType, const QPoint&)),
    297                     this, SLOT(sltHandleIndicatorContextMenuRequest(IndicatorType, const QPoint&)));
     296            connect(m_pIndicatorsPool, &UIIndicatorsPool::sigContextMenuRequest,
     297                    this, &UIMachineWindowNormal::sltHandleIndicatorContextMenuRequest);
    298298            /* Add indicator-pool into status-bar: */
    299299            statusBar()->addPermanentWidget(m_pIndicatorsPool, 0);
    300300        }
    301301        /* Post-configure status-bar: */
    302         connect(gEDataManager, SIGNAL(sigStatusBarConfigurationChange(const QUuid &)),
    303                 this, SLOT(sltHandleStatusBarConfigurationChange(const QUuid &)));
     302        connect(gEDataManager, &UIExtraDataManager::sigStatusBarConfigurationChange,
     303                this, &UIMachineWindowNormal::sltHandleStatusBarConfigurationChange);
    304304#ifdef VBOX_WS_MAC
    305305        /* Make sure the status-bar is aware of action hovering: */
    306         connect(actionPool(), SIGNAL(sigActionHovered(UIAction *)),
    307                 this, SLOT(sltActionHovered(UIAction *)));
     306        connect(actionPool(), &UIActionPool::sigActionHovered,
     307                this, &UIMachineWindowNormal::sltActionHovered);
    308308#endif /* VBOX_WS_MAC */
    309309    }
    … …  
    458458    disconnect(machineLogic()->uisession(), &UISession::sigSharedFolderChange,
    459459               this, &UIMachineWindowNormal::sltSharedFolderChange);
    460     disconnect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()),
    461                this, SLOT(sltRecordingChange()));
     460    disconnect(machineLogic()->uisession(), &UISession::sigRecordingChange,
     461               this, &UIMachineWindowNormal::sltRecordingChange);
    462462    disconnect(machineLogic()->uisession(), &UISession::sigCPUExecutionCapChange,
    463463               this, &UIMachineWindowNormal::sltCPUExecutionCapChange);

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

    r79365 r80652  
    117117
    118118    /* Prepare 'View' actions connections: */
    119     connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    120             this, SLOT(sltChangeVisualStateToNormal()));
    121     connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    122             this, SLOT(sltChangeVisualStateToFullscreen()));
    123     connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    124             this, SLOT(sltChangeVisualStateToSeamless()));
     119    connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &QAction::triggered,
     120            this, &UIMachineLogicScale::sltChangeVisualStateToNormal);
     121    connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &QAction::triggered,
     122            this, &UIMachineLogicScale::sltChangeVisualStateToFullscreen);
     123    connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered,
     124            this, &UIMachineLogicScale::sltChangeVisualStateToSeamless);
    125125}
    126126
    … …  
    148148    /* Listen for frame-buffer resize: */
    149149    foreach (UIMachineWindow *pMachineWindow, machineWindows())
    150         connect(pMachineWindow, SIGNAL(sigFrameBufferResize()),
    151                 this, SIGNAL(sigFrameBufferResize()));
     150        connect(pMachineWindow, &UIMachineWindow::sigFrameBufferResize,
     151                this, &UIMachineLogicScale::sigFrameBufferResize);
    152152    emit sigFrameBufferResize();
    153153
    … …  
    196196{
    197197    /* "View" actions disconnections: */
    198     disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    199                this, SLOT(sltChangeVisualStateToNormal()));
    200     disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    201                this, SLOT(sltChangeVisualStateToFullscreen()));
    202     disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    203                this, SLOT(sltChangeVisualStateToSeamless()));
     198    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &QAction::triggered,
     199               this, &UIMachineLogicScale::sltChangeVisualStateToNormal);
     200    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &QAction::triggered,
     201               this, &UIMachineLogicScale::sltChangeVisualStateToFullscreen);
     202    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered,
     203               this, &UIMachineLogicScale::sltChangeVisualStateToSeamless);
    204204
    205205    /* Call to base-class: */
    … …  
    226226    UIMachineLogic::cleanupActionGroups();
    227227}
    228 

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

    r79365 r80652  
    244244
    245245    /* Prepare 'View' actions connections: */
    246     connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    247             this, SLOT(sltChangeVisualStateToNormal()));
    248     connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    249             this, SLOT(sltChangeVisualStateToFullscreen()));
    250     connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    251             this, SLOT(sltChangeVisualStateToScale()));
     246    connect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered,
     247            this, &UIMachineLogicSeamless::sltChangeVisualStateToNormal);
     248    connect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &QAction::triggered,
     249            this, &UIMachineLogicSeamless::sltChangeVisualStateToFullscreen);
     250    connect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &QAction::triggered,
     251            this, &UIMachineLogicSeamless::sltChangeVisualStateToScale);
    252252}
    253253
    … …  
    273273    /* Listen for frame-buffer resize: */
    274274    foreach (UIMachineWindow *pMachineWindow, machineWindows())
    275         connect(pMachineWindow, SIGNAL(sigFrameBufferResize()),
    276                 this, SIGNAL(sigFrameBufferResize()));
     275        connect(pMachineWindow, &UIMachineWindow::sigFrameBufferResize,
     276                this, &UIMachineLogicSeamless::sigFrameBufferResize);
    277277    emit sigFrameBufferResize();
    278278
    279279    /* Connect multi-screen layout change handler: */
    280     connect(m_pScreenLayout, SIGNAL(sigScreenLayoutChange()),
    281             this, SLOT(sltScreenLayoutChanged()));
     280    connect(m_pScreenLayout, &UIMultiScreenLayout::sigScreenLayoutChange,
     281            this, &UIMachineLogicSeamless::sltScreenLayoutChanged);
    282282
    283283    /* Mark machine-window(s) created: */
    … …  
    343343{
    344344    /* "View" actions disconnections: */
    345     disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    346                this, SLOT(sltChangeVisualStateToNormal()));
    347     disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    348                this, SLOT(sltChangeVisualStateToFullscreen()));
    349     disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    350                this, SLOT(sltChangeVisualStateToScale()));
     345    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &QAction::triggered,
     346               this, &UIMachineLogicSeamless::sltChangeVisualStateToNormal);
     347    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), &QAction::triggered,
     348               this, &UIMachineLogicSeamless::sltChangeVisualStateToFullscreen);
     349    disconnect(actionPool()->action(UIActionIndexRT_M_View_T_Scale), &QAction::triggered,
     350               this, &UIMachineLogicSeamless::sltChangeVisualStateToScale);
    351351
    352352    /* Call to base-class: */
    … …  
    377377    UIMachineLogic::cleanupActionGroups();
    378378}
    379 

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

    r76606 r80652  
    129129
    130130    /* Guest additions state-change updater: */
    131     connect(uisession(), SIGNAL(sigAdditionsStateActualChange()), this, SLOT(sltAdditionsStateChanged()));
     131    connect(uisession(), &UISession::sigAdditionsStateActualChange, this, &UIMachineViewSeamless::sltAdditionsStateChanged);
    132132}
    133133
    … …  
    219219    return workingArea().size();
    220220}
    221 

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

    r79365 r80652  
    139139        /* Configure mini-toolbar: */
    140140        m_pMiniToolBar->addMenus(actionPool()->menus());
    141         connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()),
    142                 this, SLOT(sltShowMinimized()), Qt::QueuedConnection);
    143         connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
    144                 actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SLOT(trigger()));
    145         connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
    146                 actionPool()->action(UIActionIndex_M_Application_S_Close), SLOT(trigger()));
    147         connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutWindowActivationStolen()),
    148                 this, SLOT(sltRevokeWindowActivation()), Qt::QueuedConnection);
     141        connect(m_pMiniToolBar, &UIMiniToolBar::sigMinimizeAction,
     142                this, &UIMachineWindowSeamless::sltShowMinimized, Qt::QueuedConnection);
     143        connect(m_pMiniToolBar, &UIMiniToolBar::sigExitAction,
     144                actionPool()->action(UIActionIndexRT_M_View_T_Seamless), &UIAction::trigger);
     145        connect(m_pMiniToolBar, &UIMiniToolBar::sigCloseAction,
     146                actionPool()->action(UIActionIndex_M_Application_S_Close), &UIAction::trigger);
     147        connect(m_pMiniToolBar, &UIMiniToolBar::sigNotifyAboutWindowActivationStolen,
     148                this, &UIMachineWindowSeamless::sltRevokeWindowActivation, Qt::QueuedConnection);
    149149    }
    150150}
    … …  
    402402}
    403403#endif /* VBOX_WITH_MASKED_SEAMLESS */
    404 
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