CppEditor: Consider namespaces in "extract function" quickfix

Fixes: QTCREATORBUG-23256
Change-Id: I99b1271907767c3607e35adb49bd4109f3eca18c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index b52e7be493..24c43d24ca 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -3438,12 +3438,17 @@ public:
 
         // Write class qualification, if any.
         if (matchingClass) {
-            Class *current = matchingClass;
+            const Scope *current = matchingClass;
             QVector<const Name *> classes{matchingClass->name()};
             while (current->enclosingScope()->asClass()) {
                 current = current->enclosingScope()->asClass();
                 classes.prepend(current->name());
             }
+            while (current->enclosingScope() && current->enclosingScope()->asNamespace()) {
+                current = current->enclosingScope()->asNamespace();
+                if (current->name())
+                    classes.prepend(current->name());
+            }
             for (const Name *n : classes) {
                 const Name *name = rewriteName(n, &env, control);
                 funcDef.append(printer.prettyName(name));