Query serialization.

1 files changed, 16 insertions, 4 deletions

diff --git a/common/query.h b/common/query.h
index b858610..70b6d63 100644
--- a/common/query.h
+++ b/common/query.h
@@ -42,6 +42,7 @@ public:
         Comparator(const QVariant &v);
         Comparator(const QVariant &v, Comparators c);
         bool matches(const QVariant &v) const;
+        bool operator==(const Comparator &other) const;
 
         QVariant value;
         Comparators comparator;
@@ -51,8 +52,11 @@ public:
     public:
         QByteArrayList ids;
         QHash<QByteArray, Comparator> propertyFilter;
+        bool operator==(const Filter &other) const;
     };
 
+    bool operator==(const QueryBase &other) const;
+
     Comparator getFilter(const QByteArray &property) const
     {
         return mBaseFilterStage.propertyFilter.value(property);
@@ -68,6 +72,11 @@ public:
         mBaseFilterStage.propertyFilter = filter;
     }
 
+    void setFilter(const Filter &filter)
+    {
+        mBaseFilterStage = filter;
+    }
+
     QHash<QByteArray, Comparator> getBaseFilters() const
     {
         return mBaseFilterStage.propertyFilter;
@@ -110,12 +119,12 @@ public:
 
     void setSortProperty(const QByteArray &property)
     {
-        mSortPorperty = property;
+        mSortProperty = property;
     }
 
     QByteArray sortProperty() const
     {
-        return mSortPorperty;
+        return mSortProperty;
     }
 
     class FilterStage {
@@ -244,7 +253,7 @@ private:
     Filter mBaseFilterStage;
     QList<QSharedPointer<FilterStage>> mFilterStages;
     QByteArray mType;
-    QByteArray mSortPorperty;
+    QByteArray mSortProperty;
 };
 
 /**
@@ -458,7 +467,10 @@ private:
 
 }
 
-QDebug operator<<(QDebug dbg, const Sink::Query::Comparator &c);
+QDebug SINK_EXPORT operator<<(QDebug dbg, const Sink::Query::Comparator &c);
+QDataStream & SINK_EXPORT operator<< (QDataStream &stream, const Sink::QueryBase &query);
+QDataStream & SINK_EXPORT operator>> (QDataStream &stream, Sink::QueryBase &query);
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Sink::Query::Flags)
+Q_DECLARE_METATYPE(Sink::QueryBase);
 Q_DECLARE_METATYPE(Sink::Query);