From 56cdd08e719c24eb622693e96c0857ed9291df94 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Mon, 14 Nov 2022 16:53:44 +0200
Subject: [PATCH] Fix build with Qt 5.6.

---
 src/libs/vlayout/vrawlayout.cpp   |  1 -
 src/libs/vlayout/vtextmanager.cpp |  3 +++
 src/libs/vmisc/vdatastreamenum.h  | 12 +++++-------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libs/vlayout/vrawlayout.cpp b/src/libs/vlayout/vrawlayout.cpp
index 42d404530..681fc32e6 100644
--- a/src/libs/vlayout/vrawlayout.cpp
+++ b/src/libs/vlayout/vrawlayout.cpp
@@ -39,7 +39,6 @@
 #endif
 
 #include "../vmisc/def.h"
-#include "../vmisc/vdatastreamenum.h"
 #include "../ifc/exception/vexception.h"
 
 const QByteArray VRawLayout::fileHeaderByteArray = QByteArray("RLD!...");
diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp
index e47ab7591..e5f1c630f 100644
--- a/src/libs/vlayout/vtextmanager.cpp
+++ b/src/libs/vlayout/vtextmanager.cpp
@@ -39,6 +39,9 @@
 #include "../ifc/xml/vabstractpattern.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
 #include "../vmisc/vabstractvalapplication.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
+#   include "../vmisc/vdatastreamenum.h"
+#endif
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/variables/vmeasurement.h"
diff --git a/src/libs/vmisc/vdatastreamenum.h b/src/libs/vmisc/vdatastreamenum.h
index 2df8ccb54..bf712cd70 100644
--- a/src/libs/vmisc/vdatastreamenum.h
+++ b/src/libs/vmisc/vdatastreamenum.h
@@ -39,19 +39,16 @@
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 template <typename T>
-typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type&
-operator<<(QDataStream &s, const T &t)
+auto operator<<(QDataStream &s, const T &t) -> typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type&
 {
     return s << static_cast<typename std::underlying_type<T>::type>(t);
 }
 
 template <typename T>
-typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type&
-operator>>(QDataStream &s, T &t)
+auto operator>>(QDataStream &s, T &t) -> typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type&
 {
-    return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t);
+    return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
 }
-#endif
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
 template <typename Enum>
@@ -68,6 +65,7 @@ inline QDataStream &operator>>(QDataStream &s, QFlags<Enum> &e)
     e = static_cast<QFlags<Enum>>(v);
     return s;
 }
-#endif
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 
 #endif // DATASTREAM_ENUM_H