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

Split CppCodeCompletion::startCompletion().

Browse Source
This commit is contained in:
Roberto Raggi
2010-01-11 13:47:15 +01:00
parent 7524d91651
commit 421f5323f1
2 changed files with 114 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ QT_END_NAMESPACE
namespace TextEditor {
class ITextEditor;
class BaseTextEditor;
}
namespace CppTools {
@@ -93,8 +94,8 @@ public:
private:
void addKeywords();
void addMacros(const CPlusPlus::LookupContext &context);
void addMacros_helper(const CPlusPlus::LookupContext &context,
void addMacros(const QString &fileName, const CPlusPlus::Snapshot &snapshot);
void addMacros_helper(const CPlusPlus::Snapshot &snapshot,
const QString &fileName,
QSet<QString> *processed,
QSet<QString> *definedMacros);
@@ -102,6 +103,10 @@ private:
bool completeInclude(const QTextCursor &cursor);
int globalCompletion(CPlusPlus::Symbol *lastVisibleSymbol,
CPlusPlus::Document::Ptr thisDocument,
const CPlusPlus::Snapshot &snapshot);
bool completeConstructorOrFunction(const QList<CPlusPlus::LookupItem> &,
const CPlusPlus::LookupContext &,
int endOfExpression, bool toolTipOnly);
@@ -135,6 +140,12 @@ private:
int findStartOfName(int pos = -1) const;
int startCompletionInternal(TextEditor::BaseTextEditor *edit,
const QString fileName,
unsigned line, unsigned column,
const QString &expression,
int endOfExpression);
private:
bool objcKeywordsWanted() const;