diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-27 20:20:02 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2012-11-28 11:11:47 +0100 |
commit | 5ea0937167024f0f777b3a7cf27728ae46897240 (patch) | |
tree | 0b95199af3991875ce0f3c8377cf86241e2c659f /src/libs/qmljs/qmljsreformatter.cpp | |
parent | 964c01a460323adb871682a66283816d5d826a05 (diff) | |
download | qt-creator-5ea0937167024f0f777b3a7cf27728ae46897240.tar.gz |
QmlJS: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I0c5654a978f47a4db5428936fd44633f21394830
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsreformatter.cpp')
-rw-r--r-- | src/libs/qmljs/qmljsreformatter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp index 0d763f9513..bc7b78ab61 100644 --- a/src/libs/qmljs/qmljsreformatter.cpp +++ b/src/libs/qmljs/qmljsreformatter.cpp @@ -131,7 +131,7 @@ public: } // ensure good ending - if (!_result.endsWith("\n\n") || !_line.isEmpty()) + if (!_result.endsWith(QLatin1String("\n\n")) || !_line.isEmpty()) newLine(); return _result; @@ -287,7 +287,7 @@ protected: while (startSpaces < line->size() && line->at(startSpaces).isSpace()) ++startSpaces; - line->replace(0, startSpaces, QString(indent, ' ')); + line->replace(0, startSpaces, QString(indent, QLatin1Char(' '))); for (int i = 0; i < splits->size(); ++i) { (*splits)[i].offset = splits->at(i).offset - startSpaces + indent; } @@ -313,7 +313,7 @@ protected: continue; // the extra space is to avoid // comments sticking to the 0 offset - QString indentLine = newContext.join("\n") + QLatin1String("\n ") + restLine; + QString indentLine = newContext.join(QLatin1String("\n")) + QLatin1String("\n ") + restLine; int indent = tryIndent(indentLine); QList<Split> newSplits = possibleSplits.mid(i + 1); @@ -511,7 +511,7 @@ protected: { out("import ", ast->importToken); if (!ast->fileName.isNull()) { - out(QString("\"%1\"").arg(ast->fileName.toString())); + out(QString::fromLatin1("\"%1\"").arg(ast->fileName.toString())); } else { accept(ast->importUri); } |