From 3062983d075761c457249b8c3c1248aa0d45e46a Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 9 Apr 2015 14:00:26 +0200
Subject: Use QByteArray instead of QString

All identifiers should be latin1 and we make this explicit by using
QByteArray. QString is reserved for strings that can be UTF-8 or alike.
---
 dummyresource/domainadaptor.cpp | 8 ++++----
 dummyresource/facade.cpp        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'dummyresource')

diff --git a/dummyresource/domainadaptor.cpp b/dummyresource/domainadaptor.cpp
index 2182f9a..7a767ca 100644
--- a/dummyresource/domainadaptor.cpp
+++ b/dummyresource/domainadaptor.cpp
@@ -27,7 +27,7 @@ public:
 
     }
 
-    void setProperty(const QString &key, const QVariant &value)
+    void setProperty(const QByteArray &key, const QVariant &value)
     {
         if (mResourceMapper && mResourceMapper->mWriteAccessors.contains(key)) {
             // mResourceMapper->setProperty(key, value, mResourceBuffer);
@@ -36,7 +36,7 @@ public:
         }
     }
 
-    virtual QVariant getProperty(const QString &key) const
+    virtual QVariant getProperty(const QByteArray &key) const
     {
         if (mResourceBuffer && mResourceMapper->mReadAccessors.contains(key)) {
             return mResourceMapper->getProperty(key, mResourceBuffer);
@@ -47,9 +47,9 @@ public:
         return QVariant();
     }
 
-    virtual QStringList availableProperties() const
+    virtual QList<QByteArray> availableProperties() const
     {
-        QStringList props;
+        QList<QByteArray> props;
         props << mResourceMapper->mReadAccessors.keys();
         props << mLocalMapper->mReadAccessors.keys();
         return props;
diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index d196e54..1af735e 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -184,7 +184,7 @@ void DummyResourceFacade::readValue(QSharedPointer<Akonadi2::Storage> storage, c
             auto adaptor = mFactory->createAdaptor(buffer.entity());
             //TODO only copy requested properties
             auto memoryAdaptor = QSharedPointer<Akonadi2::Domain::MemoryBufferAdaptor>::create(*adaptor);
-            auto event = QSharedPointer<Akonadi2::Domain::Event>::create("org.kde.dummy", QString::fromUtf8(static_cast<char*>(keyValue), keySize), revision, memoryAdaptor);
+            auto event = QSharedPointer<Akonadi2::Domain::Event>::create("org.kde.dummy", QByteArray::fromRawData(static_cast<char*>(keyValue), keySize), revision, memoryAdaptor);
             resultCallback(event);
         }
         return true;
-- 
cgit v1.2.3