Changeset 65158 in vbox
- Timestamp:
- Jan 5, 2017 4:52:22 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
-
Doxyfile.Core (modified) (1 diff)
-
src/VBox/Main/include/Global.h (modified) (1 diff)
-
src/VBox/Main/include/MachineImpl.h (modified) (1 diff)
-
src/VBox/Main/include/Matching.h (modified) (2 diffs)
-
src/VBox/Main/src-server/MachineImpl.cpp (modified) (9 diffs)
-
src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (3 diffs)
-
src/VBox/Main/webservice/vboxweb.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Doxyfile.Core
r65122 r65158 561 561 GMMR0DECL(type)=type \ 562 562 GMMR3DECL(type)=type \ 563 VBOX_DND_FN_DECL_LOG(x)=x 563 VBOX_DND_FN_DECL_LOG(x)=x \ 564 DECLSPEC_HIDDEN= \ 565 VMSVGA3DCOCOA_DECL(type)=type \ 566 VBOX_LISTENER_DECLARE(a)= 564 567 565 568 # BS3Kit -
trunk/src/VBox/Main/include/Global.h
r65120 r65158 99 99 * recommended way to detect if the VM is online (being executed in a 100 100 * dedicated process) or not. Note that some online states are also 101 * transitional states (see #IsTransi tional()).101 * transitional states (see #IsTransient()). 102 102 */ 103 103 static bool IsOnline(MachineState_T aState) -
trunk/src/VBox/Main/include/MachineImpl.h
r65049 r65158 668 668 /* flags for #saveSettings() */ 669 669 SaveS_ResetCurStateModified = 0x01, 670 SaveS_InformCallbacksAnyway = 0x02,671 670 SaveS_Force = 0x04, 672 671 /* flags for #saveStateSettings() */ -
trunk/src/VBox/Main/include/Matching.h
r62485 r65158 44 44 ParsedFilter_base() : mValid (false), mNull (true), mErrorPosition (0) {}; 45 45 46 /** 47 * Returns @c true if the filter is valid, @c false otherwise. 48 */ 46 49 bool isValid() const { return mNull || mValid; } 47 50 bool isNull() const { return mNull; } … … 56 59 57 60 /** 58 * Returns true if current isNull() and isValid() values make further59 * detailed matching meaningful, otherwise returns false.61 * Returns @c true if current isNull() and isValid() values make further 62 * detailed matching meaningful, otherwise returns @c false. 60 63 * Must be called as a first method of every isMatch() implementation, 61 * so that isMatch() will immediately return false if isPreMatch() returns64 * so that isMatch() will immediately return @c false if isPreMatch() returns 62 65 * false. 63 66 */ -
trunk/src/VBox/Main/src-server/MachineImpl.cpp
r65125 r65158 933 933 if (mData->pMachineConfigFile) 934 934 { 935 // reset the XML file to force loadSettings() (called from registeredInit())935 // reset the XML file to force loadSettings() (called from i_registeredInit()) 936 936 // to parse it again; the file might have changed 937 937 delete mData->pMachineConfigFile; … … 8118 8118 * Increases the number of objects dependent on the machine state or on the 8119 8119 * registered state. Guarantees that these two states will not change at least 8120 * until # releaseStateDependency() is called.8120 * until #i_releaseStateDependency() is called. 8121 8121 * 8122 8122 * Depending on the @a aDepType value, additional state checks may be made. 8123 8123 * These checks will set extended error info on failure. See 8124 * # checkStateDependency() for more info.8124 * #i_checkStateDependency() for more info. 8125 8125 * 8126 8126 * If this method returns a failure, the dependency is not added and the caller … … 8175 8175 /** 8176 8176 * Decreases the number of objects dependent on the machine state. 8177 * Must always complete the # addStateDependency() call after the state8177 * Must always complete the #i_addStateDependency() call after the state 8178 8178 * dependency is no more necessary. 8179 8179 */ … … 8251 8251 * @param aDepType Dependency type to check. 8252 8252 * 8253 * @note Non Machine based classes should use # addStateDependency() and8254 * # releaseStateDependency() methods or the smart AutoStateDependency8253 * @note Non Machine based classes should use #i_addStateDependency() and 8254 * #i_releaseStateDependency() methods or the smart AutoStateDependency 8255 8255 * template. 8256 8256 * … … 8342 8342 * (usually done in the #init() method). 8343 8343 * 8344 * @note Must be called only from #init() or from # registeredInit().8344 * @note Must be called only from #init() or from #i_registeredInit(). 8345 8345 */ 8346 8346 HRESULT Machine::initDataAndChildObjects() … … 8422 8422 * procedure (usually done in the #uninit() method). 8423 8423 * 8424 * @note Must be called only from #uninit() or from # registeredInit().8424 * @note Must be called only from #uninit() or from #i_registeredInit(). 8425 8425 */ 8426 8426 void Machine::uninitDataAndChildObjects() … … 8692 8692 * 8693 8693 * -- When machine XML exists on disk already and needs to be loaded into memory, 8694 * for example, from registeredInit() to load all registered machines on8694 * for example, from #i_registeredInit() to load all registered machines on 8695 8695 * VirtualBox startup. In this case, puuidRegistry is NULL because the media 8696 8696 * attached to the machine should be part of some media registry already. … … 9958 9958 * Used when saving settings after an operation that makes them 100% 9959 9959 * correspond to the settings from the current snapshot. 9960 * - SaveS_InformCallbacksAnyway: Callbacks will be informed even if9961 * #isReallyModified() returns false. This is necessary for cases when we9962 * change machine data directly, not through the backup()/commit() mechanism.9963 9960 * - SaveS_Force: settings will be saved without doing a deep compare of the 9964 9961 * settings structures. This is used when this is called because snapshots … … 10069 10066 } 10070 10067 10071 if (fNeedsWrite || (aFlags & SaveS_InformCallbacksAnyway))10068 if (fNeedsWrite) 10072 10069 { 10073 10070 /* Fire the data change event, even on failure (since we've already -
trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
r65103 r65158 5049 5049 * 5050 5050 * When @a aSaveSettings is @c true, this operation may fail because of the 5051 * failed # saveSettings() method it calls. In this case, the dhcp server object5051 * failed #i_saveSettings() method it calls. In this case, the dhcp server object 5052 5052 * will not be remembered. It is therefore the responsibility of the caller to 5053 5053 * call this method as the last step of some action that requires registration … … 5114 5114 * @param aDHCPServer DHCP server object to remove. 5115 5115 * 5116 * This operation may fail because of the failed # saveSettings() method it5116 * This operation may fail because of the failed #i_saveSettings() method it 5117 5117 * calls. In this case, the DHCP server will NOT be removed from the settings 5118 5118 * when this method returns. … … 5295 5295 * 5296 5296 * When @a aSaveSettings is @c true, this operation may fail because of the 5297 * failed # saveSettings() method it calls. In this case, the DHCP server5297 * failed #i_saveSettings() method it calls. In this case, the DHCP server 5298 5298 * will NOT be removed from the settingsi when this method returns. 5299 5299 * -
trunk/src/VBox/Main/webservice/vboxweb.h
r63979 r65158 193 193 * Returns the contained COM pointer and the UUID of the COM interface 194 194 * which it supports. 195 * @param 195 * @param ppobjInterface 196 * @param ppobjUnknown 196 197 * @return 197 198 */ … … 317 318 * @param idParent managed object reference of calling object; used to extract 318 319 * websession ID 320 * @param pcszInterface 319 321 * @param pc COM object for which to create a reference 320 322 * @return existing or new managed object reference
Note:
See TracChangeset
for help on using the changeset viewer.

