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

Timestamp:

Dec 11, 2012 1:34:23 PM (12 years ago)

Author:

vboxsync

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

82613

Message:

Main: make the code more readable. Places where the comparisons were of the form 'isValid() == true\false' or 'isZero() == true\false' were carved \ simplified.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostImpl.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (1 diff)
• MachineImplCloneVM.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (1 diff)

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

@@ -1538 +1538 @@
 {
 #ifdef VBOX_WITH_USB
-    CheckComArgExpr(aId, Guid (aId).isValid() == true);
+    CheckComArgExpr(aId, Guid (aId).isValid());
     CheckComArgOutPointerValid(aDevice);
 

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

@@ -1001 +1001 @@
     // never be found by findMachine()
     Guid test(aName);
-    //if (test.isNotEmpty())
+
     if (test.isValid())
         return setError(E_INVALIDARG,  tr("A machine cannot have a UUID as its name"));

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

@@ -1131 +1131 @@
                             {
                                 strSrcTest = strSrcTest.substr(1, strSrcTest.length() - 2);
-                                if (isValidGuid(strSrcTest))
+                                
+                                Guid temp_guid(strSrcTest);
+                                if (temp_guid.isValid() && !temp_guid.isZero())
                                     strNewName = Utf8StrFmt("%s%s", newId.toStringCurly().c_str(), RTPathExt(strNewName.c_str()));
                             }

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

@@ -2061 +2061 @@
                                     ComSafeArrayOut(BSTR, aSnapshotIds))
 {
-    CheckComArgExpr(aMachineId, Guid(aMachineId).isValid() == true);
+    CheckComArgExpr(aMachineId, Guid(aMachineId).isValid());
     CheckComArgOutSafeArrayPointerValid(aSnapshotIds);