Changeset 42890 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Aug 20, 2012 5:45:13 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80177

Message:

Main/Machine: initializer method cleanup, makes the code easier to read

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -395 +395 @@
  *  @return  Success indicator. if not S_OK, the machine object is invalid
  */
-HRESULT Machine::init(VirtualBox *aParent,
-                      const Utf8Str &strConfigFile,
-                      const Guid *aId)
+HRESULT Machine::initFromSettings(VirtualBox *aParent,
+                                  const Utf8Str &strConfigFile,
+                                  const Guid *aId)
 {
     LogFlowThisFuncEnter();
@@ -8045 +8045 @@
         if (mData->mFirstSnapshot)
         {
-            // snapshots tree is protected by media write lock; strictly
+            // snapshots tree is protected by machine write lock; strictly
             // this isn't necessary here since we're deleting the entire
             // machine, but otherwise we assert in Snapshot::uninit()

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -607 +607 @@
         if (SUCCEEDED(rc = pMachine.createObject()))
         {
-            rc = pMachine->init(this,
-                                xmlMachine.strSettingsFile,
-                                &uuid);
+            rc = pMachine->initFromSettings(this,
+                                            xmlMachine.strSettingsFile,
+                                            &uuid);
             if (SUCCEEDED(rc))
                 rc = registerMachine(pMachine);