Changeset 103977 in vbox for trunk/src/VBox/Main/include
- Timestamp:
- Mar 21, 2024 2:04:52 AM (10 months ago)
- Location:
- trunk/src/VBox/Main/include
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/CPUProfileImpl.h
r98103 r103977 49 49 void FinalRelease(); 50 50 HRESULT initFromDbEntry(struct CPUMDBENTRY const *a_pDbEntry) RT_NOEXCEPT; 51 void uninit() ;51 void uninit() RT_OVERRIDE; 52 52 /** @} */ 53 53 -
trunk/src/VBox/Main/include/DHCPConfigImpl.h
r98103 r103977 157 157 HRESULT initWithDefaults(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent); 158 158 HRESULT initWithSettings(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent, const settings::DHCPConfig &rConfig); 159 void uninit() ;159 void uninit() RT_OVERRIDE; 160 160 /** @} */ 161 161 … … 258 258 const com::Utf8Str a_strValue); 259 259 HRESULT initWithSettings(DHCPGroupConfig *a_pParent, const settings::DHCPGroupCondition &a_rSrc); 260 void uninit() ;260 void uninit() RT_OVERRIDE; 261 261 /** @} */ 262 262 … … 322 322 HRESULT initWithDefaults(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent, const com::Utf8Str &a_rName); 323 323 HRESULT initWithSettings(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent, const settings::DHCPGroupConfig &a_rSrc); 324 void uninit() ;324 void uninit() RT_OVERRIDE; 325 325 /** @} */ 326 326 … … 446 446 HRESULT initWithSettingsAndMACAddress(VirtualBox *a_pVirtualBox, DHCPServer *a_pParent, 447 447 const settings::DHCPIndividualConfig &rData, PCRTMAC a_pMACAddress); 448 void uninit() ;448 void uninit() RT_OVERRIDE; 449 449 /** @} */ 450 450 -
trunk/src/VBox/Main/include/DHCPServerImpl.h
r98103 r103977 73 73 HRESULT init(VirtualBox *aVirtualBox, const com::Utf8Str &aName); 74 74 HRESULT init(VirtualBox *aVirtualBox, const settings::DHCPServer &data); 75 void uninit() ;75 void uninit() RT_OVERRIDE; 76 76 /** @} */ 77 77 … … 97 97 HRESULT getGlobalConfig(ComPtr<IDHCPGlobalConfig> &aGlobalConfig) RT_OVERRIDE; 98 98 HRESULT getGroupConfigs(std::vector<ComPtr<IDHCPGroupConfig> > &aGroupConfigs) RT_OVERRIDE; 99 HRESULT getIndividualConfigs(std::vector<ComPtr<IDHCPIndividualConfig> > &aIndividualConfigs) ;99 HRESULT getIndividualConfigs(std::vector<ComPtr<IDHCPIndividualConfig> > &aIndividualConfigs) RT_OVERRIDE; 100 100 /** @} */ 101 101 -
trunk/src/VBox/Main/include/HostDriveImpl.h
r98103 r103977 46 46 * @{ */ 47 47 HRESULT initFromPathAndModel(const com::Utf8Str &drivePath, const com::Utf8Str &driveModel); 48 void uninit() ;48 void uninit() RT_OVERRIDE; 49 49 /** @} */ 50 50 -
trunk/src/VBox/Main/include/HostDrivePartitionImpl.h
r98103 r103977 48 48 * @{ */ 49 49 HRESULT initFromDvmVol(RTDVMVOLUME hVol); 50 void uninit() ;50 void uninit() RT_OVERRIDE; 51 51 /** @} */ 52 52 -
trunk/src/VBox/Main/include/MachineDebuggerImpl.h
r98103 r103977 52 52 // public initializer/uninitializer for internal purposes only 53 53 HRESULT init (Console *aParent); 54 void uninit() ;54 void uninit() RT_OVERRIDE; 55 55 56 56 // "public-private methods" … … 60 60 61 61 // wrapped IMachineDeugger properties 62 HRESULT getSingleStep(BOOL *aSingleStep) ;63 HRESULT setSingleStep(BOOL aSingleStep) ;64 HRESULT getExecuteAllInIEM(BOOL *aExecuteAllInIEM) ;65 HRESULT setExecuteAllInIEM(BOOL aExecuteAllInIEM) ;66 HRESULT getLogEnabled(BOOL *aLogEnabled) ;67 HRESULT setLogEnabled(BOOL aLogEnabled) ;68 HRESULT getLogDbgFlags(com::Utf8Str &aLogDbgFlags) ;69 HRESULT getLogDbgGroups(com::Utf8Str &aLogDbgGroups) ;70 HRESULT getLogDbgDestinations(com::Utf8Str &aLogDbgDestinations) ;71 HRESULT getLogRelFlags(com::Utf8Str &aLogRelFlags) ;72 HRESULT getLogRelGroups(com::Utf8Str &aLogRelGroups) ;73 HRESULT getLogRelDestinations(com::Utf8Str &aLogRelDestinations) ;74 HRESULT getExecutionEngine(VMExecutionEngine_T *apenmEngine) ;75 HRESULT getHWVirtExNestedPagingEnabled(BOOL *aHWVirtExNestedPagingEnabled) ;76 HRESULT getHWVirtExVPIDEnabled(BOOL *aHWVirtExVPIDEnabled) ;77 HRESULT getHWVirtExUXEnabled(BOOL *aHWVirtExUXEnabled) ;78 HRESULT getOSName(com::Utf8Str &aOSName) ;79 HRESULT getOSVersion(com::Utf8Str &aOSVersion) ;80 HRESULT getPAEEnabled(BOOL *aPAEEnabled) ;81 HRESULT getVirtualTimeRate(ULONG *aVirtualTimeRate) ;82 HRESULT setVirtualTimeRate(ULONG aVirtualTimeRate) ;83 HRESULT getUptime(LONG64 *aUptime) ;62 HRESULT getSingleStep(BOOL *aSingleStep) RT_OVERRIDE; 63 HRESULT setSingleStep(BOOL aSingleStep) RT_OVERRIDE; 64 HRESULT getExecuteAllInIEM(BOOL *aExecuteAllInIEM) RT_OVERRIDE; 65 HRESULT setExecuteAllInIEM(BOOL aExecuteAllInIEM) RT_OVERRIDE; 66 HRESULT getLogEnabled(BOOL *aLogEnabled) RT_OVERRIDE; 67 HRESULT setLogEnabled(BOOL aLogEnabled) RT_OVERRIDE; 68 HRESULT getLogDbgFlags(com::Utf8Str &aLogDbgFlags) RT_OVERRIDE; 69 HRESULT getLogDbgGroups(com::Utf8Str &aLogDbgGroups) RT_OVERRIDE; 70 HRESULT getLogDbgDestinations(com::Utf8Str &aLogDbgDestinations) RT_OVERRIDE; 71 HRESULT getLogRelFlags(com::Utf8Str &aLogRelFlags) RT_OVERRIDE; 72 HRESULT getLogRelGroups(com::Utf8Str &aLogRelGroups) RT_OVERRIDE; 73 HRESULT getLogRelDestinations(com::Utf8Str &aLogRelDestinations) RT_OVERRIDE; 74 HRESULT getExecutionEngine(VMExecutionEngine_T *apenmEngine) RT_OVERRIDE; 75 HRESULT getHWVirtExNestedPagingEnabled(BOOL *aHWVirtExNestedPagingEnabled) RT_OVERRIDE; 76 HRESULT getHWVirtExVPIDEnabled(BOOL *aHWVirtExVPIDEnabled) RT_OVERRIDE; 77 HRESULT getHWVirtExUXEnabled(BOOL *aHWVirtExUXEnabled) RT_OVERRIDE; 78 HRESULT getOSName(com::Utf8Str &aOSName) RT_OVERRIDE; 79 HRESULT getOSVersion(com::Utf8Str &aOSVersion) RT_OVERRIDE; 80 HRESULT getPAEEnabled(BOOL *aPAEEnabled) RT_OVERRIDE; 81 HRESULT getVirtualTimeRate(ULONG *aVirtualTimeRate) RT_OVERRIDE; 82 HRESULT setVirtualTimeRate(ULONG aVirtualTimeRate) RT_OVERRIDE; 83 HRESULT getUptime(LONG64 *aUptime) RT_OVERRIDE; 84 84 85 85 // wrapped IMachineDeugger methods 86 86 HRESULT dumpGuestCore(const com::Utf8Str &aFilename, 87 const com::Utf8Str &aCompression) ;87 const com::Utf8Str &aCompression) RT_OVERRIDE; 88 88 HRESULT dumpHostProcessCore(const com::Utf8Str &aFilename, 89 const com::Utf8Str &aCompression) ;89 const com::Utf8Str &aCompression) RT_OVERRIDE; 90 90 HRESULT info(const com::Utf8Str &aName, 91 91 const com::Utf8Str &aArgs, 92 com::Utf8Str &aInfo) ;93 HRESULT injectNMI() ;94 HRESULT modifyLogGroups(const com::Utf8Str &aSettings) ;95 HRESULT modifyLogFlags(const com::Utf8Str &aSettings) ;96 HRESULT modifyLogDestinations(const com::Utf8Str &aSettings) ;92 com::Utf8Str &aInfo) RT_OVERRIDE; 93 HRESULT injectNMI() RT_OVERRIDE; 94 HRESULT modifyLogGroups(const com::Utf8Str &aSettings) RT_OVERRIDE; 95 HRESULT modifyLogFlags(const com::Utf8Str &aSettings) RT_OVERRIDE; 96 HRESULT modifyLogDestinations(const com::Utf8Str &aSettings) RT_OVERRIDE; 97 97 HRESULT readPhysicalMemory(LONG64 aAddress, 98 98 ULONG aSize, 99 std::vector<BYTE> &aBytes) ;99 std::vector<BYTE> &aBytes) RT_OVERRIDE; 100 100 HRESULT writePhysicalMemory(LONG64 aAddress, 101 101 ULONG aSize, 102 const std::vector<BYTE> &aBytes) ;102 const std::vector<BYTE> &aBytes) RT_OVERRIDE; 103 103 HRESULT readVirtualMemory(ULONG aCpuId, 104 104 LONG64 aAddress, 105 105 ULONG aSize, 106 std::vector<BYTE> &aBytes) ;106 std::vector<BYTE> &aBytes) RT_OVERRIDE; 107 107 HRESULT writeVirtualMemory(ULONG aCpuId, 108 108 LONG64 aAddress, 109 109 ULONG aSize, 110 const std::vector<BYTE> &aBytes) ;110 const std::vector<BYTE> &aBytes) RT_OVERRIDE; 111 111 HRESULT loadPlugIn(const com::Utf8Str &aName, 112 com::Utf8Str &aPlugInName) ;113 HRESULT unloadPlugIn(const com::Utf8Str &aName) ;114 HRESULT detectOS(com::Utf8Str &aOs) ;112 com::Utf8Str &aPlugInName) RT_OVERRIDE; 113 HRESULT unloadPlugIn(const com::Utf8Str &aName) RT_OVERRIDE; 114 HRESULT detectOS(com::Utf8Str &aOs) RT_OVERRIDE; 115 115 HRESULT queryOSKernelLog(ULONG aMaxMessages, 116 com::Utf8Str &aDmesg) ;116 com::Utf8Str &aDmesg) RT_OVERRIDE; 117 117 HRESULT getRegister(ULONG aCpuId, 118 118 const com::Utf8Str &aName, 119 com::Utf8Str &aValue) ;119 com::Utf8Str &aValue) RT_OVERRIDE; 120 120 HRESULT getRegisters(ULONG aCpuId, 121 121 std::vector<com::Utf8Str> &aNames, 122 std::vector<com::Utf8Str> &aValues) ;122 std::vector<com::Utf8Str> &aValues) RT_OVERRIDE; 123 123 HRESULT setRegister(ULONG aCpuId, 124 124 const com::Utf8Str &aName, 125 const com::Utf8Str &aValue) ;125 const com::Utf8Str &aValue) RT_OVERRIDE; 126 126 HRESULT setRegisters(ULONG aCpuId, 127 127 const std::vector<com::Utf8Str> &aNames, 128 const std::vector<com::Utf8Str> &aValues) ;128 const std::vector<com::Utf8Str> &aValues) RT_OVERRIDE; 129 129 HRESULT dumpGuestStack(ULONG aCpuId, 130 com::Utf8Str &aStack) ;131 HRESULT resetStats(const com::Utf8Str &aPattern) ;132 HRESULT dumpStats(const com::Utf8Str &aPattern) ;130 com::Utf8Str &aStack) RT_OVERRIDE; 131 HRESULT resetStats(const com::Utf8Str &aPattern) RT_OVERRIDE; 132 HRESULT dumpStats(const com::Utf8Str &aPattern) RT_OVERRIDE; 133 133 HRESULT getStats(const com::Utf8Str &aPattern, 134 134 BOOL aWithDescriptions, 135 com::Utf8Str &aStats) ;135 com::Utf8Str &aStats) RT_OVERRIDE; 136 136 HRESULT getCPULoad(ULONG aCpuId, ULONG *aPctExecuting, ULONG *aPctHalted, ULONG *aPctOther, LONG64 *aMsInterval) RT_OVERRIDE; 137 HRESULT takeGuestSample(const com::Utf8Str &aFilename, ULONG aUsInterval, LONG64 aUsSampleTime, ComPtr<IProgress> &pProgress) ;138 HRESULT getUVMAndVMMFunctionTable(LONG64 aMagicVersion, LONG64 *aVMMFunctionTable, LONG64 *aUVM) ;137 HRESULT takeGuestSample(const com::Utf8Str &aFilename, ULONG aUsInterval, LONG64 aUsSampleTime, ComPtr<IProgress> &pProgress) RT_OVERRIDE; 138 HRESULT getUVMAndVMMFunctionTable(LONG64 aMagicVersion, LONG64 *aVMMFunctionTable, LONG64 *aUVM) RT_OVERRIDE; 139 139 140 140 // private methods -
trunk/src/VBox/Main/include/MachineImpl.h
r103085 r103977 1353 1353 // public initializer/uninitializer for internal purposes only 1354 1354 HRESULT init(Machine *aMachine); 1355 void uninit() { uninit(Uninit::Unexpected); }1355 void uninit() RT_OVERRIDE { uninit(Uninit::Unexpected); } 1356 1356 void uninit(Uninit::Reason aReason); 1357 1357 1358 1358 1359 1359 // util::Lockable interface 1360 RWLockHandle *lockHandle() const ;1360 RWLockHandle *lockHandle() const RT_OVERRIDE; 1361 1361 1362 1362 // public methods only for internal purposes 1363 1363 1364 virtual bool i_isSessionMachine() const 1364 virtual bool i_isSessionMachine() const RT_OVERRIDE 1365 1365 { 1366 1366 return true; … … 1378 1378 ClientToken *i_getClientToken(); 1379 1379 1380 HRESULT i_onNetworkAdapterChange(INetworkAdapter *networkAdapter, BOOL changeAdapter) ;1380 HRESULT i_onNetworkAdapterChange(INetworkAdapter *networkAdapter, BOOL changeAdapter) RT_OVERRIDE; 1381 1381 HRESULT i_onNATRedirectRuleChanged(ULONG ulSlot, BOOL aNatRuleRemove, const Utf8Str &aRuleName, 1382 1382 NATProtocol_T aProto, const Utf8Str &aHostIp, LONG aHostPort, 1383 1383 const Utf8Str &aGuestIp, LONG aGuestPort) RT_OVERRIDE; 1384 HRESULT i_onStorageControllerChange(const com::Guid &aMachineId, const com::Utf8Str &aControllerName); 1385 HRESULT i_onMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce); 1386 HRESULT i_onVMProcessPriorityChange(VMProcPriority_T aPriority); 1387 HRESULT i_onAudioAdapterChange(IAudioAdapter *audioAdapter); 1388 HRESULT i_onHostAudioDeviceChange(IHostAudioDevice *aDevice, BOOL aNew, AudioDeviceState_T aState, IVirtualBoxErrorInfo *aErrInfo); 1389 HRESULT i_onSerialPortChange(ISerialPort *serialPort); 1390 HRESULT i_onParallelPortChange(IParallelPort *parallelPort); 1391 HRESULT i_onCPUChange(ULONG aCPU, BOOL aRemove); 1392 HRESULT i_onVRDEServerChange(BOOL aRestart); 1393 HRESULT i_onRecordingChange(BOOL aEnable); 1394 HRESULT i_onUSBControllerChange(); 1384 HRESULT i_onStorageControllerChange(const com::Guid &aMachineId, const com::Utf8Str &aControllerName) RT_OVERRIDE; 1385 HRESULT i_onMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce) RT_OVERRIDE; 1386 HRESULT i_onVMProcessPriorityChange(VMProcPriority_T aPriority) RT_OVERRIDE; 1387 HRESULT i_onAudioAdapterChange(IAudioAdapter *audioAdapter) RT_OVERRIDE; 1388 HRESULT i_onHostAudioDeviceChange(IHostAudioDevice *aDevice, BOOL aNew, AudioDeviceState_T aState, 1389 IVirtualBoxErrorInfo *aErrInfo) RT_OVERRIDE; 1390 HRESULT i_onSerialPortChange(ISerialPort *serialPort) RT_OVERRIDE; 1391 HRESULT i_onParallelPortChange(IParallelPort *parallelPort) RT_OVERRIDE; 1392 HRESULT i_onCPUChange(ULONG aCPU, BOOL aRemove) RT_OVERRIDE; 1393 HRESULT i_onVRDEServerChange(BOOL aRestart) RT_OVERRIDE; 1394 HRESULT i_onRecordingChange(BOOL aEnable) RT_OVERRIDE; 1395 HRESULT i_onUSBControllerChange() RT_OVERRIDE; 1395 1396 HRESULT i_onUSBDeviceAttach(IUSBDevice *aDevice, 1396 1397 IVirtualBoxErrorInfo *aError, … … 1399 1400 HRESULT i_onUSBDeviceDetach(IN_BSTR aId, 1400 1401 IVirtualBoxErrorInfo *aError); 1401 HRESULT i_onSharedFolderChange() ;1402 HRESULT i_onClipboardModeChange(ClipboardMode_T aClipboardMode) ;1403 HRESULT i_onClipboardFileTransferModeChange(BOOL aEnable) ;1404 HRESULT i_onDnDModeChange(DnDMode_T aDnDMode) ;1405 HRESULT i_onBandwidthGroupChange(IBandwidthGroup *aBandwidthGroup) ;1406 HRESULT i_onStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove, BOOL aSilent) ;1407 HRESULT i_onCPUExecutionCapChange(ULONG aCpuExecutionCap) ;1408 HRESULT i_onGuestDebugControlChange(IGuestDebugControl *guestDebugControl) ;1402 HRESULT i_onSharedFolderChange() RT_OVERRIDE; 1403 HRESULT i_onClipboardModeChange(ClipboardMode_T aClipboardMode) RT_OVERRIDE; 1404 HRESULT i_onClipboardFileTransferModeChange(BOOL aEnable) RT_OVERRIDE; 1405 HRESULT i_onDnDModeChange(DnDMode_T aDnDMode) RT_OVERRIDE; 1406 HRESULT i_onBandwidthGroupChange(IBandwidthGroup *aBandwidthGroup) RT_OVERRIDE; 1407 HRESULT i_onStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove, BOOL aSilent) RT_OVERRIDE; 1408 HRESULT i_onCPUExecutionCapChange(ULONG aCpuExecutionCap) RT_OVERRIDE; 1409 HRESULT i_onGuestDebugControlChange(IGuestDebugControl *guestDebugControl) RT_OVERRIDE; 1409 1410 1410 1411 bool i_hasMatchingUSBFilter(const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs); … … 1421 1422 // wrapped IInternalMachineControl methods 1422 1423 HRESULT setRemoveSavedStateFile(BOOL aRemove); 1423 HRESULT updateState(MachineState_T aState) ;1424 HRESULT beginPowerUp(const ComPtr<IProgress> &aProgress) ;1425 HRESULT endPowerUp(LONG aResult) ;1426 HRESULT beginPoweringDown(ComPtr<IProgress> &aProgress) ;1424 HRESULT updateState(MachineState_T aState) RT_OVERRIDE; 1425 HRESULT beginPowerUp(const ComPtr<IProgress> &aProgress) RT_OVERRIDE; 1426 HRESULT endPowerUp(LONG aResult) RT_OVERRIDE; 1427 HRESULT beginPoweringDown(ComPtr<IProgress> &aProgress) RT_OVERRIDE; 1427 1428 HRESULT endPoweringDown(LONG aResult, 1428 const com::Utf8Str &aErrMsg) ;1429 const com::Utf8Str &aErrMsg) RT_OVERRIDE; 1429 1430 HRESULT runUSBDeviceFilters(const ComPtr<IUSBDevice> &aDevice, 1430 1431 BOOL *aMatched, 1431 ULONG *aMaskedInterfaces) ;1432 HRESULT captureUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename) ;1432 ULONG *aMaskedInterfaces) RT_OVERRIDE; 1433 HRESULT captureUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename) RT_OVERRIDE; 1433 1434 HRESULT detachUSBDevice(const com::Guid &aId, 1434 BOOL aDone) ;1435 HRESULT autoCaptureUSBDevices() ;1436 HRESULT detachAllUSBDevices(BOOL aDone) ;1435 BOOL aDone) RT_OVERRIDE; 1436 HRESULT autoCaptureUSBDevices() RT_OVERRIDE; 1437 HRESULT detachAllUSBDevices(BOOL aDone) RT_OVERRIDE; 1437 1438 HRESULT onSessionEnd(const ComPtr<ISession> &aSession, 1438 ComPtr<IProgress> &aProgress) ;1439 HRESULT finishOnlineMergeMedium() ;1439 ComPtr<IProgress> &aProgress) RT_OVERRIDE; 1440 HRESULT finishOnlineMergeMedium() RT_OVERRIDE; 1440 1441 HRESULT pullGuestProperties(std::vector<com::Utf8Str> &aNames, 1441 1442 std::vector<com::Utf8Str> &aValues, 1442 1443 std::vector<LONG64> &aTimestamps, 1443 std::vector<com::Utf8Str> &aFlags) ;1444 std::vector<com::Utf8Str> &aFlags) RT_OVERRIDE; 1444 1445 HRESULT pushGuestProperty(const com::Utf8Str &aName, 1445 1446 const com::Utf8Str &aValue, 1446 1447 LONG64 aTimestamp, 1447 1448 const com::Utf8Str &aFlags, 1448 BOOL fWasDeleted) ;1449 HRESULT lockMedia() ;1450 HRESULT unlockMedia() ;1449 BOOL fWasDeleted) RT_OVERRIDE; 1450 HRESULT lockMedia() RT_OVERRIDE; 1451 HRESULT unlockMedia() RT_OVERRIDE; 1451 1452 HRESULT ejectMedium(const ComPtr<IMediumAttachment> &aAttachment, 1452 ComPtr<IMediumAttachment> &aNewAttachment) ;1453 ComPtr<IMediumAttachment> &aNewAttachment) RT_OVERRIDE; 1453 1454 HRESULT reportVmStatistics(ULONG aValidStats, 1454 1455 ULONG aCpuUser, … … 1466 1467 ULONG aMemSharedTotal, 1467 1468 ULONG aVmNetRx, 1468 ULONG aVmNetTx) ;1469 ULONG aVmNetTx) RT_OVERRIDE; 1469 1470 HRESULT authenticateExternal(const std::vector<com::Utf8Str> &aAuthParams, 1470 com::Utf8Str &aResult) ;1471 com::Utf8Str &aResult) RT_OVERRIDE; 1471 1472 1472 1473 … … 1495 1496 // Override some functionality for SessionMachine, this is where the 1496 1497 // real action happens (the Machine methods are just dummies). 1497 HRESULT saveState(ComPtr<IProgress> &aProgress) ;1498 HRESULT adoptSavedState(const com::Utf8Str &aSavedStateFile) ;1499 HRESULT discardSavedState(BOOL aFRemoveFile) ;1498 HRESULT saveState(ComPtr<IProgress> &aProgress) RT_OVERRIDE; 1499 HRESULT adoptSavedState(const com::Utf8Str &aSavedStateFile) RT_OVERRIDE; 1500 HRESULT discardSavedState(BOOL aFRemoveFile) RT_OVERRIDE; 1500 1501 HRESULT takeSnapshot(const com::Utf8Str &aName, 1501 1502 const com::Utf8Str &aDescription, 1502 1503 BOOL aPause, 1503 1504 com::Guid &aId, 1504 ComPtr<IProgress> &aProgress) ;1505 ComPtr<IProgress> &aProgress) RT_OVERRIDE; 1505 1506 HRESULT deleteSnapshot(const com::Guid &aId, 1506 ComPtr<IProgress> &aProgress) ;1507 ComPtr<IProgress> &aProgress) RT_OVERRIDE; 1507 1508 HRESULT deleteSnapshotAndAllChildren(const com::Guid &aId, 1508 ComPtr<IProgress> &aProgress) ;1509 ComPtr<IProgress> &aProgress) RT_OVERRIDE; 1509 1510 HRESULT deleteSnapshotRange(const com::Guid &aStartId, 1510 1511 const com::Guid &aEndId, 1511 ComPtr<IProgress> &aProgress) ;1512 ComPtr<IProgress> &aProgress) RT_OVERRIDE; 1512 1513 HRESULT restoreSnapshot(const ComPtr<ISnapshot> &aSnapshot, 1513 ComPtr<IProgress> &aProgress) ;1514 ComPtr<IProgress> &aProgress) RT_OVERRIDE; 1514 1515 1515 1516 void i_releaseSavedStateFile(const Utf8Str &strSavedStateFile, Snapshot *pSnapshotToIgnore); … … 1556 1557 bool *pfNeedsMachineSaveSettings); 1557 1558 1558 HRESULT i_setMachineState(MachineState_T aMachineState) ;1559 HRESULT i_setMachineState(MachineState_T aMachineState) RT_OVERRIDE; 1559 1560 HRESULT i_updateMachineStateOnClient(); 1560 1561 … … 1615 1616 IN_GUID aSnapshotId, 1616 1617 const Utf8Str &aStateFilePath); 1617 void uninit() ;1618 void uninit() RT_OVERRIDE; 1618 1619 1619 1620 // util::Lockable interface 1620 RWLockHandle *lockHandle() const ;1621 RWLockHandle *lockHandle() const RT_OVERRIDE; 1621 1622 1622 1623 // public methods only for internal purposes 1623 1624 1624 virtual bool i_isSnapshotMachine() const 1625 virtual bool i_isSnapshotMachine() const RT_OVERRIDE 1625 1626 { 1626 1627 return true; -
trunk/src/VBox/Main/include/PlatformPropertiesImpl.h
r102113 r103977 51 51 // public initializer/uninitializer for internal purposes only 52 52 HRESULT init(VirtualBox *aParent, bool fIsHost = false); 53 void uninit() ;53 void uninit() RT_OVERRIDE; 54 54 55 55 // public internal methods … … 80 80 HRESULT getSupportedFirmwareTypes(std::vector<FirmwareType_T> &aSupportedFirmwareTypes) RT_OVERRIDE; 81 81 HRESULT getSupportedGraphicsControllerTypes(std::vector<GraphicsControllerType_T> &aSupportedGraphicsControllerTypes) RT_OVERRIDE; 82 HRESULT getSupportedGuestOSTypes(std::vector<ComPtr<IGuestOSType> > &aSupportedGuestOSTypes) ;83 HRESULT getSupportedNetAdpPromiscModePols(std::vector<NetworkAdapterPromiscModePolicy_T> &aSupportedNetworkAdapterPromiscModePolicies) ;82 HRESULT getSupportedGuestOSTypes(std::vector<ComPtr<IGuestOSType> > &aSupportedGuestOSTypes) RT_OVERRIDE; 83 HRESULT getSupportedNetAdpPromiscModePols(std::vector<NetworkAdapterPromiscModePolicy_T> &aSupportedNetworkAdapterPromiscModePolicies) RT_OVERRIDE; 84 84 HRESULT getSupportedNetworkAdapterTypes(std::vector<NetworkAdapterType_T> &aSupportedNetworkAdapterTypes) RT_OVERRIDE; 85 85 HRESULT getSupportedUartTypes(std::vector<UartType_T> &aSupportedUartTypes) RT_OVERRIDE; 86 86 HRESULT getSupportedUSBControllerTypes(std::vector<USBControllerType_T> &aSupportedUSBControllerTypes) RT_OVERRIDE; 87 87 HRESULT getSupportedAudioControllerTypes(std::vector<AudioControllerType_T> &aSupportedAudioControllerTypes) RT_OVERRIDE; 88 HRESULT getSupportedBootDevices(std::vector<DeviceType_T> &aSupportedBootDevices) ;88 HRESULT getSupportedBootDevices(std::vector<DeviceType_T> &aSupportedBootDevices) RT_OVERRIDE; 89 89 HRESULT getSupportedStorageBuses(std::vector<StorageBus_T> &aSupportedStorageBuses) RT_OVERRIDE; 90 90 HRESULT getSupportedStorageControllerTypes(std::vector<StorageControllerType_T> &aSupportedStorageControllerTypes) RT_OVERRIDE; -
trunk/src/VBox/Main/include/ProgressProxyImpl.h
r98103 r103977 76 76 ULONG uFirstOperationWeight, 77 77 ULONG cOtherProgressObjectOperations); 78 void uninit() ;78 void uninit() RT_OVERRIDE; 79 79 80 80 // IProgress properties 81 STDMETHOD(COMGETTER(Cancelable))(BOOL *aCancelable) ;82 STDMETHOD(COMGETTER(Percent))(ULONG *aPercent) ;83 STDMETHOD(COMGETTER(TimeRemaining))(LONG *aTimeRemaining) ;84 STDMETHOD(COMGETTER(Completed))(BOOL *aCompleted) ;85 STDMETHOD(COMGETTER(Canceled))(BOOL *aCanceled) ;86 STDMETHOD(COMGETTER(ResultCode))(LONG *aResultCode) ;87 STDMETHOD(COMGETTER(ErrorInfo))(IVirtualBoxErrorInfo **aErrorInfo) ;81 STDMETHOD(COMGETTER(Cancelable))(BOOL *aCancelable) RT_OVERRIDE; 82 STDMETHOD(COMGETTER(Percent))(ULONG *aPercent) RT_OVERRIDE; 83 STDMETHOD(COMGETTER(TimeRemaining))(LONG *aTimeRemaining) RT_OVERRIDE; 84 STDMETHOD(COMGETTER(Completed))(BOOL *aCompleted) RT_OVERRIDE; 85 STDMETHOD(COMGETTER(Canceled))(BOOL *aCanceled) RT_OVERRIDE; 86 STDMETHOD(COMGETTER(ResultCode))(LONG *aResultCode) RT_OVERRIDE; 87 STDMETHOD(COMGETTER(ErrorInfo))(IVirtualBoxErrorInfo **aErrorInfo) RT_OVERRIDE; 88 88 //STDMETHOD(COMGETTER(OperationCount))(ULONG *aOperationCount); - not necessary 89 STDMETHOD(COMGETTER(Operation))(ULONG *aOperation) ;90 STDMETHOD(COMGETTER(OperationDescription))(BSTR *aOperationDescription) ;91 STDMETHOD(COMGETTER(OperationPercent))(ULONG *aOperationPercent) ;92 STDMETHOD(COMSETTER(Timeout))(ULONG aTimeout) ;93 STDMETHOD(COMGETTER(Timeout))(ULONG *aTimeout) ;89 STDMETHOD(COMGETTER(Operation))(ULONG *aOperation) RT_OVERRIDE; 90 STDMETHOD(COMGETTER(OperationDescription))(BSTR *aOperationDescription) RT_OVERRIDE; 91 STDMETHOD(COMGETTER(OperationPercent))(ULONG *aOperationPercent) RT_OVERRIDE; 92 STDMETHOD(COMSETTER(Timeout))(ULONG aTimeout) RT_OVERRIDE; 93 STDMETHOD(COMGETTER(Timeout))(ULONG *aTimeout) RT_OVERRIDE; 94 94 95 95 // IProgress methods 96 STDMETHOD(WaitForCompletion)(LONG aTimeout) ;97 STDMETHOD(WaitForOperationCompletion)(ULONG aOperation, LONG aTimeout) ;98 STDMETHOD(Cancel)() ;99 STDMETHOD(SetCurrentOperationProgress)(ULONG aPercent) ;100 STDMETHOD(SetNextOperation)(IN_BSTR bstrNextOperationDescription, ULONG ulNextOperationsWeight) ;96 STDMETHOD(WaitForCompletion)(LONG aTimeout) RT_OVERRIDE; 97 STDMETHOD(WaitForOperationCompletion)(ULONG aOperation, LONG aTimeout) RT_OVERRIDE; 98 STDMETHOD(Cancel)() RT_OVERRIDE; 99 STDMETHOD(SetCurrentOperationProgress)(ULONG aPercent) RT_OVERRIDE; 100 STDMETHOD(SetNextOperation)(IN_BSTR bstrNextOperationDescription, ULONG ulNextOperationsWeight) RT_OVERRIDE; 101 101 102 102 // public methods only for internal purposes -
trunk/src/VBox/Main/include/SystemPropertiesImpl.h
r103085 r103977 59 59 // public initializer/uninitializer for internal purposes only 60 60 HRESULT init(VirtualBox *aParent); 61 void uninit() ;61 void uninit() RT_OVERRIDE; 62 62 63 63 // public methods for internal purposes only … … 123 123 HRESULT getProxyURL(com::Utf8Str &aProxyURL) RT_OVERRIDE; 124 124 HRESULT setProxyURL(const com::Utf8Str &aProxyURL) RT_OVERRIDE; 125 HRESULT getSupportedPlatformArchitectures(std::vector<PlatformArchitecture_T> &aSupportedPlatformArchitectures) ;125 HRESULT getSupportedPlatformArchitectures(std::vector<PlatformArchitecture_T> &aSupportedPlatformArchitectures) RT_OVERRIDE; 126 126 HRESULT getSupportedClipboardModes(std::vector<ClipboardMode_T> &aSupportedClipboardModes) RT_OVERRIDE; 127 127 HRESULT getSupportedDnDModes(std::vector<DnDMode_T> &aSupportedDnDModes) RT_OVERRIDE; -
trunk/src/VBox/Main/include/VirtualBoxBase.h
r98103 r103977 609 609 610 610 #define VIRTUALBOXBASE_ADD_VIRTUAL_COMPONENT_METHODS(cls, iface) \ 611 virtual const IID & getClassIID() const\611 virtual const IID &getClassIID() const RT_OVERRIDE \ 612 612 { \ 613 613 return cls::getStaticClassIID(); \ 614 614 } \ 615 static const IID &getStaticClassIID() \615 static const IID &getStaticClassIID() \ 616 616 { \ 617 617 return COM_IIDOF(iface); \ 618 618 } \ 619 virtual const char * getComponentName() const\619 virtual const char *getComponentName() const RT_OVERRIDE \ 620 620 { \ 621 621 return cls::getStaticComponentName(); \ 622 622 } \ 623 static const char *getStaticComponentName() \623 static const char *getStaticComponentName() \ 624 624 { \ 625 625 return #cls; \ … … 642 642 #define VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(cls, iface) \ 643 643 VIRTUALBOXBASE_ADD_VIRTUAL_COMPONENT_METHODS(cls, iface) \ 644 STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid) \644 STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid) RT_OVERRIDE \ 645 645 { \ 646 646 const ATL::_ATL_INTMAP_ENTRY* pEntries = cls::_GetEntries(); \ -
trunk/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h
r98103 r103977 144 144 145 145 // IVirtualBoxErrorInfo properties 146 STDMETHOD(COMGETTER(ResultCode))(LONG *aResultCode) ;147 STDMETHOD(COMGETTER(ResultDetail))(LONG *aResultDetail) ;148 STDMETHOD(COMGETTER(InterfaceID))(BSTR *aIID) ;149 STDMETHOD(COMGETTER(Component))(BSTR *aComponent) ;150 STDMETHOD(COMGETTER(Text))(BSTR *aText) ;151 STDMETHOD(COMGETTER(Next))(IVirtualBoxErrorInfo **aNext) ;146 STDMETHOD(COMGETTER(ResultCode))(LONG *aResultCode) RT_OVERRIDE; 147 STDMETHOD(COMGETTER(ResultDetail))(LONG *aResultDetail) RT_OVERRIDE; 148 STDMETHOD(COMGETTER(InterfaceID))(BSTR *aIID) RT_OVERRIDE; 149 STDMETHOD(COMGETTER(Component))(BSTR *aComponent) RT_OVERRIDE; 150 STDMETHOD(COMGETTER(Text))(BSTR *aText) RT_OVERRIDE; 151 STDMETHOD(COMGETTER(Next))(IVirtualBoxErrorInfo **aNext) RT_OVERRIDE; 152 152 153 153 const char* getComponentName() const { return "VirtualBoxErrorInfo"; }
Note:
See TracChangeset
for help on using the changeset viewer.