feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixed string escaping when writing QML properties.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-03-05 15:24:38 +01:00
parent b59442e072
commit 72ea71aacf
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/core/model/qmltextgenerator.cpp
View File

@@ -97,7 +97,7 @@ QString QmlTextGenerator::toQml(const AbstractProperty &property, int indentDept
return stringValue; return stringValue;
default: default:
return QString(QLatin1String("\"%1\"")).arg(stringValue); return QString(QLatin1String("\"%1\"")).arg(escape(stringValue));
} }
} else { } else {
Q_ASSERT("Unknown property type"); Q_ASSERT("Unknown property type");
@@ -176,3 +176,16 @@ QString QmlTextGenerator::propertyToQml(const AbstractProperty &property, int in
return result; return result;
} }
QString QmlTextGenerator::escape(const QString &value)
{
QString result = value;
result.replace(QLatin1String("\\"), QLatin1String("\\\\"));
result.replace(QLatin1String("\""), QLatin1String("\\\""));
result.replace(QLatin1String("\t"), QLatin1String("\\\t"));
result.replace(QLatin1String("\r"), QLatin1String("\\\r"));
result.replace(QLatin1String("\n"), QLatin1String("\\\n"));
return result;
}

2
src/plugins/qmldesigner/core/model/qmltextgenerator.h
View File

@@ -56,6 +56,8 @@ private:
QString propertiesToQml(const ModelNode &node, int indentDepth) const; QString propertiesToQml(const ModelNode &node, int indentDepth) const;
QString propertyToQml(const AbstractProperty &property, int indentDepth) const; QString propertyToQml(const AbstractProperty &property, int indentDepth) const;
static QString escape(const QString &value);
private: private:
QStringList m_propertyOrder; QStringList m_propertyOrder;
int m_indentDepth; int m_indentDepth;