Changeset 19519 in vbox for trunk/src/VBox

Timestamp:

May 8, 2009 12:38:07 PM (16 years ago)

Author:

vboxsync

Message:

Main: decouple xml classes from COM dependencies

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (4 diffs)
• xml/xml.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -600 +600 @@
         DiskImage d;
         const char *pcszBad = NULL;
-        if (!(pelmDisk->getAttributeValue("diskId", d.strDiskId)))
+        const char *pcszDiskId;
+        const char *pcszFormat;
+        if (!(pelmDisk->getAttributeValue("diskId", pcszDiskId)))
             pcszBad = "diskId";
-        else if (!(pelmDisk->getAttributeValue("format", d.strFormat)))
+        else if (!(pelmDisk->getAttributeValue("format", pcszFormat)))
             pcszBad = "format";
         else if (!(pelmDisk->getAttributeValue("capacity", d.iCapacity)))
@@ -608 +610 @@
         else
         {
+            d.strDiskId = pcszDiskId;
+            d.strFormat = pcszFormat;
+
             if (!(pelmDisk->getAttributeValue("populatedSize", d.iPopulatedSize)))
                 // optional
                 d.iPopulatedSize = -1;
 
-            Utf8Str strFileRef;
-            if (pelmDisk->getAttributeValue("fileRef", strFileRef)) // optional
+            const char *pcszFileRef;
+            if (pelmDisk->getAttributeValue("fileRef", pcszFileRef)) // optional
             {
                 // look up corresponding /References/File nodes (list built above)
                 const xml::ElementNode *pFileElem;
                 if (    pReferencesElem
-                     && ((pFileElem = pReferencesElem->findChildElementFromId(strFileRef.c_str())))
+                     && ((pFileElem = pReferencesElem->findChildElementFromId(pcszFileRef)))
                    )
                 {
                     // copy remaining values from file node then
                     const char *pcszBadInFile = NULL;
-                    if (!(pFileElem->getAttributeValue("href", d.strHref)))
+                    const char *pcszHref;
+                    if (!(pFileElem->getAttributeValue("href", pcszHref)))
                         pcszBadInFile = "href";
                     else if (!(pFileElem->getAttributeValue("size", d.iSize)))
                         d.iSize = -1;       // optional
+
+                    d.strHref = pcszHref;
+
                     // if (!(pFileElem->getAttributeValue("size", d.iChunkSize))) TODO
                     d.iChunkSize = -1;       // optional
-                    pFileElem->getAttributeValue("compression", d.strCompression);
+                    const char *pcszCompression;
+                    if (pFileElem->getAttributeValue("compression", pcszCompression))
+                        d.strCompression = pcszCompression;
 
                     if (pcszBadInFile)
@@ -642 +653 @@
                                     tr("Error reading \"%s\": cannot find References/File element for ID '%s' referenced by 'Disk' element, line %d"),
                                     pcszPath,
-                                    strFileRef.c_str(),
+                                    pcszFileRef,
                                     pelmDisk->getLineNumber());
             }
@@ -2322 +2333 @@
                         rc = dstHdVBox->COMGETTER(Id)(hdId.asOutParam());
                         if (FAILED(rc)) throw rc;
-                         
+
                         /* For now we assume we have one controller of every type only */
                         HardDiskController hdc = (*vsysThis.mapControllers.find(vd.idController)).second;

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

@@ -721 +721 @@
  * @return TRUE if attribute was found and str was thus updated.
  */
-bool ElementNode::getAttributeValue(const char *pcszMatch, com::Utf8Str &str) const
+bool ElementNode::getAttributeValue(const char *pcszMatch, const char *&ppcsz) const
 {
     const Node* pAttr;
     if ((pAttr = findAttribute(pcszMatch)))
     {
-        str = pAttr->getValue();
+        ppcsz = pAttr->getValue();
         return true;
     }
@@ -745 +745 @@
 bool ElementNode::getAttributeValue(const char *pcszMatch, int64_t &i) const
 {
-    com::Utf8Str str;
-    if (    (getAttributeValue(pcszMatch, str))
-         && (VINF_SUCCESS == RTStrToInt64Ex(str.c_str(), NULL, 10, &i))
+    const char *pcsz;
+    if (    (getAttributeValue(pcszMatch, pcsz))
+         && (VINF_SUCCESS == RTStrToInt64Ex(pcsz, NULL, 10, &i))
        )
         return true;
@@ -766 +766 @@
 bool ElementNode::getAttributeValue(const char *pcszMatch, uint64_t &i) const
 {
-    com::Utf8Str str;
-    if (    (getAttributeValue(pcszMatch, str))
-         && (VINF_SUCCESS == RTStrToUInt64Ex(str.c_str(), NULL, 10, &i))
+    const char *pcsz;
+    if (    (getAttributeValue(pcszMatch, pcsz))
+         && (VINF_SUCCESS == RTStrToUInt64Ex(pcsz, NULL, 10, &i))
        )
         return true;