From d7164a01d1d83a7135d659518669b500f990f568 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 3 Aug 2010 14:45:11 +0200
Subject: [PATCH] Get rid of dangerous bool cast.

---
 src/plugins/cpptools/cppcodecompletion.cpp    | 8 +++++---
 src/plugins/texteditor/icompletioncollector.h | 3 ---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index ec30ba5024f..ba535a1218f 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;
diff --git a/src/plugins/texteditor/icompletioncollector.h b/src/plugins/texteditor/icompletioncollector.h
index dc8549635b7..d62f01557b5 100644
--- a/src/plugins/texteditor/icompletioncollector.h
+++ b/src/plugins/texteditor/icompletioncollector.h
@@ -58,9 +58,6 @@ struct CompletionItem
     bool isValid() const
     { return collector != 0; }
 
-    operator bool() const
-    { return collector != 0; }
-
     QString text;
     QString details;
     QIcon icon;