Changeset 65088 in vbox for trunk/src/VBox/Main/include
- Timestamp:
- Jan 3, 2017 8:52:49 PM (8 years ago)
- Location:
- trunk/src/VBox/Main/include
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/ApplianceImpl.h
r63184 r65088 178 178 void i_convertDiskAttachmentValues(const ovf::HardDiskController &hdc, 179 179 uint32_t ulAddressOnParent, 180 Utf8Str &controller Type,180 Utf8Str &controllerName, 181 181 int32_t &lControllerPort, 182 182 int32_t &lDevice); -
trunk/src/VBox/Main/include/BandwidthGroupImpl.h
r61194 r65088 37 37 // public initializer/uninitializer for internal purposes only 38 38 HRESULT init(BandwidthControl *aParent, 39 const Utf8Str &aName,39 const com::Utf8Str &aName, 40 40 BandwidthGroupType_T aType, 41 41 LONG64 aMaxBytesPerSec); -
trunk/src/VBox/Main/include/ConsoleImpl.h
r64134 r65088 401 401 * 402 402 * @sa SafeVMPtr, SafeVMPtrQuiet 403 * @ obsolete Use SafeVMPtr403 * @note Obsolete, use SafeVMPtr 404 404 */ 405 405 typedef AutoVMCallerBase<false, false> AutoVMCaller; … … 410 410 * 411 411 * @note Temporarily locks the argument for writing. 412 * @obsolete Use SafeVMPtrQuiet412 * @note Obsolete, use SafeVMPtrQuiet 413 413 */ 414 414 typedef AutoVMCallerBase<true, false> AutoVMCallerQuiet; … … 419 419 * 420 420 * @note Temporarily locks the argument for writing. 421 * @ obsolete Use SafeVMPtr421 * @note Obsolete, use SafeVMPtr 422 422 */ 423 423 typedef AutoVMCallerBase<false, true> AutoVMCallerWeak; … … 429 429 * 430 430 * @note Temporarily locks the argument for writing. 431 * @ obsolete Use SafeVMPtrQuiet431 * @note Obsolete, use SafeVMPtrQuiet 432 432 */ 433 433 typedef AutoVMCallerBase<true, true> AutoVMCallerQuietWeak; -
trunk/src/VBox/Main/include/HostPower.h
r62485 r65088 45 45 }; 46 46 47 # if def RT_OS_WINDOWS47 # if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING) 48 48 /** 49 49 * The Windows hosted Power Service. … … 64 64 RTTHREAD mThread; 65 65 }; 66 #elif defined(RT_OS_LINUX) 66 # endif 67 # if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING) 67 68 /** 68 69 * The Linux hosted Power Service. … … 87 88 }; 88 89 89 # elif defined(RT_OS_DARWIN) /* RT_OS_WINDOWS */ 90 # endif 91 # if defined(RT_OS_DARWIN) || defined(DOXYGEN_RUNNING) 90 92 /** 91 93 * The Darwin hosted Power Service. … … 116 118 bool mCritical; /* Indicate if the battery was in the critical state last checked */ 117 119 }; 118 # endif /* RT_OS_DARWIN */120 # endif 119 121 120 122 #endif /* !____H_HOSTPOWER */ -
trunk/src/VBox/Main/include/PCIDeviceAttachmentImpl.h
r61009 r65088 37 37 // public initializer/uninitializer for internal purposes only 38 38 HRESULT init(IMachine * aParent, 39 const Utf8Str &a Name,39 const Utf8Str &aDevName, 40 40 LONG aHostAddess, 41 41 LONG aGuestAddress, -
trunk/src/VBox/Main/include/SharedFolderImpl.h
r62485 r65088 36 36 37 37 // public initializer/uninitializer for internal purposes only 38 HRESULT init(Machine *aMachine, const Utf8Str &aName, constUtf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);38 HRESULT init(Machine *aMachine, const com::Utf8Str &aName, const com::Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError); 39 39 HRESULT initCopy(Machine *aMachine, SharedFolder *aThat); 40 HRESULT init(Console *aConsole, const Utf8Str &aName, constUtf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);40 HRESULT init(Console *aConsole, const com::Utf8Str &aName, const com::Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError); 41 41 // HRESULT init(VirtualBox *aVirtualBox, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError); 42 42 void uninit(); -
trunk/src/VBox/Main/include/SnapshotImpl.h
r62485 r65088 40 40 HRESULT init(VirtualBox *aVirtualBox, 41 41 const Guid &aId, 42 const Utf8Str &aName,43 const Utf8Str &aDescription,42 const com::Utf8Str &aName, 43 const com::Utf8Str &aDescription, 44 44 const RTTIMESPEC &aTimeStamp, 45 45 SnapshotMachine *aMachine, … … 80 80 81 81 ComObjPtr<Snapshot> i_findChildOrSelf(IN_GUID aId); 82 ComObjPtr<Snapshot> i_findChildOrSelf(const Utf8Str &aName);82 ComObjPtr<Snapshot> i_findChildOrSelf(const com::Utf8Str &aName); 83 83 84 84 void i_updateSavedStatePaths(const Utf8Str &strOldPath, -
trunk/src/VBox/Main/include/StorageControllerImpl.h
r62485 r65088 34 34 // public initializer/uninitializer for internal purposes only 35 35 HRESULT init(Machine *aParent, 36 const Utf8Str &aName,36 const com::Utf8Str &aName, 37 37 StorageBus_T aBus, 38 38 ULONG aInstance, -
trunk/src/VBox/Main/include/USBControllerImpl.h
r62485 r65088 42 42 43 43 // public initializer/uninitializer for internal purposes only 44 HRESULT init(Machine *aParent, const Utf8Str &aName, USBControllerType_T enmType);44 HRESULT init(Machine *aParent, const com::Utf8Str &aName, USBControllerType_T enmType); 45 45 HRESULT init(Machine *aParent, USBController *aThat, bool fReshare = false); 46 46 HRESULT initCopy(Machine *aParent, USBController *aThat); -
trunk/src/VBox/Main/include/USBGetDevices.h
r62485 r65088 63 63 /** 64 64 * Free a linked list of USB devices created by the Linux enumeration code. 65 * @param p Head Pointer to the first device in the linked list65 * @param ppHead Pointer to the first device in the linked list 66 66 */ 67 67 DECLINLINE(void) deviceListFree(PUSBDEVICE *ppHead) -
trunk/src/VBox/Main/include/USBProxyBackend.h
r65063 r65088 42 42 public: 43 43 44 DECLARE_EMPTY_CTOR_DTOR 44 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackend) 45 45 46 46 HRESULT FinalConstruct(); … … 131 131 132 132 133 # if def RT_OS_DARWIN133 # if defined(RT_OS_DARWIN) || defined(DOXYGEN_RUNNING) 134 134 # include <VBox/param.h> 135 135 # undef PAGE_SHIFT … … 145 145 { 146 146 public: 147 DECLARE_EMPTY_CTOR_DTOR 147 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendDarwin) 148 148 149 149 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 182 182 183 183 184 # if def RT_OS_LINUX184 # if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING) 185 185 # include <stdio.h> 186 186 # ifdef VBOX_USB_WITH_SYSFS … … 194 194 { 195 195 public: 196 DECLARE_EMPTY_CTOR_DTOR 196 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendLinux) 197 197 198 198 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 237 237 238 238 239 # if def RT_OS_OS2239 # if defined(RT_OS_OS2) || defined(DOXYGEN_RUNNING) 240 240 # include <usbcalls.h> 241 241 … … 246 246 { 247 247 public: 248 DECLARE_EMPTY_CTOR_DTOR (USBProxyBackend)249 250 virtual int captureDevice 251 virtual int releaseDevice 248 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendOs2) 249 250 virtual int captureDevice(HostUSBDevice *aDevice); 251 virtual int releaseDevice(HostUSBDevice *aDevice); 252 252 253 253 protected: … … 273 273 APIRET (APIENTRY *mpfnUsbQueryDeviceReport)(ULONG, PULONG, PVOID); 274 274 }; 275 # endif /* RT_OS_ LINUX*/276 277 278 # if def RT_OS_SOLARIS275 # endif /* RT_OS_OS2 */ 276 277 278 # if defined(RT_OS_SOLARIS) || defined(DOXYGEN_RUNNING) 279 279 # include <libdevinfo.h> 280 280 … … 285 285 { 286 286 public: 287 DECLARE_EMPTY_CTOR_DTOR 287 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendSolaris) 288 288 289 289 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 293 293 virtual void removeFilter (void *aID); 294 294 295 virtual int captureDevice 296 virtual int releaseDevice 295 virtual int captureDevice(HostUSBDevice *aDevice); 296 virtual int releaseDevice(HostUSBDevice *aDevice); 297 297 virtual void captureDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess); 298 298 virtual void releaseDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess); … … 313 313 314 314 315 # if def RT_OS_WINDOWS315 # if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING) 316 316 /** 317 317 * The Windows hosted USB Proxy Backend. … … 320 320 { 321 321 public: 322 DECLARE_EMPTY_CTOR_DTOR 322 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendWindows) 323 323 324 324 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 328 328 virtual void removeFilter (void *aID); 329 329 330 virtual int captureDevice 331 virtual int releaseDevice 330 virtual int captureDevice(HostUSBDevice *aDevice); 331 virtual int releaseDevice(HostUSBDevice *aDevice); 332 332 333 333 virtual bool i_isDevReEnumerationRequired(); … … 344 344 # endif /* RT_OS_WINDOWS */ 345 345 346 # if def RT_OS_FREEBSD346 # if defined(RT_OS_FREEBSD) || defined(DOXYGEN_RUNNING) 347 347 /** 348 348 * The FreeBSD hosted USB Proxy Backend. … … 351 351 { 352 352 public: 353 DECLARE_EMPTY_CTOR_DTOR 353 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendFreeBSD) 354 354 355 355 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 402 402 { 403 403 public: 404 DECLARE_EMPTY_CTOR_DTOR 404 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendUsbIp) 405 405 406 406 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); -
trunk/src/VBox/Main/include/VirtualBoxBase.h
r63643 r65088 593 593 * translation"). See VirtualBoxBase::translate() for more info. 594 594 * 595 * @param aSourceTextString to translate.595 * @param pcszSourceText String to translate. 596 596 * @param aComment Comment to the string to resolve possible 597 597 * ambiguities (NULL means no comment). … … 641 641 * of a class derived from VirtualBoxBase cannot be instantiated. 642 642 * 643 * @param XThe class name, e.g. "Class".644 * @param IXThe interface name which this class implements, e.g. "IClass".643 * @param cls The class name, e.g. "Class". 644 * @param iface The interface name which this class implements, e.g. "IClass". 645 645 */ 646 646 #ifdef VBOX_WITH_XPCOM -
trunk/src/VBox/Main/include/VirtualBoxImpl.h
r63187 r65088 179 179 ComObjPtr<Machine> *aMachine = NULL); 180 180 181 HRESULT i_validateMachineGroup(const Utf8Str &aGroup, bool fPrimary);181 HRESULT i_validateMachineGroup(const com::Utf8Str &aGroup, bool fPrimary); 182 182 HRESULT i_convertMachineGroups(const std::vector<com::Utf8Str> aMachineGroups, StringsList *pllMachineGroups); 183 183
Note:
See TracChangeset
for help on using the changeset viewer.