From 5177057be100c91f418eb520c33bad8a1ff76a5e Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Tue, 7 Jan 2020 09:45:26 +0200
Subject: [PATCH] Since Qt 5.14 enumerations can be serialized through
 QDataStream without the need of manually defining streaming operators. Enum
 classes are serialized using the declared size.

--HG--
branch : develop
---
 src/libs/vgeometry/vgeometrydef.cpp   | 4 +++-
 src/libs/vlayout/vabstractpiece_p.h   | 4 +++-
 src/libs/vlayout/vlayoutpiece_p.h     | 4 +++-
 src/libs/vlayout/vlayoutpiecepath_p.h | 4 +++-
 src/libs/vlayout/vtextmanager.cpp     | 4 +++-
 src/libs/vmisc/def.cpp                | 4 +++-
 src/libs/vmisc/vdatastreamenum.h      | 2 ++
 src/libs/vpatterndb/vpiecenode_p.h    | 4 +++-
 8 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/libs/vgeometry/vgeometrydef.cpp b/src/libs/vgeometry/vgeometrydef.cpp
index 0d8aac1f0..e8e231951 100644
--- a/src/libs/vgeometry/vgeometrydef.cpp
+++ b/src/libs/vgeometry/vgeometrydef.cpp
@@ -28,7 +28,9 @@
 
 #include "vgeometrydef.h"
 
-#include "../vmisc/vdatastreamenum.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#   include "../vmisc/vdatastreamenum.h"
+#endif
 #include "../ifc/exception/vexception.h"
 
 #include <QCoreApplication>
diff --git a/src/libs/vlayout/vabstractpiece_p.h b/src/libs/vlayout/vabstractpiece_p.h
index 650d0dc0d..562c941d2 100644
--- a/src/libs/vlayout/vabstractpiece_p.h
+++ b/src/libs/vlayout/vabstractpiece_p.h
@@ -34,7 +34,9 @@
 #include <QCoreApplication>
 
 #include "../vmisc/diagnostic.h"
-#include "../vmisc/vdatastreamenum.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#   include "../vmisc/vdatastreamenum.h"
+#endif
 #include "../vmisc/defglobal.h"
 #include "../ifc/exception/vexception.h"
 
diff --git a/src/libs/vlayout/vlayoutpiece_p.h b/src/libs/vlayout/vlayoutpiece_p.h
index 1f6f41a3a..7c53713a8 100644
--- a/src/libs/vlayout/vlayoutpiece_p.h
+++ b/src/libs/vlayout/vlayoutpiece_p.h
@@ -38,7 +38,9 @@
 #include "../vpatterndb/floatItemData/vpatternlabeldata.h"
 #include "../vpatterndb/floatItemData/vgrainlinedata.h"
 #include "../vmisc/diagnostic.h"
-#include "../vmisc/vdatastreamenum.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#   include "../vmisc/vdatastreamenum.h"
+#endif
 #include "vlayoutpiecepath.h"
 #include "../vgeometry/vgeometrydef.h"
 #include "vtextmanager.h"
diff --git a/src/libs/vlayout/vlayoutpiecepath_p.h b/src/libs/vlayout/vlayoutpiecepath_p.h
index b5438889a..265499a31 100644
--- a/src/libs/vlayout/vlayoutpiecepath_p.h
+++ b/src/libs/vlayout/vlayoutpiecepath_p.h
@@ -34,7 +34,9 @@
 #include <QVector>
 
 #include "../vmisc/diagnostic.h"
-#include "../vmisc/vdatastreamenum.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#   include "../vmisc/vdatastreamenum.h"
+#endif
 #include "../ifc/exception/vexception.h"
 
 QT_WARNING_PUSH
diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp
index e9ef99ae7..2a6005862 100644
--- a/src/libs/vlayout/vtextmanager.cpp
+++ b/src/libs/vlayout/vtextmanager.cpp
@@ -39,7 +39,9 @@
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vmath.h"
-#include "../vmisc/vdatastreamenum.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#   include "../vmisc/vdatastreamenum.h"
+#endif
 #include "../vpatterndb/vcontainer.h"
 #include "vtextmanager.h"
 
diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp
index d3246c026..943595a25 100644
--- a/src/libs/vmisc/def.cpp
+++ b/src/libs/vmisc/def.cpp
@@ -56,7 +56,9 @@
 #include <QGlobalStatic>
 
 #include "vabstractapplication.h"
-#include "vdatastreamenum.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#   include "vdatastreamenum.h"
+#endif
 #include "../ifc/exception/vexception.h"
 
 const qreal   defCurveApproximationScale = 0.5;
diff --git a/src/libs/vmisc/vdatastreamenum.h b/src/libs/vmisc/vdatastreamenum.h
index d46455a83..3b998ab23 100644
--- a/src/libs/vmisc/vdatastreamenum.h
+++ b/src/libs/vmisc/vdatastreamenum.h
@@ -34,6 +34,7 @@
 
 // (de)serialize enums into QDataStream
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
 //a function that can serialize any enum into QDataStream
 //it stores the enum in a qint64
 template<typename Enum,
@@ -54,6 +55,7 @@ inline QDataStream& operator>>(QDataStream& stream, Enum& e)
     e = static_cast<Enum>(v);
     return stream;
 }
+#endif
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
 template <typename Enum>
diff --git a/src/libs/vpatterndb/vpiecenode_p.h b/src/libs/vpatterndb/vpiecenode_p.h
index 056dd5797..f71d2d5a1 100644
--- a/src/libs/vpatterndb/vpiecenode_p.h
+++ b/src/libs/vpatterndb/vpiecenode_p.h
@@ -36,7 +36,9 @@
 #include "../ifc/ifcdef.h"
 #include "../ifc/exception/vexception.h"
 #include "../vmisc/diagnostic.h"
-#include "../vmisc/vdatastreamenum.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#   include "../vmisc/vdatastreamenum.h"
+#endif
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")