diff options
author | John Ehresman <jpe@wingware.com> | 2012-06-07 20:44:19 -0400 |
---|---|---|
committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2012-06-14 20:20:21 +0200 |
commit | e40e993cecd1663636e2f0d33b3e2a6204d64984 (patch) | |
tree | 172ed7dbfc535fd6113c8707a82e02647aaec7dc /tests/libsample | |
parent | 54cce10fa8a9942450c9e1a9d9a9d2a1b688f243 (diff) |
Find function modifications defined in the 2nd+ base class.
Fixes bug PYSIDE-54
Change-Id: Ic5c341741170cc77e8ebb59c46c746211582ddeb
Reviewed-by: Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'tests/libsample')
-rw-r--r-- | tests/libsample/objecttype.cpp | 14 | ||||
-rw-r--r-- | tests/libsample/objecttype.h | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/tests/libsample/objecttype.cpp b/tests/libsample/objecttype.cpp index c253c610f..02ea7badc 100644 --- a/tests/libsample/objecttype.cpp +++ b/tests/libsample/objecttype.cpp @@ -289,3 +289,17 @@ std::size_t ObjectType::createObjectType() void* addr = new ObjectType(); return (std::size_t) addr; } + +OtherBase::~OtherBase() +{ +} + +ObjectTypeDerived::~ObjectTypeDerived() +{ +} + +bool +ObjectTypeDerived::event(Event* event) +{ + return true; +} diff --git a/tests/libsample/objecttype.h b/tests/libsample/objecttype.h index 84812a8d6..78cbf8f5a 100644 --- a/tests/libsample/objecttype.h +++ b/tests/libsample/objecttype.h @@ -144,5 +144,19 @@ private: LIBSAMPLE_API unsigned int objectTypeHash(const ObjectType* objectType); +class LIBSAMPLE_API OtherBase { +public: + OtherBase() {}; + virtual ~OtherBase(); +}; + +class LIBSAMPLE_API ObjectTypeDerived: public ObjectType, public OtherBase { +public: + ObjectTypeDerived(): ObjectType(), OtherBase() {}; + + virtual bool event(Event* event); + virtual ~ObjectTypeDerived(); +}; + #endif // OBJECTTYPE_H |