From 3fa3e56e64530d57b1b47e110fc5d5e353a1da42 Mon Sep 17 00:00:00 2001 From: Ievgenii Meshcheriakov Date: Fri, 7 Jul 2023 13:06:44 +0200 Subject: [PATCH] QDBusConnectionPrivate: Use enum for mode argument of sendWithReply Change type of mode argument to QDBus::CallMode instead of int. Also change the argument name in the implementation to much the declaration. Change-Id: Ice19bfff72f3bf1f4a5748f2caa16999e87a131f Reviewed-by: Thiago Macieira Reviewed-by: Qt CI Bot --- src/dbus/qdbusconnection_p.h | 2 +- src/dbus/qdbusintegrator.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index dc16da0a7e0..1af6ce08420 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -177,7 +177,7 @@ public: QObject *obj, const char *member); bool send(const QDBusMessage &message); - QDBusMessage sendWithReply(const QDBusMessage &message, int mode, int timeout = -1); + QDBusMessage sendWithReply(const QDBusMessage &message, QDBus::CallMode mode, int timeout = -1); QDBusMessage sendWithReplyLocal(const QDBusMessage &message); QDBusPendingCallPrivate *sendWithReplyAsync(const QDBusMessage &message, QObject *receiver, const char *returnMethod, const char *errorMethod,int timeout = -1); diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index c978252efeb..826b274d843 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -2027,9 +2027,8 @@ private: QElapsedTimer m_callTimer; }; - QDBusMessage QDBusConnectionPrivate::sendWithReply(const QDBusMessage &message, - int sendMode, int timeout) + QDBus::CallMode mode, int timeout) { QDBusBlockingCallWatcher watcher(message); @@ -2038,7 +2037,7 @@ QDBusMessage QDBusConnectionPrivate::sendWithReply(const QDBusMessage &message, if (pcall->replyMessage.type() == QDBusMessage::InvalidMessage) { // need to wait for the reply - if (sendMode == QDBus::BlockWithGui) { + if (mode == QDBus::BlockWithGui) { pcall->watcherHelper = new QDBusPendingCallWatcherHelper; QEventLoop loop; loop.connect(pcall->watcherHelper, &QDBusPendingCallWatcherHelper::reply, &loop, &QEventLoop::quit);