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

CppEditor: Remove final functions from virtuals tree

Browse Source 
Change-Id: I2daad43539927e012af23b19dbca00f3aaa644e2
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Orgad Shaneh
2014-01-28 20:30:06 +02:00
committed by Orgad Shaneh
parent d89d26ab4d
commit fd31b4716c
1 changed files with 115 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/plugins/cppeditor/cppinsertvirtualmethods.cpp
View File

@@ -41,6 +41,7 @@
#include <cplusplus/CppRewriter.h>
#include <cplusplus/Overview.h>
#include <utils/changeset.h>
#include <utils/qtcassert.h>
#include <QCheckBox>
#include <QComboBox>
@@ -161,6 +162,7 @@ public:
QString description() const { return name; }
Qt::ItemFlags flags() const;
Qt::CheckState checkState() const;
void removeFunction(int row);
const Class *klass;
const QString name;
@@ -222,6 +224,15 @@ Qt::CheckState ClassItem::checkState() const
return state;
}
void ClassItem::removeFunction(int row)
{
QTC_ASSERT(row >= 0 && row < functions.count(), return);
functions.removeAt(row);
// Update row number for all the following functions
for (int r = row, total = functions.count(); r < total; ++r)
functions[r]->row = r;
}
FunctionItem::FunctionItem(const Function *func, const QString &functionName, ClassItem *parent) :
InsertVirtualMethodsItem(parent),
function(func),
@@ -316,6 +327,14 @@ public:
endInsertRows();
}
void removeFunction(FunctionItem *funcItem)
{
ClassItem *classItem = static_cast<ClassItem *>(funcItem->parent());
beginRemoveRows(createIndex(classItem->row, 0, classItem), funcItem->row, funcItem->row);
classItem->removeFunction(funcItem->row);
endRemoveRows();
}
QVariant data(const QModelIndex &index, int role) const
{
if (!index.isValid())
@@ -494,6 +513,18 @@ public:
if (!isVirtual)
continue;
if (func->isFinal()) {
if (FunctionItem *first = virtualFunctions[firstVirtual]) {
FunctionItem *next = 0;
for (FunctionItem *removed = first; next != first; removed = next) {
next = removed->nextOverride;
m_factory->classFunctionModel->removeFunction(removed);
delete removed;
};
virtualFunctions.remove(firstVirtual);
}
continue;
}
// Filter OQbject's
// - virtual const QMetaObject *metaObject() const;
// - virtual void *qt_metacast(const char *);
@@ -1506,6 +1537,90 @@ void CppEditorPlugin::test_quickfix_InsertVirtualMethods_data()
" virtual int c();\n"
"};\n"
);
// Check: Remove final function
QTest::newRow("final_function_removed")
<< InsertVirtualMethodsDialog::ModeOnlyDeclarations << true << _(
"class BaseA {\n"
"public:\n"
" virtual int a() = 0;\n"
" virtual int b() = 0;\n"
"};\n\n"
"class BaseB : public BaseA {\n"
"public:\n"
" virtual int a() final = 0;\n"
"};\n\n"
"class Der@ived : public BaseB {\n"
"};"
) << _(
"class BaseA {\n"
"public:\n"
" virtual int a() = 0;\n"
" virtual int b() = 0;\n"
"};\n\n"
"class BaseB : public BaseA {\n"
"public:\n"
" virtual int a() final = 0;\n"
"};\n\n"
"class Der@ived : public BaseB {\n"
"\n"
" // BaseA interface\n"
"public:\n"
" virtual int b();\n"
"};\n"
);
// Check: Remove multiple final functions
QTest::newRow("multiple_final_functions_removed")
<< InsertVirtualMethodsDialog::ModeOnlyDeclarations << true << _(
"class BaseA {\n"
"public:\n"
" virtual int a() = 0;\n"
" virtual int b() = 0;\n"
"};\n\n"
"class BaseB : public BaseA {\n"
"public:\n"
" virtual int a() = 0;\n"
" virtual int c() = 0;\n"
"};\n\n"
"class BaseC : public BaseB {\n"
"public:\n"
" virtual int a() final = 0;\n"
" virtual int d() = 0;\n"
"};\n\n"
"class Der@ived : public BaseC {\n"
"};"
) << _(
"class BaseA {\n"
"public:\n"
" virtual int a() = 0;\n"
" virtual int b() = 0;\n"
"};\n\n"
"class BaseB : public BaseA {\n"
"public:\n"
" virtual int a() = 0;\n"
" virtual int c() = 0;\n"
"};\n\n"
"class BaseC : public BaseB {\n"
"public:\n"
" virtual int a() final = 0;\n"
" virtual int d() = 0;\n"
"};\n\n"
"class Der@ived : public BaseC {\n"
"\n"
" // BaseA interface\n"
"public:\n"
" virtual int b();\n"
"\n"
" // BaseB interface\n"
"public:\n"
" virtual int c();\n"
"\n"
" // BaseC interface\n"
"public:\n"
" virtual int d();\n"
"};\n"
);
}
void CppEditorPlugin::test_quickfix_InsertVirtualMethods()