From e796a90e5c40f820ca76dd039bbb2cf629bf63a5 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sat, 3 Dec 2016 08:49:01 -0800
Subject: Match operator>>: m_detailType is deserialized as quint32

So serialize it as quint32 too.

Change-Id: I73fa1e59a4844c43a109fffd148cccf7afe00b6c
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
---
 src/organizer/filters/qorganizeritemdetailfieldfilter_p.h | 2 +-
 src/organizer/filters/qorganizeritemdetailfilter_p.h      | 2 +-
 src/organizer/filters/qorganizeritemdetailrangefilter_p.h | 3 ++-
 src/organizer/qorganizeritemdetail.cpp                    | 2 +-
 src/organizer/qorganizeritemsortorder.cpp                 | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/organizer/filters/qorganizeritemdetailfieldfilter_p.h b/src/organizer/filters/qorganizeritemdetailfieldfilter_p.h
index d2d78e691..0c9e5ccda 100644
--- a/src/organizer/filters/qorganizeritemdetailfieldfilter_p.h
+++ b/src/organizer/filters/qorganizeritemdetailfieldfilter_p.h
@@ -78,7 +78,7 @@ public:
     QDataStream &outputToStream(QDataStream &stream, quint8 formatVersion) const
     {
         if (formatVersion == 1)
-            stream << m_detailType << m_detailField << m_exactValue << static_cast<quint32>(m_flags);
+            stream << quint32(m_detailType) << m_detailField << m_exactValue << static_cast<quint32>(m_flags);
         return stream;
     }
 
diff --git a/src/organizer/filters/qorganizeritemdetailfilter_p.h b/src/organizer/filters/qorganizeritemdetailfilter_p.h
index 06572b1c9..725719b4d 100644
--- a/src/organizer/filters/qorganizeritemdetailfilter_p.h
+++ b/src/organizer/filters/qorganizeritemdetailfilter_p.h
@@ -78,7 +78,7 @@ public:
     QDataStream &outputToStream(QDataStream &stream, quint8 formatVersion) const
     {
         if (formatVersion == 1)
-            stream << m_detailType << m_detailFields << m_exactValues << static_cast<quint32>(m_flags);
+            stream << quint32(m_detailType) << m_detailFields << m_exactValues << static_cast<quint32>(m_flags);
         return stream;
     }
 
diff --git a/src/organizer/filters/qorganizeritemdetailrangefilter_p.h b/src/organizer/filters/qorganizeritemdetailrangefilter_p.h
index 13b088a03..d9862ef7d 100644
--- a/src/organizer/filters/qorganizeritemdetailrangefilter_p.h
+++ b/src/organizer/filters/qorganizeritemdetailrangefilter_p.h
@@ -79,7 +79,8 @@ public:
     QDataStream &outputToStream(QDataStream &stream, quint8 formatVersion) const
     {
         if (formatVersion == 1) {
-            stream << m_detailType << m_detailField << m_minValue << m_maxValue
+            stream << static_cast<quint32>(m_detailType)
+                   << m_detailField << m_minValue << m_maxValue
                    << static_cast<quint32>(m_flags)
                    << static_cast<quint32>(m_rangeflags);
         }
diff --git a/src/organizer/qorganizeritemdetail.cpp b/src/organizer/qorganizeritemdetail.cpp
index 24ddad0c0..5db5c7817 100644
--- a/src/organizer/qorganizeritemdetail.cpp
+++ b/src/organizer/qorganizeritemdetail.cpp
@@ -286,7 +286,7 @@ Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerIte
 {
     quint8 formatVersion = 1; // Version of QDataStream format for QOrganizerItemDetail
     return out << formatVersion
-               << detail.type()
+               << static_cast<quint32>(detail.type())
                << detail.values();
 }
 
diff --git a/src/organizer/qorganizeritemsortorder.cpp b/src/organizer/qorganizeritemsortorder.cpp
index ca9a8c94e..ccc35f600 100644
--- a/src/organizer/qorganizeritemsortorder.cpp
+++ b/src/organizer/qorganizeritemsortorder.cpp
@@ -138,7 +138,7 @@ QDataStream &operator<<(QDataStream &out, const QOrganizerItemSortOrder &sortOrd
 {
     quint8 formatVersion = 1; // Version of QDataStream format for QOrganizerItemSortOrder
     return out << formatVersion
-               << sortOrder.detailType()
+               << static_cast<quint32>(sortOrder.detailType())
                << sortOrder.detailField()
                << static_cast<quint32>(sortOrder.blankPolicy())
                << static_cast<quint32>(sortOrder.direction())
-- 
cgit v1.2.3