Use Key API in DataStoreQuery

Reviewers: cmollekopf

Reviewed By: cmollekopf

Tags: #sink

Differential Revision: https://phabricator.kde.org/D14099

1 files changed, 47 insertions, 0 deletions

diff --git a/common/storage/key.cpp b/common/storage/key.cpp
index 01a3e3a..cfeb016 100644
--- a/common/storage/key.cpp
+++ b/common/storage/key.cpp
@@ -46,8 +46,14 @@ QDebug &operator<<(QDebug &dbg, const Key &key)
 
 // Identifier
 
+Identifier Identifier::createIdentifier()
+{
+    return Identifier(QUuid::createUuid());
+}
+
 QByteArray Identifier::toInternalByteArray() const
 {
+    Q_ASSERT(!uid.isNull());
     return uid.toRfc4122();
 }
 
@@ -73,6 +79,21 @@ Identifier Identifier::fromDisplayByteArray(const QByteArray &bytes)
     return Identifier(QUuid(bytes));
 }
 
+bool Identifier::isNull() const
+{
+    return uid.isNull();
+}
+
+bool Identifier::operator==(const Identifier &other) const
+{
+    return uid == other.uid;
+}
+
+bool Identifier::operator!=(const Identifier &other) const
+{
+    return !(*this == other);
+}
+
 // Revision
 
 QByteArray Revision::toInternalByteArray() const
@@ -107,6 +128,16 @@ qint64 Revision::toQint64() const
     return rev;
 }
 
+bool Revision::operator==(const Revision &other) const
+{
+    return rev == other.rev;
+}
+
+bool Revision::operator!=(const Revision &other) const
+{
+    return !(*this == other);
+}
+
 // Key
 
 QByteArray Key::toInternalByteArray() const
@@ -154,3 +185,19 @@ void Key::setRevision(const Revision &newRev)
 {
     rev = newRev;
 }
+
+bool Key::isNull() const
+{
+    return id.isNull();
+}
+
+bool Key::operator==(const Key &other) const
+{
+    return (id == other.id) && (rev == other.rev);
+}
+
+bool Key::operator!=(const Key &other) const
+{
+    return !(*this == other);
+}
+