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

Introduced Symbol::copy(otherSymbol) and removed some deprecated code.

Browse Source
This commit is contained in:
Roberto Raggi
2010-05-10 12:19:13 +02:00
parent 9a51f684ee
commit 139087ee5c
6 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1115,7 +1115,7 @@ bool CppCodeCompletion::completeMember(const QList<LookupItem> &baseResults,
classObjectCandidates.append(klass);
else if (NamedType *namedTy = ty->asNamedType()) {
if (ClassOrNamespace *b = context.classOrNamespace(namedTy->name(), r.lastVisibleSymbol()->scope())) {
if (ClassOrNamespace *b = context.classOrNamespace(namedTy->name(), r.lastVisibleSymbol())) {
classOrNamespace = b;
break;
@@ -1342,22 +1342,6 @@ void CppCodeCompletion::completeNamespace(ClassOrNamespace *b, const LookupConte
}
}
void CppCodeCompletion::completeNamespace(const QList<Symbol *> &candidates,
const DeprecatedLookupContext &deprecatedContext)
{
if (candidates.isEmpty())
return;
else if (Namespace *ns = candidates.first()->asNamespace()) {
LookupContext context(deprecatedContext.expressionDocument(),
deprecatedContext.thisDocument(),
deprecatedContext.snapshot());
if (ClassOrNamespace *binding = context.classOrNamespace(ns))
completeNamespace(binding, context);
}
}
void CppCodeCompletion::completeClass(ClassOrNamespace *b, const LookupContext &, bool staticLookup)
{
QSet<ClassOrNamespace *> bindingsVisited;
@@ -1405,23 +1389,6 @@ void CppCodeCompletion::completeClass(ClassOrNamespace *b, const LookupContext &
}
}
void CppCodeCompletion::completeClass(const QList<Symbol *> &candidates,
const DeprecatedLookupContext &deprecatedContext,
bool staticLookup)
{
if (candidates.isEmpty())
return;
else if (Symbol *klass = candidates.first()) {
LookupContext context(deprecatedContext.expressionDocument(),
deprecatedContext.thisDocument(),
deprecatedContext.snapshot());
if (ClassOrNamespace *binding = context.classOrNamespace(klass))
completeClass(binding, context, staticLookup);
}
}
bool CppCodeCompletion::completeQtMethod(const QList<LookupItem> &results,
const LookupContext &newContext,
bool wantSignals)

7
src/plugins/cpptools/cppcodecompletion.h
View File

@@ -126,17 +126,10 @@ private:
void completeNamespace(CPlusPlus::ClassOrNamespace *binding,
const CPlusPlus::LookupContext &context);
void completeNamespace(const QList<CPlusPlus::Symbol *> &candidates,
const CPlusPlus::DeprecatedLookupContext &context);
void completeClass(CPlusPlus::ClassOrNamespace *b,
const CPlusPlus::LookupContext &context,
bool staticLookup = true);
void completeClass(const QList<CPlusPlus::Symbol *> &candidates,
const CPlusPlus::DeprecatedLookupContext &context,
bool staticLookup = true);
bool completeConstructors(CPlusPlus::Class *klass);
bool completeQtMethod(const QList<CPlusPlus::LookupItem> &results,