From 4eb5b11af789ad30f9e20b0527562d73825e6f33 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 23 Apr 2006 19:04:53 +0000 Subject: * qt/qdbusconnection_p.h: * qt/qdbusmetaobject.cpp: * qt/qdbusmetaobject_p.h: * qt/qdbusintegrator.cpp: Use the new merged-interface mode for the dynamic meta object. No need to guess which interface to call. * qt/qdbusabstractinterface_p.h: * qt/qdbusconnection.cpp: * qt/qdbusintegrator.cpp: * qt/qdbusinterface.cpp: * qt/qdbusinterface.h: Make findInterface always return a non-null pointer. Add a QDBusRef that looks and behaves like DCOPRef. --- qt/qdbusmetaobject_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt/qdbusmetaobject_p.h') diff --git a/qt/qdbusmetaobject_p.h b/qt/qdbusmetaobject_p.h index c62c9727..7d6c5caa 100644 --- a/qt/qdbusmetaobject_p.h +++ b/qt/qdbusmetaobject_p.h @@ -46,7 +46,7 @@ struct QDBUS_EXPORT QDBusMetaObject: public QMetaObject { bool cached; - static QDBusMetaObject *createMetaObject(QString &interface, const QString &xml, + static QDBusMetaObject *createMetaObject(const QString &interface, const QString &xml, QHash &map, QDBusError &error); ~QDBusMetaObject() -- cgit