diff options
Diffstat (limited to 'src/plugins/cppeditor/cppinsertvirtualmethods.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cppinsertvirtualmethods.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp index f1293f2663..1564bc0da2 100644 --- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp +++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp @@ -278,7 +278,7 @@ class InsertVirtualMethodsModel : public QAbstractItemModel public: InsertVirtualMethodsModel(QObject *parent = 0) : QAbstractItemModel(parent) { - const TextEditor::FontSettings &fs = TextEditor::TextEditorSettings::fontSettings(); + const FontSettings &fs = TextEditorSettings::fontSettings(); formatReimpFunc = fs.formatFor(C_DISABLED_CODE); } @@ -509,7 +509,7 @@ public: QHash<const Function *, FunctionItem *> virtualFunctions; foreach (const Class *clazz, baseClasses) { ClassItem *itemBase = new ClassItem(printer.prettyName(clazz->name()), clazz); - for (Scope::iterator it = clazz->firstMember(); it != clazz->lastMember(); ++it) { + for (Scope::iterator it = clazz->memberBegin(); it != clazz->memberEnd(); ++it) { if (const Function *func = (*it)->type()->asFunctionType()) { // Filter virtual destructors if (func->name()->asDestructorNameId()) @@ -735,7 +735,7 @@ public: const QString accessSpecString = InsertionPointLocator::accessSpecToString(funcItem->accessSpec); if (accessSpecString != lastAccessSpecString) { - declaration = accessSpecString + declaration; + declaration = accessSpecString + QLatin1String(":\n") + declaration; if (!lastAccessSpecString.isEmpty()) // separate if not direct after the comment declaration = QLatin1String("\n") + declaration; lastAccessSpecString = accessSpecString; @@ -1406,16 +1406,7 @@ void CppEditorPlugin::test_quickfix_InsertVirtualMethods_data() "public:\n" " virtual int virtualFuncA() = 0;\n" "};\n" - ) << _( - "class BaseA {\n" - "public:\n" - " virtual int virtualFuncA();\n" - "};\n\n" - "class Derived : public Bas@eA {\n" - "public:\n" - " virtual int virtualFuncA() = 0;\n" - "};\n" - ); + ) << _(); // Check: One pure, one not QTest::newRow("Some_Pure") |