Changeset 73106 in vbox

Timestamp:

Jul 13, 2018 5:39:36 AM (7 years ago)

Author:

vboxsync

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

123685

Message:

FE/Qt: bugref:9012 Internally use string-string pairs in video capture settings rather than string-bool pairs

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -125 +125 @@
     }
 
-    /** Returns bool value corresponding to passed @a strValue. */
-    static bool toVideoCaptureOptionValue(const QString &strValue)
-    {
-        /* Compare case-sensitive: */
-        QMap<QString, bool> values;
-        values["true"] = true;
-        values["false"] = false;
-        /* Return known value or true otherwise: */
-        return values.value(strValue, false);
-    }
-
     /** Returns string representation for passed enum @a enmKey. */
     static QString fromVideoCaptureOptionKey(VideoCaptureOption enmKey)
@@ -147 +136 @@
     }
 
-    /** Returns string representation for passed bool @a fValue. */
-    static QString fromVideoCaptureOptionValue(bool fValue)
-    {
-        /* Compare case-sensitive: */
-        QMap<bool, QString> values;
-        values[true] = "true";
-        values[false] = "false";
-        /* Return known value or "false" otherwise: */
-        return values.value(fValue, "false");
-    }
-
     /** Parses Video Capture Options. */
     static void parseVideoCaptureOptions(const QString &strOptions,
                                          QList<VideoCaptureOption> &outKeys,
-                                         QList<bool> &outValues)
+                                         QStringList &outValues)
     {
         outKeys.clear();
@@ -169 +147 @@
         {
             const QStringList aPair = strPair.split('=');
+            if (aPair.size() != 2)
+                continue;
             const VideoCaptureOption enmKey = toVideoCaptureOptionKey(aPair.value(0));
-            const bool fValue = toVideoCaptureOptionValue(aPair.value(1));
             if (enmKey == VideoCaptureOption_Unknown)
                 continue;
             outKeys << enmKey;
-            outValues << fValue;
+            outValues << aPair.value(1);
         }
     }
@@ -180 +159 @@
     /** Serializes Video Capture Options. */
     static void serializeVideoCaptureOptions(const QList<VideoCaptureOption> &inKeys,
-                                             const QList<bool> &inValues,
+                                             const QStringList &inValues,
                                              QString &strOptions)
     {
@@ -188 +167 @@
             QStringList aPair;
             aPair << fromVideoCaptureOptionKey(inKeys.value(i));
-            aPair << fromVideoCaptureOptionValue(inValues.value(i));
+            aPair << inValues.value(i);
             aPairs << aPair.join('=');
         }
@@ -199 +178 @@
     {
         QList<VideoCaptureOption> aKeys;
-        QList<bool> aValues;
+        QStringList aValues;
         parseVideoCaptureOptions(strOptions, aKeys, aValues);
         int iIndex = aKeys.indexOf(enmOption);
         if (iIndex == -1)
             return false; /* If option is missing, assume disabled (false). */
-        return aValues.value(iIndex);
+        if (aValues.value(iIndex).compare("true", Qt::CaseInsensitive) == 0)
+            return true;
+        return false;
     }
 
@@ -213 +194 @@
     {
         QList<VideoCaptureOption> aKeys;
-        QList<bool> aValues;
+        QStringList aValues;
         parseVideoCaptureOptions(strOptions, aKeys, aValues);
         int iIndex = aKeys.indexOf(enmOption);
+        QString strValue = fEnabled ? "true" : "false";
         if (iIndex == -1)
         {
             aKeys << enmOption;
-            aValues << fEnabled;
+            aValues << strValue;
         }
         else
         {
-            aValues[iIndex] = fEnabled;
+            aValues[iIndex] = strValue;
         }
         QString strResult;
@@ -238 +220 @@
             return QString();
         QList<VideoCaptureOption> aKeys;
-        QList<bool> aValues;
+        QStringList aValues;
         parseVideoCaptureOptions(strOptions, aKeys, aValues);
         for(int i = 0; i < flags.size(); ++i)
         {
+            QString strValue = flags[i] ? "true" : "false";
             int iIndex = aKeys.indexOf(enmOptions[i]);
             if (iIndex == -1)
             {
                 aKeys << enmOptions[i];
-                aValues << flags[i];
+                aValues << strValue;
             }
             else
             {
-                aValues[iIndex] = flags[i];
+                aValues[iIndex] = strValue;
             }
         }