diff options
| author | Andrew Christian <andrew.christian@nokia.com> | 2012-02-15 14:04:55 -0500 |
|---|---|---|
| committer | Chris Craig <ext-chris.craig@nokia.com> | 2012-02-15 21:43:19 +0100 |
| commit | 883d1eb8b4c2203e06cba92e7368defd83241c31 (patch) | |
| tree | 8e3e69601574bdf932be8ff862a3d581583de6dc | |
| parent | 63f2d72f52bbd59f3db99af22b027ea704bc54b0 (diff) | |
Changed DECLARE_METATYPE macro to not prepend ::
Change-Id: I86a8c43b6bc3872cdc8f8fce1de9f115500ea59c
Reviewed-by: Chris Craig <ext-chris.craig@nokia.com>
| -rw-r--r-- | src/jsonauthority.h | 2 | ||||
| -rw-r--r-- | src/jsonpidauthority.h | 2 | ||||
| -rw-r--r-- | src/jsonstream-global.h | 8 | ||||
| -rw-r--r-- | src/jsontokenauthority.h | 2 | ||||
| -rw-r--r-- | src/jsonuidauthority.h | 2 | ||||
| -rw-r--r-- | src/jsonuidrangeauthority.h | 2 |
6 files changed, 8 insertions, 10 deletions
diff --git a/src/jsonauthority.h b/src/jsonauthority.h index aacfc7e..fca4867 100644 --- a/src/jsonauthority.h +++ b/src/jsonauthority.h @@ -85,6 +85,6 @@ public: QT_END_NAMESPACE_JSONSTREAM -QT_JSONSTREAM_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_JSONSTREAM(JsonAuthority) *) +QT_JSONSTREAM_DECLARE_METATYPE_PTR(JsonAuthority) #endif // JSONAUTHORITY_H diff --git a/src/jsonpidauthority.h b/src/jsonpidauthority.h index 8f0876e..512ad0a 100644 --- a/src/jsonpidauthority.h +++ b/src/jsonpidauthority.h @@ -70,6 +70,6 @@ private: QT_END_NAMESPACE_JSONSTREAM -QT_JSONSTREAM_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_JSONSTREAM(JsonPIDAuthority) *) +QT_JSONSTREAM_DECLARE_METATYPE_PTR(JsonPIDAuthority) #endif // JSONPIDAUTHORITYPROVIDER_H diff --git a/src/jsonstream-global.h b/src/jsonstream-global.h index d9bf27d..3edff30 100644 --- a/src/jsonstream-global.h +++ b/src/jsonstream-global.h @@ -61,11 +61,9 @@ # define QT_PREPEND_NAMESPACE_JSONSTREAM(name) ::QtAddOn::JsonStream::name #endif -// The compiler will not correctly expand this: -// Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_PROCESSMANAGER(ProcessFrontend) *) -// so we add an extra level of indirection so the correct expanded typename is processed -// by Q_DECLARE_METATYPE. -#define QT_JSONSTREAM_DECLARE_METATYPE(TYPE) Q_DECLARE_METATYPE(TYPE) +#define QT_JSONSTREAM_DECLARE_METATYPE_PTR(name) Q_DECLARE_METATYPE(QtAddOn::JsonStream::name *) +#define QT_JSONSTREAM_DECLARE_METATYPE_CONST_PTR(name) Q_DECLARE_METATYPE(const QtAddOn::JsonStream::name *) + QT_BEGIN_NAMESPACE_JSONSTREAM diff --git a/src/jsontokenauthority.h b/src/jsontokenauthority.h index acdfbf6..7ccbcae 100644 --- a/src/jsontokenauthority.h +++ b/src/jsontokenauthority.h @@ -67,6 +67,6 @@ private: QT_END_NAMESPACE_JSONSTREAM -QT_JSONSTREAM_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_JSONSTREAM(JsonTokenAuthority) *) +QT_JSONSTREAM_DECLARE_METATYPE_PTR(JsonTokenAuthority) #endif // JSONTOKENAUTHORITYPROVIDER_H diff --git a/src/jsonuidauthority.h b/src/jsonuidauthority.h index 2b91748..3558a93 100644 --- a/src/jsonuidauthority.h +++ b/src/jsonuidauthority.h @@ -74,6 +74,6 @@ private: QT_END_NAMESPACE_JSONSTREAM -QT_JSONSTREAM_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_JSONSTREAM(JsonUIDAuthority) *) +QT_JSONSTREAM_DECLARE_METATYPE_PTR(JsonUIDAuthority) #endif // JSONUIDAUTHORITYPROVIDER_H diff --git a/src/jsonuidrangeauthority.h b/src/jsonuidrangeauthority.h index 723612a..2622c2a 100644 --- a/src/jsonuidrangeauthority.h +++ b/src/jsonuidrangeauthority.h @@ -79,6 +79,6 @@ private: QT_END_NAMESPACE_JSONSTREAM -QT_JSONSTREAM_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_JSONSTREAM(JsonUIDRangeAuthority) *) +QT_JSONSTREAM_DECLARE_METATYPE_PTR(JsonUIDRangeAuthority) #endif // JSON_UID_RANGE_AUTHORITY_H |