Changeset 6616 in vbox

Timestamp:

Jan 30, 2008 5:31:18 PM (17 years ago)

Author:

vboxsync

Message:

Renaming TriStateBool enum qualifiers:
True => TSTrue
False => TSFalse
Default => TSDefault

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (3 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• Frontends/VirtualBox/ui/VBoxNewVMWzd.ui.h (modified) (1 diff)
• Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (modified) (2 diffs)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/MachineImpl.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -910 +910 @@
     TriStateBool_T hwVirtExEnabled;
     machine->COMGETTER(HWVirtExEnabled)(&hwVirtExEnabled);
-    if (hwVirtExEnabled == TriStateBool_Default)
+    if (hwVirtExEnabled == TriStateBool_TSDefault)
     {
         BOOL fHWVirtExEnabled;
@@ -924 +924 @@
     {
         if (details == VMINFO_MACHINEREADABLE)
-            RTPrintf("hwvirtex=\"%s\"\n", hwVirtExEnabled == TriStateBool_True ? "on" : "off");
+            RTPrintf("hwvirtex=\"%s\"\n", hwVirtExEnabled == TriStateBool_TSTrue ? "on" : "off");
         else
-            RTPrintf("Hardw. virt.ext: %s\n", hwVirtExEnabled == TriStateBool_True ? "on" : "off");
+            RTPrintf("Hardw. virt.ext: %s\n", hwVirtExEnabled == TriStateBool_TSTrue ? "on" : "off");
     }
 
@@ -4392 +4392 @@
             if (strcmp(hwvirtex, "on") == 0)
             {
-                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TriStateBool_True));
+                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TriStateBool_TSTrue));
             }
             else if (strcmp(hwvirtex, "off") == 0)
             {
-                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TriStateBool_False));
+                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TriStateBool_TSFalse));
             }
             else if (strcmp(hwvirtex, "default") == 0)
             {
-                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TriStateBool_Default));
+                CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TriStateBool_TSDefault));
             }
             else

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -838 +838 @@
     unsigned fPATM  = ~0U;
     unsigned fCSAM  = ~0U;
-    TriStateBool_T fHWVirt = TriStateBool_Default;
+    TriStateBool_T fHWVirt = TriStateBool_TSDefault;
     uint32_t u32WarpDrive = 0;
 #endif
@@ -1275 +1275 @@
             fCSAM = false;
         else if (strcmp(argv[curArg], "-hwvirtex") == 0)
-            fHWVirt = TriStateBool_True;
+            fHWVirt = TriStateBool_TSTrue;
         else if (strcmp(argv[curArg], "-nohwvirtex") == 0)
-            fHWVirt = TriStateBool_False;
+            fHWVirt = TriStateBool_TSFalse;
         else if (strcmp(argv[curArg], "-warpdrive") == 0)
         {
@@ -1823 +1823 @@
         gMachineDebugger->COMSETTER(CSAMEnabled)(fCSAM);
     }
-    if (fHWVirt != TriStateBool_Default)
+    if (fHWVirt != TriStateBool_TSDefault)
     {
         gMachine->COMSETTER(HWVirtExEnabled)(fHWVirt);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -1442 +1442 @@
         /* VT-x/AMD-V */
         CSystemProperties props = vboxGlobal().virtualBox().GetSystemProperties();
-        QString virt = m.GetHWVirtExEnabled() == true ?
+        QString virt = m.GetHWVirtExEnabled() == CEnums::TSTrue ?
                        tr ("Enabled", "details report (VT-x/AMD-V)") :
-                       m.GetHWVirtExEnabled() == false ?
+                       m.GetHWVirtExEnabled() == CEnums::TSFalse ?
                        tr ("Disabled", "details report (VT-x/AMD-V)") :
                        props.GetHWVirtExEnabled() ?

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxNewVMWzd.ui.h

@@ -330 +330 @@
         type.GetId() == "os2warp4" ||
         type.GetId() == "os2warp45")
-        cmachine.SetHWVirtExEnabled (CEnums::True);
+        cmachine.SetHWVirtExEnabled (CEnums::TSTrue);
 
     /* RAM size */

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -1671 +1671 @@
 
     /* VT-x/AMD-V */
-    machine.GetHWVirtExEnabled() == CEnums::False ? chbVTX->setChecked (false) :
-    machine.GetHWVirtExEnabled() == CEnums::True ?  chbVTX->setChecked (true) :
-                                                    chbVTX->setNoChange();
+    machine.GetHWVirtExEnabled() == CEnums::TSFalse ? chbVTX->setChecked (false) :
+    machine.GetHWVirtExEnabled() == CEnums::TSTrue ?  chbVTX->setChecked (true) :
+                                                      chbVTX->setNoChange();
 
     /* Saved state folder */
@@ -2044 +2044 @@
     /* VT-x/AMD-V */
     cmachine.SetHWVirtExEnabled (
-        chbVTX->state() == QButton::Off ? CEnums::False :
-        chbVTX->state() == QButton::On ? CEnums::True : CEnums::Default);
+        chbVTX->state() == QButton::Off ? CEnums::TSFalse :
+        chbVTX->state() == QButton::On ? CEnums::TSTrue : CEnums::TSDefault);
 
     /* Saved state folder */

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -153 +153 @@
     BOOL fHWVirtExEnabled;
     hrc = pMachine->COMGETTER(HWVirtExEnabled)(&hwVirtExEnabled);                   H();
-    if (hwVirtExEnabled == TriStateBool_Default)
+    if (hwVirtExEnabled == TriStateBool_TSDefault)
     {
         /* check the default value */
@@ -159 +159 @@
     }
     else
-        fHWVirtExEnabled = (hwVirtExEnabled == TriStateBool_True);
+        fHWVirtExEnabled = (hwVirtExEnabled == TriStateBool_TSTrue);
 #ifndef RT_OS_DARWIN /** @todo Implement HWVirtExt on darwin. See #1865. */
     if (fHWVirtExEnabled)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -169 +169 @@
     mVRAMSize = 8;
     mMonitorCount = 1;
-    mHWVirtExEnabled = TriStateBool_False;
+    mHWVirtExEnabled = TriStateBool_TSFalse;
 
     /* default boot order: floppy - DVD - HDD */
@@ -4141 +4141 @@
     {
         /* default value in case the node is not there */
-        mHWData->mHWVirtExEnabled = TriStateBool_Default;
+        mHWData->mHWVirtExEnabled = TriStateBool_TSDefault;
 
         Key cpuNode = aNode.findKey ("CPU");
@@ -4151 +4151 @@
                 const char *enabled = hwVirtExNode.stringValue ("enabled");
                 if      (strcmp (enabled, "false") == 0)
-                    mHWData->mHWVirtExEnabled = TriStateBool_False;
+                    mHWData->mHWVirtExEnabled = TriStateBool_TSFalse;
                 else if (strcmp (enabled, "true") == 0)
-                    mHWData->mHWVirtExEnabled = TriStateBool_True;
+                    mHWData->mHWVirtExEnabled = TriStateBool_TSTrue;
                 else
-                    mHWData->mHWVirtExEnabled = TriStateBool_Default;
+                    mHWData->mHWVirtExEnabled = TriStateBool_TSDefault;
             }
         }
@@ -5529 +5529 @@
         switch (mHWData->mHWVirtExEnabled)
         {
-            case TriStateBool_False:
+            case TriStateBool_TSFalse:
                 value = "false";
                 break;
-            case TriStateBool_True:
+            case TriStateBool_TSTrue:
                 value = "true";
                 break;
-            case TriStateBool_Default:
+            case TriStateBool_TSDefault:
                 value = "default";
         }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -105 +105 @@
     </desc>
 
-    <const name="False"   value="0"/>
-    <const name="True"    value="1"/>
-    <const name="Default" value="2"/>
+    <const name="TSFalse"   value="0"/>
+    <const name="TSTrue"    value="1"/>
+    <const name="TSDefault" value="2"/>
   </enum>