2 files changed, 3 insertions, 4 deletions

diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index 79763ef..e0d27dc 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -138,7 +138,7 @@ void DummyResourceFacade::readValue(QSharedPointer<Akonadi2::Storage> storage, c
     storage->scan(key.data(), key.size(), [=](void *keyValue, int keySize, void *dataValue, int dataSize) -> bool {
 
         //Skip internals
-        if (QByteArray::fromRawData(static_cast<char*>(keyValue), keySize).startsWith("__internal")) {
+        if (Akonadi2::Storage::isInternalKey(keyValue, keySize)) {
             return true;
         }
 
diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp
index aefd66f..e5019f2 100644
--- a/dummyresource/resourcefactory.cpp
+++ b/dummyresource/resourcefactory.cpp
@@ -113,9 +113,8 @@ public:
         mProcessingLock(false)
     {
         for (auto queue : mCommandQueues) {
-            bool ret = connect(queue, &MessageQueue::messageReady, this, &Processor::process);
+            const bool ret = connect(queue, &MessageQueue::messageReady, this, &Processor::process);
             Q_UNUSED(ret);
-            Q_ASSERT(ret);
         }
     }
 
@@ -298,7 +297,7 @@ void findByRemoteId(QSharedPointer<Akonadi2::Storage> storage, const QString &ri
     //TODO lookup in rid index instead of doing a full scan
     const std::string ridString = rid.toStdString();
     storage->scan("", [&](void *keyValue, int keySize, void *dataValue, int dataSize) -> bool {
-        if (QByteArray::fromRawData(static_cast<char*>(keyValue), keySize).startsWith("__internal")) {
+        if (Akonadi2::Storage::isInternalKey(keyValue, keySize)) {
             return true;
         }