mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-03 00:15:21 +00:00
chore: 适配最新的dtkcore
最新的dtkcore中已经包含frame/qtdbusextended目录下的所有文件，删除原来的同名文件，同时修改引用的头文件的名称 Log: Influence: 正常编译 Task: https://pms.uniontech.com/task-view-224841.html Change-Id: I53c6ece52dad59874ca560fa63fbd1c456c6adb3
This commit is contained in:
donghualin
fanpengcheng
parent
35b4788180
commit
72a7265487
@ -32,7 +32,7 @@
|
|||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
#include <DBusExtendedAbstractInterface>
|
#include <DDBusExtendedAbstractInterface>
|
||||||
#include <QtDBus>
|
#include <QtDBus>
|
||||||
|
|
||||||
typedef QList<quint32> WindowList;
|
typedef QList<quint32> WindowList;
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
#include "dbusextended.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "dbusextendedabstractinterface.h"
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
// -*- c++ -*-
|
|
||||||
|
|
||||||
/*!
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Jolla Ltd.
|
|
||||||
*
|
|
||||||
* Contact: Valerio Valerio <valerio.valerio@jolla.com>
|
|
||||||
* Author: Andres Gomez <andres.gomez@jolla.com>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef QT_DBUS_EXTENDED_H
|
|
||||||
#define QT_DBUS_EXTENDED_H
|
|
||||||
|
|
||||||
#if defined(QT_DBUS_EXTENDED_LIBRARY)
|
|
||||||
# define QT_DBUS_EXTENDED_EXPORT Q_DECL_EXPORT
|
|
||||||
#else
|
|
||||||
# define QT_DBUS_EXTENDED_EXPORT Q_DECL_IMPORT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* QT_DBUS_EXTENDED_H */
|
|
||||||
@ -1,525 +0,0 @@
|
|||||||
// -*- c++ -*-
|
|
||||||
|
|
||||||
/*!
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Jolla Ltd.
|
|
||||||
*
|
|
||||||
* Contact: Valerio Valerio <valerio.valerio@jolla.com>
|
|
||||||
* Author: Andres Gomez <andres.gomez@jolla.com>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include "dbusextendedpendingcallwatcher_p.h"
|
|
||||||
|
|
||||||
#include <DBusExtendedAbstractInterface>
|
|
||||||
|
|
||||||
#include <QtDBus/QDBusMetaType>
|
|
||||||
#include <QtDBus/QDBusMessage>
|
|
||||||
#include <QtDBus/QDBusPendingCall>
|
|
||||||
#include <QtDBus/QDBusPendingCallWatcher>
|
|
||||||
#include <QtDBus/QDBusPendingReply>
|
|
||||||
|
|
||||||
#include <QtCore/QDebug>
|
|
||||||
#include <QtCore/QMetaProperty>
|
|
||||||
|
|
||||||
|
|
||||||
Q_GLOBAL_STATIC_WITH_ARGS(QByteArray, dBusInterface, ("org.freedesktop.DBus"))
|
|
||||||
Q_GLOBAL_STATIC_WITH_ARGS(QByteArray, dBusPropertiesInterface, ("org.freedesktop.DBus.Properties"))
|
|
||||||
Q_GLOBAL_STATIC_WITH_ARGS(QByteArray, dBusPropertiesChangedSignal, ("PropertiesChanged"))
|
|
||||||
Q_GLOBAL_STATIC_WITH_ARGS(QByteArray, propertyChangedSignature, ("propertyChanged(QString,QVariant)"))
|
|
||||||
Q_GLOBAL_STATIC_WITH_ARGS(QByteArray, propertyInvalidatedSignature, ("propertyInvalidated(QString)"))
|
|
||||||
|
|
||||||
|
|
||||||
DBusExtendedAbstractInterface::DBusExtendedAbstractInterface(const QString &service, const QString &path, const char *interface, const QDBusConnection &connection, QObject *parent)
|
|
||||||
: QDBusAbstractInterface(service, path, interface, connection, parent)
|
|
||||||
, m_sync(true)
|
|
||||||
, m_useCache(false)
|
|
||||||
, m_getAllPendingCallWatcher(0)
|
|
||||||
, m_propertiesChangedConnected(false)
|
|
||||||
{
|
|
||||||
const_cast<QDBusConnection&>(connection).connect(QString("org.freedesktop.DBus"), QString("/org/freedesktop/DBus"), QString("org.freedesktop.DBus"), QString("NameOwnerChanged"), this, SLOT(onDBusNameOwnerChanged(QString,QString,QString)));
|
|
||||||
}
|
|
||||||
|
|
||||||
DBusExtendedAbstractInterface::~DBusExtendedAbstractInterface()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::setSync(bool sync) { setSync(sync, true); }
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Note: After sync is set to false, it will always return a empty value
|
|
||||||
* if you call the property's get function directly. So you can only get it
|
|
||||||
* through the changed signal when you get an property, and it's also a good idea
|
|
||||||
* to save a cache yourself.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 注意: 如果设置 sync 为 false 那么在调用属性的 get 函数获取一个属性时会一直返回空值,
|
|
||||||
* 解决方法是监听属性的 changed 信号并自行保存一份缓存, 让 changed 信号修改这个缓存
|
|
||||||
*/
|
|
||||||
void DBusExtendedAbstractInterface::setSync(bool sync, bool autoStart)
|
|
||||||
{
|
|
||||||
m_sync = sync;
|
|
||||||
|
|
||||||
// init all properties
|
|
||||||
if (autoStart && !m_sync && !isValid())
|
|
||||||
startServiceProcess();
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::getAllProperties()
|
|
||||||
{
|
|
||||||
m_lastExtendedError = QDBusError();
|
|
||||||
|
|
||||||
if (!isValid()) {
|
|
||||||
QString errorMessage = QStringLiteral("This Extended DBus interface is not valid yet.");
|
|
||||||
m_lastExtendedError = QDBusMessage::createError(QDBusError::Failed, errorMessage);
|
|
||||||
qDebug() << Q_FUNC_INFO << errorMessage;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!m_sync && m_getAllPendingCallWatcher) {
|
|
||||||
// Call already in place, not repeating ...
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
QDBusMessage msg = QDBusMessage::createMethodCall(service(), path(), *dBusPropertiesInterface(), QStringLiteral("GetAll"));
|
|
||||||
msg << interface();
|
|
||||||
|
|
||||||
if (m_sync) {
|
|
||||||
QDBusMessage reply = connection().call(msg);
|
|
||||||
|
|
||||||
if (reply.type() != QDBusMessage::ReplyMessage) {
|
|
||||||
m_lastExtendedError = QDBusError(reply);
|
|
||||||
qWarning() << Q_FUNC_INFO << m_lastExtendedError.message();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (reply.signature() != QLatin1String("a{sv}")) {
|
|
||||||
QString errorMessage = QStringLiteral("Invalid signature \"%1\" in return from call to %2")
|
|
||||||
.arg(reply.signature(),
|
|
||||||
QString(*dBusPropertiesInterface()));
|
|
||||||
qWarning() << Q_FUNC_INFO << errorMessage;
|
|
||||||
m_lastExtendedError = QDBusError(QDBusError::InvalidSignature, errorMessage);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
QVariantMap value = reply.arguments().at(0).toMap();
|
|
||||||
onPropertiesChanged(interface(), value, QStringList());
|
|
||||||
} else {
|
|
||||||
QDBusPendingReply<QVariantMap> async = connection().asyncCall(msg);
|
|
||||||
m_getAllPendingCallWatcher = new QDBusPendingCallWatcher(async, this);
|
|
||||||
|
|
||||||
connect(m_getAllPendingCallWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(onAsyncGetAllPropertiesFinished(QDBusPendingCallWatcher*)));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::connectNotify(const QMetaMethod &signal)
|
|
||||||
{
|
|
||||||
if (signal.methodType() == QMetaMethod::Signal
|
|
||||||
&& (signal.methodSignature() == *propertyChangedSignature()
|
|
||||||
|| signal.methodSignature() == *propertyInvalidatedSignature())) {
|
|
||||||
if (!m_propertiesChangedConnected) {
|
|
||||||
QStringList argumentMatch;
|
|
||||||
argumentMatch << interface();
|
|
||||||
connection().connect(service(), path(), *dBusPropertiesInterface(), *dBusPropertiesChangedSignal(),
|
|
||||||
argumentMatch, QString(),
|
|
||||||
this, SLOT(onPropertiesChanged(QString, QVariantMap, QStringList)));
|
|
||||||
|
|
||||||
m_propertiesChangedConnected = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
QDBusAbstractInterface::connectNotify(signal);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::disconnectNotify(const QMetaMethod &signal)
|
|
||||||
{
|
|
||||||
if (signal.methodType() == QMetaMethod::Signal
|
|
||||||
&& (signal.methodSignature() == *propertyChangedSignature()
|
|
||||||
|| signal.methodSignature() == *propertyInvalidatedSignature())) {
|
|
||||||
if (m_propertiesChangedConnected
|
|
||||||
&& 0 == receivers(propertyChangedSignature()->constData())
|
|
||||||
&& 0 == receivers(propertyInvalidatedSignature()->constData())) {
|
|
||||||
QStringList argumentMatch;
|
|
||||||
argumentMatch << interface();
|
|
||||||
connection().disconnect(service(), path(), *dBusPropertiesInterface(), *dBusPropertiesChangedSignal(),
|
|
||||||
argumentMatch, QString(),
|
|
||||||
this, SLOT(onPropertiesChanged(QString, QVariantMap, QStringList)));
|
|
||||||
|
|
||||||
m_propertiesChangedConnected = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
QDBusAbstractInterface::disconnectNotify(signal);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
QVariant DBusExtendedAbstractInterface::internalPropGet(const char *propname, void *propertyPtr)
|
|
||||||
{
|
|
||||||
m_lastExtendedError = QDBusError();
|
|
||||||
|
|
||||||
if (m_useCache) {
|
|
||||||
int propertyIndex = metaObject()->indexOfProperty(propname);
|
|
||||||
QMetaProperty metaProperty = metaObject()->property(propertyIndex);
|
|
||||||
return QVariant(metaProperty.userType(), propertyPtr);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (m_sync) {
|
|
||||||
QVariant ret = property(propname);
|
|
||||||
|
|
||||||
QMetaType::construct(ret.userType(), propertyPtr, ret.constData());
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
} else {
|
|
||||||
if (!isValid()) {
|
|
||||||
QString errorMessage = QStringLiteral("This Extended DBus interface is not valid yet.");
|
|
||||||
m_lastExtendedError = QDBusMessage::createError(QDBusError::Failed, errorMessage);
|
|
||||||
qDebug() << Q_FUNC_INFO << errorMessage;
|
|
||||||
return QVariant();
|
|
||||||
}
|
|
||||||
|
|
||||||
int propertyIndex = metaObject()->indexOfProperty(propname);
|
|
||||||
|
|
||||||
if (-1 == propertyIndex) {
|
|
||||||
QString errorMessage = QStringLiteral("Got unknown property \"%1\" to read")
|
|
||||||
.arg(QString::fromLatin1(propname));
|
|
||||||
m_lastExtendedError = QDBusMessage::createError(QDBusError::Failed, errorMessage);
|
|
||||||
qWarning() << Q_FUNC_INFO << errorMessage;
|
|
||||||
return QVariant();
|
|
||||||
}
|
|
||||||
|
|
||||||
QMetaProperty metaProperty = metaObject()->property(propertyIndex);
|
|
||||||
|
|
||||||
if (!metaProperty.isReadable()) {
|
|
||||||
QString errorMessage = QStringLiteral("Property \"%1\" is NOT readable")
|
|
||||||
.arg(QString::fromLatin1(propname));
|
|
||||||
m_lastExtendedError = QDBusMessage::createError(QDBusError::Failed, errorMessage);
|
|
||||||
qWarning() << Q_FUNC_INFO << errorMessage;
|
|
||||||
return QVariant();
|
|
||||||
}
|
|
||||||
|
|
||||||
// is this metatype registered?
|
|
||||||
const char *expectedSignature = "";
|
|
||||||
if (int(metaProperty.type()) != QMetaType::QVariant) {
|
|
||||||
expectedSignature = QDBusMetaType::typeToSignature(metaProperty.userType());
|
|
||||||
if (0 == expectedSignature) {
|
|
||||||
QString errorMessage =
|
|
||||||
QStringLiteral("Type %1 must be registered with Qt D-Bus "
|
|
||||||
"before it can be used to read property "
|
|
||||||
"%2.%3")
|
|
||||||
.arg(metaProperty.typeName(),
|
|
||||||
interface(),
|
|
||||||
propname);
|
|
||||||
m_lastExtendedError = QDBusMessage::createError(QDBusError::Failed, errorMessage);
|
|
||||||
qWarning() << Q_FUNC_INFO << errorMessage;
|
|
||||||
return QVariant();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
asyncProperty(propname);
|
|
||||||
return QVariant(metaProperty.userType(), propertyPtr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::internalPropSet(const char *propname, const QVariant &value, void *propertyPtr)
|
|
||||||
{
|
|
||||||
m_lastExtendedError = QDBusError();
|
|
||||||
|
|
||||||
if (m_sync) {
|
|
||||||
setProperty(propname, value);
|
|
||||||
} else {
|
|
||||||
if (!isValid()) {
|
|
||||||
QString errorMessage = QStringLiteral("This interface is not yet valid");
|
|
||||||
m_lastExtendedError = QDBusMessage::createError(QDBusError::Failed, errorMessage);
|
|
||||||
qDebug() << Q_FUNC_INFO << errorMessage;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
int propertyIndex = metaObject()->indexOfProperty(propname);
|
|
||||||
|
|
||||||
if (-1 == propertyIndex) {
|
|
||||||
QString errorMessage = QStringLiteral("Got unknown property \"%1\" to write")
|
|
||||||
.arg(QString::fromLatin1(propname));
|
|
||||||
m_lastExtendedError = QDBusMessage::createError(QDBusError::Failed, errorMessage);
|
|
||||||
qWarning() << Q_FUNC_INFO << errorMessage;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
QMetaProperty metaProperty = metaObject()->property(propertyIndex);
|
|
||||||
|
|
||||||
if (!metaProperty.isWritable()) {
|
|
||||||
QString errorMessage = QStringLiteral("Property \"%1\" is NOT writable")
|
|
||||||
.arg(QString::fromLatin1(propname));
|
|
||||||
m_lastExtendedError = QDBusMessage::createError(QDBusError::Failed, errorMessage);
|
|
||||||
qWarning() << Q_FUNC_INFO << errorMessage;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
QVariant variant = QVariant(metaProperty.type(), propertyPtr);
|
|
||||||
variant = value;
|
|
||||||
|
|
||||||
asyncSetProperty(propname, variant);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
QVariant DBusExtendedAbstractInterface::asyncProperty(const QString &propertyName)
|
|
||||||
{
|
|
||||||
QDBusMessage msg = QDBusMessage::createMethodCall(service(), path(), *dBusPropertiesInterface(), QStringLiteral("Get"));
|
|
||||||
msg << interface() << propertyName;
|
|
||||||
QDBusPendingReply<QVariant> async = connection().asyncCall(msg);
|
|
||||||
DBusExtendedPendingCallWatcher *watcher = new DBusExtendedPendingCallWatcher(async, propertyName, QVariant(), this);
|
|
||||||
|
|
||||||
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(onAsyncPropertyFinished(QDBusPendingCallWatcher*)));
|
|
||||||
|
|
||||||
return QVariant();
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::asyncSetProperty(const QString &propertyName, const QVariant &value)
|
|
||||||
{
|
|
||||||
QDBusMessage msg = QDBusMessage::createMethodCall(service(), path(), *dBusPropertiesInterface(), QStringLiteral("Set"));
|
|
||||||
|
|
||||||
msg << interface() << propertyName << QVariant::fromValue(QDBusVariant(value));
|
|
||||||
QDBusPendingReply<> async = connection().asyncCall(msg);
|
|
||||||
DBusExtendedPendingCallWatcher *watcher = new DBusExtendedPendingCallWatcher(async, propertyName, value, this);
|
|
||||||
|
|
||||||
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(onAsyncSetPropertyFinished(QDBusPendingCallWatcher*)));
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::startServiceProcess()
|
|
||||||
{
|
|
||||||
const QString &servName = service();
|
|
||||||
|
|
||||||
if (isValid())
|
|
||||||
{
|
|
||||||
qWarning() << "Service" << servName << "is already started.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.DBus", "/", *dBusInterface(), QStringLiteral("StartServiceByName"));
|
|
||||||
msg << servName << quint32(0);
|
|
||||||
QDBusPendingReply<quint32> async = connection().asyncCall(msg);
|
|
||||||
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(async, this);
|
|
||||||
|
|
||||||
connect(watcher, &QDBusPendingCallWatcher::finished, this, &DBusExtendedAbstractInterface::onStartServiceProcessFinished);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::onStartServiceProcessFinished(QDBusPendingCallWatcher *w)
|
|
||||||
{
|
|
||||||
if (w->isError())
|
|
||||||
{
|
|
||||||
m_lastExtendedError = w->error();
|
|
||||||
} else {
|
|
||||||
m_lastExtendedError = QDBusError();
|
|
||||||
}
|
|
||||||
|
|
||||||
QDBusPendingReply<quint32> reply = *w;
|
|
||||||
|
|
||||||
Q_EMIT serviceStartFinished(reply.value());
|
|
||||||
|
|
||||||
w->deleteLater();
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::onAsyncPropertyFinished(QDBusPendingCallWatcher *w)
|
|
||||||
{
|
|
||||||
DBusExtendedPendingCallWatcher *watcher = qobject_cast<DBusExtendedPendingCallWatcher *>(w);
|
|
||||||
Q_ASSERT(watcher);
|
|
||||||
|
|
||||||
QDBusPendingReply<QVariant> reply = *watcher;
|
|
||||||
|
|
||||||
if (reply.isError()) {
|
|
||||||
m_lastExtendedError = reply.error();
|
|
||||||
} else {
|
|
||||||
int propertyIndex = metaObject()->indexOfProperty(watcher->asyncProperty().toLatin1().constData());
|
|
||||||
QVariant value = demarshall(interface(),
|
|
||||||
metaObject()->property(propertyIndex),
|
|
||||||
reply.value(),
|
|
||||||
&m_lastExtendedError);
|
|
||||||
|
|
||||||
if (m_lastExtendedError.isValid()) {
|
|
||||||
Q_EMIT propertyInvalidated(watcher->asyncProperty());
|
|
||||||
} else {
|
|
||||||
Q_EMIT propertyChanged(watcher->asyncProperty(), value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Q_EMIT asyncPropertyFinished(watcher->asyncProperty());
|
|
||||||
watcher->deleteLater();
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::onAsyncSetPropertyFinished(QDBusPendingCallWatcher *w)
|
|
||||||
{
|
|
||||||
DBusExtendedPendingCallWatcher *watcher = qobject_cast<DBusExtendedPendingCallWatcher *>(w);
|
|
||||||
Q_ASSERT(watcher);
|
|
||||||
|
|
||||||
QDBusPendingReply<> reply = *watcher;
|
|
||||||
|
|
||||||
if (reply.isError()) {
|
|
||||||
m_lastExtendedError = reply.error();
|
|
||||||
} else {
|
|
||||||
m_lastExtendedError = QDBusError();
|
|
||||||
}
|
|
||||||
|
|
||||||
Q_EMIT asyncSetPropertyFinished(watcher->asyncProperty());
|
|
||||||
|
|
||||||
// Resetting the property to its previous value after sending the
|
|
||||||
// finished signal
|
|
||||||
if (reply.isError()) {
|
|
||||||
m_lastExtendedError = QDBusError();
|
|
||||||
Q_EMIT propertyChanged(watcher->asyncProperty(), watcher->previousValue());
|
|
||||||
}
|
|
||||||
|
|
||||||
watcher->deleteLater();
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::onAsyncGetAllPropertiesFinished(QDBusPendingCallWatcher *watcher)
|
|
||||||
{
|
|
||||||
m_getAllPendingCallWatcher = 0;
|
|
||||||
|
|
||||||
QDBusPendingReply<QVariantMap> reply = *watcher;
|
|
||||||
|
|
||||||
if (reply.isError()) {
|
|
||||||
m_lastExtendedError = reply.error();
|
|
||||||
} else {
|
|
||||||
m_lastExtendedError = QDBusError();
|
|
||||||
}
|
|
||||||
|
|
||||||
Q_EMIT asyncGetAllPropertiesFinished();
|
|
||||||
|
|
||||||
if (!reply.isError()) {
|
|
||||||
onPropertiesChanged(interface(), reply.value(), QStringList());
|
|
||||||
}
|
|
||||||
|
|
||||||
watcher->deleteLater();
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::onPropertiesChanged(const QString& interfaceName,
|
|
||||||
const QVariantMap& changedProperties,
|
|
||||||
const QStringList& invalidatedProperties)
|
|
||||||
{
|
|
||||||
if (interfaceName == interface()) {
|
|
||||||
QVariantMap::const_iterator i = changedProperties.constBegin();
|
|
||||||
while (i != changedProperties.constEnd()) {
|
|
||||||
int propertyIndex = metaObject()->indexOfProperty(i.key().toLatin1().constData());
|
|
||||||
|
|
||||||
if (-1 == propertyIndex) {
|
|
||||||
qDebug() << Q_FUNC_INFO << "Got unknown changed property" << i.key();
|
|
||||||
} else {
|
|
||||||
QVariant value = demarshall(interface(), metaObject()->property(propertyIndex), i.value(), &m_lastExtendedError);
|
|
||||||
|
|
||||||
if (m_lastExtendedError.isValid()) {
|
|
||||||
Q_EMIT propertyInvalidated(i.key());
|
|
||||||
} else {
|
|
||||||
Q_EMIT propertyChanged(i.key(), value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
++i;
|
|
||||||
}
|
|
||||||
|
|
||||||
QStringList::const_iterator j = invalidatedProperties.constBegin();
|
|
||||||
while (j != invalidatedProperties.constEnd()) {
|
|
||||||
if (-1 == metaObject()->indexOfProperty(j->toLatin1().constData())) {
|
|
||||||
qDebug() << Q_FUNC_INFO << "Got unknown invalidated property" << *j;
|
|
||||||
} else {
|
|
||||||
m_lastExtendedError = QDBusError();
|
|
||||||
Q_EMIT propertyInvalidated(*j);
|
|
||||||
}
|
|
||||||
|
|
||||||
++j;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void DBusExtendedAbstractInterface::onDBusNameOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner)
|
|
||||||
{
|
|
||||||
if (name == service() && oldOwner.isEmpty())
|
|
||||||
{
|
|
||||||
m_dbusOwner = newOwner;
|
|
||||||
Q_EMIT serviceValidChanged(true);
|
|
||||||
}
|
|
||||||
else if (name == m_dbusOwner && newOwner.isEmpty())
|
|
||||||
{
|
|
||||||
m_dbusOwner.clear();
|
|
||||||
Q_EMIT serviceValidChanged(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
QVariant DBusExtendedAbstractInterface::demarshall(const QString &interface, const QMetaProperty &metaProperty, const QVariant &value, QDBusError *error)
|
|
||||||
{
|
|
||||||
Q_ASSERT(metaProperty.isValid());
|
|
||||||
Q_ASSERT(error != 0);
|
|
||||||
|
|
||||||
if (value.userType() == metaProperty.userType()) {
|
|
||||||
// No need demarshalling. Passing back straight away ...
|
|
||||||
*error = QDBusError();
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
QVariant result = QVariant(metaProperty.userType(), (void*)0);
|
|
||||||
QString errorMessage;
|
|
||||||
const char *expectedSignature = QDBusMetaType::typeToSignature(metaProperty.userType());
|
|
||||||
|
|
||||||
if (value.userType() == qMetaTypeId<QDBusArgument>()) {
|
|
||||||
// demarshalling a DBus argument ...
|
|
||||||
QDBusArgument dbusArg = value.value<QDBusArgument>();
|
|
||||||
|
|
||||||
if (expectedSignature == dbusArg.currentSignature().toLatin1()) {
|
|
||||||
QDBusMetaType::demarshall(dbusArg, metaProperty.userType(), result.data());
|
|
||||||
if (!result.isValid()) {
|
|
||||||
errorMessage = QStringLiteral("Unexpected failure demarshalling "
|
|
||||||
"upon PropertiesChanged signal arrival "
|
|
||||||
"for property `%3.%4' (expected type `%5' (%6))")
|
|
||||||
.arg(interface,
|
|
||||||
QString::fromLatin1(metaProperty.name()),
|
|
||||||
QString::fromLatin1(metaProperty.typeName()),
|
|
||||||
expectedSignature);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
errorMessage = QStringLiteral("Unexpected `user type' (%2) "
|
|
||||||
"upon PropertiesChanged signal arrival "
|
|
||||||
"for property `%3.%4' (expected type `%5' (%6))")
|
|
||||||
.arg(dbusArg.currentSignature(),
|
|
||||||
interface,
|
|
||||||
QString::fromLatin1(metaProperty.name()),
|
|
||||||
QString::fromLatin1(metaProperty.typeName()),
|
|
||||||
QString::fromLatin1(expectedSignature));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const char *actualSignature = QDBusMetaType::typeToSignature(value.userType());
|
|
||||||
|
|
||||||
errorMessage = QStringLiteral("Unexpected `%1' (%2) "
|
|
||||||
"upon PropertiesChanged signal arrival "
|
|
||||||
"for property `%3.%4' (expected type `%5' (%6))")
|
|
||||||
.arg(QString::fromLatin1(value.typeName()),
|
|
||||||
QString::fromLatin1(actualSignature),
|
|
||||||
interface,
|
|
||||||
QString::fromLatin1(metaProperty.name()),
|
|
||||||
QString::fromLatin1(metaProperty.typeName()),
|
|
||||||
QString::fromLatin1(expectedSignature));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (errorMessage.isEmpty()) {
|
|
||||||
*error = QDBusError();
|
|
||||||
} else {
|
|
||||||
*error = QDBusMessage::createError(QDBusError::InvalidSignature, errorMessage);
|
|
||||||
qDebug() << Q_FUNC_INFO << errorMessage;
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
// -*- c++ -*-
|
|
||||||
|
|
||||||
/*!
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Jolla Ltd.
|
|
||||||
*
|
|
||||||
* Contact: Valerio Valerio <valerio.valerio@jolla.com>
|
|
||||||
* Author: Andres Gomez <andres.gomez@jolla.com>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef DBUSEXTENDEDABSTRACTINTERFACE_H
|
|
||||||
#define DBUSEXTENDEDABSTRACTINTERFACE_H
|
|
||||||
|
|
||||||
#include <DBusExtended>
|
|
||||||
|
|
||||||
#include <QDBusAbstractInterface>
|
|
||||||
#include <QDBusError>
|
|
||||||
|
|
||||||
class QDBusPendingCallWatcher;
|
|
||||||
class DBusExtendedPendingCallWatcher;
|
|
||||||
|
|
||||||
class QT_DBUS_EXTENDED_EXPORT DBusExtendedAbstractInterface: public QDBusAbstractInterface
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
virtual ~DBusExtendedAbstractInterface();
|
|
||||||
|
|
||||||
Q_PROPERTY(bool sync READ sync WRITE setSync)
|
|
||||||
inline bool sync() const { return m_sync; }
|
|
||||||
void setSync(bool sync);
|
|
||||||
void setSync(bool sync, bool autoStart);
|
|
||||||
|
|
||||||
Q_PROPERTY(bool useCache READ useCache WRITE setUseCache)
|
|
||||||
inline bool useCache() const { return m_useCache; }
|
|
||||||
inline void setUseCache(bool useCache) { m_useCache = useCache; }
|
|
||||||
|
|
||||||
void getAllProperties();
|
|
||||||
inline QDBusError lastExtendedError() const { return m_lastExtendedError; }
|
|
||||||
|
|
||||||
public Q_SLOTS:
|
|
||||||
void startServiceProcess();
|
|
||||||
|
|
||||||
protected:
|
|
||||||
DBusExtendedAbstractInterface(const QString &service,
|
|
||||||
const QString &path,
|
|
||||||
const char *interface,
|
|
||||||
const QDBusConnection &connection,
|
|
||||||
QObject *parent);
|
|
||||||
|
|
||||||
void connectNotify(const QMetaMethod &signal);
|
|
||||||
void disconnectNotify(const QMetaMethod &signal);
|
|
||||||
QVariant internalPropGet(const char *propname, void *propertyPtr);
|
|
||||||
void internalPropSet(const char *propname, const QVariant &value, void *propertyPtr);
|
|
||||||
|
|
||||||
Q_SIGNALS:
|
|
||||||
void serviceValidChanged(const bool valid) const;
|
|
||||||
void serviceStartFinished(const quint32 ret) const;
|
|
||||||
void propertyChanged(const QString &propertyName, const QVariant &value);
|
|
||||||
void propertyInvalidated(const QString &propertyName);
|
|
||||||
void asyncPropertyFinished(const QString &propertyName);
|
|
||||||
void asyncSetPropertyFinished(const QString &propertyName);
|
|
||||||
void asyncGetAllPropertiesFinished();
|
|
||||||
|
|
||||||
private Q_SLOTS:
|
|
||||||
void onPropertiesChanged(const QString& interfaceName,
|
|
||||||
const QVariantMap& changedProperties,
|
|
||||||
const QStringList& invalidatedProperties);
|
|
||||||
void onDBusNameOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
|
|
||||||
void onAsyncPropertyFinished(QDBusPendingCallWatcher *w);
|
|
||||||
void onAsyncSetPropertyFinished(QDBusPendingCallWatcher *w);
|
|
||||||
void onAsyncGetAllPropertiesFinished(QDBusPendingCallWatcher *watcher);
|
|
||||||
void onStartServiceProcessFinished(QDBusPendingCallWatcher *w);
|
|
||||||
|
|
||||||
private:
|
|
||||||
QVariant asyncProperty(const QString &propertyName);
|
|
||||||
void asyncSetProperty(const QString &propertyName, const QVariant &value);
|
|
||||||
static QVariant demarshall(const QString &interface, const QMetaProperty &metaProperty, const QVariant &value, QDBusError *error);
|
|
||||||
|
|
||||||
bool m_sync;
|
|
||||||
bool m_useCache;
|
|
||||||
QDBusPendingCallWatcher *m_getAllPendingCallWatcher;
|
|
||||||
QDBusError m_lastExtendedError;
|
|
||||||
QString m_dbusOwner;
|
|
||||||
bool m_propertiesChangedConnected;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* DBUSEXTENDEDABSTRACTINTERFACE_H */
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
// -*- c++ -*-
|
|
||||||
|
|
||||||
/*!
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Jolla Ltd.
|
|
||||||
*
|
|
||||||
* Contact: Valerio Valerio <valerio.valerio@jolla.com>
|
|
||||||
* Author: Andres Gomez <andres.gomez@jolla.com>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include "dbusextendedpendingcallwatcher_p.h"
|
|
||||||
|
|
||||||
|
|
||||||
DBusExtendedPendingCallWatcher::DBusExtendedPendingCallWatcher(const QDBusPendingCall &call, const QString &asyncProperty, const QVariant &previousValue, QObject *parent)
|
|
||||||
: QDBusPendingCallWatcher(call, parent)
|
|
||||||
, m_asyncProperty(asyncProperty)
|
|
||||||
, m_previousValue(previousValue)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
DBusExtendedPendingCallWatcher::~DBusExtendedPendingCallWatcher()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
// -*- c++ -*-
|
|
||||||
|
|
||||||
/*!
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Jolla Ltd.
|
|
||||||
*
|
|
||||||
* Contact: Valerio Valerio <valerio.valerio@jolla.com>
|
|
||||||
* Author: Andres Gomez <andres.gomez@jolla.com>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
//
|
|
||||||
// W A R N I N G
|
|
||||||
// -------------
|
|
||||||
//
|
|
||||||
// This file is not part of the public API. This header file may
|
|
||||||
// change from version to version without notice, or even be
|
|
||||||
// removed.
|
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
|
||||||
//
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef DBUSEXTENDEDPENDINGCALLWATCHER_P_H
|
|
||||||
#define DBUSEXTENDEDPENDINGCALLWATCHER_P_H
|
|
||||||
|
|
||||||
#include <QDBusPendingCallWatcher>
|
|
||||||
#include <QDBusError>
|
|
||||||
|
|
||||||
class DBusExtendedPendingCallWatcher: public QDBusPendingCallWatcher
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit DBusExtendedPendingCallWatcher(const QDBusPendingCall &call,
|
|
||||||
const QString &asyncProperty,
|
|
||||||
const QVariant &previousValue,
|
|
||||||
QObject *parent = 0);
|
|
||||||
~DBusExtendedPendingCallWatcher();
|
|
||||||
|
|
||||||
Q_PROPERTY(QString AsyncProperty READ asyncProperty)
|
|
||||||
inline QString asyncProperty() const { return m_asyncProperty; }
|
|
||||||
|
|
||||||
Q_PROPERTY(QVariant PreviousValue READ previousValue)
|
|
||||||
inline QVariant previousValue() const { return m_previousValue; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
QString m_asyncProperty;
|
|
||||||
QVariant m_previousValue;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* DBUSEXTENDEDPENDINGCALLWATCHER_P_H */
|
|
||||||
Loading…
x
Reference in New Issue
Block a user