diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-06-19 23:01:15 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-08-07 20:09:17 +0000 |
| commit | 80179e3b7e91bbe4d129b95eab8c6350e26f5569 (patch) | |
| tree | 3e44b8b7d3a8033c8dd03585e21f5e27d8ebc71f /src/dbus | |
| parent | 5f1f0fe0b71c19be041ec85a9449584649c9fc18 (diff) | |
Port users of QDBusAbstractInterface::(async)callWithArgumentList() to new variadic (async)Call()
Except in the auto-generated files.
Required to add a cast operator from QDBusObjectPath to QVariant, as the
variadic call() uses QVariant(arg) instead of QVariant::fromValue(arg).
[ChangeLog][QtDBus][QDBusObjectPath] Added explicit cast operator to QVariant.
Change-Id: I3f3004f7b9300a6340d27488f5b97981cbab3c24
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusextratypes.cpp | 8 | ||||
| -rw-r--r-- | src/dbus/qdbusextratypes.h | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp index a0b121a1a3..06fbd6062e 100644 --- a/src/dbus/qdbusextratypes.cpp +++ b/src/dbus/qdbusextratypes.cpp @@ -167,6 +167,14 @@ void QDBusSignature::doCheck() */ /*! + \since 5.14 + + Implicit cast to QVariant. Equivalent to calling + QVariant::fromValue() with this object as argument. +*/ +QDBusObjectPath::operator QVariant() const { return QVariant::fromValue(*this); } + +/*! \class QDBusSignature \inmodule QtDBus \since 4.2 diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index fdac917947..6bb12ffe49 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE - class Q_DBUS_EXPORT QDBusObjectPath { QString m_path; @@ -75,6 +74,8 @@ public: inline QString path() const { return m_path; } + operator QVariant() const; + private: void doCheck(); }; |