diff options
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 56 |
1 files changed, 5 insertions, 51 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 1d2d6a6794..ee157347ea 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -246,7 +246,7 @@ public: return connectImpl(sender, reinterpret_cast<void **>(&signal), receiver, reinterpret_cast<void **>(&slot), - new QSlotObject<Func2, typename QtPrivate::List_Left<typename SignalType::Arguments, SlotType::ArgumentCount>::Value, + new QtPrivate::QSlotObject<Func2, typename QtPrivate::List_Left<typename SignalType::Arguments, SlotType::ArgumentCount>::Value, typename SignalType::ReturnType>(slot), type, types, &SignalType::Object::staticMetaObject); } @@ -268,7 +268,7 @@ public: "Return type of the slot is not compatible with the return type of the signal."); return connectImpl(sender, reinterpret_cast<void **>(&signal), sender, 0, - new QStaticSlotObject<Func2, + new QtPrivate::QStaticSlotObject<Func2, typename QtPrivate::List_Left<typename SignalType::Arguments, SlotType::ArgumentCount>::Value, typename SignalType::ReturnType>(slot), Qt::DirectConnection, 0, &SignalType::Object::staticMetaObject); @@ -282,7 +282,7 @@ public: typedef QtPrivate::FunctionPointer<Func1> SignalType; return connectImpl(sender, reinterpret_cast<void **>(&signal), sender, 0, - new QFunctorSlotObject<Func2, SignalType::ArgumentCount, typename SignalType::Arguments, typename SignalType::ReturnType>(slot), + new QtPrivate::QFunctorSlotObject<Func2, SignalType::ArgumentCount, typename SignalType::Arguments, typename SignalType::ReturnType>(slot), Qt::DirectConnection, 0, &SignalType::Object::staticMetaObject); } #endif //Q_QDOC @@ -394,56 +394,10 @@ private: Q_DISABLE_COPY(QObject) Q_PRIVATE_SLOT(d_func(), void _q_reregisterTimers(void *)) - private: - // internal base class (interface) containing functions required to call a slot managed by a pointer to function. - struct Q_CORE_EXPORT QSlotObjectBase { - QAtomicInt ref; - QSlotObjectBase() : ref(1) {} - virtual ~QSlotObjectBase(); - virtual void call(QObject *receiver, void **a) = 0; - virtual bool compare(void **); - }; - // implementation of QSlotObjectBase for which the slot is a pointer to member function of a QObject - // Args and R are the List of arguments and the returntype of the signal to which the slot is connected. - template<typename Func, typename Args, typename R> struct QSlotObject : QSlotObjectBase - { - typedef QtPrivate::FunctionPointer<Func> FuncType; - Func function; - QSlotObject(Func f) : function(f) {} - virtual void call(QObject *receiver, void **a) { - FuncType::template call<Args, R>(function, static_cast<typename FuncType::Object *>(receiver), a); - } - virtual bool compare(void **f) { - return *reinterpret_cast<Func *>(f) == function; - } - }; - // implementation of QSlotObjectBase for which the slot is a static function - // Args and R are the List of arguments and the returntype of the signal to which the slot is connected. - template<typename Func, typename Args, typename R> struct QStaticSlotObject : QSlotObjectBase - { - typedef QtPrivate::FunctionPointer<Func> FuncType; - Func function; - QStaticSlotObject(Func f) : function(f) {} - virtual void call(QObject *receiver, void **a) { - FuncType::template call<Args, R>(function, receiver, a); - } - }; - // implementation of QSlotObjectBase for which the slot is a functor (or lambda) - // N is the number of arguments - // Args and R are the List of arguments and the returntype of the signal to which the slot is connected. - template<typename Func, int N, typename Args, typename R> struct QFunctorSlotObject : QSlotObjectBase - { - typedef QtPrivate::Functor<Func, N> FuncType; - Func function; - QFunctorSlotObject(const Func &f) : function(f) {} - virtual void call(QObject *receiver, void **a) { - FuncType::template call<Args, R>(function, receiver, a); - } - }; - +private: static QMetaObject::Connection connectImpl(const QObject *sender, void **signal, const QObject *receiver, void **slotPtr, - QSlotObjectBase *slot, Qt::ConnectionType type, + QtPrivate::QSlotObjectBase *slot, Qt::ConnectionType type, const int *types, const QMetaObject *senderMetaObject); static bool disconnectImpl(const QObject *sender, void **signal, const QObject *receiver, void **slot, |