Changeset 72905 in vbox for trunk/include

Timestamp:

Jul 4, 2018 10:20:12 PM (7 years ago)

Author:

vboxsync

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

123452

Message:

com::Guid: refactor some more, same object code is generated.

File:

• trunk/include/VBox/com/Guid.h (modified) (7 diffs)

trunk/include/VBox/com/Guid.h

@@ -67 +67 @@
     Guid()
     {
-        ::RTUuidClear(&mUuid);
-        mGuidState = GUID_ZERO;
-        dbg_refresh();
+        clear();
     }
 
@@ -222 +220 @@
     void clear()
     {
-        ::RTUuidClear(&mUuid);
-        mGuidState = GUID_ZERO;
+        makeClear();
         dbg_refresh();
     }
@@ -401 +398 @@
 
 private:
+    void makeClear()
+    {
+        ::RTUuidClear(&mUuid);
+        mGuidState = GUID_ZERO;
+    }
+
+    void makeInvalid()
+    {
+        ::RTUuidClear(&mUuid);
+        mGuidState = GUID_INVALID;
+    }
+
     void updateState()
     {
@@ -413 +422 @@
         if (!that || !*that)
         {
-            ::RTUuidClear(&mUuid);
-            mGuidState = GUID_ZERO;
+            makeClear();
         }
         else
@@ -420 +428 @@
             int rc = ::RTUuidFromStr(&mUuid, that);
             if (RT_FAILURE(rc))
-            {
-                ::RTUuidClear(&mUuid);
-                mGuidState = GUID_INVALID;
-            }
+                makeInvalid();
             else
                 updateState();
@@ -434 +439 @@
         if (!that || !*that)
         {
-            ::RTUuidClear(&mUuid);
-            mGuidState = GUID_ZERO;
+            makeClear();
         }
         else
@@ -441 +445 @@
             int rc = ::RTUuidFromUtf16(&mUuid, that);
             if (RT_FAILURE(rc))
-            {
-                ::RTUuidClear(&mUuid);
-                mGuidState = GUID_INVALID;
-            }
+                makeInvalid();
             else
                 updateState();