diff options
author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-08-03 14:45:11 +0200 |
---|---|---|
committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-08-03 14:45:11 +0200 |
commit | d7164a01d1d83a7135d659518669b500f990f568 (patch) | |
tree | c8527ac810d4c3e48b923ecbf5265d03eb8ac8a0 /src/plugins/cpptools/cppcodecompletion.cpp | |
parent | a601035697ba47d628d0de81c6d287cbbe3d00f0 (diff) | |
download | qt-creator-d7164a01d1d83a7135d659518669b500f990f568.tar.gz |
Get rid of dangerous bool cast.
Diffstat (limited to 'src/plugins/cpptools/cppcodecompletion.cpp')
-rw-r--r-- | src/plugins/cpptools/cppcodecompletion.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index ec30ba5024..ba535a1218 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -152,7 +152,7 @@ public: TextEditor::CompletionItem previousItem = switchCompletionItem(0); Symbol *previousSymbol = switchSymbol(symbol); accept(symbol->identity()); - if (_item) + if (_item.isValid()) _item.data = QVariant::fromValue(symbol); (void) switchSymbol(previousSymbol); return switchCompletionItem(previousItem); @@ -1407,7 +1407,8 @@ void CppCodeCompletion::addMacros_helper(const Snapshot &snapshot, void CppCodeCompletion::addCompletionItem(Symbol *symbol) { ConvertToCompletionItem toCompletionItem(this); - if (TextEditor::CompletionItem item = toCompletionItem(symbol)) + TextEditor::CompletionItem item = toCompletionItem(symbol); + if (item.isValid()) m_completions.append(item); } @@ -1654,7 +1655,8 @@ bool CppCodeCompletion::completeQtMethod(const QList<LookupItem> &results, continue; else if (! wantSignals && ! fun->isSlot()) continue; - if (TextEditor::CompletionItem item = toCompletionItem(fun)) { + TextEditor::CompletionItem item = toCompletionItem(fun); + if (item.isValid()) { unsigned count = fun->argumentCount(); while (true) { TextEditor::CompletionItem ci = item; |