diff options
Diffstat (limited to 'src/scxml/qscxmlstatemachine.cpp')
| -rw-r--r-- | src/scxml/qscxmlstatemachine.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/scxml/qscxmlstatemachine.cpp b/src/scxml/qscxmlstatemachine.cpp index b477292..b7431ba 100644 --- a/src/scxml/qscxmlstatemachine.cpp +++ b/src/scxml/qscxmlstatemachine.cpp @@ -96,7 +96,7 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") /*! \fn template<typename PointerToMemberFunction> QMetaObject::Connection QScxmlStateMachine::connectToEvent( const QString &scxmlEventSpec, - const QObject *receiver, + const typename QtPrivate::FunctionPointer<PointerToMemberFunction>::Object *receiver, PointerToMemberFunction method, Qt::ConnectionType type) @@ -114,7 +114,7 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") */ /*! - \fn template<typename Functor> QMetaObject::Connection QScxmlStateMachine::connectToEvent( + \fn template<typename Functor> typename QtPrivate::QEnableIf<!QtPrivate::FunctionPointer<Functor>::IsPointerToMemberFunction && !std::is_same<const char*, Functor>::value, QMetaObject::Connection>::Type QScxmlStateMachine::connectToEvent( const QString &scxmlEventSpec, Functor functor, Qt::ConnectionType type) @@ -133,7 +133,7 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") */ /*! - \fn template<typename Functor> QMetaObject::Connection QScxmlStateMachine::connectToEvent( + \fn template<typename Functor> typename QtPrivate::QEnableIf<!QtPrivate::FunctionPointer<Functor>::IsPointerToMemberFunction && !std::is_same<const char*, Functor>::value, QMetaObject::Connection>::Type QScxmlStateMachine::connectToEvent( const QString &scxmlEventSpec, const QObject *context, Functor functor, @@ -155,7 +155,7 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") /*! \fn template<typename PointerToMemberFunction> QMetaObject::Connection QScxmlStateMachine::connectToState( const QString &scxmlStateName, - const QObject *receiver, + const typename QtPrivate::FunctionPointer<PointerToMemberFunction>::Object *receiver, PointerToMemberFunction method, Qt::ConnectionType type) @@ -168,9 +168,8 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") Returns a handle to the connection, which can be used later to disconnect. */ - /*! - \fn template<typename Functor> QMetaObject::Connection QScxmlStateMachine::connectToState( + \fn template<typename Functor> typename QtPrivate::QEnableIf<!QtPrivate::FunctionPointer<Functor>::IsPointerToMemberFunction && !std::is_same<const char*, Functor>::value, QMetaObject::Connection>::Type QScxmlStateMachine::connectToState( const QString &scxmlStateName, Functor functor, Qt::ConnectionType type) @@ -185,7 +184,7 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") */ /*! - \fn template<typename Functor> QMetaObject::Connection QScxmlStateMachine::connectToState( + \fn template<typename Functor> typename QtPrivate::QEnableIf<!QtPrivate::FunctionPointer<Functor>::IsPointerToMemberFunction && !std::is_same<const char*, Functor>::value, QMetaObject::Connection>::Type QScxmlStateMachine::connectToState( const QString &scxmlStateName, const QObject *context, Functor functor, @@ -231,7 +230,8 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") */ /*! - \fn template<typename Functor> QScxmlStateMachine::onEntry(Functor functor) + \fn template<typename Functor> std::function<void(bool)> QScxmlStateMachine::onEntry( + Functor functor) Returns a functor that accepts a boolean argument and calls the given \a functor if that argument is \c true. The given \a functor must not @@ -242,7 +242,7 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") */ /*! - \fn template<typename Functor> QScxmlStateMachine::onExit(Functor functor) + \fn template<typename Functor> std::function<void(bool)> QScxmlStateMachine::onExit(Functor functor) Returns a functor that accepts a boolean argument and calls the given \a functor if that argument is \c false. The given \a functor must not @@ -253,8 +253,9 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") */ /*! - \fn template<typename PointerToMemberFunction> QScxmlStateMachine::onEntry( - const QObject *receiver, PointerToMemberFunction method) + \fn template<typename PointerToMemberFunction> std::function<void(bool)> QScxmlStateMachine::onEntry( + const typename QtPrivate::FunctionPointer<PointerToMemberFunction>::Object *receiver, + PointerToMemberFunction method) Returns a functor that accepts a boolean argument and calls the given \a method on \a receiver if that argument is \c true and the \a receiver @@ -266,8 +267,9 @@ Q_LOGGING_CATEGORY(scxmlLog, "scxml.statemachine") */ /*! - \fn template<typename PointerToMemberFunction> QScxmlStateMachine::onExit( - const QObject *receiver, PointerToMemberFunction method) + \fn template<typename PointerToMemberFunction> std::function<void(bool)> QScxmlStateMachine::onExit( + const typename QtPrivate::FunctionPointer<PointerToMemberFunction>::Object *receiver, + PointerToMemberFunction method) Returns a functor that accepts a boolean argument and calls the given \a method on \a receiver if that argument is \c false and the \a receiver |