c864267f04
Summary: The use of Q_FOREACH is advised against (https://doc.qt.io/qt-5/qtglobal.html#Q_FOREACH) since Qt 5.7 and will eventually be removed from Qt. I replaced all occurrences with the range-for loop introduced in C++11 (except for the one in daemon.cpp in deviceIdByName which might have a bug / typo in it). I added const to the container or casted it with qAsConst when appropriate to avoid unnecessary copies. (This is my first submission. I did all the unit tests, and they all passed but I don't know how to show it here.) Reviewers: #kde_connect, nicolasfella, apol Reviewed By: #kde_connect, nicolasfella, apol Subscribers: albertvaka, apol, nicolasfella Tags: #kde_connect Differential Revision: https://phabricator.kde.org/D6724
132 lines
3.7 KiB
C++
132 lines
3.7 KiB
C++
#include "responsewaiter.h"
|
|
|
|
#include <QDBusPendingCall>
|
|
#include <QDBusPendingReply>
|
|
#include <QDebug>
|
|
#include <QCoreApplication>
|
|
|
|
Q_DECLARE_METATYPE(QDBusPendingReply<>)
|
|
Q_DECLARE_METATYPE(QDBusPendingReply<QVariant>)
|
|
Q_DECLARE_METATYPE(QDBusPendingReply<bool>)
|
|
Q_DECLARE_METATYPE(QDBusPendingReply<int>)
|
|
Q_DECLARE_METATYPE(QDBusPendingReply<QString>)
|
|
|
|
DBusResponseWaiter* DBusResponseWaiter::m_instance = nullptr;
|
|
|
|
DBusResponseWaiter* DBusResponseWaiter::instance()
|
|
{
|
|
if (!m_instance)
|
|
{
|
|
m_instance = new DBusResponseWaiter();
|
|
}
|
|
return m_instance;
|
|
}
|
|
|
|
DBusResponseWaiter::DBusResponseWaiter()
|
|
: QObject()
|
|
{
|
|
m_registered
|
|
<< qRegisterMetaType<QDBusPendingReply<> >("QDBusPendingReply<>")
|
|
<< qRegisterMetaType<QDBusPendingReply<QVariant> >("QDBusPendingReply<QVariant>")
|
|
<< qRegisterMetaType<QDBusPendingReply<bool> >("QDBusPendingReply<bool>")
|
|
<< qRegisterMetaType<QDBusPendingReply<int> >("QDBusPendingReply<int>")
|
|
<< qRegisterMetaType<QDBusPendingReply<QString> >("QDBusPendingReply<QString>")
|
|
;
|
|
}
|
|
|
|
QVariant DBusResponseWaiter::waitForReply(QVariant variant) const
|
|
{
|
|
if (QDBusPendingCall* call = const_cast<QDBusPendingCall*>(extractPendingCall(variant)))
|
|
{
|
|
call->waitForFinished();
|
|
|
|
if (call->isError())
|
|
{
|
|
qWarning() << "error:" << call->error();
|
|
return QVariant("error");
|
|
}
|
|
|
|
QDBusMessage reply = call->reply();
|
|
|
|
if (reply.arguments().count() > 0)
|
|
{
|
|
return reply.arguments().at(0);
|
|
}
|
|
}
|
|
return QVariant();
|
|
}
|
|
|
|
DBusAsyncResponse::DBusAsyncResponse(QObject* parent)
|
|
: QObject(parent)
|
|
, m_autodelete(false)
|
|
{
|
|
m_timeout.setSingleShot(true);
|
|
m_timeout.setInterval(15000);
|
|
connect(&m_timeout, &QTimer::timeout, this, &DBusAsyncResponse::onTimeout);
|
|
}
|
|
|
|
|
|
void DBusAsyncResponse::setPendingCall(QVariant variant)
|
|
{
|
|
if (QDBusPendingCall* call = const_cast<QDBusPendingCall*>(DBusResponseWaiter::instance()->extractPendingCall(variant)))
|
|
{
|
|
QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(*call);
|
|
watcher->setProperty("pengingCallVariant", variant);
|
|
connect(watcher, &QDBusPendingCallWatcher::finished, this, &DBusAsyncResponse::onCallFinished);
|
|
connect(watcher, &QDBusPendingCallWatcher::finished, watcher, &QObject::deleteLater);
|
|
connect(&m_timeout, &QTimer::timeout, watcher, &QObject::deleteLater);
|
|
m_timeout.start();
|
|
}
|
|
}
|
|
|
|
void DBusAsyncResponse::onCallFinished(QDBusPendingCallWatcher* watcher)
|
|
{
|
|
m_timeout.stop();
|
|
QVariant variant = watcher->property("pengingCallVariant");
|
|
|
|
if (QDBusPendingCall* call = const_cast<QDBusPendingCall*>(DBusResponseWaiter::instance()->extractPendingCall(variant)))
|
|
{
|
|
if (call->isError())
|
|
{
|
|
Q_EMIT error(call->error().message());
|
|
}
|
|
else
|
|
{
|
|
QDBusMessage reply = call->reply();
|
|
|
|
if (reply.arguments().count() > 0)
|
|
{
|
|
Q_EMIT success(reply.arguments().at(0));
|
|
}
|
|
else
|
|
{
|
|
Q_EMIT success(QVariant());
|
|
}
|
|
}
|
|
}
|
|
if (m_autodelete)
|
|
{
|
|
deleteLater();
|
|
}
|
|
}
|
|
|
|
void DBusAsyncResponse::onTimeout()
|
|
{
|
|
Q_EMIT error(QStringLiteral("timeout when waiting dbus response!"));
|
|
}
|
|
|
|
const QDBusPendingCall* DBusResponseWaiter::extractPendingCall(QVariant& variant) const
|
|
{
|
|
for (int type : qAsConst(m_registered))
|
|
{
|
|
if (variant.canConvert(QVariant::Type(type)))
|
|
{
|
|
return reinterpret_cast<const QDBusPendingCall*>(variant.constData());
|
|
}
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
|
|
|