From a06c5ef1515822b5693e2be24060a77a049cf465 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 11 Nov 2013 22:11:14 +0200
Subject: [PATCH] CppEditor: Cleanup quickfixes

Change-Id: I19fb785372291f66b756cf5be1fc941870c304c3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
---
 src/plugins/cppeditor/cppquickfixes.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 9feaef149a6..0dcb161b8d4 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -158,10 +158,8 @@ InsertionLocation insertLocationForMethodDefinition(Symbol *symbol, const bool u
             = locator.methodDefinition(symbol, useSymbolFinder, fileName);
     for (int i = 0; i < list.count(); ++i) {
         InsertionLocation location = list.at(i);
-        if (location.isValid() && location.fileName() == fileName) {
+        if (location.isValid() && location.fileName() == fileName)
             return location;
-            break;
-        }
     }
 
     // ...failed,
@@ -4769,11 +4767,11 @@ public:
                     ? Qt::Checked : Qt::Unchecked;
             for (Scope::iterator it = clazz->firstMember(); it != clazz->lastMember(); ++it) {
                 if (const Function *func = (*it)->type()->asFunctionType()) {
-                    if (!func->isVirtual())
+                    // Filter virtual destructors
+                    if (func->name()->asDestructorNameId())
                         continue;
 
-                    // Filter virtual destructors
-                    if (printer.prettyName(func->name()).startsWith(QLatin1Char('~')))
+                    if (!func->isVirtual())
                         continue;
 
                     // Filter OQbject's
@@ -4917,16 +4915,12 @@ public:
             switch (spec) {
             case InsertionPointLocator::Private:
                 return InsertionPointLocator::PrivateSlot;
-                break;
             case InsertionPointLocator::Protected:
                 return InsertionPointLocator::ProtectedSlot;
-                break;
             case InsertionPointLocator::Public:
                 return InsertionPointLocator::PublicSlot;
-                break;
             default:
                 return spec;
-                break;
             }
         }
         return spec;