VirtualBox

Changeset 80576 in vbox


Ignore:
Timestamp:
Sep 4, 2019 7:16:42 AM (5 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:8938. Converting connection syntax of console events.

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

Legend:

Unmodified
Added
Removed

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

    r80555 r80576  
    220220{
    221221    /* Create direct (sync) connections for signals of main listener: */
    222     connect(m_pQtListener->getWrapped(), SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)),
    223             this, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)),
    224             Qt::DirectConnection);
    225     connect(m_pQtListener->getWrapped(), SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)),
    226             this, SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)),
    227             Qt::DirectConnection);
    228     connect(m_pQtListener->getWrapped(), SIGNAL(sigCursorPositionChange(bool, unsigned long, unsigned long)),
    229             this, SIGNAL(sigCursorPositionChange(bool, unsigned long, unsigned long)),
    230             Qt::DirectConnection);
    231     connect(m_pQtListener->getWrapped(), SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)),
    232             this, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)),
    233             Qt::DirectConnection);
    234     connect(m_pQtListener->getWrapped(), SIGNAL(sigStateChange(KMachineState)),
    235             this, SIGNAL(sigStateChange(KMachineState)),
    236             Qt::DirectConnection);
    237     connect(m_pQtListener->getWrapped(), SIGNAL(sigAdditionsChange()),
    238             this, SIGNAL(sigAdditionsChange()),
    239             Qt::DirectConnection);
    240     connect(m_pQtListener->getWrapped(), SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)),
    241             this, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)),
    242             Qt::DirectConnection);
    243     connect(m_pQtListener->getWrapped(), SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)),
    244             this, SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)),
    245             Qt::DirectConnection);
    246     connect(m_pQtListener->getWrapped(), SIGNAL(sigMediumChange(CMediumAttachment)),
    247             this, SIGNAL(sigMediumChange(CMediumAttachment)),
    248             Qt::DirectConnection);
    249     connect(m_pQtListener->getWrapped(), SIGNAL(sigVRDEChange()),
    250             this, SIGNAL(sigVRDEChange()),
    251             Qt::DirectConnection);
    252     connect(m_pQtListener->getWrapped(), SIGNAL(sigRecordingChange()),
    253             this, SIGNAL(sigRecordingChange()),
    254             Qt::DirectConnection);
    255     connect(m_pQtListener->getWrapped(), SIGNAL(sigUSBControllerChange()),
    256             this, SIGNAL(sigUSBControllerChange()),
    257             Qt::DirectConnection);
    258     connect(m_pQtListener->getWrapped(), SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)),
    259             this, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)),
    260             Qt::DirectConnection);
    261     connect(m_pQtListener->getWrapped(), SIGNAL(sigSharedFolderChange()),
    262             this, SIGNAL(sigSharedFolderChange()),
    263             Qt::DirectConnection);
    264     connect(m_pQtListener->getWrapped(), SIGNAL(sigCPUExecutionCapChange()),
    265             this, SIGNAL(sigCPUExecutionCapChange()),
    266             Qt::DirectConnection);
    267     connect(m_pQtListener->getWrapped(), SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
    268             this, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
    269             Qt::DirectConnection);
    270     connect(m_pQtListener->getWrapped(), SIGNAL(sigRuntimeError(bool, QString, QString)),
    271             this, SIGNAL(sigRuntimeError(bool, QString, QString)),
    272             Qt::DirectConnection);
    273     connect(m_pQtListener->getWrapped(), SIGNAL(sigCanShowWindow(bool &, QString &)),
    274             this, SLOT(sltCanShowWindow(bool &, QString &)),
    275             Qt::DirectConnection);
    276     connect(m_pQtListener->getWrapped(), SIGNAL(sigShowWindow(qint64 &)),
    277             this, SLOT(sltShowWindow(qint64 &)),
     222    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigMousePointerShapeChange,
     223        this, &UIConsoleEventHandlerProxy::sigMousePointerShapeChange,
     224            Qt::DirectConnection);
     225    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigMouseCapabilityChange,
     226           this, &UIConsoleEventHandlerProxy::sigMouseCapabilityChange,
     227            Qt::DirectConnection);
     228    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigCursorPositionChange,
     229           this, &UIConsoleEventHandlerProxy::sigCursorPositionChange,
     230            Qt::DirectConnection);
     231    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigKeyboardLedsChangeEvent,
     232            this, &UIConsoleEventHandlerProxy::sigKeyboardLedsChangeEvent,
     233            Qt::DirectConnection);
     234    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigStateChange,
     235        this, &UIConsoleEventHandlerProxy::sigStateChange,
     236            Qt::DirectConnection);
     237    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigAdditionsChange,
     238            this, &UIConsoleEventHandlerProxy::sigAdditionsChange,
     239            Qt::DirectConnection);
     240    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigNetworkAdapterChange,
     241            this, &UIConsoleEventHandlerProxy::sigNetworkAdapterChange,
     242            Qt::DirectConnection);
     243    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigStorageDeviceChange,
     244            this, &UIConsoleEventHandlerProxy::sigStorageDeviceChange,
     245            Qt::DirectConnection);
     246    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigMediumChange,
     247            this, &UIConsoleEventHandlerProxy::sigMediumChange,
     248            Qt::DirectConnection);
     249    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigVRDEChange,
     250            this, &UIConsoleEventHandlerProxy::sigVRDEChange,
     251            Qt::DirectConnection);
     252    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigRecordingChange,
     253            this, &UIConsoleEventHandlerProxy::sigRecordingChange,
     254            Qt::DirectConnection);
     255    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigUSBControllerChange,
     256            this, &UIConsoleEventHandlerProxy::sigUSBControllerChange,
     257            Qt::DirectConnection);
     258    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigUSBDeviceStateChange,
     259            this, &UIConsoleEventHandlerProxy::sigUSBDeviceStateChange,
     260            Qt::DirectConnection);
     261    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigSharedFolderChange,
     262            this, &UIConsoleEventHandlerProxy::sigSharedFolderChange,
     263            Qt::DirectConnection);
     264    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigCPUExecutionCapChange,
     265            this, &UIConsoleEventHandlerProxy::sigCPUExecutionCapChange,
     266            Qt::DirectConnection);
     267    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestMonitorChange,
     268            this, &UIConsoleEventHandlerProxy::sigGuestMonitorChange,
     269            Qt::DirectConnection);
     270    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigRuntimeError,
     271            this, &UIConsoleEventHandlerProxy::sigRuntimeError,
     272            Qt::DirectConnection);
     273    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigCanShowWindow,
     274            this, &UIConsoleEventHandlerProxy::sltCanShowWindow,
     275            Qt::DirectConnection);
     276    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigShowWindow,
     277            this, &UIConsoleEventHandlerProxy::sltShowWindow,
    278278            Qt::DirectConnection);
    279279    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigAudioAdapterChange,
    … …  
    388388{
    389389    /* Create queued (async) connections for signals of event proxy object: */
    390     connect(m_pProxy, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)),
    391             this, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)),
    392             Qt::QueuedConnection);
    393     connect(m_pProxy, SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)),
    394             this, SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)),
    395             Qt::QueuedConnection);
    396     connect(m_pProxy, SIGNAL(sigCursorPositionChange(bool, unsigned long, unsigned long)),
    397             this, SIGNAL(sigCursorPositionChange(bool, unsigned long, unsigned long)),
    398             Qt::QueuedConnection);
    399     connect(m_pProxy, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)),
    400             this, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)),
    401             Qt::QueuedConnection);
    402     connect(m_pProxy, SIGNAL(sigStateChange(KMachineState)),
    403             this, SIGNAL(sigStateChange(KMachineState)),
    404             Qt::QueuedConnection);
    405     connect(m_pProxy, SIGNAL(sigAdditionsChange()),
    406             this, SIGNAL(sigAdditionsChange()),
    407             Qt::QueuedConnection);
    408     connect(m_pProxy, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)),
    409             this, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)),
    410             Qt::QueuedConnection);
    411     connect(m_pProxy, SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)),
    412             this, SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)),
    413             Qt::QueuedConnection);
    414     connect(m_pProxy, SIGNAL(sigMediumChange(CMediumAttachment)),
    415             this, SIGNAL(sigMediumChange(CMediumAttachment)),
    416             Qt::QueuedConnection);
    417     connect(m_pProxy, SIGNAL(sigVRDEChange()),
    418             this, SIGNAL(sigVRDEChange()),
    419             Qt::QueuedConnection);
    420     connect(m_pProxy, SIGNAL(sigRecordingChange()),
    421             this, SIGNAL(sigRecordingChange()),
    422             Qt::QueuedConnection);
    423     connect(m_pProxy, SIGNAL(sigUSBControllerChange()),
    424             this, SIGNAL(sigUSBControllerChange()),
    425             Qt::QueuedConnection);
    426     connect(m_pProxy, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)),
    427             this, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)),
    428             Qt::QueuedConnection);
    429     connect(m_pProxy, SIGNAL(sigSharedFolderChange()),
    430             this, SIGNAL(sigSharedFolderChange()),
    431             Qt::QueuedConnection);
    432     connect(m_pProxy, SIGNAL(sigCPUExecutionCapChange()),
    433             this, SIGNAL(sigCPUExecutionCapChange()),
    434             Qt::QueuedConnection);
    435     connect(m_pProxy, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
    436             this, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
    437             Qt::QueuedConnection);
    438     connect(m_pProxy, SIGNAL(sigRuntimeError(bool, QString, QString)),
    439             this, SIGNAL(sigRuntimeError(bool, QString, QString)),
     390    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigMousePointerShapeChange,
     391            this, &UIConsoleEventHandler::sigMousePointerShapeChange,
     392            Qt::QueuedConnection);
     393    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigMouseCapabilityChange,
     394            this, &UIConsoleEventHandler::sigMouseCapabilityChange,
     395            Qt::QueuedConnection);
     396    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigCursorPositionChange,
     397            this, &UIConsoleEventHandler::sigCursorPositionChange,
     398            Qt::QueuedConnection);
     399    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigKeyboardLedsChangeEvent,
     400            this, &UIConsoleEventHandler::sigKeyboardLedsChangeEvent,
     401            Qt::QueuedConnection);
     402    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigStateChange,
     403        this, &UIConsoleEventHandler::sigStateChange,
     404            Qt::QueuedConnection);
     405    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigAdditionsChange,
     406            this, &UIConsoleEventHandler::sigAdditionsChange,
     407            Qt::QueuedConnection);
     408    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigNetworkAdapterChange,
     409            this, &UIConsoleEventHandler::sigNetworkAdapterChange,
     410            Qt::QueuedConnection);
     411    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigStorageDeviceChange,
     412        this, &UIConsoleEventHandler::sigStorageDeviceChange,
     413            Qt::QueuedConnection);
     414    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigMediumChange,
     415            this, &UIConsoleEventHandler::sigMediumChange,
     416            Qt::QueuedConnection);
     417    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigVRDEChange,
     418            this, &UIConsoleEventHandler::sigVRDEChange,
     419            Qt::QueuedConnection);
     420    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigRecordingChange,
     421            this, &UIConsoleEventHandler::sigRecordingChange,
     422            Qt::QueuedConnection);
     423    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigUSBControllerChange,
     424            this, &UIConsoleEventHandler::sigUSBControllerChange,
     425            Qt::QueuedConnection);
     426    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigUSBDeviceStateChange,
     427            this, &UIConsoleEventHandler::sigUSBDeviceStateChange,
     428            Qt::QueuedConnection);
     429    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigSharedFolderChange,
     430            this, &UIConsoleEventHandler::sigSharedFolderChange,
     431            Qt::QueuedConnection);
     432    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigCPUExecutionCapChange,
     433            this, &UIConsoleEventHandler::sigCPUExecutionCapChange,
     434            Qt::QueuedConnection);
     435    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigGuestMonitorChange,
     436            this, &UIConsoleEventHandler::sigGuestMonitorChange,
     437            Qt::QueuedConnection);
     438    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigRuntimeError,
     439            this, &UIConsoleEventHandler::sigRuntimeError,
    440440            Qt::QueuedConnection);
    441441#ifdef RT_OS_DARWIN
    442     connect(m_pProxy, SIGNAL(sigShowWindow(qint64 &)),
    443             this, SIGNAL(sigShowWindow(qint64 &)),
     442    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigShowWindow,
     443            this, &UIConsoleEventHandler::sigShowWindow,
    444444            Qt::QueuedConnection);
    445445#endif /* RT_OS_DARWIN */
    446     connect(m_pProxy, SIGNAL(sigAudioAdapterChange()),
    447             this, SIGNAL(sigAudioAdapterChange()),
     446    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigAudioAdapterChange,
     447            this, &UIConsoleEventHandler::sigAudioAdapterChange,
    448448            Qt::QueuedConnection);
    449449    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigClipboardModeChange,

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

    r80543 r80576  
    11031103        {
    11041104            /* Configure Mac OS X menu-bar: */
    1105             connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange(const QUuid &)),
    1106                     this, SLOT(sltHandleMenuBarConfigurationChange(const QUuid &)));
     1105            connect(gEDataManager, &UIExtraDataManager::sigMenuBarConfigurationChange,
     1106                    this, &UISession::sltHandleMenuBarConfigurationChange);
    11071107            /* Update Mac OS X menu-bar: */
    11081108            updateMenu();
    … …  
    11141114void UISession::prepareConnections()
    11151115{
    1116     connect(this, SIGNAL(sigInitialized()), this, SLOT(sltMarkInitialized()));
     1116    connect(this, &UISession::sigInitialized, this, &UISession::sltMarkInitialized);
    11171117
    11181118#ifdef VBOX_WS_MAC
    … …  
    11211121#else /* !VBOX_WS_MAC */
    11221122    /* Install Qt display reconfiguration callbacks: */
    1123     connect(gpDesktop, SIGNAL(sigHostScreenCountChanged(int)),
    1124             this, SLOT(sltHandleHostScreenCountChange()));
    1125     connect(gpDesktop, SIGNAL(sigHostScreenResized(int)),
    1126             this, SLOT(sltHandleHostScreenGeometryChange()));
     1123    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenCountChanged,
     1124            this, &UISession::sltHandleHostScreenCountChange);
     1125    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenResized,
     1126            this, &UISession::sltHandleHostScreenGeometryChange);
    11271127# ifdef VBOX_WS_X11
    1128     connect(gpDesktop, SIGNAL(sigHostScreenWorkAreaRecalculated(int)),
    1129             this, SLOT(sltHandleHostScreenAvailableAreaChange()));
     1128    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaRecalculated,
     1129            this, &UISession::sltHandleHostScreenAvailableAreaChange);
    11301130# else /* !VBOX_WS_X11 */
    1131     connect(gpDesktop, SIGNAL(sigHostScreenWorkAreaResized(int)),
    1132             this, SLOT(sltHandleHostScreenAvailableAreaChange()));
     1131    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaResized,
     1132            this, &UISession::sltHandleHostScreenAvailableAreaChange);
    11331133# endif /* !VBOX_WS_X11 */
    11341134#endif /* !VBOX_WS_MAC */
    … …  
    11411141
    11421142    /* Add console event connections: */
    1143     connect(gConsoleEvents, SIGNAL(sigMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)),
    1144             this, SLOT(sltMousePointerShapeChange(bool, bool, QPoint, QSize, QVector<uint8_t>)));
    1145 
    1146     connect(gConsoleEvents, SIGNAL(sigMouseCapabilityChange(bool, bool, bool, bool)),
    1147             this, SLOT(sltMouseCapabilityChange(bool, bool, bool, bool)));
     1143    connect(gConsoleEvents, &UIConsoleEventHandler::sigMousePointerShapeChange,
     1144        this, &UISession::sltMousePointerShapeChange);
     1145
     1146    connect(gConsoleEvents, &UIConsoleEventHandler::sigMouseCapabilityChange,
     1147            this, &UISession::sltMouseCapabilityChange);
    11481148
    11491149    connect(gConsoleEvents, &UIConsoleEventHandler::sigCursorPositionChange,
    11501150            this, &UISession::sltCursorPositionChange);
    11511151
    1152     connect(gConsoleEvents, SIGNAL(sigKeyboardLedsChangeEvent(bool, bool, bool)),
    1153             this, SLOT(sltKeyboardLedsChangeEvent(bool, bool, bool)));
    1154 
    1155     connect(gConsoleEvents, SIGNAL(sigStateChange(KMachineState)),
    1156             this, SLOT(sltStateChange(KMachineState)));
    1157 
    1158     connect(gConsoleEvents, SIGNAL(sigAdditionsChange()),
    1159             this, SLOT(sltAdditionsChange()));
    1160 
    1161     connect(gConsoleEvents, SIGNAL(sigVRDEChange()),
    1162             this, SLOT(sltVRDEChange()));
    1163 
    1164     connect(gConsoleEvents, SIGNAL(sigRecordingChange()),
    1165             this, SLOT(sltRecordingChange()));
    1166 
    1167     connect(gConsoleEvents, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)),
    1168             this, SIGNAL(sigNetworkAdapterChange(CNetworkAdapter)));
    1169 
    1170     connect(gConsoleEvents, SIGNAL(sigStorageDeviceChange(CMediumAttachment, bool, bool)),
    1171             this, SLOT(sltHandleStorageDeviceChange(CMediumAttachment, bool, bool)));
    1172 
    1173     connect(gConsoleEvents, SIGNAL(sigMediumChange(CMediumAttachment)),
    1174             this, SIGNAL(sigMediumChange(CMediumAttachment)));
    1175 
    1176     connect(gConsoleEvents, SIGNAL(sigUSBControllerChange()),
    1177             this, SIGNAL(sigUSBControllerChange()));
    1178 
    1179     connect(gConsoleEvents, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)),
    1180             this, SIGNAL(sigUSBDeviceStateChange(CUSBDevice, bool, CVirtualBoxErrorInfo)));
    1181 
    1182     connect(gConsoleEvents, SIGNAL(sigSharedFolderChange()),
    1183             this, SIGNAL(sigSharedFolderChange()));
    1184 
    1185     connect(gConsoleEvents, SIGNAL(sigRuntimeError(bool, QString, QString)),
    1186             this, SIGNAL(sigRuntimeError(bool, QString, QString)));
     1152    connect(gConsoleEvents, &UIConsoleEventHandler::sigKeyboardLedsChangeEvent,
     1153            this, &UISession::sltKeyboardLedsChangeEvent);
     1154
     1155    connect(gConsoleEvents, &UIConsoleEventHandler::sigStateChange,
     1156            this, &UISession::sltStateChange);
     1157
     1158    connect(gConsoleEvents, &UIConsoleEventHandler::sigAdditionsChange,
     1159            this, &UISession::sltAdditionsChange);
     1160
     1161    connect(gConsoleEvents, &UIConsoleEventHandler::sigVRDEChange,
     1162            this, &UISession::sltVRDEChange);
     1163
     1164    connect(gConsoleEvents, &UIConsoleEventHandler::sigRecordingChange,
     1165            this, &UISession::sltRecordingChange);
     1166
     1167    connect(gConsoleEvents, &UIConsoleEventHandler::sigNetworkAdapterChange,
     1168            this, &UISession::sigNetworkAdapterChange);
     1169
     1170    connect(gConsoleEvents, &UIConsoleEventHandler::sigStorageDeviceChange,
     1171            this, &UISession::sltHandleStorageDeviceChange);
     1172
     1173    connect(gConsoleEvents, &UIConsoleEventHandler::sigMediumChange,
     1174            this, &UISession::sigMediumChange);
     1175
     1176    connect(gConsoleEvents, &UIConsoleEventHandler::sigUSBControllerChange,
     1177            this, &UISession::sigUSBControllerChange);
     1178
     1179    connect(gConsoleEvents, &UIConsoleEventHandler::sigUSBDeviceStateChange,
     1180            this, &UISession::sigUSBDeviceStateChange);
     1181
     1182    connect(gConsoleEvents, &UIConsoleEventHandler::sigSharedFolderChange,
     1183            this, &UISession::sigSharedFolderChange);
     1184
     1185    connect(gConsoleEvents, &UIConsoleEventHandler::sigRuntimeError,
     1186            this, &UISession::sigRuntimeError);
    11871187
    11881188#ifdef VBOX_WS_MAC
    1189     connect(gConsoleEvents, SIGNAL(sigShowWindow()),
    1190             this, SIGNAL(sigShowWindows()), Qt::QueuedConnection);
     1189    connect(gConsoleEvents, &UIConsoleEventHandler::sigShowWindow,
     1190            this, &UISession::sigShowWindows, Qt::QueuedConnection);
    11911191#endif /* VBOX_WS_MAC */
    11921192
    1193     connect(gConsoleEvents, SIGNAL(sigCPUExecutionCapChange()),
    1194             this, SIGNAL(sigCPUExecutionCapChange()));
    1195 
    1196     connect(gConsoleEvents, SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
    1197             this, SLOT(sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)));
    1198 
    1199     connect(gConsoleEvents, SIGNAL(sigAudioAdapterChange()),
    1200             this, SLOT(sltAudioAdapterChange()));
    1201 
    1202     connect(gConsoleEvents, SIGNAL(sigClipboardModeChange(KClipboardMode)),
    1203             this, SLOT(sltClipboardModeChange(KClipboardMode)));
    1204 
    1205     connect(gConsoleEvents, SIGNAL(sigDnDModeChange(KDnDMode)),
    1206             this, SLOT(sltDnDModeChange(KDnDMode)));
     1193    connect(gConsoleEvents, &UIConsoleEventHandler::sigCPUExecutionCapChange,
     1194            this, &UISession::sigCPUExecutionCapChange);
     1195
     1196    connect(gConsoleEvents, &UIConsoleEventHandler::sigGuestMonitorChange,
     1197            this, &UISession::sltGuestMonitorChange);
     1198
     1199    connect(gConsoleEvents, &UIConsoleEventHandler::sigAudioAdapterChange,
     1200            this, &UISession::sltAudioAdapterChange);
     1201
     1202    connect(gConsoleEvents, &UIConsoleEventHandler::sigClipboardModeChange,
     1203        this, &UISession::sltClipboardModeChange);
     1204
     1205    connect(gConsoleEvents, &UIConsoleEventHandler::sigDnDModeChange,
     1206            this, &UISession::sltDnDModeChange);
    12071207}
    12081208
    … …  
    12181218        m_pWatchdogDisplayChange->setInterval(500);
    12191219        m_pWatchdogDisplayChange->setSingleShot(true);
    1220         connect(m_pWatchdogDisplayChange, SIGNAL(timeout()),
    1221                 this, SLOT(sltCheckIfHostDisplayChanged()));
     1220        connect(m_pWatchdogDisplayChange, &QTimer::timeout,
     1221                this, &UISession::sltCheckIfHostDisplayChanged);
    12221222    }
    12231223#endif /* VBOX_WS_MAC */

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

    r79365 r80576  
    237237
    238238    /* We should watch for console events: */
    239     connect(machineLogic()->uisession(), SIGNAL(sigMediumChange(const CMediumAttachment &)),
    240             this, SLOT(sltMediumChange(const CMediumAttachment &)));
    241     connect(machineLogic()->uisession(), SIGNAL(sigUSBControllerChange()),
    242             this, SLOT(sltUSBControllerChange()));
    243     connect(machineLogic()->uisession(), SIGNAL(sigUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &)),
    244             this, SLOT(sltUSBDeviceStateChange()));
     239    connect(machineLogic()->uisession(), &UISession::sigMediumChange,
     240        this, &UIMachineWindowNormal::sltMediumChange);
     241    connect(machineLogic()->uisession(), &UISession::sigUSBControllerChange,
     242            this, &UIMachineWindowNormal::sltUSBControllerChange);
     243    connect(machineLogic()->uisession(), &UISession::sigUSBDeviceStateChange,
     244            this, &UIMachineWindowNormal::sltUSBDeviceStateChange);
    245245    connect(machineLogic()->uisession(), &UISession::sigAudioAdapterChange,
    246246            this, &UIMachineWindowNormal::sltAudioAdapterChange);
    247     connect(machineLogic()->uisession(), SIGNAL(sigNetworkAdapterChange(const CNetworkAdapter &)),
    248             this, SLOT(sltNetworkAdapterChange()));
    249     connect(machineLogic()->uisession(), SIGNAL(sigSharedFolderChange()),
    250             this, SLOT(sltSharedFolderChange()));
     247    connect(machineLogic()->uisession(), &UISession::sigNetworkAdapterChange,
     248            this, &UIMachineWindowNormal::sltNetworkAdapterChange);
     249    connect(machineLogic()->uisession(), &UISession::sigSharedFolderChange,
     250            this, &UIMachineWindowNormal::sltSharedFolderChange);
    251251    connect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()),
    252252            this, SLOT(sltRecordingChange()));
    253     connect(machineLogic()->uisession(), SIGNAL(sigCPUExecutionCapChange()),
    254             this, SLOT(sltCPUExecutionCapChange()));
     253    connect(machineLogic()->uisession(), &UISession::sigCPUExecutionCapChange,
     254            this, &UIMachineWindowNormal::sltCPUExecutionCapChange);
    255255    connect(machineLogic()->uisession(), SIGNAL(sigInitialized()),
    256256            this, SLOT(sltHandleSessionInitialized()));
    … …  
    446446{
    447447    /* We should stop watching for console events: */
    448     disconnect(machineLogic()->uisession(), SIGNAL(sigMediumChange(const CMediumAttachment &)),
    449                this, SLOT(sltMediumChange(const CMediumAttachment &)));
    450     disconnect(machineLogic()->uisession(), SIGNAL(sigUSBControllerChange()),
    451                this, SLOT(sltUSBControllerChange()));
    452     disconnect(machineLogic()->uisession(), SIGNAL(sigUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &)),
    453                this, SLOT(sltUSBDeviceStateChange()));
    454     disconnect(machineLogic()->uisession(), SIGNAL(sigNetworkAdapterChange(const CNetworkAdapter &)),
    455                this, SLOT(sltNetworkAdapterChange()));
     448    disconnect(machineLogic()->uisession(), &UISession::sigMediumChange,
     449               this, &UIMachineWindowNormal::sltMediumChange);
     450    disconnect(machineLogic()->uisession(), &UISession::sigUSBControllerChange,
     451               this, &UIMachineWindowNormal::sltUSBControllerChange);
     452    disconnect(machineLogic()->uisession(), &UISession::sigUSBDeviceStateChange,
     453               this, &UIMachineWindowNormal::sltUSBDeviceStateChange);
     454    disconnect(machineLogic()->uisession(), &UISession::sigNetworkAdapterChange,
     455               this, &UIMachineWindowNormal::sltNetworkAdapterChange);
    456456    disconnect(machineLogic()->uisession(), &UISession::sigAudioAdapterChange,
    457457               this, &UIMachineWindowNormal::sltAudioAdapterChange);
    458     disconnect(machineLogic()->uisession(), SIGNAL(sigSharedFolderChange()),
    459                this, SLOT(sltSharedFolderChange()));
     458    disconnect(machineLogic()->uisession(), &UISession::sigSharedFolderChange,
     459               this, &UIMachineWindowNormal::sltSharedFolderChange);
    460460    disconnect(machineLogic()->uisession(), SIGNAL(sigRecordingChange()),
    461461               this, SLOT(sltRecordingChange()));
    462     disconnect(machineLogic()->uisession(), SIGNAL(sigCPUExecutionCapChange()),
    463                this, SLOT(sltCPUExecutionCapChange()));
     462    disconnect(machineLogic()->uisession(), &UISession::sigCPUExecutionCapChange,
     463               this, &UIMachineWindowNormal::sltCPUExecutionCapChange);
    464464
    465465    /* Call to base-class: */
    … …  
    659659#endif /* !VBOX_WS_MAC */
    660660}
    661 
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