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

Changed license template reading to use the global default encoding.

Browse Source 
Task-number: QTCREATORBUG-3039

Reviewed-by: con
This commit is contained in:
Erik Verbruggen
2010-11-11 11:00:40 +01:00
parent 79d6e943b0
commit a4cbd970e5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -45,6 +45,7 @@
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QDate> #include <QtCore/QDate>
#include <QtCore/QLocale> #include <QtCore/QLocale>
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
@@ -208,7 +209,13 @@ QString CppFileSettings::licenseTemplate(const QString &fileName, const QString
qWarning("Unable to open the license template %s: %s", qPrintable(path), qPrintable(file.errorString())); qWarning("Unable to open the license template %s: %s", qPrintable(path), qPrintable(file.errorString()));
return QString(); return QString();
} }
QString license = QString::fromUtf8(file.readAll());
QTextCodec *codec = Core::EditorManager::instance()->defaultTextEncoding();
QTextStream licenseStream(&file);
licenseStream.setCodec(codec);
licenseStream.setAutoDetectUnicode(true);
QString license = licenseStream.readAll();
parseLicenseTemplatePlaceholders(&license, fileName, className); parseLicenseTemplatePlaceholders(&license, fileName, className);
// Ensure exactly one additional new line separating stuff // Ensure exactly one additional new line separating stuff
const QChar newLine = QLatin1Char('\n'); const QChar newLine = QLatin1Char('\n');