summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorLeandro Melo <leandro.melo@nokia.com>2012-01-12 17:53:56 +0100
committerLeandro Melo <leandro.melo@nokia.com>2012-01-13 11:22:28 +0100
commitc287d906043244874541afb94ae3a90b2990946e (patch)
tree31e448e4570f1cca485e8376e1b96d7c88a39bee /src/plugins
parent40810e759687beaaf813c6df456418b3795ca0e2 (diff)
downloadqt-creator-c287d906043244874541afb94ae3a90b2990946e.tar.gz
C++: Rename source/setSource to utf8Source/setUtf8Source
Continuinng a previous commit... This is in order to make the interface clearer. Change-Id: Ic1b05217f878578bc84a064927507b75981c47d6 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/cppeditor/cppchecksymbols.cpp4
-rw-r--r--src/plugins/cppeditor/cppfunctiondecldeflink.cpp4
-rw-r--r--src/plugins/cpptools/cppcodegen_test.cpp30
-rw-r--r--src/plugins/cpptools/cppcompletionassist.cpp2
-rw-r--r--src/plugins/cpptools/cppmodelmanager.cpp2
-rw-r--r--src/plugins/cpptools/doxygengenerator.cpp2
-rw-r--r--src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp10
-rw-r--r--src/plugins/qmljstools/qmljsmodelmanager.cpp2
8 files changed, 28 insertions, 28 deletions
diff --git a/src/plugins/cppeditor/cppchecksymbols.cpp b/src/plugins/cppeditor/cppchecksymbols.cpp
index e95adfb167..8b1deeac60 100644
--- a/src/plugins/cppeditor/cppchecksymbols.cpp
+++ b/src/plugins/cppeditor/cppchecksymbols.cpp
@@ -505,7 +505,7 @@ bool CheckSymbols::visit(MemberAccessAST *ast)
if (_potentialMembers.contains(id)) {
const Token start = tokenAt(ast->firstToken());
const Token end = tokenAt(ast->lastToken() - 1);
- const QByteArray expression = _doc->source().mid(start.begin(), end.end() - start.begin());
+ const QByteArray expression = _doc->utf8Source().mid(start.begin(), end.end() - start.begin());
const QList<LookupItem> candidates =
typeOfExpression(expression, enclosingScope(), TypeOfExpression::Preprocess);
@@ -568,7 +568,7 @@ QByteArray CheckSymbols::textOf(AST *ast) const
{
const Token start = tokenAt(ast->firstToken());
const Token end = tokenAt(ast->lastToken() - 1);
- const QByteArray text = _doc->source().mid(start.begin(), end.end() - start.begin());
+ const QByteArray text = _doc->utf8Source().mid(start.begin(), end.end() - start.begin());
return text;
}
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
index d6fb74bf5f..e1dae57f51 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
@@ -579,7 +579,7 @@ Utils::ChangeSet FunctionDeclDefLink::changes(const Snapshot &snapshot, int targ
QString::fromUtf8(typeOfExpression.preprocess(newDeclText.toUtf8()));
Document::Ptr newDeclDoc = Document::create(QLatin1String("<decl>"));
- newDeclDoc->setSource(newDeclTextPreprocessed.toUtf8());
+ newDeclDoc->setUtf8Source(newDeclTextPreprocessed.toUtf8());
newDeclDoc->parse(Document::ParseDeclaration);
newDeclDoc->check();
@@ -810,7 +810,7 @@ Utils::ChangeSet FunctionDeclDefLink::changes(const Snapshot &snapshot, int targ
// don't change the name if it's in a comment
if (hasCommentedName(targetFile->cppDocument()->translationUnit(),
- QLatin1String(targetFile->cppDocument()->source()),
+ QLatin1String(targetFile->cppDocument()->utf8Source()),
targetFunctionDeclarator, existingParamIndex))
replacementName = 0;
diff --git a/src/plugins/cpptools/cppcodegen_test.cpp b/src/plugins/cpptools/cppcodegen_test.cpp
index 3bbdaf1e30..df07ce5d2d 100644
--- a/src/plugins/cpptools/cppcodegen_test.cpp
+++ b/src/plugins/cpptools/cppcodegen_test.cpp
@@ -72,7 +72,7 @@ void CppToolsPlugin::test_codegen_public_in_empty_class()
"\n";
Document::Ptr doc = Document::create("public_in_empty_class");
- doc->setSource(src);
+ doc->setUtf8Source(src);
doc->parse();
doc->check();
@@ -112,7 +112,7 @@ void CppToolsPlugin::test_codegen_public_in_nonempty_class()
"\n";
Document::Ptr doc = Document::create("public_in_nonempty_class");
- doc->setSource(src);
+ doc->setUtf8Source(src);
doc->parse();
doc->check();
@@ -152,7 +152,7 @@ void CppToolsPlugin::test_codegen_public_before_protected()
"\n";
Document::Ptr doc = Document::create("public_before_protected");
- doc->setSource(src);
+ doc->setUtf8Source(src);
doc->parse();
doc->check();
@@ -193,7 +193,7 @@ void CppToolsPlugin::test_codegen_private_after_protected()
"\n";
Document::Ptr doc = Document::create("private_after_protected");
- doc->setSource(src);
+ doc->setUtf8Source(src);
doc->parse();
doc->check();
@@ -234,7 +234,7 @@ void CppToolsPlugin::test_codegen_protected_in_nonempty_class()
"\n";
Document::Ptr doc = Document::create("protected_in_nonempty_class");
- doc->setSource(src);
+ doc->setUtf8Source(src);
doc->parse();
doc->check();
@@ -275,7 +275,7 @@ void CppToolsPlugin::test_codegen_protected_between_public_and_private()
"\n";
Document::Ptr doc = Document::create("protected_betwee_public_and_private");
- doc->setSource(src);
+ doc->setUtf8Source(src);
doc->parse();
doc->check();
@@ -336,7 +336,7 @@ void CppToolsPlugin::test_codegen_qtdesigner_integration()
"#endif // MAINWINDOW_H\n";
Document::Ptr doc = Document::create("qtdesigner_integration");
- doc->setSource(src);
+ doc->setUtf8Source(src);
doc->parse();
doc->check();
@@ -380,7 +380,7 @@ void CppToolsPlugin::test_codegen_definition_empty_class()
Utils::FileSaver srcSaver(src->fileName());
srcSaver.write(srcText);
srcSaver.finalize();
- src->setSource(srcText);
+ src->setUtf8Source(srcText);
src->parse();
src->check();
QCOMPARE(src->diagnosticMessages().size(), 0);
@@ -390,7 +390,7 @@ void CppToolsPlugin::test_codegen_definition_empty_class()
Utils::FileSaver dstSaver(dst->fileName());
dstSaver.write(dstText);
dstSaver.finalize();
- dst->setSource(dstText);
+ dst->setUtf8Source(dstText);
dst->parse();
dst->check();
QCOMPARE(dst->diagnosticMessages().size(), 0);
@@ -448,7 +448,7 @@ void CppToolsPlugin::test_codegen_definition_first_member()
Utils::FileSaver srcSaver(src->fileName());
srcSaver.write(srcText);
srcSaver.finalize();
- src->setSource(srcText);
+ src->setUtf8Source(srcText);
src->parse();
src->check();
QCOMPARE(src->diagnosticMessages().size(), 0);
@@ -459,7 +459,7 @@ void CppToolsPlugin::test_codegen_definition_first_member()
Utils::FileSaver dstSaver(dst->fileName());
dstSaver.write(dstText);
dstSaver.finalize();
- dst->setSource(dstText);
+ dst->setUtf8Source(dstText);
dst->parse();
dst->check();
QCOMPARE(dst->diagnosticMessages().size(), 0);
@@ -517,7 +517,7 @@ void CppToolsPlugin::test_codegen_definition_last_member()
Utils::FileSaver srcSaver(src->fileName());
srcSaver.write(srcText);
srcSaver.finalize();
- src->setSource(srcText);
+ src->setUtf8Source(srcText);
src->parse();
src->check();
QCOMPARE(src->diagnosticMessages().size(), 0);
@@ -528,7 +528,7 @@ void CppToolsPlugin::test_codegen_definition_last_member()
Utils::FileSaver dstSaver(dst->fileName());
dstSaver.write(dstText);
dstSaver.finalize();
- dst->setSource(dstText);
+ dst->setUtf8Source(dstText);
dst->parse();
dst->check();
QCOMPARE(dst->diagnosticMessages().size(), 0);
@@ -592,7 +592,7 @@ void CppToolsPlugin::test_codegen_definition_middle_member()
Utils::FileSaver srcSaver(src->fileName());
srcSaver.write(srcText);
srcSaver.finalize();
- src->setSource(srcText);
+ src->setUtf8Source(srcText);
src->parse();
src->check();
QCOMPARE(src->diagnosticMessages().size(), 0);
@@ -603,7 +603,7 @@ void CppToolsPlugin::test_codegen_definition_middle_member()
Utils::FileSaver dstSaver(dst->fileName());
dstSaver.write(dstText);
dstSaver.finalize();
- dst->setSource(dstText);
+ dst->setUtf8Source(dstText);
dst->parse();
dst->check();
QCOMPARE(dst->diagnosticMessages().size(), 0);
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index ca17afe2ce..cd6e14be59 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -1844,7 +1844,7 @@ bool CppCompletionAssistProcessor::completeConstructorOrFunction(const QList<CPl
QString possibleDecl = bs.mid(lineStartToken).trimmed().append("();");
Document::Ptr doc = Document::create(QLatin1String("<completion>"));
- doc->setSource(possibleDecl.toLatin1());
+ doc->setUtf8Source(possibleDecl.toLatin1());
if (doc->parse(Document::ParseDeclaration)) {
doc->check();
if (SimpleDeclarationAST *sd = doc->translationUnit()->ast()->asSimpleDeclaration()) {
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 8e0b79cf3f..bf676e26e3 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -589,7 +589,7 @@ void CppPreprocessor::sourceNeeded(QString &fileName, IncludeType type, unsigned
const QByteArray preprocessedCode = preprocess(fileName, contents);
- doc->setSource(preprocessedCode);
+ doc->setUtf8Source(preprocessedCode);
doc->keepSourceAndAST();
doc->tokenize();
diff --git a/src/plugins/cpptools/doxygengenerator.cpp b/src/plugins/cpptools/doxygengenerator.cpp
index 8e3df8d6b8..9883ceb322 100644
--- a/src/plugins/cpptools/doxygengenerator.cpp
+++ b/src/plugins/cpptools/doxygengenerator.cpp
@@ -82,7 +82,7 @@ QString DoxygenGenerator::generate(QTextCursor cursor)
declCandidate.append(QLatin1Char('}'));
Document::Ptr doc = Document::create(QLatin1String("<doxygen>"));
- doc->setSource(declCandidate.toUtf8());
+ doc->setUtf8Source(declCandidate.toUtf8());
doc->parse(Document::ParseDeclaration);
doc->check(Document::FastCheck);
diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
index e266f76b11..fe7c95b5c4 100644
--- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
+++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
@@ -264,7 +264,7 @@ protected:
// and the expression
const Token begin = translationUnit()->tokenAt(typeId->firstToken());
const Token last = translationUnit()->tokenAt(typeId->lastToken() - 1);
- exportedType.typeExpression = _doc->source().mid(begin.begin(), last.end() - begin.begin());
+ exportedType.typeExpression = _doc->utf8Source().mid(begin.begin(), last.end() - begin.begin());
_exportedTypes += exportedType;
@@ -392,12 +392,12 @@ private:
{
const Token firstToken = translationUnit()->tokenAt(first);
const Token lastToken = translationUnit()->tokenAt(last);
- return _doc->source().mid(firstToken.begin(), lastToken.end() - firstToken.begin());
+ return _doc->utf8Source().mid(firstToken.begin(), lastToken.end() - firstToken.begin());
}
QString stringOf(const Token &token)
{
- return _doc->source().mid(token.begin(), token.length());
+ return _doc->utf8Source().mid(token.begin(), token.length());
}
ExpressionAST *skipStringCall(ExpressionAST *exp)
@@ -689,7 +689,7 @@ void FindExportedCppTypes::operator()(const CPlusPlus::Document::Ptr &document)
// this check only guards against some input errors, if document's source and AST has not
// been guarded properly the source and AST may still become empty/null while this function is running
- if (document->source().isEmpty()
+ if (document->utf8Source().isEmpty()
|| !document->translationUnit()->ast())
return;
@@ -710,7 +710,7 @@ void FindExportedCppTypes::operator()(const CPlusPlus::Document::Ptr &document)
// context properties need lookup inside function scope, and thus require a full check
Document::Ptr localDoc = document;
if (document->checkMode() != Document::FullCheck && !contextPropertyDescriptions.isEmpty()) {
- localDoc = m_snapshot.documentFromSource(document->source(), document->fileName());
+ localDoc = m_snapshot.documentFromSource(document->utf8Source(), document->fileName());
localDoc->check();
}
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index beb90c1ed2..19acd74606 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -710,7 +710,7 @@ void ModelManager::maybeQueueCppQmlTypeUpdate(const CPlusPlus::Document::Ptr &do
{
// avoid scanning documents without source code available
doc->keepSourceAndAST();
- if (doc->source().isEmpty()) {
+ if (doc->utf8Source().isEmpty()) {
doc->releaseSourceAndAST();
return;
}