diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-01 17:31:39 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-01 17:31:39 +0200 |
| commit | e426d08e54bd10b7513a3ced9cf9237b75b06b45 (patch) | |
| tree | b4f20c8d93877aa4ef6964ec8c700102def865d0 /src/plugins/cpptools/cppcompletionassist.h | |
| parent | 26e51ff633a8d3b60ec25fe875724cfe5e3f92df (diff) | |
| parent | ea1f5d2b6c896f9dc5791d981ab5a8630f4561f6 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/debugger/debuggerruncontrol.cpp
Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
Diffstat (limited to 'src/plugins/cpptools/cppcompletionassist.h')
| -rw-r--r-- | src/plugins/cpptools/cppcompletionassist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h index 14a9e9190c..809a5a1005 100644 --- a/src/plugins/cpptools/cppcompletionassist.h +++ b/src/plugins/cpptools/cppcompletionassist.h @@ -105,7 +105,7 @@ private: TextEditor::IAssistProposal *createHintProposal(QList<CPlusPlus::Function *> symbols) const; bool accepts() const; - int startOfOperator(int pos, unsigned *kind, bool wantFunctionCall) const; + int startOfOperator(int positionInDocument, unsigned *kind, bool wantFunctionCall) const; int findStartOfName(int pos = -1) const; int startCompletionHelper(); bool tryObjCCompletion(); |