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/dbus/qdbusmetatype | |
| 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/dbus/qdbusmetatype')
| -rw-r--r-- | tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
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) |