diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2014-11-13 10:50:50 +0100 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-11-17 14:54:09 +0100 |
| commit | 801c5326360405cd3c7cae4ec57d466d98ca31e7 (patch) | |
| tree | 67e88233bb6a64b189b2b3e1efa6ebf9e0848a24 /src/dbus/qdbusmetaobject.cpp | |
| parent | c5ecabb70c0f0cb25a22bf3742f39648a34d1c3c (diff) | |
Update dbus to use new QMetaType::registerNormalizedType signature
Change-Id: I5d755f383d8cd226a25bd495f6854c0db9719a51
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusmetaobject.cpp')
| -rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 9f07817df0..1fe5428f06 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -123,17 +123,6 @@ QDBusMetaObjectGenerator::QDBusMetaObjectGenerator(const QString &interfaceName, static int registerComplexDBusType(const char *typeName) { struct QDBusRawTypeHandler { - static void destroy(void *) - { - qFatal("Cannot destroy placeholder type QDBusRawType"); - } - - static void *create(const void *) - { - qFatal("Cannot create placeholder type QDBusRawType"); - return 0; - } - static void destruct(void *) { qFatal("Cannot destruct placeholder type QDBusRawType"); @@ -146,8 +135,7 @@ static int registerComplexDBusType(const char *typeName) } }; - return QMetaType::registerNormalizedType(typeName, QDBusRawTypeHandler::destroy, - QDBusRawTypeHandler::create, + return QMetaType::registerNormalizedType(typeName, QDBusRawTypeHandler::destruct, QDBusRawTypeHandler::construct, sizeof(void *), |