Changeset 29618 in vbox

Timestamp:

May 18, 2010 12:07:30 PM (14 years ago)

Author:

vboxsync

Message:

Main/Medium: BOOL->bool in many places, gets rid of a gcc warning

File:

• trunk/src/VBox/Main/MediumImpl.cpp (modified) (10 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -96 +96 @@
           setImageId(false),
           setParentId(false),
-          hostDrive(FALSE),
+          hostDrive(false),
           implicit(false),
           numCreateDiffTasks(0),
@@ -134 +134 @@
     HDDOpenMode hddOpenMode;
 
-    BOOL autoReset : 1;
+    bool autoReset : 1;
 
     /** the following members are invalid after changing UUID on open */
-    BOOL setImageId : 1;
-    BOOL setParentId : 1;
+    bool setImageId : 1;
+    bool setParentId : 1;
     const Guid imageId;
     const Guid parentId;
 
-    BOOL hostDrive : 1;
+    bool hostDrive : 1;
 
     typedef std::map <Bstr, Bstr> PropertyMap;
@@ -747 +747 @@
 
     /* cannot be a host drive */
-    m->hostDrive = FALSE;
+    m->hostDrive = false;
 
     /* No storage unit is created yet, no need to queryInfo() */
@@ -835 +835 @@
 
     /* cannot be a host drive */
-    m->hostDrive = FALSE;
+    m->hostDrive = false;
 
     /* remember the open mode (defaults to ReadWrite) */
@@ -847 +847 @@
 
     /* save the new uuid values, will be used by queryInfo() */
-    m->setImageId = aSetImageId;
+    m->setImageId = !!aSetImageId;
     unconst(m->imageId) = aImageId;
-    m->setParentId = aSetParentId;
+    m->setParentId = !!aSetParentId;
     unconst(m->parentId) = aParentId;
 
@@ -928 +928 @@
 
     /* assume not a host drive */
-    m->hostDrive = FALSE;
+    m->hostDrive = false;
 
     /* optional */
@@ -1548 +1548 @@
     if (m->pParent)
         *aAutoReset = FALSE;
-
-    *aAutoReset = m->autoReset;
+    else
+        *aAutoReset = m->autoReset;
 
     return S_OK;
@@ -1567 +1567 @@
                         m->strLocationFull.raw());
 
-    if (m->autoReset != aAutoReset)
-    {
-        m->autoReset = aAutoReset;
+    if (m->autoReset != !!aAutoReset)
+    {
+        m->autoReset = !!aAutoReset;
 
         return m->pVirtualBox->saveSettings();
@@ -3012 +3012 @@
     /* optional, only for diffs, default is false */
     if (m->pParent)
-        data.fAutoReset = !!m->autoReset;
+        data.fAutoReset = m->autoReset;
     else
         data.fAutoReset = false;
@@ -5401 +5401 @@
         pTarget->m->state = MediumState_NotCreated;
 
-        pTarget->m->autoReset = FALSE;
+        pTarget->m->autoReset = false;
 
         /* reset UUID to prevent it from being reused next time */