aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor/tests
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-12-08 14:26:45 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-12-21 17:18:26 +0000
commit7a8c4226bfccfdc27e32213671cd75ea27945abf (patch)
tree19e518cec384ad191446096592e1f95cb060693b /sources/shiboken2/ApiExtractor/tests
parentb1b1ffcdff68f8e2c46608a3f3b10607c97d5dd1 (diff)
shiboken: Remove unused code in abstractmetalang.h
The AbstractMeta* classes had a lot of functions trying to determine whether wrapper functions/classes should be generated. Apparently at some stage, this functionality was moved to the generator classes (apparently in conjunction with the "protected hack"), leaving the functions unused. Change-Id: Ia3fef96fe86cc6a6f9c70c674635bccf510362bc Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/tests')
-rw-r--r--sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp33
1 files changed, 24 insertions, 9 deletions
diff --git a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp b/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp
index f67d8c9b2..9acbba675 100644
--- a/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp
+++ b/sources/shiboken2/ApiExtractor/tests/testabstractmetaclass.cpp
@@ -86,6 +86,17 @@ void TestAbstractMetaClass::testClassNameUnderNamespace()
// QVERIFY(classes[0]->hasNonPrivateConstructor());
}
+static AbstractMetaFunctionList virtualFunctions(const AbstractMetaClass *c)
+{
+ AbstractMetaFunctionList result;
+ const AbstractMetaFunctionList &functions = c->functions();
+ for (AbstractMetaFunction *f : functions) {
+ if (f->isVirtual())
+ result.append(f);
+ }
+ return result;
+}
+
void TestAbstractMetaClass::testVirtualMethods()
{
const char cppCode[] =R"CPP(
@@ -150,15 +161,19 @@ public:
QCOMPARE(ctorA->ownerClass(), a);
QCOMPARE(ctorA->declaringClass(), a);
- QCOMPARE(a->virtualFunctions().size(), 1); // Add a pureVirtualMethods method !?
- QCOMPARE(b->virtualFunctions().size(), 1);
- QCOMPARE(c->virtualFunctions().size(), 1);
- QCOMPARE(f->virtualFunctions().size(), 1);
-
- AbstractMetaFunction* funcA = a->virtualFunctions().first();
- AbstractMetaFunction* funcB = b->virtualFunctions().first();
- AbstractMetaFunction* funcC = c->virtualFunctions().first();
- const AbstractMetaFunction* funcF = f->virtualFunctions().constFirst();
+ const AbstractMetaFunctionList virtualFunctionsA = virtualFunctions(a);
+ const AbstractMetaFunctionList virtualFunctionsB = virtualFunctions(b);
+ const AbstractMetaFunctionList virtualFunctionsC = virtualFunctions(c);
+ const AbstractMetaFunctionList virtualFunctionsF = virtualFunctions(f);
+ QCOMPARE(virtualFunctionsA.size(), 1); // Add a pureVirtualMethods method !?
+ QCOMPARE(virtualFunctionsB.size(), 1);
+ QCOMPARE(virtualFunctionsC.size(), 1);
+ QCOMPARE(virtualFunctionsF.size(), 1);
+
+ const AbstractMetaFunction* funcA = virtualFunctionsA.constFirst();
+ const AbstractMetaFunction* funcB = virtualFunctionsB.constFirst();
+ const AbstractMetaFunction* funcC = virtualFunctionsC.constFirst();
+ const AbstractMetaFunction* funcF = virtualFunctionsF.constFirst();
QCOMPARE(funcA->ownerClass(), a);
QVERIFY(funcC->attributes() & AbstractMetaAttributes::VirtualCppMethod);