diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2016-06-01 09:58:48 +0000 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-06-01 23:41:31 +0000 |
commit | e81877218b2c5f5321a2032e602e7255f370e72a (patch) | |
tree | e58b43809ef62fbd668b4ef4fb3a6c0c8907f189 | |
parent | 9fdeaf602e44377226d5c1b23e111c3454e42843 (diff) |
Revert "QObject::connect: reduce generated code size for statics and functors"
This reverts commit 2e4191eadce4cfe944afd0baf37f06bbcb65c5f4. The change
is backwards compatible but not forwards, so it can't appear past the .0
release.
Change-Id: I390c5e80795a9b3b27f6edcab79f7892a79c3564
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-rw-r--r-- | src/corelib/kernel/qobject_impl.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/corelib/kernel/qobject_impl.h b/src/corelib/kernel/qobject_impl.h index b4091a4f1c..6140ae775e 100644 --- a/src/corelib/kernel/qobject_impl.h +++ b/src/corelib/kernel/qobject_impl.h @@ -126,7 +126,7 @@ namespace QtPrivate { inline void destroyIfLastRef() Q_DECL_NOTHROW { if (!m_ref.deref()) m_impl(Destroy, this, Q_NULLPTR, Q_NULLPTR, Q_NULLPTR); } - inline bool compare(void **a) { bool ret = false; m_impl(Compare, this, Q_NULLPTR, a, &ret); return ret; } + inline bool compare(void **a) { bool ret; m_impl(Compare, this, Q_NULLPTR, a, &ret); return ret; } inline void call(QObject *r, void **a) { m_impl(Call, this, r, a, Q_NULLPTR); } protected: ~QSlotObjectBase() {} @@ -172,9 +172,10 @@ namespace QtPrivate { case Call: FuncType::template call<Args, R>(static_cast<QStaticSlotObject*>(this_)->function, r, a); break; - case Compare: // not implemented - case NumOperations: - Q_UNUSED(ret); + case Compare: + *ret = false; // not implemented + break; + case NumOperations: ; } } public: @@ -196,9 +197,10 @@ namespace QtPrivate { case Call: FuncType::template call<Args, R>(static_cast<QFunctorSlotObject*>(this_)->function, r, a); break; - case Compare: // not implemented - case NumOperations: - Q_UNUSED(ret); + case Compare: + *ret = false; // not implemented + break; + case NumOperations: ; } } public: |