diff options
author | André Klitzing <aklitzing@gmail.com> | 2015-08-31 15:04:51 +0200 |
---|---|---|
committer | André Klitzing <aklitzing@gmail.com> | 2015-12-08 17:07:04 +0000 |
commit | 63827c4d278a090522148ae36202205854388187 (patch) | |
tree | 8c985ea97d5b02edc91c3433c361f5dc28d92649 /src/corelib/statemachine/qsignaltransition.h | |
parent | d6ffbedc49c352755369ebf29022b707b3b9d6a7 (diff) |
Add PointerToMemberFunction for ctor of QSignalTransition
[ChangeLog][QtCore][State Machine] Added constructor overload that
takes a pointer-to-member for the QSignalTransition.
Change-Id: I80ac6e16d0edf7d2ab09882b6f6db4cbd73364e1
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/statemachine/qsignaltransition.h')
-rw-r--r-- | src/corelib/statemachine/qsignaltransition.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h index c388323ec4..b428cb621d 100644 --- a/src/corelib/statemachine/qsignaltransition.h +++ b/src/corelib/statemachine/qsignaltransition.h @@ -35,6 +35,7 @@ #define QSIGNALTRANSITION_H #include <QtCore/qabstracttransition.h> +#include <QtCore/qmetaobject.h> QT_BEGIN_NAMESPACE @@ -52,6 +53,18 @@ public: QSignalTransition(QState *sourceState = Q_NULLPTR); QSignalTransition(const QObject *sender, const char *signal, QState *sourceState = Q_NULLPTR); +#ifdef Q_QDOC + QSignalTransition(const QObject *object, PointerToMemberFunction signal, + QState *sourceState = Q_NULLPTR); +#elif defined(Q_COMPILER_DELEGATING_CONSTRUCTORS) + template <typename Func> + QSignalTransition(const typename QtPrivate::FunctionPointer<Func>::Object *obj, + Func sig, QState *srcState = Q_NULLPTR) + : QSignalTransition(obj, QMetaMethod::fromSignal(sig).methodSignature().constData(), srcState) + { + } +#endif + ~QSignalTransition(); QObject *senderObject() const; |