diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-05-05 12:44:45 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-05-10 05:12:17 +0200 |
| commit | 12ccc8e5d6ddc0fd533b8e1b64f5769a36610da6 (patch) | |
| tree | 08140ee8a61c822370e393558ad04268de994108 | |
| parent | 4f1cbb777a89df7fa489a84bf3d9d9bcca5f6aa6 (diff) | |
Adapt to QSlotObject changes in qtbase
Adapt to changed signature of the QFunctorSlotObject type, and replace
QSlotObject with QFunctorSlotObject.
Change-Id: I567e82cb871ba57eadbf4b8bced3e8ca15f0deae
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
| -rw-r--r-- | src/scxml/qscxmlstatemachine.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scxml/qscxmlstatemachine.h b/src/scxml/qscxmlstatemachine.h index dc8cca2..50592a8 100644 --- a/src/scxml/qscxmlstatemachine.h +++ b/src/scxml/qscxmlstatemachine.h @@ -99,7 +99,7 @@ public: typedef QtPrivate::FunctionPointer<PointerToMemberFunction> SlotType; return connectToStateImpl( scxmlStateName, receiver, nullptr, - new QtPrivate::QSlotObject<PointerToMemberFunction, + new QtPrivate::QFunctorSlotObject<PointerToMemberFunction, typename SlotType::Arguments, void>(method), type); } @@ -124,7 +124,7 @@ public: connectToState(const QString &scxmlStateName, const QObject *context, Functor functor, Qt::ConnectionType type = Qt::AutoConnection) { - QtPrivate::QSlotObjectBase *slotObj = new QtPrivate::QFunctorSlotObject<Functor, 1, + QtPrivate::QSlotObjectBase *slotObj = new QtPrivate::QFunctorSlotObject<Functor, QtPrivate::List<bool>, void>(functor); return connectToStateImpl(scxmlStateName, context, reinterpret_cast<void **>(&functor), slotObj, type); @@ -213,7 +213,7 @@ public: typedef QtPrivate::FunctionPointer<PointerToMemberFunction> SlotType; return connectToEventImpl( scxmlEventSpec, receiver, nullptr, - new QtPrivate::QSlotObject<PointerToMemberFunction, + new QtPrivate::QFunctorSlotObject<PointerToMemberFunction, typename SlotType::Arguments, void>(method), type); } @@ -238,7 +238,7 @@ public: connectToEvent(const QString &scxmlEventSpec, const QObject *context, Functor functor, Qt::ConnectionType type = Qt::AutoConnection) { - QtPrivate::QSlotObjectBase *slotObj = new QtPrivate::QFunctorSlotObject<Functor, 1, + QtPrivate::QSlotObjectBase *slotObj = new QtPrivate::QFunctorSlotObject<Functor, QtPrivate::List<QScxmlEvent>, void>(functor); return connectToEventImpl(scxmlEventSpec, context, reinterpret_cast<void **>(&functor), slotObj, type); |