whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDBusCallDeliveryEvent: Remove unused flags member 

Also remove flags argument of QDBusConnectionPrivate::deliverCall().

Change-Id: Idd569f531891ffd21e6f57c17e5d03539c3fd230
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Ievgenii Meshcheriakov 2023-08-29 15:45:14 +02:00
parent 9f7c794626
commit 5cad1d7a04
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dbus/qdbusconnection_p.h
View File

@ -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);

8
src/dbus/qdbusintegrator.cpp
View File

@ -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(),

12
src/dbus/qdbusintegrator_p.h
View File

@ -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