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

Merge commit 'origin/1.3'

Browse Source 
Conflicts:
	src/plugins/cpptools/cppcodecompletion.h
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qmleditor/QmlEditor.pluginspec
This commit is contained in:
con
2009-10-26 13:51:56 +01:00
parent 4504aec7de 3c0ca8c188
commit 441ece365a
138 changed files with 4799 additions and 2432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,28 +149,26 @@ private:
int findStartOfName(int pos = -1) const;
QList<TextEditor::CompletionItem> m_completions;
private:
bool objcKeywordsWanted() const;
CppModelManager *m_manager;
TextEditor::ITextEditable *m_editor;
int m_startPosition; // Position of the cursor from which completion started
CppModelManager *m_manager;
Qt::CaseSensitivity m_caseSensitivity;
bool m_autoInsertBrackets;
bool m_partialCompletionEnabled;
bool m_forcedCompletion;
unsigned m_completionOperator;
bool m_objcEnabled;
CPlusPlus::Icons m_icons;
CPlusPlus::Overview overview;
CPlusPlus::TypeOfExpression typeOfExpression;
unsigned m_completionOperator;
QPointer<FunctionArgumentWidget> m_functionArgumentWidget;
bool objcKeywordsWanted() const;
bool m_objcEnabled;
QList<TextEditor::CompletionItem> m_completions;
};
} // namespace Internal