summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusinterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/dbus/qdbusinterface.cpp')
-rw-r--r--src/dbus/qdbusinterface.cpp102
1 files changed, 35 insertions, 67 deletions
diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp
index 4dd02e8c76..d4da36b35c 100644
--- a/src/dbus/qdbusinterface.cpp
+++ b/src/dbus/qdbusinterface.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtDBus module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "qdbusinterface.h"
#include "qdbusinterface_p.h"
@@ -51,67 +15,69 @@
QT_BEGIN_NAMESPACE
+using namespace Qt::StringLiterals;
+
static void copyArgument(void *to, int id, const QVariant &arg)
{
- if (id == arg.userType()) {
+ if (id == arg.metaType().id()) {
switch (id) {
- case QVariant::Bool:
+ case QMetaType::Bool:
*reinterpret_cast<bool *>(to) = arg.toBool();
return;
case QMetaType::UChar:
- *reinterpret_cast<uchar *>(to) = arg.value<uchar>();
+ *reinterpret_cast<uchar *>(to) = qvariant_cast<uchar>(arg);
return;
case QMetaType::Short:
- *reinterpret_cast<short *>(to) = arg.value<short>();
+ *reinterpret_cast<short *>(to) = qvariant_cast<short>(arg);
return;
case QMetaType::UShort:
- *reinterpret_cast<ushort *>(to) = arg.value<ushort>();
+ *reinterpret_cast<ushort *>(to) = qvariant_cast<ushort>(arg);
return;
- case QVariant::Int:
+ case QMetaType::Int:
*reinterpret_cast<int *>(to) = arg.toInt();
return;
- case QVariant::UInt:
+ case QMetaType::UInt:
*reinterpret_cast<uint *>(to) = arg.toUInt();
return;
- case QVariant::LongLong:
+ case QMetaType::LongLong:
*reinterpret_cast<qlonglong *>(to) = arg.toLongLong();
return;
- case QVariant::ULongLong:
+ case QMetaType::ULongLong:
*reinterpret_cast<qulonglong *>(to) = arg.toULongLong();
return;
- case QVariant::Double:
+ case QMetaType::Double:
*reinterpret_cast<double *>(to) = arg.toDouble();
return;
- case QVariant::String:
+ case QMetaType::QString:
*reinterpret_cast<QString *>(to) = arg.toString();
return;
- case QVariant::ByteArray:
+ case QMetaType::QByteArray:
*reinterpret_cast<QByteArray *>(to) = arg.toByteArray();
return;
- case QVariant::StringList:
+ case QMetaType::QStringList:
*reinterpret_cast<QStringList *>(to) = arg.toStringList();
return;
}
- if (id == QDBusMetaTypeId::variant()) {
- *reinterpret_cast<QDBusVariant *>(to) = arg.value<QDBusVariant>();
+ if (id == QDBusMetaTypeId::variant().id()) {
+ *reinterpret_cast<QDBusVariant *>(to) = qvariant_cast<QDBusVariant>(arg);
return;
- } else if (id == QDBusMetaTypeId::objectpath()) {
- *reinterpret_cast<QDBusObjectPath *>(to) = arg.value<QDBusObjectPath>();
+ } else if (id == QDBusMetaTypeId::objectpath().id()) {
+ *reinterpret_cast<QDBusObjectPath *>(to) = qvariant_cast<QDBusObjectPath>(arg);
return;
- } else if (id == QDBusMetaTypeId::signature()) {
- *reinterpret_cast<QDBusSignature *>(to) = arg.value<QDBusSignature>();
+ } else if (id == QDBusMetaTypeId::signature().id()) {
+ *reinterpret_cast<QDBusSignature *>(to) = qvariant_cast<QDBusSignature>(arg);
return;
}
@@ -121,14 +87,14 @@ static void copyArgument(void *to, int id, const QVariant &arg)
}
// if we got here, it's either an un-dermarshalled type or a mismatch
- if (arg.userType() != QDBusMetaTypeId::argument()) {
+ if (arg.metaType() != QDBusMetaTypeId::argument()) {
// it's a mismatch
//qWarning?
return;
}
// is this type registered?
- const char *userSignature = QDBusMetaType::typeToSignature(id);
+ const char *userSignature = QDBusMetaType::typeToSignature(QMetaType(id));
if (!userSignature || !*userSignature) {
// type not registered
//qWarning?
@@ -136,20 +102,20 @@ static void copyArgument(void *to, int id, const QVariant &arg)
}
// is it the same signature?
- QDBusArgument dbarg = arg.value<QDBusArgument>();
- if (dbarg.currentSignature() != QLatin1String(userSignature)) {
+ QDBusArgument dbarg = qvariant_cast<QDBusArgument>(arg);
+ if (dbarg.currentSignature() != QLatin1StringView(userSignature)) {
// not the same signature, another mismatch
//qWarning?
return;
}
// we can demarshall
- QDBusMetaType::demarshall(dbarg, id, to);
+ QDBusMetaType::demarshall(dbarg, QMetaType(id), to);
}
QDBusInterfacePrivate::QDBusInterfacePrivate(const QString &serv, const QString &p,
const QString &iface, const QDBusConnection &con)
- : QDBusAbstractInterfacePrivate(serv, p, iface, con, true), metaObject(0)
+ : QDBusAbstractInterfacePrivate(serv, p, iface, con, true), metaObject(nullptr)
{
// QDBusAbstractInterfacePrivate's constructor checked the parameters for us
if (connection.isConnected()) {
@@ -161,7 +127,7 @@ QDBusInterfacePrivate::QDBusInterfacePrivate(const QString &serv, const QString
// those are not fatal errors, so we continue working
if (!lastError.isValid())
- lastError = QDBusError(QDBusError::InternalError, QLatin1String("Unknown error"));
+ lastError = QDBusError(QDBusError::InternalError, "Unknown error"_L1);
}
}
}
@@ -204,7 +170,9 @@ QDBusInterfacePrivate::~QDBusInterfacePrivate()
interface \a interface on object at path \a path on service \a
service, using the given \a connection. If \a interface is an
empty string, the object created will refer to the merging of all
- interfaces found in that object.
+ interfaces found by introspecting that object. Otherwise if
+ \a interface is not empty, the QDBusInterface object will be cached
+ to speedup further creations of the same interface.
\a parent is passed to the base class constructor.
@@ -243,7 +211,7 @@ const QMetaObject *QDBusInterface::metaObject() const
*/
void *QDBusInterface::qt_metacast(const char *_clname)
{
- if (!_clname) return 0;
+ if (!_clname) return nullptr;
if (!strcmp(_clname, "QDBusInterface"))
return static_cast<void*>(const_cast<QDBusInterface*>(this));
if (d_func()->interface.toLatin1() == _clname)
@@ -287,7 +255,7 @@ int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv)
args.reserve(inputTypesCount);
int i = 1;
for ( ; i <= inputTypesCount; ++i)
- args << QVariant(inputTypes[i], argv[i]);
+ args << QVariant(QMetaType(inputTypes[i]), argv[i]);
// make the call
QDBusMessage reply = q->callWithArgumentList(QDBus::Block, methodName, args);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 06:07:56 +0000