diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-15 13:24:04 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-15 16:09:25 +0000 |
| commit | 5cf39393d93205490ccf829dc795fed05bf47c71 (patch) | |
| tree | e50805dda74fc9633aef0de6a4de081f956d0841 /src/libs/modelinglib | |
| parent | 018581a8c20ea08f5349df159599ca5c34db524f (diff) | |
ModelEditor: Simplify template syntax a bit
... using C++14's "_t" typdef.
Change-Id: I863ee99bdcfea92ae7fe6fda0eb1d1ee16db445d
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/modelinglib')
| -rw-r--r-- | src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h index c92ac8f3760..e9b2f0699ae 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h @@ -200,14 +200,14 @@ Archive &loadPointer(Archive &ar, BASE *&p) } template<class Archive, class T> -typename std::enable_if<!std::is_abstract<T>::value, void>::type loadNonVirtualPointer( +typename std::enable_if_t<!std::is_abstract<T>::value, void> loadNonVirtualPointer( Archive &archive, T *&p) { registry::loadPointer<Archive, T, T>(archive, p); } template<class Archive, class T> -typename std::enable_if<std::is_abstract<T>::value, void>::type loadNonVirtualPointer( +typename std::enable_if_t<std::is_abstract<T>::value, void> loadNonVirtualPointer( Archive &archive, T *&p) { (void) archive; @@ -302,6 +302,6 @@ typename registry::TypeRegistry<Archive,T>::TypeInfo typeInfo(const QString &uid int qark::registry::DerivedTypeRegistry<OUTARCHIVE, BASE, DERIVED>::staticInit = \ qark::registry::DerivedTypeRegistry<OUTARCHIVE, BASE, DERIVED>::init(qark::registry::savePointer<OUTARCHIVE, BASE, DERIVED>, 0); \ template<> \ - int qark::registry::DerivedTypeRegistry<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>::staticInit = \ - qark::registry::DerivedTypeRegistry<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>:: \ - init(qark::registry::savePointer<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>, 0); + int qark::registry::DerivedTypeRegistry<OUTARCHIVE, std::add_const_t<BASE>, std::add_const_t<DERIVED>>::staticInit = \ + qark::registry::DerivedTypeRegistry<OUTARCHIVE, std::add_const_t<BASE>, std::add_const_t<DERIVED>>:: \ + init(qark::registry::savePointer<OUTARCHIVE, std::add_const_t<BASE>, std::add_const_t<DERIVED>>, 0); |