From 801c5326360405cd3c7cae4ec57d466d98ca31e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 13 Nov 2014 10:50:50 +0100 Subject: [PATCH] Update dbus to use new QMetaType::registerNormalizedType signature Change-Id: I5d755f383d8cd226a25bd495f6854c0db9719a51 Reviewed-by: Thiago Macieira --- src/dbus/qdbusmetaobject.cpp | 14 +------------- 1 file changed, 1 insertion(+), 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 *),