diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-01-03 10:41:37 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-04 13:20:06 +0100 |
commit | ad330f327e68fb42b3013b72a2b64588d2ce01fe (patch) | |
tree | cab31878ad0de229bbbda1e3708eb23ace6efdd1 /tests/auto | |
parent | bd04a3d136ed3384aa754f288201b5675a912596 (diff) |
DBus: Remove declaration of built-in and automatic metatypes.
These types are either built-in or 'automatically declared' and so
don't need to be explicitly declared as metatypes.
In some cases, the type is required to be registered with the typedef
name, so those Q_DECLARE_METATYPE uses remain for now. In a future
patch we can also remove those and the typedefs themselves.
Change-Id: I5721955c86f566ae09024203954840f817bd3088
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/dbus/qdbusinterface/myobject.h | 1 | ||||
-rw-r--r-- | tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp | 3 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusmarshall/common.h | 31 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp | 3 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp | 10 |
5 files changed, 0 insertions, 48 deletions
diff --git a/tests/auto/dbus/qdbusinterface/myobject.h b/tests/auto/dbus/qdbusinterface/myobject.h index 986289bfb6..597fdbc7a3 100644 --- a/tests/auto/dbus/qdbusinterface/myobject.h +++ b/tests/auto/dbus/qdbusinterface/myobject.h @@ -45,7 +45,6 @@ #include <QtCore/QObject> #include <QtDBus/QtDBus> -Q_DECLARE_METATYPE(QVariantList) class MyObject: public QObject { diff --git a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp index 707148ead4..72b383adf3 100644 --- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp +++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp @@ -45,9 +45,6 @@ #include <QtTest/QtTest> #include <QtDBus> -Q_DECLARE_METATYPE(QVariant) -Q_DECLARE_METATYPE(QList<int>) -Q_DECLARE_METATYPE(QVector<int>) class tst_QDBusLocalCalls: public QObject { diff --git a/tests/auto/dbus/qdbusmarshall/common.h b/tests/auto/dbus/qdbusmarshall/common.h index 0f2efd9edf..9b2c17c8fb 100644 --- a/tests/auto/dbus/qdbusmarshall/common.h +++ b/tests/auto/dbus/qdbusmarshall/common.h @@ -56,42 +56,13 @@ static bool compareFileDescriptors(int fd1, int fd2) } #endif -Q_DECLARE_METATYPE(QVariant) -Q_DECLARE_METATYPE(QList<bool>) -Q_DECLARE_METATYPE(QList<short>) -Q_DECLARE_METATYPE(QList<ushort>) -Q_DECLARE_METATYPE(QList<int>) -Q_DECLARE_METATYPE(QList<uint>) -Q_DECLARE_METATYPE(QList<qlonglong>) -Q_DECLARE_METATYPE(QList<qulonglong>) -Q_DECLARE_METATYPE(QList<double>) -Q_DECLARE_METATYPE(QList<QDBusVariant>) -Q_DECLARE_METATYPE(QList<QDateTime>) - -Q_DECLARE_METATYPE(QList<QByteArray>) -Q_DECLARE_METATYPE(QList<QVariantList>) -Q_DECLARE_METATYPE(QList<QStringList>) -Q_DECLARE_METATYPE(QList<QList<bool> >) -Q_DECLARE_METATYPE(QList<QList<short> >) -Q_DECLARE_METATYPE(QList<QList<ushort> >) -Q_DECLARE_METATYPE(QList<QList<int> >) -Q_DECLARE_METATYPE(QList<QList<uint> >) -Q_DECLARE_METATYPE(QList<QList<qlonglong> >) -Q_DECLARE_METATYPE(QList<QList<qulonglong> >) -Q_DECLARE_METATYPE(QList<QList<double> >) -Q_DECLARE_METATYPE(QList<QList<QDBusObjectPath> >) -Q_DECLARE_METATYPE(QList<QList<QDBusSignature> >) - typedef QMap<int, QString> IntStringMap; typedef QMap<QString, QString> StringStringMap; typedef QMap<QDBusObjectPath, QString> ObjectPathStringMap; typedef QMap<qlonglong, QDateTime> LLDateTimeMap; typedef QMap<QDBusSignature, QString> SignatureStringMap; -Q_DECLARE_METATYPE(IntStringMap) Q_DECLARE_METATYPE(StringStringMap) -Q_DECLARE_METATYPE(ObjectPathStringMap) Q_DECLARE_METATYPE(LLDateTimeMap) -Q_DECLARE_METATYPE(SignatureStringMap) static bool compare(const QDBusUnixFileDescriptor &t1, const QDBusUnixFileDescriptor &t2) { @@ -144,7 +115,6 @@ struct MyVariantMapStruct { return s == other.s && map == other.map; } }; Q_DECLARE_METATYPE(MyVariantMapStruct) -Q_DECLARE_METATYPE(QList<MyVariantMapStruct>) QDBusArgument &operator<<(QDBusArgument &arg, const MyVariantMapStruct &ms) { @@ -170,7 +140,6 @@ struct MyFileDescriptorStruct { return compare(fd, other.fd); } }; Q_DECLARE_METATYPE(MyFileDescriptorStruct) -Q_DECLARE_METATYPE(QList<MyFileDescriptorStruct>) QDBusArgument &operator<<(QDBusArgument &arg, const MyFileDescriptorStruct &ms) { diff --git a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp index 5773ba66dd..a3acc3ad54 100644 --- a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp +++ b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp @@ -83,9 +83,6 @@ Q_DECLARE_METATYPE(Struct1) Q_DECLARE_METATYPE(Struct4) Q_DECLARE_METATYPE(StringPair) -Q_DECLARE_METATYPE(QList<Struct1>) -Q_DECLARE_METATYPE(QList<Struct4>) - Q_DECLARE_METATYPE(const QMetaObject*) QT_BEGIN_NAMESPACE diff --git a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp index f0d15f4c20..1c93a558a8 100644 --- a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp +++ b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp @@ -93,11 +93,6 @@ Q_DECLARE_METATYPE(Struct3) Q_DECLARE_METATYPE(Struct4) Q_DECLARE_METATYPE(StringPair) -Q_DECLARE_METATYPE(QList<Struct1>) -Q_DECLARE_METATYPE(QList<Struct2>) -Q_DECLARE_METATYPE(QList<Struct3>) -Q_DECLARE_METATYPE(QList<Struct4>) - Q_DECLARE_METATYPE(Invalid0) Q_DECLARE_METATYPE(Invalid1) Q_DECLARE_METATYPE(Invalid2) @@ -107,14 +102,9 @@ Q_DECLARE_METATYPE(Invalid5) Q_DECLARE_METATYPE(Invalid6) Q_DECLARE_METATYPE(Invalid7) -Q_DECLARE_METATYPE(QList<Invalid0>) - typedef QMap<int, QString> IntStringMap; typedef QMap<QString, QString> StringStringMap; typedef QMap<QString, Struct1> StringStruct1Map; -Q_DECLARE_METATYPE(IntStringMap) -Q_DECLARE_METATYPE(StringStringMap) -Q_DECLARE_METATYPE(StringStruct1Map) Q_DECLARE_METATYPE(QVariant::Type) |