Fix multi line strings inside array arguments on the call details pane.

diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp
index 67fc955957805308f71fb8b9c0ac06c37933fe4e..807476295cb606a3da26d868e5ebeb46ca7f1cbc 100644 (file)
--- a/gui/apitracecall.cpp
+++ b/gui/apitracecall.cpp
@@ -129,10 +129,10 @@ apiVariantToString(const QVariant &variant, bool multiLine)
         return variant.value<ApiBitmask>().toString();
     }
     if (variant.canConvert<ApiStruct>()) {
-        return variant.value<ApiStruct>().toString();
+        return variant.value<ApiStruct>().toString(multiLine);
     }
     if (variant.canConvert<ApiArray>()) {
-        return variant.value<ApiArray>().toString();
+        return variant.value<ApiArray>().toString(multiLine);
     }
     if (variant.canConvert<ApiEnum>()) {
         return variant.value<ApiEnum>().toString();
@@ -353,7 +353,7 @@ ApiStruct::ApiStruct(const Trace::Struct *s)
     init(s);
 }
 
-QString ApiStruct::toString() const
+QString ApiStruct::toString(bool multiLine) const
 {
     QString str;
 
@@ -361,7 +361,7 @@ QString ApiStruct::toString() const
     for (unsigned i = 0; i < m_members.count(); ++i) {
         str += m_sig.memberNames[i] %
                QLatin1Literal(" = ") %
-               apiVariantToString(m_members[i]);
+               apiVariantToString(m_members[i], multiLine);
         if (i < m_members.count() - 1)
             str += QLatin1String(", ");
     }
@@ -400,13 +400,13 @@ QVector<QVariant> ApiArray::values() const
     return m_array;
 }
 
-QString ApiArray::toString() const
+QString ApiArray::toString(bool multiLine) const
 {
     QString str;
     str += QLatin1String("[");
     for(int i = 0; i < m_array.count(); ++i) {
         const QVariant &var = m_array[i];
-        str += apiVariantToString(var);
+        str += apiVariantToString(var, multiLine);
         if (i < m_array.count() - 1)
             str += QLatin1String(", ");
     }

diff --git a/gui/apitracecall.h b/gui/apitracecall.h
index 12b0216a6e6ee4763da8d915d4cabbbb12b42858..e9e8621b5342905335e5286e070a106d584977ac 100644 (file)
--- a/gui/apitracecall.h
+++ b/gui/apitracecall.h
@@ -124,7 +124,7 @@ public:
 
     ApiStruct(const Trace::Struct *s = 0);
 
-    QString toString() const;
+    QString toString(bool multiLine = false) const;
     Signature signature() const;
     QList<QVariant> values() const;
 
@@ -142,7 +142,7 @@ public:
     ApiArray(const Trace::Array *arr = 0);
     ApiArray(const QVector<QVariant> &vals);
 
-    QString toString() const;
+    QString toString(bool multiLine = false) const;
 
     QVector<QVariant> values() const;
 private: