Resource factory methods and capability filter.

1 files changed, 11 insertions, 3 deletions

diff --git a/common/query.h b/common/query.h
index 5c0d5c9..8a420f9 100644
--- a/common/query.h
+++ b/common/query.h
@@ -35,7 +35,7 @@ class SINK_EXPORT Query
 public:
     enum Flag
     {
-        /** Leave the query running an contiously update the result set. */
+        /** Leave the query running and continuously update the result set. */
         LiveQuery
     };
     Q_DECLARE_FLAGS(Flags, Flag)
@@ -43,14 +43,14 @@ public:
     static Query PropertyFilter(const QByteArray &key, const QVariant &value)
     {
         Query query;
-        query.propertyFilter.insert(key, value);
+        query.propertyFilter.insert(key, Comparator(value));
         return query;
     }
 
     static Query PropertyContainsFilter(const QByteArray &key, const QVariant &value)
     {
         Query query;
-        query.propertyFilter.insert(key, value);
+        query.propertyFilter.insert(key, Comparator(value, Comparator::Contains));
         return query;
     }
 
@@ -85,6 +85,13 @@ public:
         return query;
     }
 
+    static Query CapabilityFilter(const QByteArray &capability)
+    {
+        Query query;
+        query.propertyFilter.insert("capabilities", Comparator(capability, Comparator::Contains));
+        return query;
+    }
+
     static Query AccountFilter(const QByteArrayList &identifier)
     {
         Q_ASSERT(!identifier.isEmpty());
@@ -167,6 +174,7 @@ public:
 
         Comparator();
         Comparator(const QVariant &v);
+        Comparator(const QVariant &v, Comparators c);
         bool matches(const QVariant &v) const;
 
         QVariant value;