diff options
| author | hjk <qtc-committer@nokia.com> | 2009-01-13 18:15:52 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-01-13 18:15:52 +0100 |
| commit | 0ec5f9544f4989826aa0028b81421800839c900c (patch) | |
| tree | c4aa0797808b3cbf045242126a04715552de25cc /src | |
| parent | 1bb1589225cd8d849458dd44c198a7a60a7fa45b (diff) | |
| parent | 71ef39629c10528822e0d87bdced064fc79b3cd0 (diff) | |
| download | qt-creator-0ec5f9544f4989826aa0028b81421800839c900c.tar.gz | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/cpptools/cppcodecompletion.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index a3759c7c95..8fb0d00ae2 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -916,7 +916,7 @@ bool CppCodeCompletion::completeQtMethod(CPlusPlus::FullySpecifiedType, if (TextEditor::CompletionItem item = toCompletionItem(fun)) { unsigned count = fun->argumentCount(); while (true) { - TextEditor::CompletionItem i = item; + TextEditor::CompletionItem ci = item; QString signature; signature += overview.prettyName(fun->name()); @@ -937,8 +937,8 @@ bool CppCodeCompletion::completeQtMethod(CPlusPlus::FullySpecifiedType, if (! signatures.contains(signature)) { signatures.insert(signature); - i.m_text = signature; // fix the completion item. - m_completions.append(i); + ci.m_text = signature; // fix the completion item. + m_completions.append(ci); } if (count && fun->argumentAt(count - 1)->asArgument()->hasInitializer()) |