From 7476b10fda3eee649ca573844de95dc83085120f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 5 Feb 2017 22:45:06 +0000 Subject: Revert "Automatically mark classes with pure virtual functions as /Abstract/." With some combination of PyQt/compiler this breaks the build of kcoreaddons. This reverts commit 2e20aeab6e86670a66ff99a7b79120c4004b4d22. --- tests/GenerateSipBindings/cpplib.cpp | 20 -------------------- tests/GenerateSipBindings/cpplib.h | 20 -------------------- tests/GenerateSipBindings/testscript.py | 5 ----- 3 files changed, 45 deletions(-) (limited to 'tests') diff --git a/tests/GenerateSipBindings/cpplib.cpp b/tests/GenerateSipBindings/cpplib.cpp index 8ecedcbc..47370ca0 100644 --- a/tests/GenerateSipBindings/cpplib.cpp +++ b/tests/GenerateSipBindings/cpplib.cpp @@ -239,23 +239,3 @@ Shared::Shared(const Shared& other) { } - -int Abstract::callableMultiply(int i, int j) -{ - return i * j; -} - -Abstract::~Abstract() -{ - -} - -int Concrete::callableAdd(int i, int j) -{ - return i + j; -} - -void Concrete::virtualInterface() -{ - -} diff --git a/tests/GenerateSipBindings/cpplib.h b/tests/GenerateSipBindings/cpplib.h index 82e795a1..958b8750 100644 --- a/tests/GenerateSipBindings/cpplib.h +++ b/tests/GenerateSipBindings/cpplib.h @@ -219,23 +219,3 @@ class NO_EXPORT Invisible public: int someApi() { return 1; } }; - -class Abstract -{ -public: - virtual ~Abstract(); - - int callableMultiply(int i, int j); - -protected: - virtual void virtualInterface() = 0; -}; - -class Concrete : public Abstract -{ -public: - int callableAdd(int i, int j); - -protected: - void virtualInterface() override; -}; diff --git a/tests/GenerateSipBindings/testscript.py b/tests/GenerateSipBindings/testscript.py index f1bef91e..b388841f 100644 --- a/tests/GenerateSipBindings/testscript.py +++ b/tests/GenerateSipBindings/testscript.py @@ -135,8 +135,3 @@ try: assert False except AttributeError as e: assert str(e) == "module 'PyTest.CppLib' has no attribute 'Invisible'" - -concrete = PyTest.CppLib.Concrete() - -assert(concrete.callableMultiply(2, 3) == 6) -assert(concrete.callableAdd(2, 3) == 5) -- cgit v1.2.1