summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/cpptools')
-rw-r--r--src/plugins/cpptools/cppcodecompletion.cpp24
-rw-r--r--src/plugins/cpptools/cppcodecompletion.h16
-rw-r--r--src/plugins/cpptools/cppmodelmanager.cpp10
3 files changed, 25 insertions, 25 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index a01e63b18d..519dd69ed5 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -46,7 +46,7 @@
#include <TranslationUnit.h>
#include <cplusplus/ResolveExpression.h>
-#include <cplusplus/LookupContext.h>
+#include <cplusplus/DeprecatedLookupContext.h>
#include <cplusplus/MatchingText.h>
#include <cplusplus/Overview.h>
#include <cplusplus/ExpressionUnderCursor.h>
@@ -89,7 +89,7 @@ class FunctionArgumentWidget : public QLabel
public:
FunctionArgumentWidget();
void showFunctionHint(QList<Function *> functionSymbols,
- const LookupContext &context,
+ const DeprecatedLookupContext &context,
int startPosition);
protected:
@@ -117,7 +117,7 @@ private:
QLabel *m_numberLabel;
Utils::FakeToolTip *m_popupFrame;
QList<Function *> m_items;
- LookupContext m_context;
+ DeprecatedLookupContext m_context;
};
class ConvertToCompletionItem: protected NameVisitor
@@ -265,7 +265,7 @@ FunctionArgumentWidget::FunctionArgumentWidget():
}
void FunctionArgumentWidget::showFunctionHint(QList<Function *> functionSymbols,
- const LookupContext &context,
+ const DeprecatedLookupContext &context,
int startPosition)
{
Q_ASSERT(!functionSymbols.isEmpty());
@@ -798,7 +798,7 @@ int CppCodeCompletion::startCompletionInternal(TextEditor::BaseTextEditor *edit,
QList<LookupItem> results = typeOfExpression(expression, thisDocument, lastVisibleSymbol, TypeOfExpression::Preprocess);
- LookupContext context = typeOfExpression.lookupContext();
+ DeprecatedLookupContext context = typeOfExpression.lookupContext();
if (results.isEmpty()) {
if (m_completionOperator == T_SIGNAL || m_completionOperator == T_SLOT) {
@@ -894,7 +894,7 @@ int CppCodeCompletion::globalCompletion(Symbol *lastVisibleSymbol,
}
Document::Ptr exprDoc = Document::create(QLatin1String("<expression>"));
- const LookupContext context(lastVisibleSymbol, exprDoc, thisDocument, snapshot);
+ const DeprecatedLookupContext context(lastVisibleSymbol, exprDoc, thisDocument, snapshot);
const QList<Scope *> scopes = context.expand(context.visibleScopes());
foreach (Scope *scope, scopes) {
@@ -907,7 +907,7 @@ int CppCodeCompletion::globalCompletion(Symbol *lastVisibleSymbol,
}
bool CppCodeCompletion::completeConstructorOrFunction(const QList<LookupItem> &results,
- const LookupContext &context,
+ const DeprecatedLookupContext &context,
int endOfExpression, bool toolTipOnly)
{
QList<Function *> functions;
@@ -1101,7 +1101,7 @@ bool CppCodeCompletion::completeConstructorOrFunction(const QList<LookupItem> &r
}
bool CppCodeCompletion::completeMember(const QList<LookupItem> &baseResults,
- const LookupContext &context)
+ const DeprecatedLookupContext &context)
{
if (baseResults.isEmpty())
return false;
@@ -1149,7 +1149,7 @@ bool CppCodeCompletion::completeMember(const QList<LookupItem> &baseResults,
}
bool CppCodeCompletion::completeScope(const QList<LookupItem> &results,
- const LookupContext &context)
+ const DeprecatedLookupContext &context)
{
QList<Symbol *> classes, namespaces;
@@ -1296,7 +1296,7 @@ bool CppCodeCompletion::completeInclude(const QTextCursor &cursor)
}
void CppCodeCompletion::completeNamespace(const QList<Symbol *> &candidates,
- const LookupContext &context)
+ const DeprecatedLookupContext &context)
{
QList<Scope *> todo;
QList<Scope *> visibleScopes = context.visibleScopes();
@@ -1318,7 +1318,7 @@ void CppCodeCompletion::completeNamespace(const QList<Symbol *> &candidates,
}
void CppCodeCompletion::completeClass(const QList<Symbol *> &candidates,
- const LookupContext &context,
+ const DeprecatedLookupContext &context,
bool staticLookup)
{
if (candidates.isEmpty())
@@ -1351,7 +1351,7 @@ void CppCodeCompletion::completeClass(const QList<Symbol *> &candidates,
}
bool CppCodeCompletion::completeQtMethod(const QList<LookupItem> &results,
- const LookupContext &context,
+ const DeprecatedLookupContext &context,
bool wantSignals)
{
if (results.isEmpty())
diff --git a/src/plugins/cpptools/cppcodecompletion.h b/src/plugins/cpptools/cppcodecompletion.h
index b3c8402ee2..e7d171f6dc 100644
--- a/src/plugins/cpptools/cppcodecompletion.h
+++ b/src/plugins/cpptools/cppcodecompletion.h
@@ -107,34 +107,34 @@ private:
const CPlusPlus::Snapshot &snapshot);
bool completeConstructorOrFunction(const QList<CPlusPlus::LookupItem> &,
- const CPlusPlus::LookupContext &,
+ const CPlusPlus::DeprecatedLookupContext &,
int endOfExpression, bool toolTipOnly);
bool completeMember(const QList<CPlusPlus::LookupItem> &,
- const CPlusPlus::LookupContext &context);
+ const CPlusPlus::DeprecatedLookupContext &context);
bool completeScope(const QList<CPlusPlus::LookupItem> &,
- const CPlusPlus::LookupContext &context);
+ const CPlusPlus::DeprecatedLookupContext &context);
void completeNamespace(const QList<CPlusPlus::Symbol *> &candidates,
- const CPlusPlus::LookupContext &context);
+ const CPlusPlus::DeprecatedLookupContext &context);
void completeClass(const QList<CPlusPlus::Symbol *> &candidates,
- const CPlusPlus::LookupContext &context,
+ const CPlusPlus::DeprecatedLookupContext &context,
bool staticLookup = true);
bool completeConstructors(CPlusPlus::Class *klass);
bool completeQtMethod(const QList<CPlusPlus::LookupItem> &,
- const CPlusPlus::LookupContext &context,
+ const CPlusPlus::DeprecatedLookupContext &context,
bool wantSignals);
bool completeSignal(const QList<CPlusPlus::LookupItem> &results,
- const CPlusPlus::LookupContext &context)
+ const CPlusPlus::DeprecatedLookupContext &context)
{ return completeQtMethod(results, context, true); }
bool completeSlot(const QList<CPlusPlus::LookupItem> &results,
- const CPlusPlus::LookupContext &context)
+ const CPlusPlus::DeprecatedLookupContext &context)
{ return completeQtMethod(results, context, false); }
int findStartOfName(int pos = -1) const;
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 87ad8c3d21..e2119a5cb7 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -77,7 +77,7 @@
#include <Parser.h>
#include <Control.h>
-#include <cplusplus/LookupContext.h>
+#include <cplusplus/DeprecatedLookupContext.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
@@ -282,12 +282,12 @@ public:
_workingCopy(workingCopy)
{ }
- LookupContext lookupContext(unsigned line, unsigned column) const
+ DeprecatedLookupContext lookupContext(unsigned line, unsigned column) const
{ return lookupContext(_doc->findSymbolAt(line, column)); }
- LookupContext lookupContext(Symbol *symbol) const
+ DeprecatedLookupContext lookupContext(Symbol *symbol) const
{
- LookupContext context(symbol, Document::create(QLatin1String("<none>")), _doc, _snapshot);
+ DeprecatedLookupContext context(symbol, Document::create(QLatin1String("<none>")), _doc, _snapshot);
return context;
}
@@ -825,7 +825,7 @@ QList<int> CppModelManager::references(CPlusPlus::Symbol *symbol,
const CPlusPlus::Snapshot &snapshot)
{
NamespaceBindingPtr glo = bind(doc, snapshot);
- return m_findReferences->references(LookupContext::canonicalSymbol(symbol, glo.data()), doc, snapshot);
+ return m_findReferences->references(DeprecatedLookupContext::canonicalSymbol(symbol, glo.data()), doc, snapshot);
}
void CppModelManager::findUsages(CPlusPlus::Document::Ptr symbolDocument, CPlusPlus::Symbol *symbol)
View Lorry Controller Status