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

C++: change working-copy to work on UTF-8 encoded QByteArrays.

Browse Source 
These not only take less space than UTF-16 encoded QStrings, but due to
the caching in the CppEditorSupport also take less time to build.

This patch also fixes a number of possible encoding issues, where files
and constant strings were (falsely) assumed to be UTF-8.

Change-Id: Ib6f91c9a94ebed5b5dfbd4eb2998825c62c72784
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Erik Verbruggen
2013-08-19 15:47:51 +02:00
parent eebb1dfcf4
commit f7c68f6baf
24 changed files with 118 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,8 +53,8 @@ using namespace CppTools::Internal;
using namespace CppTools;
using namespace CPlusPlus;
static QString getSource(const QString &fileName,
const CppModelManagerInterface::WorkingCopy &workingCopy)
static QByteArray getSource(const QString &fileName,
const CppModelManagerInterface::WorkingCopy &workingCopy)
{
if (workingCopy.contains(fileName)) {
return workingCopy.source(fileName);
@@ -68,7 +68,7 @@ static QString getSource(const QString &fileName,
if (result != Utils::TextFileFormat::ReadSuccess)
qWarning() << "Could not read " << fileName << ". Error: " << error;
return fileContents;
return fileContents.toUtf8();
}
}
@@ -110,7 +110,7 @@ public:
return usages; // skip this document, it's not using symbolId.
}
Document::Ptr doc;
const QString unpreprocessedSource = getSource(fileName, workingCopy);
const QByteArray unpreprocessedSource = getSource(fileName, workingCopy);
if (symbolDocument && fileName == symbolDocument->fileName()) {
doc = symbolDocument;
@@ -124,7 +124,7 @@ public:
if (doc != symbolDocument)
doc->check();
FindUsages process(unpreprocessedSource.toUtf8(), doc, snapshot);
FindUsages process(unpreprocessedSource, doc, snapshot);
process(symbol);
usages = process.usages();
@@ -439,7 +439,7 @@ bool CppFindReferences::findSymbol(CppFindReferencesParameters *parameters,
Document::Ptr newSymbolDocument = snapshot.document(symbolFile);
// document is not parsed and has no bindings yet, do it
QString source = getSource(newSymbolDocument->fileName(), _modelManager->workingCopy());
QByteArray source = getSource(newSymbolDocument->fileName(), _modelManager->workingCopy());
Document::Ptr doc =
snapshot.preprocessedDocument(source, newSymbolDocument->fileName());
doc->check();
@@ -541,7 +541,7 @@ public:
{
QList<Usage> usages;
Document::Ptr doc = snapshot.document(fileName);
QString source;
QByteArray source;
restart_search:
if (future->isPaused())
@@ -566,8 +566,8 @@ restart_search:
if (macro.name() == useMacro.name()) {
unsigned lineStart;
const QString &lineSource = matchingLine(use.begin(), source, &lineStart);
usages.append(Usage(fileName, lineSource, use.beginLine(),
const QByteArray &lineSource = matchingLine(use.begin(), source, &lineStart);
usages.append(Usage(fileName, QString::fromUtf8(lineSource), use.beginLine(),
use.begin() - lineStart, useMacro.name().length()));
}
}
@@ -578,18 +578,18 @@ restart_search:
return usages;
}
static QString matchingLine(unsigned position, const QString &source,
unsigned *lineStart = 0)
static QByteArray matchingLine(unsigned position, const QByteArray &source,
unsigned *lineStart = 0)
{
int lineBegin = source.lastIndexOf(QLatin1Char('\n'), position) + 1;
int lineEnd = source.indexOf(QLatin1Char('\n'), position);
int lineBegin = source.lastIndexOf('\n', position) + 1;
int lineEnd = source.indexOf('\n', position);
if (lineEnd == -1)
lineEnd = source.length();
if (lineStart)
*lineStart = lineBegin;
const QString matchingLine = source.mid(lineBegin, lineEnd - lineBegin);
const QByteArray matchingLine = source.mid(lineBegin, lineEnd - lineBegin);
return matchingLine;
}
};
@@ -652,10 +652,11 @@ void CppFindReferences::findMacroUses(const Macro &macro, const QString &replace
// add the macro definition itself
{
const QString &source = getSource(macro.fileName(), workingCopy);
const QByteArray &source = getSource(macro.fileName(), workingCopy);
unsigned lineStart;
const QString line = FindMacroUsesInFile::matchingLine(macro.offset(), source, &lineStart);
search->addResult(macro.fileName(), macro.line(), line,
const QByteArray line = FindMacroUsesInFile::matchingLine(macro.offset(), source,
&lineStart);
search->addResult(macro.fileName(), macro.line(), QString::fromUtf8(line),
macro.offset() - lineStart, macro.name().length());
}