1 files changed, 7 insertions, 7 deletions

diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index e3377b2..981d4ef 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -382,7 +382,7 @@ DataStore::NamedDatabase::~NamedDatabase()
 bool DataStore::NamedDatabase::write(const size_t key, const QByteArray &value,
     const std::function<void(const DataStore::Error &error)> &errorHandler)
 {
-    auto baKey = QByteArray::fromRawData(reinterpret_cast<const char *>(&key), sizeof(key));
+    auto baKey = sizeTToByteArray(key);
     return write(baKey, value, errorHandler);
 }
 
@@ -425,7 +425,7 @@ bool DataStore::NamedDatabase::write(const QByteArray &sKey, const QByteArray &s
 void DataStore::NamedDatabase::remove(
     const size_t key, const std::function<void(const DataStore::Error &error)> &errorHandler)
 {
-    auto baKey = QByteArray::fromRawData(reinterpret_cast<const char *>(&key), sizeof(key));
+    auto baKey = sizeTToByteArray(key);
     return remove(baKey, errorHandler);
 }
 
@@ -437,7 +437,7 @@ void DataStore::NamedDatabase::remove(const QByteArray &k, const std::function<v
 void DataStore::NamedDatabase::remove(const size_t key, const QByteArray &value,
     const std::function<void(const DataStore::Error &error)> &errorHandler)
 {
-    auto baKey = QByteArray::fromRawData(reinterpret_cast<const char *>(&key), sizeof(key));
+    auto baKey = sizeTToByteArray(key);
     return remove(baKey, value, errorHandler);
 }
 
@@ -478,10 +478,10 @@ int DataStore::NamedDatabase::scan(const size_t key,
     const std::function<bool(size_t key, const QByteArray &value)> &resultHandler,
     const std::function<void(const DataStore::Error &error)> &errorHandler, bool skipInternalKeys) const
 {
-    auto baKey = QByteArray::fromRawData(reinterpret_cast<const char *>(&key), sizeof(key));
+    auto baKey = sizeTToByteArray(key);
     return scan(baKey,
         [&resultHandler](const QByteArray &key, const QByteArray &value) {
-            size_t integerKey = *reinterpret_cast<const size_t *>(key.constData());
+            size_t integerKey = byteArrayToSizeT(value);
             return resultHandler(integerKey, value);
         },
         errorHandler, /* findSubstringKeys = */ false, skipInternalKeys);
@@ -650,8 +650,8 @@ int DataStore::NamedDatabase::findAllInRange(const size_t lowerBound, const size
     const std::function<void(const QByteArray &key, const QByteArray &value)> &resultHandler,
     const std::function<void(const DataStore::Error &error)> &errorHandler) const
 {
-    auto baLowerBound = QByteArray::fromRawData(reinterpret_cast<const char *>(&lowerBound), sizeof(size_t));
-    auto baUpperBound = QByteArray::fromRawData(reinterpret_cast<const char *>(&upperBound), sizeof(size_t));
+    auto baLowerBound = sizeTToByteArray(lowerBound);
+    auto baUpperBound = sizeTToByteArray(upperBound);
     return findAllInRange(baLowerBound, baUpperBound, resultHandler, errorHandler);
 }