Changeset 33073 in vbox for trunk/src

Timestamp:

Oct 12, 2010 3:02:53 PM (14 years ago)

Author:

vboxsync

Message:

Main: partly reverted r66582

Location:

trunk/src/VBox/Main

Files:

• glue/string.cpp (modified) (4 diffs)
• xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/glue/string.cpp

@@ -50 +50 @@
 #endif
 
-Utf8Str &Utf8Str::stripTrailingSlash()
+Utf8Str& Utf8Str::stripTrailingSlash()
 {
     if (length())
@@ -60 +60 @@
 }
 
-Utf8Str &Utf8Str::stripFilename()
+Utf8Str& Utf8Str::stripFilename()
 {
     if (length())
@@ -70 +70 @@
 }
 
-Utf8Str &Utf8Str::stripPath()
+Utf8Str& Utf8Str::stripPath()
 {
     if (length())
@@ -82 +82 @@
 }
 
-Utf8Str &Utf8Str::stripExt()
+Utf8Str& Utf8Str::stripExt()
 {
     if (length())

trunk/src/VBox/Main/xml/Settings.cpp

@@ -661 +661 @@
         {
             // pre-1.4 used lower case, so make this case-insensitive
-            strType.upper();
+            strType.toUpper();
             if (strType == "NORMAL")
                 med.hdType = MediumType_Normal;
@@ -2128 +2128 @@
     {
         // settings before 1.3 used lower case so make sure this is case-insensitive
-        strTemp.upper();
+        strTemp.toUpper();
         if (strTemp == "NULL")
             aa.driverType = AudioDriverType_Null;
@@ -2439 +2439 @@
             {
                 // settings before 1.3 used lower case so make sure this is case-insensitive
-                strAuthType.upper();
+                strAuthType.toUpper();
                 if (strAuthType == "NULL")
                     hw.vrdpSettings.authType = VRDPAuthType_Null;
@@ -2482 +2482 @@
                 {
                     // settings before 1.3 used lower case so make sure this is case-insensitive
-                    strBootMenuMode.upper();
+                    strBootMenuMode.toUpper();
                     if (strBootMenuMode == "DISABLED")
                         hw.biosSettings.biosBootMenuMode = BIOSBootMenuMode_Disabled;