path: root/src/dbus/qdbusmetatype.h
diff options
authorMarc Mutz <>2012-07-20 10:34:27 +0200
committerQt by Nokia <>2012-07-24 20:11:05 +0200
commite9ecf1b420d8f0fc4393cbfdea2fe731409d83c6 (patch)
treed9a13f2e48954c6dac35f6b43d3fabc6ebbc831f /src/dbus/qdbusmetatype.h
parent95232af3effab1f722c31e136c59fdd4ae3967b1 (diff)
QtDBus: use qMetaTypeId<T>() instead of qRegisterMetaType<T>("T")
Using qMetaTypeId<T> has the advantage that multiple calls during a program run are much more efficient, since an inlined atomic is used to store the result. It also ensures that Q_DECLARE_METATYPE(T) has been used, whereas qRegisterMetaType<T> (the unary version) will happily register anything. Had to add a proper default constructor to QDBusError, as the one doubling as the default constructor wasn't available under QT_BOOTSTRAP, but Q_DECLARE_METATYPE requires a default ctor. Also changed a nullary qRegisterMetaType() to qMetaTypeId() in qDBusRegisterMetaType(). They're equivalent, since the former just calls the latter, but apart from the miniscule optimisation that the compiler has to instantiate one function less, the result is also used, so using qMetaTypeId() better expresses what 'id' is. Change-Id: Ib9dde17923ab9ee55f9464138a625ab8cd55c482 Reviewed-by: Stephen Kelly <>
Diffstat (limited to 'src/dbus/qdbusmetatype.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h
index bb791c9636..060e8adf2e 100644
--- a/src/dbus/qdbusmetatype.h
+++ b/src/dbus/qdbusmetatype.h
@@ -84,7 +84,7 @@ int qDBusRegisterMetaType(
void (*mf)(QDBusArgument &, const T *) = qDBusMarshallHelper<T>;
void (*df)(const QDBusArgument &, T *) = qDBusDemarshallHelper<T>;
- int id = qRegisterMetaType<T>(); // make sure it's registered
+ int id = qMetaTypeId<T>(); // make sure it's registered