From 652454a8324ce60f2b23a06eb74c38bd4afcfde3 Mon Sep 17 00:00:00 2001 From: Tobias Hunger <tobias.hunger@nokia.com> Date: Tue, 31 May 2011 15:53:35 +0000 Subject: [PATCH] encoding: Make sure all text files are utf8 encoded Change-Id: Ib83224b24026c29158e8df8fa235cf5050390555 Reviewed-on: http://codereview.qt.nokia.com/281 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> --- doc/api/qtcreator-ui-text.qdoc | 2 +- doc/pluginhowto/editor-type.qdoc | 4 ++-- doc/pluginhowto/project-file-wizard.qdoc | 2 +- src/plugins/projectexplorer/gccparser.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/api/qtcreator-ui-text.qdoc b/doc/api/qtcreator-ui-text.qdoc index 838139a7a8c..0d6d3497be2 100644 --- a/doc/api/qtcreator-ui-text.qdoc +++ b/doc/api/qtcreator-ui-text.qdoc @@ -236,7 +236,7 @@ \o Different languages have different word order rules. Do not use run-time concatenation. Use complete phrases - and “%1” formatting instead. For example, use: + and "%1" formatting instead. For example, use: \c{tr("Foo failed: %1").arg(message)} diff --git a/doc/pluginhowto/editor-type.qdoc b/doc/pluginhowto/editor-type.qdoc index d877d39bf27..e3f600bc0a1 100644 --- a/doc/pluginhowto/editor-type.qdoc +++ b/doc/pluginhowto/editor-type.qdoc @@ -34,7 +34,7 @@ \section2 10.1.1 The Core::IFile interface This interface abstracts file operations from the user-interface point of view. It provides virtual methods to load and - save files, given a file name. It also helps in understanding the mime-type of file and value of certain flags like “modified” + save files, given a file name. It also helps in understanding the mime-type of file and value of certain flags like "modified" and "read-only". The \bold{Core::IFile} interface is declared as follows in src/plugins/coreplugin/ifile.h \code @@ -77,7 +77,7 @@ actual disk-file contents have not been modified. \bold {QFile} emits the \bold {bytesWritten()} signal only when the disk-file contents have been modified. - \o \bold {IFile} has to handle how a modified file, on the disk, is reloaded. \bold {QFile} on the other-hand doesn’t need to + \o \bold {IFile} has to handle how a modified file, on the disk, is reloaded. \bold {QFile} on the other-hand doesn't need to handle this. \endlist diff --git a/doc/pluginhowto/project-file-wizard.qdoc b/doc/pluginhowto/project-file-wizard.qdoc index 69c663df8ac..621fd6ea475 100644 --- a/doc/pluginhowto/project-file-wizard.qdoc +++ b/doc/pluginhowto/project-file-wizard.qdoc @@ -480,7 +480,7 @@ } \endcode - The \bold{readFile()} method is implemented to read a file and return its contents as a string. Before returning the file’s + The \bold{readFile()} method is implemented to read a file and return its contents as a string. Before returning the file's contents as string, the function uses the replacement table passed as second parameter to fix the string. \code diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp index b276e07f26a..d044b848ef8 100644 --- a/src/plugins/projectexplorer/gccparser.cpp +++ b/src/plugins/projectexplorer/gccparser.cpp @@ -623,17 +623,17 @@ void ProjectExplorerPlugin::testGccOutputParsers_data() << QString(); QTest::newRow("enumeration warning") - << QString::fromLatin1("../../../src/shared/proparser/profileevaluator.cpp: In member function ‘ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateConditionalFunction(const ProString&, const ProStringList&)’:\n" - "../../../src/shared/proparser/profileevaluator.cpp:2817:9: warning: case value ‘0’ not in enumerated type ‘ProFileEvaluator::Private::TestFunc’") + << QString::fromLatin1("../../../src/shared/proparser/profileevaluator.cpp: In member function 'ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateConditionalFunction(const ProString&, const ProStringList&)':\n" + "../../../src/shared/proparser/profileevaluator.cpp:2817:9: warning: case value '0' not in enumerated type ‘ProFileEvaluator::Private::TestFunc’") << OutputParserTester::STDERR << QString() << QString() << ( QList<ProjectExplorer::Task>() << Task(Task::Unknown, - QLatin1String("In member function ‘ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateConditionalFunction(const ProString&, const ProStringList&)’:"), + QLatin1String("In member function 'ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateConditionalFunction(const ProString&, const ProStringList&)':"), QLatin1String("../../../src/shared/proparser/profileevaluator.cpp"), -1, Constants::TASK_CATEGORY_COMPILE) << Task(Task::Warning, - QLatin1String("case value ‘0’ not in enumerated type ‘ProFileEvaluator::Private::TestFunc’"), + QLatin1String("case value '0' not in enumerated type ‘ProFileEvaluator::Private::TestFunc’"), QLatin1String("../../../src/shared/proparser/profileevaluator.cpp"), 2817, Constants::TASK_CATEGORY_COMPILE)) << QString(); -- GitLab