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/qdbusmetatype_p.h | |
| 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/qdbusmetatype_p.h')
| -rw-r--r-- | src/dbus/qdbusmetatype_p.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/dbus/qdbusmetatype_p.h b/src/dbus/qdbusmetatype_p.h index 1aa11552df..39deaf9f2f 100644 --- a/src/dbus/qdbusmetatype_p.h +++ b/src/dbus/qdbusmetatype_p.h @@ -78,11 +78,7 @@ struct QDBusMetaTypeId }; inline int QDBusMetaTypeId::message() -#ifdef QT_BOOTSTRAPPED -{ return qDBusRegisterMetaType<QList<QDBusUnixFileDescriptor> >() + 1; } -#else { return qMetaTypeId<QDBusMessage>(); } -#endif inline int QDBusMetaTypeId::argument() { return qMetaTypeId<QDBusArgument>(); } @@ -97,11 +93,7 @@ inline int QDBusMetaTypeId::signature() { return qMetaTypeId<QDBusSignature>(); } inline int QDBusMetaTypeId::error() -#ifdef QT_BOOTSTRAPPED -{ return qDBusRegisterMetaType<QList<QDBusUnixFileDescriptor> >() + 2; } -#else { return qMetaTypeId<QDBusError>(); } -#endif inline int QDBusMetaTypeId::unixfd() { return qMetaTypeId<QDBusUnixFileDescriptor>(); } |