Changeset 30867 in vbox

Timestamp:

Jul 16, 2010 9:33:38 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63698

Message:

FE/Qt4: add default params to the extra data help list versions

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• COMDefs.h (modified) (1 diff)
• COMWrappers.xsl (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

@@ -81 +81 @@
 #include <QUuid>
 #include <QVector>
-#include <QList>
+#include <QStringList>
 #include <QMetaType>
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMWrappers.xsl

@@ -391 +391 @@
 
     void SetExtraDataStringList(const QString &strKey, const QStringList &value);
-    QStringList GetExtraDataStringList(const QString &strKey);
+    QStringList GetExtraDataStringList(const QString &strKey, QStringList def = QStringList());
 
     void SetExtraDataIntList(const QString &strKey, const QList<int> &value);
-    QList<int> GetExtraDataIntList(const QString &strKey);
+    QList<int> GetExtraDataIntList(const QString &strKey, QList<int> def = QList<int>());
 
 </xsl:text>
@@ -783 +783 @@
   <xsl:text>QStringList C</xsl:text>
   <xsl:value-of select="substring(@name,2)"/>
-  <xsl:text>::GetExtraDataStringList(const QString &amp;strKey)</xsl:text>
+  <xsl:text>::GetExtraDataStringList(const QString &amp;strKey, QStringList def /* = QStringList() */)</xsl:text>
 <xsl:text>
 {
-    return GetExtraData(strKey).split(",");
+    QString strValue = GetExtraData(strKey);
+    if (strValue.isEmpty())
+        return def;
+    else
+        return strValue.split(",");
 }
 
@@ -806 +810 @@
   <xsl:text>QList&lt;int&gt; C</xsl:text>
   <xsl:value-of select="substring(@name,2)"/>
-  <xsl:text>::GetExtraDataIntList(const QString &amp;strKey)</xsl:text>
+  <xsl:text>::GetExtraDataIntList(const QString &amp;strKey, QList&lt;int&gt; def /* = QList&lt;int&gt;() */)</xsl:text>
 <xsl:text>
 {
-    bool fOk;
-    QList&lt;int&gt; intList;
     QStringList strList = GetExtraDataStringList(strKey);
-    for (int i=0; i &lt; strList.size(); ++i)
+    if (strList.size() > 0)
     {
-        intList &lt;&lt; strList.at(i).toInt(&amp;fOk);
-        if (!fOk)
-            return QList&lt;int&gt;();
-
+        QList&lt;int&gt; intList;
+        bool fOk;
+        for (int i=0; i &lt; strList.size(); ++i)
+        {
+            intList &lt;&lt; strList.at(i).toInt(&amp;fOk);
+            if (!fOk)
+                return def;
+        }
+        return intList;
     }
-    return intList;
+    return def;
 }