diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-09 12:30:11 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-23 19:30:15 +0200 |
| commit | d39bd9e258a5bb45f6209d892ed682809623807d (patch) | |
| tree | fc75877633b97db8d54930f3826d27ce359c9db7 /src/dbus/qdbusintegrator.cpp | |
| parent | abd1b7f3068e7d4a41adf440d6f6163bfa9f531a (diff) | |
Cleanup DBus type registration code
Modernize the code base, use QMetaType and avoid
reinterpret_casts.
Change-Id: I0bad2ee393a0f850cf40b248cb9439b06ed9f663
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusintegrator.cpp')
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 24a571e227..e177583bfa 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -952,7 +952,7 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const Q *reinterpret_cast<const QDBusArgument *>(arg.constData()); QVariant &out = auxParameters[auxParameters.count() - 1]; - if (Q_UNLIKELY(!QDBusMetaType::demarshall(in, out.userType(), out.data()))) + if (Q_UNLIKELY(!QDBusMetaType::demarshall(in, out.metaType(), out.data()))) qFatal("Internal error: demarshalling function for type '%s' (%d) failed!", out.typeName(), out.userType()); |