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

Get rid of dangerous bool cast.

Browse Source
This commit is contained in:
Roberto Raggi
2010-08-03 14:45:11 +02:00
parent a601035697
commit d7164a01d1
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -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;