diff options
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
-rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 5c97bc6851..27138dd075 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1341,7 +1341,7 @@ QByteArray QMetaObject::normalizedSignature(const char *method) enum { MaximumParamCount = 11 }; // up to 10 arguments + 1 return value -/*! +/* Returns the signatures of all methods whose name matches \a nonExistentMember, or an empty QByteArray if there are no matches. */ @@ -1595,53 +1595,29 @@ bool QMetaObject::invokeMethodImpl(QObject *object, QtPrivate::QSlotObjectBase * */ /*! - \fn bool QMetaObject::invokeMethod(QObject *receiver, PointerToMemberFunction function, Qt::ConnectionType type = Qt::AutoConnection, MemberFunctionReturnType *ret = Q_NULLPTR) - - \since 5.10 - - \overload -*/ - -/*! - \fn bool QMetaObject::invokeMethod(QObject *receiver, PointerToMemberFunction function, MemberFunctionReturnType *ret) - - \since 5.10 - - \overload - - This overload invokes the member function using the connection type Qt::AutoConnection. -*/ - -/*! - \fn bool QMetaObject::invokeMethod(QObject *context, Functor function, Qt::ConnectionType type = Qt::AutoConnection, FunctorReturnType *ret = Q_NULLPTR) + \fn template<typename Functor, typename FunctorReturnType> bool QMetaObject::invokeMethod(QObject *context, Functor function, Qt::ConnectionType type, FunctorReturnType *ret) \since 5.10 \overload - Call the functor in the event loop of \a context. + Invokes the \a function in the event loop of \a context. \a function can be a functor + or a pointer to a member function. Returns \c true if the function could be invoked. + Returns \c false if there is no such function or the parameters did not match. + The return value of the function call is placed in \a ret. */ /*! - \fn bool QMetaObject::invokeMethod(QObject *context, Functor function, FunctorReturnType *ret = Q_NULLPTR) + \fn template<typename Functor, typename FunctorReturnType> bool QMetaObject::invokeMethod(QObject *context, Functor function, FunctorReturnType *ret) \since 5.10 \overload - Call the functor in the event loop of \a context using the connection type Qt::AutoConnection. -*/ - -/*! - \fn QMetaObject::Connection::Connection(const Connection &other) - - Constructs a copy of \a other. -*/ - -/*! - \fn QMetaObject::Connection::Connection &operator=(const Connection &other) - - Assigns \a other to this connection and returns a reference to this connection. + Invokes the \a function in the event loop of \a context using the connection type Qt::AutoConnection. + \a function can be a functor or a pointer to a member function. Returns \c true if the function could + be invoked. Returns \c false if there is no such member or the parameters did not match. + The return value of the function call is placed in \a ret. */ /*! @@ -2113,7 +2089,7 @@ QMetaMethod::MethodType QMetaMethod::methodType() const } /*! - \fn QMetaMethod QMetaMethod::fromSignal(PointerToMemberFunction signal) + \fn template <typename PointerToMemberFunction> QMetaMethod QMetaMethod::fromSignal(PointerToMemberFunction signal) \since 5.0 Returns the meta-method that corresponds to the given \a signal, or an |