Changeset 16849 in vbox for trunk/src

Timestamp:

Feb 17, 2009 2:59:38 PM (16 years ago)

Author:

vboxsync

Message:

OVF: replace stringstreams with IPRT funcs, without templates

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -214 +214 @@
 // globals
 ////////////////////////////////////////////////////////////////////////////////
-
-template<class T> inline com::Utf8Str toString(const T &val);
-
-// specializations
-template<> com::Utf8Str toString<uint32_t>(const uint32_t &val)
-{
-    return Utf8StrFmt("%RI16", val);
-}
-
-template<> com::Utf8Str toString<uint64_t>(const uint64_t &val)
-{
-    return Utf8StrFmt("%RI32", val);
-}
 
 static Utf8Str stripFilename(const Utf8Str &strFile)
@@ -1253 +1240 @@
             /* Guest OS type */
             Utf8Str strOsTypeVBox,
-                    strCIMOSType = toString<ULONG>(vsysThis.cimos);
+                    strCIMOSType = Utf8StrFmt("%RI32", (uint32_t)vsysThis.cimos);
             convertCIMOSType2VBoxOSType(strOsTypeVBox, vsysThis.cimos);
             pNewDesc->addEntry(VirtualSystemDescriptionType_OS,
@@ -1290 +1277 @@
             pNewDesc->addEntry(VirtualSystemDescriptionType_CPU,
                                "",
-                               toString<ULONG>(vsysThis.cCPUs),
-                               toString<ULONG>(cpuCountVBox));
+                               Utf8StrFmt("%RI32", (uint32_t)vsysThis.cCPUs),
+                               Utf8StrFmt("%RI32", (uint32_t)cpuCountVBox));
 
             /* RAM */
@@ -1315 +1302 @@
             pNewDesc->addEntry(VirtualSystemDescriptionType_Memory,
                                "",
-                               toString<uint64_t>(vsysThis.ullMemorySize),
-                               toString<uint64_t>(ullMemSizeVBox));
+                               Utf8StrFmt("%RI64", (uint64_t)vsysThis.ullMemorySize),
+                               Utf8StrFmt("%RI64", (uint64_t)ullMemSizeVBox));
 
             /* Audio */
@@ -1325 +1312 @@
                                    "",
                                    vsysThis.strSoundCardType,
-                                   toString<ULONG>(AudioControllerType_AC97));
+                                   Utf8StrFmt("%RI32", (uint32_t)AudioControllerType_AC97));
 
             /* USB Controller */
@@ -1371 +1358 @@
                                        "",      // ref
                                        strNetwork,      // orig
-                                       toString<ULONG>(nwAdapterVBox),   // conf
+                                       Utf8StrFmt("%RI32", (uint32_t)nwAdapterVBox),   // conf
                                        Utf8StrFmt("network=%s", strNetwork.c_str()));       // extra conf
                 }
@@ -1397 +1384 @@
             {
                 const HardDiskController &hdc = hdcIt->second;
-                Utf8Str strControllerID = toString<uint32_t>(hdc.idController);
+                Utf8Str strControllerID = Utf8StrFmt("%RI32", (uint32_t)hdc.idController);
 
                 switch (hdc.system)
@@ -1410 +1397 @@
                                 // @todo: figure out the IDE types
                                 /* Use PIIX4 as default */
-                                //                             IDEControllerType_T hdcController = IDEControllerType_PIIX4;
                                 Utf8Str strType = "PIIX4";
                                 if (!RTStrICmp(hdc.strControllerType.c_str(), "PIIX3"))
                                     strType = "PIIX3";
-                                //                             else // if (!RTStrICmp(hdc.strControllerType.c_str(), "PIIX4"))
-                                //                                 hdcController = IDEControllerType_PIIX4;
                                 pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerIDE,
                                                    strControllerID,
@@ -2389 +2373 @@
 const VirtualSystemDescriptionEntry* VirtualSystemDescription::findControllerFromID(uint32_t id)
 {
-    Utf8Str strRef = toString<uint32_t>(id);
+    Utf8Str strRef = Utf8StrFmt("%RI32", id);
     list<VirtualSystemDescriptionEntry>::const_iterator it;
     for (it = m->descriptions.begin();