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

"Find Usages" and "Refactor" may decode error.

Browse Source 
Task-number: QTCREATORBUG-7204

Change-Id: I6ce82c701246ddac9cadcdd22ef994b0086ce8f7
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
raidsan
2012-04-14 13:29:03 +08:00
committed by Eike Ziller
parent 9de676ce03
commit 6b5bccd08e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cpptools/cppfindreferences.cpp
View File

@@ -65,6 +65,7 @@
#include <QDir>
#include <QApplication>
#include <utils/runextensions.h>
#include <utils/textfileformat.h>
#include <functional>
@@ -77,11 +78,16 @@ static QString getSource(const QString &fileName,
if (workingCopy.contains(fileName)) {
return workingCopy.source(fileName);
} else {
Utils::FileReader reader;
if (!reader.fetch(fileName, QFile::Text)) // ### FIXME error reporting
return QString();
QString fileContents;
Utils::TextFileFormat format;
QString error;
QTextCodec *defaultCodec = Core::EditorManager::instance()->defaultTextCodec();
Utils::TextFileFormat::ReadResult result = Utils::TextFileFormat::readFile(
fileName, defaultCodec, &fileContents, &format, &error);
if (result != Utils::TextFileFormat::ReadSuccess)
qWarning() << "Could not read " << fileName << ". Error: " << error;
return QString::fromLocal8Bit(reader.data()); // ### FIXME encoding
return fileContents;
}
}