diff options
| -rw-r--r-- | src/dbus/qdbusconnection_p.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 8 | ||||
| -rw-r--r-- | src/dbus/qdbusintegrator_p.h | 12 |
3 files changed, 9 insertions, 15 deletions
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 80bf04571e..6eb5aa8763 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -229,8 +229,8 @@ private: void sendInternal(QDBusPendingCallPrivate *pcall, void *msg, int timeout); void sendError(const QDBusMessage &msg, QDBusError::ErrorType code); - void deliverCall(QObject *object, int flags, const QDBusMessage &msg, - const QList<QMetaType> &metaTypes, int slotIdx); + void deliverCall(QObject *object, const QDBusMessage &msg, const QList<QMetaType> &metaTypes, + int slotIdx); SignalHookHash::Iterator removeSignalHookNoLock(SignalHookHash::Iterator it); void collectAllObjects(ObjectTreeNode &node, QSet<QObject *> &set); diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 7f30f3be11..5cef94216b 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -810,7 +810,7 @@ void QDBusConnectionPrivate::activateSignal(const QDBusConnectionPrivate::Signal if (call == DIRECT_DELIVERY) { // short-circuit delivery Q_ASSERT(this == hook.obj); - deliverCall(this, 0, msg, hook.params, hook.midx); + deliverCall(this, msg, hook.params, hook.midx); return; } if (call) @@ -895,20 +895,20 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, const QDBu object->setProperty(cachePropertyName, QVariant::fromValue(slotCache)); // found the slot to be called - deliverCall(object, flags, msg, slotData.metaTypes, slotData.slotIdx); + deliverCall(object, msg, slotData.metaTypes, slotData.slotIdx); return true; } else if (cacheIt->slotIdx == -1) { // negative cache return false; } else { // use the cache - deliverCall(object, flags, msg, cacheIt->metaTypes, cacheIt->slotIdx); + deliverCall(object, msg, cacheIt->metaTypes, cacheIt->slotIdx); return true; } return false; } -void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const QDBusMessage &msg, +void QDBusConnectionPrivate::deliverCall(QObject *object, const QDBusMessage &msg, const QList<QMetaType> &metaTypes, int slotIdx) { Q_ASSERT_X(!object || QThread::currentThread() == object->thread(), diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index f997bb97b6..ab5dba5d29 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -69,19 +69,14 @@ class QDBusCallDeliveryEvent: public QAbstractMetaCallEvent { public: QDBusCallDeliveryEvent(const QDBusConnection &c, int id, QObject *sender, - const QDBusMessage &msg, const QList<QMetaType> &types, int f = 0) - : QAbstractMetaCallEvent(sender, -1), - connection(c), - message(msg), - metaTypes(types), - id(id), - flags(f) + const QDBusMessage &msg, const QList<QMetaType> &types) + : QAbstractMetaCallEvent(sender, -1), connection(c), message(msg), metaTypes(types), id(id) { } void placeMetaCall(QObject *object) override { - QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id); + QDBusConnectionPrivate::d(connection)->deliverCall(object, message, metaTypes, id); } private: @@ -89,7 +84,6 @@ private: QDBusMessage message; QList<QMetaType> metaTypes; int id; - int flags; }; class QDBusActivateObjectEvent: public QAbstractMetaCallEvent |