diff options
author | hjk <hjk@theqtcompany.com> | 2016-03-18 07:55:01 +0100 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2016-03-30 15:20:19 +0000 |
commit | 39a38d5679084b515276285c044d8a27e671adb1 (patch) | |
tree | 8f72b00aa4a7db53eb8e193119033edf1ae9b0e4 /src/libs/modelinglib/qtserialization | |
parent | 6b805c217273b9d169aa7e8a78949e17179016bf (diff) |
Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce
Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/libs/modelinglib/qtserialization')
20 files changed, 20 insertions, 81 deletions
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/access.h b/src/libs/modelinglib/qtserialization/inc/qark/access.h index bc12e32af8a..276e6a275e3 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/access.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/access.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_ACCESS_H -#define QARK_ACCESS_H +#pragma once namespace qark { @@ -106,5 +105,3 @@ void serializeHelper(Archive &archive, T &t) #define QARK_ACCESS_SPECIALIZE(INARCHIVE, OUTARCHIVE, TYPE) \ template class Access<INARCHIVE, TYPE>; \ template class Access<OUTARCHIVE, TYPE>; - -#endif // QARK_ACCESS_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h b/src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h index 4f9ad079d98..591954d20f3 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_ARCHIVEBASICS_H -#define QARK_ARCHIVEBASICS_H +#pragma once #include "flag.h" @@ -84,5 +83,3 @@ private: }; } // namespace qark - -#endif // QARK_ARCHIVEBASICS_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/attribute.h b/src/libs/modelinglib/qtserialization/inc/qark/attribute.h index da1203ad536..7070964d6fb 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/attribute.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/attribute.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_ATTRIBUTE_H -#define QARK_ATTRIBUTE_H +#pragma once #include "parameters.h" @@ -368,5 +367,3 @@ GetSetFuncAttr<U, T, V> attr(const QString &qualifiedName, U &u, T (*func)(const } } // namespace qark - -#endif // QARK_ATTRIBUTE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h b/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h index 99776515a30..4fae0f2e7a0 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_BASECLASS_H -#define QARK_BASECLASS_H +#pragma once #include "typeregistry.h" #include "parameters.h" @@ -99,5 +98,3 @@ Base<BASE, DERIVED> base(DERIVED &obj, const Parameters ¶meters) } } // namespace qark - -#endif // QARK_BASECLASS_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/flag.h b/src/libs/modelinglib/qtserialization/inc/qark/flag.h index 932c6b40836..e1ac63c484a 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/flag.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/flag.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_FLAG_H -#define QARK_FLAG_H +#pragma once namespace qark { @@ -43,5 +42,3 @@ private: }; } // namespace qark - -#endif // QARK_FLAG_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/friend_access.h b/src/libs/modelinglib/qtserialization/inc/qark/friend_access.h index 5c39a37aba0..37b5fd35d06 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/friend_access.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/friend_access.h @@ -23,11 +23,8 @@ ** ****************************************************************************/ -#ifndef QARK_FRIEND_ACCESS_H -#define QARK_FRIEND_ACCESS_H +#pragma once #define QARK_FRIEND_ACCESS \ template<class Archive, class T> \ friend class qark::Access; - -#endif // QMT_FRIEND_ACCESS_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h b/src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h index 1e44d169cfe..6e290bd9276 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_LOADINGREFMAP_H -#define QARK_LOADINGREFMAP_H +#pragma once #include "objectid.h" @@ -63,5 +62,3 @@ private: } // namespace impl } // namespace qark - -#endif // QARK_LOADINGREFMAP_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h b/src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h index 142f2975b29..98c9b713438 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_OBJECTID_H -#define QARK_OBJECTID_H +#pragma once namespace qark { namespace impl { @@ -51,5 +50,3 @@ inline bool operator<(const ObjectId &lhs, const ObjectId &rhs) } // namespace impl } // namespace qark - -#endif // QARK_OBJECTID_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h b/src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h index f80f432ff52..b87fa6c3ede 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SAVINGREFMAP_H -#define QARK_SAVINGREFMAP_H +#pragma once #include "objectid.h" @@ -73,5 +72,3 @@ private: } // namespace impl } // namespace qark - -#endif // QARK_SAVINGREFMAP_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/parameters.h b/src/libs/modelinglib/qtserialization/inc/qark/parameters.h index 37f38aa74f4..c583ff183b9 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/parameters.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/parameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_PARAMETER_H -#define QARK_PARAMETER_H +#pragma once #include "flag.h" @@ -56,5 +55,3 @@ private: }; } // namespace qark - -#endif // QARK_PARAMETER_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h index b6f1ef077ed..b11a4db04b2 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_QXMLINARCHIVE_H -#define QARK_QXMLINARCHIVE_H +#pragma once #include "archivebasics.h" #include "tag.h" @@ -925,5 +924,3 @@ void QXmlInArchive::skipUntilEndOfTag(const XmlTag &xmlTag) } } // namespace qark - -#endif // QARK_XMLINARCHIVE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h index 651d7458e24..91525173cbc 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_QXMLOUTARCHIVE_H -#define QARK_QXMLOUTARCHIVE_H +#pragma once #include "archivebasics.h" #include "tag.h" @@ -327,5 +326,3 @@ private: }; } // namespace qark - -#endif // QARK_QXMLOUTARCHIVE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/reference.h b/src/libs/modelinglib/qtserialization/inc/qark/reference.h index cd2f8ac93b8..c00c6b66641 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/reference.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/reference.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_REFERENCE_H -#define QARK_REFERENCE_H +#pragma once #include "parameters.h" @@ -422,5 +421,3 @@ GetSetFuncRef<U, T *, V * const &> ref(const QString &qualifiedName, U &u, T *(* } } // namespace qark - -#endif // QARK_REFERENCE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize.h index bff84bbc62d..57a3a19e08c 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_H -#define QARK_SERIALIZE_H +#pragma once #include "tag.h" #include "baseclass.h" @@ -494,5 +493,3 @@ typename std::enable_if<Archive::inArchive, Archive &>::type operator||( } } // namespace qark - -#endif // QARK_SERIALIZE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h index 06e69d143c2..695c53031dc 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_BASIC_H -#define QARK_SERIALIZE_BASIC_H +#pragma once #include "parameters.h" #include "qstringparser/qstringparser.h" @@ -126,5 +125,3 @@ inline void load(Archive &archive, QDateTime &dateTime, const Parameters &) } } // namespace qark - -#endif // QARK_SERIALIZE_BASIC_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h index 85865398b25..a9d8e2a9224 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_CONTAINER_H -#define QARK_SERIALIZE_CONTAINER_H +#pragma once #include "parameters.h" @@ -201,5 +200,3 @@ inline void load(Archive &archive, QHash<KEY, VALUE> &hash, const Parameters &) } } // namespace qark - -#endif // QARK_SERIALIZE_CONTAINER_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h index c4dcf219c6c..f8c20f2896a 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_ENUM_H -#define QARK_SERIALIZE_ENUM_H +#pragma once #include "parameters.h" @@ -81,5 +80,3 @@ inline void load(Archive &archive, QFlags<T> &flags, const Parameters &) } } // namespace qark - -#endif // QARK_SERIALIZE_ENUM_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h index 2338676b243..876609643d3 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_POINTER_H -#define QARK_SERIALIZE_POINTER_H +#pragma once #include "typeregistry.h" @@ -86,6 +85,3 @@ void load(Archive &archive, T *&p, const Parameters &) } } // namespace qark - -#endif // QARK_SERIALIZE_POINTER_H - diff --git a/src/libs/modelinglib/qtserialization/inc/qark/tag.h b/src/libs/modelinglib/qtserialization/inc/qark/tag.h index 5f6615bd36f..24f81e5d920 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/tag.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/tag.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_TAG_H -#define QARK_TAG_H +#pragma once #include "typeregistry.h" #include "parameters.h" @@ -150,5 +149,3 @@ inline End end(const Parameters ¶meters) } } // namespace qark - -#endif // QARK_TAG_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h index 50090e18265..aa0750cfdbe 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_TYPEREGISTRY_H -#define QARK_TYPEREGISTRY_H +#pragma once #include "parameters.h" @@ -308,5 +307,3 @@ typename registry::TypeRegistry<Archive,T>::TypeInfo typeInfo(const QString &uid 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); - -#endif // QARK_TYPEREGISTRY_H |