Changeset 44091 in vbox

Timestamp:

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

Author:

vboxsync

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

Files:

• include/VBox/com/Guid.h (modified) (2 diffs)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (4 diffs)
• src/VBox/Main/src-server/HostImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/MachineImplCloneVM.cpp (modified) (1 diff)
• src/VBox/Main/src-server/MediumImpl.cpp (modified) (1 diff)

trunk/include/VBox/com/Guid.h

@@ -420 +420 @@
     {
 #ifdef DEBUG
-        ::RTUuidToStr(&mUuid, mszUuid, RTUUID_STR_LENGTH);
-        m_pcszUUID = mszUuid;
+//        ::RTUuidToStr(&mUuid, mszUuid, RTUUID_STR_LENGTH);
+//        m_pcszUUID = mszUuid;
 #endif
     }
@@ -444 +444 @@
 }
 */
-inline bool isValidGuid(const Bstr& str)
-{
-   Guid guid(str);
-   return guid.isValid();
-//   return !guid.isEmpty();
-}
+//inline bool isValidGuid(const Bstr& str)
+//{
+//   Guid guid(str);
+//   return guid.isValid();
+////   return !guid.isEmpty();
+//}
 
 } /* namespace com */

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -3177 +3177 @@
 {
 #ifdef VBOX_WITH_USB
-    CheckComArgExpr(aId, Guid(aId).isValid() == true);
+    CheckComArgExpr(aId, Guid(aId).isValid());
     CheckComArgOutPointerValid(aDevice);
 
@@ -3489 +3489 @@
 STDMETHODIMP Console::DeleteSnapshot(IN_BSTR aId, IProgress **aProgress)
 {
-    CheckComArgExpr(aId, Guid(aId).isValid() == true);
+    CheckComArgExpr(aId, Guid(aId).isValid());
     CheckComArgOutPointerValid(aProgress);
 
@@ -3512 +3512 @@
 STDMETHODIMP Console::DeleteSnapshotAndAllChildren(IN_BSTR aId, IProgress **aProgress)
 {
-    CheckComArgExpr(aId, Guid(aId).isValid() == true);
+    CheckComArgExpr(aId, Guid(aId).isValid());
     CheckComArgOutPointerValid(aProgress);
 
@@ -3535 +3535 @@
 STDMETHODIMP Console::DeleteSnapshotRange(IN_BSTR aStartId, IN_BSTR aEndId, IProgress **aProgress)
 {
-    CheckComArgExpr(aStartId, Guid(aStartId).isValid() == true);
-    CheckComArgExpr(aEndId, Guid(aEndId).isValid() == true);
+    CheckComArgExpr(aStartId, Guid(aStartId).isValid());
+    CheckComArgExpr(aEndId, Guid(aEndId).isValid());
     CheckComArgOutPointerValid(aProgress);
 

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);