From 5cf39393d93205490ccf829dc795fed05bf47c71 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 15 Feb 2018 13:24:04 +0100
Subject: [PATCH] ModelEditor: Simplify template syntax a bit

... using C++14's "_t" typdef.

Change-Id: I863ee99bdcfea92ae7fe6fda0eb1d1ee16db445d
Reviewed-by: hjk <hjk@qt.io>
---
 .../qtserialization/inc/qark/typeregistry.h            | 10 +++++-----
 1 file 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);