CppEditor: Prevent "Add Declaration" for existing template functions

class Foo
{
    template<class T>
    void func();
};

template<class T>
void Foo::func() {} // Add Declaration should not be triggered at all

Change-Id: Ifff733d8381177300dae017ae419200cfdf5c425
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 11 insertions, 1 deletions

diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index f65f1b6a57..371ec66f8e 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -2465,7 +2465,17 @@ void InsertDeclFromDef::match(const CppQuickFixInterface &interface, QuickFixOpe
     Function *fun = funDef->symbol;
     if (Class *matchingClass = isMemberFunction(interface.context(), fun)) {
         const QualifiedNameId *qName = fun->name()->asQualifiedNameId();
-        for (Symbol *s = matchingClass->find(qName->identifier()); s; s = s->next()) {
+        for (Symbol *symbol = matchingClass->find(qName->identifier());
+             symbol; symbol = symbol->next()) {
+            Symbol *s = symbol;
+            if (fun->enclosingScope()->isTemplate()) {
+                if (const Template *templ = s->type()->asTemplateType()) {
+                    if (Symbol *decl = templ->declaration()) {
+                        if (decl->type()->isFunctionType())
+                            s = decl;
+                    }
+                }
+            }
             if (!s->name()
                     || !qName->identifier()->match(s->identifier())
                     || !s->type()->isFunctionType())