feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix function extraction for nested classes

Browse Source 
If the function is added to a class inside a class, these must be
prepended before the inner class name.

Fixes: QTCREATORBUG-7271
Change-Id: I07042cdd4927af3b630c6ab1b5587971754e1199
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Eike Ziller
2018-10-02 13:02:08 +02:00
parent 7a7898e2c9
commit 049291504d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -3302,10 +3302,18 @@ public:
// Write class qualification, if any. // Write class qualification, if any.
if (matchingClass) { if (matchingClass) {
const Name *name = rewriteName(matchingClass->name(), &env, control); Class *current = matchingClass;
QVector<const Name *> classes{matchingClass->name()};
while (current->enclosingScope()->asClass()) {
current = current->enclosingScope()->asClass();
classes.prepend(current->name());
}
for (const Name *n : classes) {
const Name *name = rewriteName(n, &env, control);
funcDef.append(printer.prettyName(name)); funcDef.append(printer.prettyName(name));
funcDef.append(QLatin1String("::")); funcDef.append(QLatin1String("::"));
} }
}
// Write the extracted function itself and its call. // Write the extracted function itself and its call.
funcDef.append(funcName); funcDef.append(funcName);