feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ModelEditor: Simplify template syntax a bit

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

Change-Id: I863ee99bdcfea92ae7fe6fda0eb1d1ee16db445d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2018-02-15 13:24:04 +01:00
parent 018581a8c2
commit 5cf39393d9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
View File

@@ -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);