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

ExtraCompiler: Store contents as Utf8

Browse Source 
Avoid conversions when they're not needed.

Change-Id: I7e996bc6e87be4327d75f0d743ff2de38d6ccc32
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-02-17 23:41:22 +02:00
committed by Orgad Shaneh
parent 97414e654b
commit 8b0d849a27
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/extracompiler.cpp
View File

@@ -52,7 +52,7 @@ public:
const Project *project;
Utils::FileName source;
Utils::FileNameList targets;
QVector<QString> contents;
QVector<QByteArray> contents;
QList<Task> issues;
QDateTime compileTime;
Core::IEditor *lastEditor = 0;
@@ -117,7 +117,7 @@ ExtraCompiler::ExtraCompiler(const Project *project, const Utils::FileName &sour
QFile file(target.toString());
if (file.open(QFile::ReadOnly | QFile::Text))
setContent(target, QTextStream(&file).readAll());
setContent(target, file.readAll());
}
if (d->dirty) {
@@ -146,13 +146,13 @@ Utils::FileName ExtraCompiler::source() const
return d->source;
}
QString ExtraCompiler::content(const Utils::FileName &file) const
QByteArray ExtraCompiler::content(const Utils::FileName &file) const
{
for (int i = 0; i < d->targets.length(); ++i) {
if (d->targets[i] == file)
return d->contents[i];
}
return QString();
return QByteArray();
}
Utils::FileNameList ExtraCompiler::targets() const
@@ -190,9 +190,8 @@ void ExtraCompiler::onTargetsBuilt(Project *project)
QFile file(target.toString());
if (file.open(QFile::ReadOnly | QFile::Text)) {
QTextStream stream(&file);
d->compileTime = generateTime;
setContent(target, stream.readAll());
setContent(target, file.readAll());
}
}
}
@@ -334,7 +333,7 @@ void ExtraCompilerPrivate::updateIssues()
widget->setExtraSelections(TextEditor::TextEditorWidget::CodeWarningsSelection, selections);
}
void ExtraCompiler::setContent(const Utils::FileName &file, const QString &contents)
void ExtraCompiler::setContent(const Utils::FileName &file, const QByteArray &contents)
{
for (int i = 0; i < d->targets.length(); ++i) {
if (d->targets[i] == file) {