diff options
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject_p.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index af87c7d0e3..0cc5244b65 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -516,7 +516,7 @@ QObjectList QObjectPrivate::senderList() const return returnValue; } -void QObjectPrivate::ensureConnectionData() +inline void QObjectPrivate::ensureConnectionData() { if (connections.loadRelaxed()) return; @@ -535,7 +535,7 @@ void QObjectPrivate::ensureConnectionData() Will also add the connection in the sender's list of the receiver. */ -void QObjectPrivate::addConnection(int signal, Connection *c) +inline void QObjectPrivate::addConnection(int signal, Connection *c) { Q_ASSERT(c->sender == q_ptr); ensureConnectionData(); @@ -657,7 +657,7 @@ void QObjectPrivate::ConnectionData::cleanOrphanedConnectionsImpl(QObject *sende } } -void QObjectPrivate::ConnectionData::deleteOrphaned(QObjectPrivate::ConnectionOrSignalVector *o) +inline void QObjectPrivate::ConnectionData::deleteOrphaned(QObjectPrivate::ConnectionOrSignalVector *o) { while (o) { QObjectPrivate::ConnectionOrSignalVector *next = nullptr; @@ -1345,7 +1345,7 @@ QObject::~QObject() d->setParent_helper(nullptr); } -QObjectPrivate::Connection::~Connection() +inline QObjectPrivate::Connection::~Connection() { if (ownArgumentTypes) { const int *v = argumentTypes.loadRelaxed(); @@ -5532,7 +5532,7 @@ bool QObjectPrivate::disconnect(const QObject *sender, int signal_index, const Q \internal \threadsafe */ -bool QObjectPrivate::disconnect(QObjectPrivate::Connection *c) +inline bool QObjectPrivate::disconnect(QObjectPrivate::Connection *c) { if (!c) return false; diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index ed32a90497..5de0e53d4b 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -173,7 +173,7 @@ public: QObjectList receiverList(const char *signal) const; QObjectList senderList() const; - void addConnection(int signal, Connection *c); + inline void addConnection(int signal, Connection *c); static QObjectPrivate *get(QObject *o) { return o->d_func(); } static const QObjectPrivate *get(const QObject *o) { return o->d_func(); } @@ -211,9 +211,9 @@ public: static bool disconnect(const QObject *sender, int signal_index, void **slot); static bool disconnect(const QObject *sender, int signal_index, const QObject *receiver, void **slot); - static bool disconnect(Connection *c); + static inline bool disconnect(Connection *c); - void ensureConnectionData(); + inline void ensureConnectionData(); virtual std::string flagsForDumping() const; |