diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 2faf2084fbe..2049d6a7811 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -1006,8 +1006,7 @@ void CPPEditorWidget::updateOutlineIndex()
 }
 
 void CPPEditorWidget::highlightUses(const QList<SemanticInfo::Use> &uses,
-                              const SemanticInfo &semanticInfo,
-                              QList<QTextEdit::ExtraSelection> *selections)
+                                    QList<QTextEdit::ExtraSelection> *selections)
 {
     bool isUnused = false;
 
@@ -1031,14 +1030,6 @@ void CPPEditorWidget::highlightUses(const QList<SemanticInfo::Use> &uses,
         sel.cursor.setPosition(anchor);
         sel.cursor.setPosition(position, QTextCursor::KeepAnchor);
 
-        if (isUnused) {
-            if (semanticInfo.hasQ && sel.cursor.selectedText() == QLatin1String("q"))
-                continue; // skip q
-
-            else if (semanticInfo.hasD && sel.cursor.selectedText() == QLatin1String("d"))
-                continue; // skip d
-        }
-
         selections->append(sel);
     }
 }
@@ -1965,10 +1956,10 @@ void CPPEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo)
         if (uses.size() == 1) {
             if (!CppTools::isOwnershipRAIIType(it.key(), context)) {
                 // it's an unused declaration
-                highlightUses(uses, semanticInfo, &unusedSelections);
+                highlightUses(uses, &unusedSelections);
             }
         } else if (good && m_renameSelections.isEmpty()) {
-            highlightUses(uses, semanticInfo, &m_renameSelections);
+            highlightUses(uses, &m_renameSelections);
         }
     }
 
@@ -2228,8 +2219,6 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
         const LocalSymbols useTable(semanticInfo.doc, currentFunctionDefinition);
         semanticInfo.revision = source.revision;
         semanticInfo.localUses = useTable.uses;
-        semanticInfo.hasQ = useTable.hasQ;
-        semanticInfo.hasD = useTable.hasD;
     }
 
     return semanticInfo;
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index d471f7a425b..3c3064f0528 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -262,7 +262,6 @@ private:
     SemanticHighlighter::Source currentSource(bool force = false);
 
     void highlightUses(const QList<TextEditor::SemanticHighlighter::Result> &uses,
-                       const CppTools::SemanticInfo &semanticInfo,
                        QList<QTextEdit::ExtraSelection> *selections);
 
     void createToolBar(CPPEditor *editable);
diff --git a/src/plugins/cpptools/cpplocalsymbols.cpp b/src/plugins/cpptools/cpplocalsymbols.cpp
index 18b1ce59746..8b682b382ea 100644
--- a/src/plugins/cpptools/cpplocalsymbols.cpp
+++ b/src/plugins/cpptools/cpplocalsymbols.cpp
@@ -51,13 +51,11 @@ class FindLocalSymbols: protected ASTVisitor
 
 public:
     FindLocalSymbols(Document::Ptr doc)
-        : ASTVisitor(doc->translationUnit()), _doc(doc), hasD(false), hasQ(false)
+        : ASTVisitor(doc->translationUnit()), _doc(doc)
     { }
 
     // local and external uses.
     SemanticInfo::LocalUseMap localUses;
-    bool hasD;
-    bool hasQ;
 
     void operator()(DeclarationAST *ast)
     {
@@ -169,16 +167,6 @@ protected:
         return true;
     }
 
-    virtual bool visit(QtMemberDeclarationAST *ast)
-    {
-        if (tokenKind(ast->q_token) == T_Q_D)
-            hasD = true;
-        else
-            hasQ = true;
-
-        return true;
-    }
-
     virtual bool visit(FunctionDefinitionAST *ast)
     {
         if (ast->symbol)
@@ -313,7 +301,5 @@ LocalSymbols::LocalSymbols(CPlusPlus::Document::Ptr doc, CPlusPlus::DeclarationA
 {
     FindLocalSymbols findLocalSymbols(doc);
     findLocalSymbols(ast);
-    hasD = findLocalSymbols.hasD;
-    hasQ = findLocalSymbols.hasQ;
     uses = findLocalSymbols.localUses;
 }
diff --git a/src/plugins/cpptools/cpplocalsymbols.h b/src/plugins/cpptools/cpplocalsymbols.h
index fdcc9dd6010..80e4f73fa67 100644
--- a/src/plugins/cpptools/cpplocalsymbols.h
+++ b/src/plugins/cpptools/cpplocalsymbols.h
@@ -45,8 +45,6 @@ class CPPTOOLS_EXPORT LocalSymbols
 public:
     LocalSymbols(CPlusPlus::Document::Ptr doc, CPlusPlus::DeclarationAST *ast);
 
-    bool hasD;
-    bool hasQ;
     SemanticInfo::LocalUseMap uses;
 };
 
diff --git a/src/plugins/cpptools/cppsemanticinfo.cpp b/src/plugins/cpptools/cppsemanticinfo.cpp
index 1a335037b0a..3484ab437d7 100644
--- a/src/plugins/cpptools/cppsemanticinfo.cpp
+++ b/src/plugins/cpptools/cppsemanticinfo.cpp
@@ -32,6 +32,6 @@
 using namespace CppTools;
 
 SemanticInfo::SemanticInfo()
-    : revision(0), hasQ(false), hasD(false), forced(false)
+    : revision(0), forced(false)
 {
 }
diff --git a/src/plugins/cpptools/cppsemanticinfo.h b/src/plugins/cpptools/cppsemanticinfo.h
index 075902a8bb8..69a32e578cd 100644
--- a/src/plugins/cpptools/cppsemanticinfo.h
+++ b/src/plugins/cpptools/cppsemanticinfo.h
@@ -62,8 +62,6 @@ public:
     SemanticInfo();
 
     unsigned revision;
-    bool hasQ: 1;
-    bool hasD: 1;
     bool forced: 1;
     CPlusPlus::Snapshot snapshot;
     CPlusPlus::Document::Ptr doc;