From a596a9edffb8e74b3e7b6a756a83c5170aa175ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Tue, 27 Sep 2011 10:19:28 +0100 Subject: [PATCH] Fix multi line strings inside array arguments on the call details pane. --- gui/apitracecall.cpp | 12 ++++++------ gui/apitracecall.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp index 67fc955..8074762 100644 --- a/gui/apitracecall.cpp +++ b/gui/apitracecall.cpp @@ -129,10 +129,10 @@ apiVariantToString(const QVariant &variant, bool multiLine) return variant.value().toString(); } if (variant.canConvert()) { - return variant.value().toString(); + return variant.value().toString(multiLine); } if (variant.canConvert()) { - return variant.value().toString(); + return variant.value().toString(multiLine); } if (variant.canConvert()) { return variant.value().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 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 12b0216..e9e8621 100644 --- 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 values() const; @@ -142,7 +142,7 @@ public: ApiArray(const Trace::Array *arr = 0); ApiArray(const QVector &vals); - QString toString() const; + QString toString(bool multiLine = false) const; QVector values() const; private: -- 2.43.0