Changeset 48955 in vbox for trunk/src/VBox/Main/include
- Timestamp:
- Oct 7, 2013 9:59:25 PM (11 years ago)
- svn:sync-xref-src-repo-rev:
- 89652
- Location:
- trunk/src/VBox/Main/include
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/ApplianceImpl.h
r47716 r48955 235 235 struct XMLStack; 236 236 237 void buildXML(AutoWriteLockBase& writeLock, 238 xml::Document &doc, 239 XMLStack &stack, 240 const Utf8Str &strPath, 237 void buildXML(AutoWriteLockBase& writeLock, 238 xml::Document &doc, 239 XMLStack &stack, 240 const Utf8Str &strPath, 241 241 ovf::OVFVersion_T enFormat); 242 242 void buildXMLForOneVirtualSystem(AutoWriteLockBase& writeLock, -
trunk/src/VBox/Main/include/ApplianceImplPrivate.h
r47963 r48955 77 77 bool fManifest; // Create a manifest file on export 78 78 bool fSha256; // true = SHA256 (OVF 2.0), false = SHA1 (OVF 1.0) 79 Utf8Str strOVFSHADigest;//SHA digest of OVf file. It is stored here after reading OVF file (before import) 79 Utf8Str strOVFSHADigest;//SHA digest of OVf file. It is stored here after reading OVF file (before import) 80 80 81 81 RTCList<ImportOptions_T> optList; -
trunk/src/VBox/Main/include/DHCPServerImpl.h
r47018 r48955 48 48 * for server configuration needs, it's perhaps better to use (VM,slot) pair 49 49 * (vm-name, slot) <----> (MAC) 50 * 50 * 51 51 * but for client configuration, when server will have MACs at hand, it'd be 52 52 * easier to requiest options by MAC. 53 53 * (MAC) <----> (option-list) 54 54 * 55 * Doubts: What should be done if MAC changed for (vm-name, slot), when syncing should? 56 * XML: serialization of dependecy (DHCP options) - (VM,slot) shouldn't be done via MAC in 55 * Doubts: What should be done if MAC changed for (vm-name, slot), when syncing should? 56 * XML: serialization of dependecy (DHCP options) - (VM,slot) shouldn't be done via MAC in 57 57 * the middle. 58 58 */ … … 114 114 STDMETHOD(GetMacOptions)(IN_BSTR aMAC, ComSafeArrayOut(BSTR, aValues)); 115 115 STDMETHOD(COMGETTER(EventSource))(IEventSource **aEventSource); 116 116 117 117 STDMETHOD(SetConfiguration)(IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aFromIPAddress, IN_BSTR aToIPAddress); 118 118 -
trunk/src/VBox/Main/include/DisplayImpl.h
r47774 r48955 57 57 58 58 uint16_t flags; 59 59 60 60 /* for saving the rectangles arrived during fb resize is in progress. */ 61 61 PRTRECT mpSavedVisibleRegion; … … 299 299 int vbvaLock(void); 300 300 void vbvaUnlock(void); 301 301 302 302 RTCRITSECT mSaveSeamlessRectLock; 303 303 int SaveSeamlessRectLock(void); 304 304 void SaveSeamlessRectUnLock(void); 305 305 306 306 public: 307 307 static int displayTakeScreenshotEMT(Display *pDisplay, ULONG aScreenId, uint8_t **ppu8Data, size_t *pcbData, uint32_t *pu32Width, uint32_t *pu32Height); -
trunk/src/VBox/Main/include/EmulatedUSBImpl.h
r48631 r48955 65 65 { 66 66 Data() 67 68 67 { 68 } 69 69 70 70 ComObjPtr<Console> pConsole; -
trunk/src/VBox/Main/include/HostVideoInputDeviceImpl.h
r48607 r48955 56 56 { 57 57 Data() 58 59 58 { 59 } 60 60 61 61 com::Utf8Str name; -
trunk/src/VBox/Main/include/Performance.h
r48013 r48955 174 174 } VMSTATMASK; 175 175 176 const ULONG VMSTATS_GUEST_CPULOAD = 176 const ULONG VMSTATS_GUEST_CPULOAD = 177 177 VMSTATMASK_GUEST_CPUUSER | VMSTATMASK_GUEST_CPUKERNEL | 178 178 VMSTATMASK_GUEST_CPUIDLE; -
trunk/src/VBox/Main/include/TokenImpl.h
r48431 r48955 52 52 { 53 53 Data() 54 55 54 { 55 } 56 56 57 57 ComObjPtr<SessionMachine> pSessionMachine; -
trunk/src/VBox/Main/include/VirtualBoxImpl.h
r48804 r48955 227 227 IN_BSTR aGuestIp, LONG aGuestPort); 228 228 void onHostNameResolutionConfigurationChange(); 229 229 230 230 int natNetworkRefInc(IN_BSTR aNetworkName); 231 231 int natNetworkRefDec(IN_BSTR aNetworkName); -
trunk/src/VBox/Main/include/ovfreader.h
r46518 r48955 200 200 struct EnvelopeData 201 201 { 202 OVFVersion_T version;//OVF standard version, it is used internally only by VirtualBox 202 OVFVersion_T version;//OVF standard version, it is used internally only by VirtualBox 203 203 RTCString lang;//language 204 204 … … 378 378 protected: 379 379 virtual void _checkConsistencyAndCompliance() throw (OVFLogicError); 380 virtual const RTCString& getItemName() 380 virtual const RTCString& getItemName() 381 381 { 382 382 return _getItemName(); … … 387 387 bool fDefault;//true means that some fields were absent in the XML and some default values were assigned to. 388 388 389 virtual const RTCString& _getItemName() 389 virtual const RTCString& _getItemName() 390 390 { 391 391 return itemName; … … 432 432 RTCString itemName; 433 433 434 virtual const RTCString& _getItemName() 434 virtual const RTCString& _getItemName() 435 435 { 436 436 return itemName; … … 478 478 RTCString itemName; 479 479 480 virtual const RTCString& _getItemName() 480 virtual const RTCString& _getItemName() 481 481 { 482 482 return itemName; … … 640 640 641 641 // Data fields 642 EnvelopeData m_envelopeData; //data of root element "Envelope" 642 EnvelopeData m_envelopeData; //data of root element "Envelope" 643 643 RTCString m_strPath; // file name given to constructor 644 644 DiskImagesMap m_mapDisks; // map of DiskImage structs, sorted by DiskImage.strDiskId
Note:
See TracChangeset
for help on using the changeset viewer.