diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-01 22:55:54 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 01:08:05 +0200 |
| commit | 13e1e30ec39e9039930a25d851bb525ec486a15d (patch) | |
| tree | 1570f7f7700e0ec2763c5b6113db2ea08d966e0c /src/corelib | |
| parent | 2ec9d34df6003107c865661b8abfb9a9fa38c146 (diff) | |
Add constexpr template specializations for built in metatypes.
This will make it possible (in Qt 6) to remove the enums listing
metatype ids. As it is constexpr, it can be used in switch statements
just like enums, as enum values, and as template specialization values.
Change-Id: I51293674c403714e34cb8a8b8953522fc97a740a
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index a42333fbf8..79514c8116 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -536,17 +536,17 @@ template <typename T> struct QMetaTypeId2 { enum { Defined = QMetaTypeId<T>::Defined }; - static inline int qt_metatype_id() { return QMetaTypeId<T>::qt_metatype_id(); } + static inline Q_DECL_CONSTEXPR int qt_metatype_id() { return QMetaTypeId<T>::qt_metatype_id(); } }; namespace QtPrivate { template <typename T, bool Defined = QMetaTypeId2<T>::Defined> struct QMetaTypeIdHelper { - static inline int qt_metatype_id() + static inline Q_DECL_CONSTEXPR int qt_metatype_id() { return QMetaTypeId2<T>::qt_metatype_id(); } }; template <typename T> struct QMetaTypeIdHelper<T, false> { - static inline int qt_metatype_id() + static inline Q_DECL_CONSTEXPR int qt_metatype_id() { return -1; } }; @@ -624,7 +624,7 @@ void qRegisterMetaTypeStreamOperators(const char *typeName #endif // QT_NO_DATASTREAM template <typename T> -inline int qMetaTypeId( +inline Q_DECL_CONSTEXPR int qMetaTypeId( #ifndef qdoc T * /* dummy */ = 0 #endif @@ -713,7 +713,7 @@ inline int qRegisterMetaTypeStreamOperators() template<> struct QMetaTypeId2<TYPE> \ { \ enum { Defined = 1, MetaType = QMetaType::NAME }; \ - static inline int qt_metatype_id() { return QMetaType::NAME; } \ + static inline Q_DECL_CONSTEXPR int qt_metatype_id() { return QMetaType::NAME; } \ }; \ QT_END_NAMESPACE |