Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unused QDBusConnectionPrivate::deliverCall() argument

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-02-18 03:55:35 +02:00
parent ca7ead8557
commit 5241fb392a
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dbus/qdbusconnection_p.h
View file

@ -204,7 +204,7 @@ private:
bool activateCall(QObject *object, int flags, const QDBusMessage &msg); bool activateCall(QObject *object, int flags, const QDBusMessage &msg);
void sendError(const QDBusMessage &msg, QDBusError::ErrorType code); void sendError(const QDBusMessage &msg, QDBusError::ErrorType code);
void deliverCall(QObject *object, int flags, const QDBusMessage &msg, void deliverCall(QObject *object, const QDBusMessage &msg,
const QList<int> &metaTypes, int slotIdx); const QList<int> &metaTypes, int slotIdx);
bool isServiceRegisteredByThread(const QString &serviceName); bool isServiceRegisteredByThread(const QString &serviceName);

8
src/dbus/qdbusintegrator.cpp
View file

@ -743,7 +743,7 @@ void QDBusConnectionPrivate::activateSignal(const QDBusConnectionPrivate::Signal
if (call == DIRECT_DELIVERY) { if (call == DIRECT_DELIVERY) {
// short-circuit delivery // short-circuit delivery
Q_ASSERT(this == hook.obj); Q_ASSERT(this == hook.obj);
deliverCall(this, 0, msg, hook.params, hook.midx); deliverCall(this, msg, hook.params, hook.midx);
return; return;
} }
if (call) if (call)
@ -826,21 +826,21 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, const QDBu
object->setProperty(cachePropertyName, QVariant::fromValue(slotCache)); object->setProperty(cachePropertyName, QVariant::fromValue(slotCache));
// found the slot to be called // found the slot to be called
deliverCall(object, flags, msg, slotData.metaTypes, slotData.slotIdx); deliverCall(object, msg, slotData.metaTypes, slotData.slotIdx);
return true; return true;
} else if (cacheIt->slotIdx == -1) { } else if (cacheIt->slotIdx == -1) {
// negative cache // negative cache
return false; return false;
} else { } else {
// use the cache // use the cache
deliverCall(object, flags, msg, cacheIt->metaTypes, cacheIt->slotIdx); deliverCall(object, msg, cacheIt->metaTypes, cacheIt->slotIdx);
return true; return true;
} }
#endif // QT_NO_PROPERTIES #endif // QT_NO_PROPERTIES
return false; return false;
} }
void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const QDBusMessage &msg, void QDBusConnectionPrivate::deliverCall(QObject *object, const QDBusMessage &msg,
const QList<int> &metaTypes, int slotIdx) const QList<int> &metaTypes, int slotIdx)
{ {
Q_ASSERT_X(!object || QThread::currentThread() == object->thread(), Q_ASSERT_X(!object || QThread::currentThread() == object->thread(),

7
src/dbus/qdbusintegrator_p.h
View file

@ -72,20 +72,19 @@ class QDBusCallDeliveryEvent: public QMetaCallEvent
{ {
public: public:
QDBusCallDeliveryEvent(const QDBusConnection &c, int id, QObject *sender, QDBusCallDeliveryEvent(const QDBusConnection &c, int id, QObject *sender,
const QDBusMessage &msg, const QList<int> &types, int f = 0) const QDBusMessage &msg, const QList<int> &types)
: QMetaCallEvent(0, id, 0, sender, -1), connection(c), message(msg), metaTypes(types), flags(f) : QMetaCallEvent(0, id, 0, sender, -1), connection(c), message(msg), metaTypes(types)
{ } { }
void placeMetaCall(QObject *object) void placeMetaCall(QObject *object)
{ {
QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id()); QDBusConnectionPrivate::d(connection)->deliverCall(object, message, metaTypes, id());
} }
private: private:
QDBusConnection connection; // just for refcounting QDBusConnection connection; // just for refcounting
QDBusMessage message; QDBusMessage message;
QList<int> metaTypes; QList<int> metaTypes;
int flags;
}; };
class QDBusActivateObjectEvent: public QMetaCallEvent class QDBusActivateObjectEvent: public QMetaCallEvent