From 91f0b273fc2072a4d7c96ba83b37fe45b3cda1ef Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 21 Aug 2018 13:40:59 +0200
Subject: =?UTF-8?q?Refactor=20QByteArray=20=E2=86=94=20size=5Ft=20conversi?=
 =?UTF-8?q?ons=20into=20utils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/storage_common.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'common/storage_common.cpp')

diff --git a/common/storage_common.cpp b/common/storage_common.cpp
index ac246b2..5b4d3ec 100644
--- a/common/storage_common.cpp
+++ b/common/storage_common.cpp
@@ -141,7 +141,7 @@ size_t DataStore::getLatestRevisionFromUid(DataStore::Transaction &t, const QByt
     size_t revision;
     t.openDatabase("uidsToRevisions", {}, AllowDuplicates | IntegerValues)
         .findLatest(uid, [&revision](const QByteArray &key, const QByteArray &value) {
-            revision = *reinterpret_cast<const size_t *>(value.constData());
+            revision = byteArrayToSizeT(value);
         });
 
     return revision;
@@ -152,7 +152,7 @@ QList<size_t> DataStore::getRevisionsUntilFromUid(DataStore::Transaction &t, con
     QList<size_t> queriedRevisions;
     t.openDatabase("uidsToRevisions", {}, AllowDuplicates | IntegerValues)
         .scan(uid, [&queriedRevisions, lastRevision](const QByteArray &, const QByteArray &value) {
-            size_t currentRevision = *reinterpret_cast<const size_t *>(value.constData());
+            size_t currentRevision = byteArrayToSizeT(value);
             if (currentRevision < lastRevision) {
                 queriedRevisions << currentRevision;
                 return true;
@@ -185,7 +185,7 @@ void DataStore::recordRevision(DataStore::Transaction &transaction, size_t revis
         .openDatabase("revisions", /* errorHandler = */ {}, IntegerKeys)
         .write(revision, uid);
     transaction.openDatabase("uidsToRevisions", /* errorHandler = */ {}, AllowDuplicates | IntegerValues)
-        .write(uid, QByteArray::fromRawData(reinterpret_cast<const char *>(&revision), sizeof(revision)));
+        .write(uid, sizeTToByteArray(revision));
     transaction
         .openDatabase("revisionType", /* errorHandler = */ {}, IntegerKeys)
         .write(revision, type);
@@ -199,7 +199,7 @@ void DataStore::removeRevision(DataStore::Transaction &transaction, size_t revis
         .openDatabase("revisions", /* errorHandler = */ {}, IntegerKeys)
         .remove(revision);
     transaction.openDatabase("uidsToRevisions", /* errorHandler = */ {}, AllowDuplicates | IntegerValues)
-        .remove(uid, QByteArray::fromRawData(reinterpret_cast<const char *>(&revision), sizeof(revision)));
+        .remove(uid, sizeTToByteArray(revision));
     transaction
         .openDatabase("revisionType", /* errorHandler = */ {}, IntegerKeys)
         .remove(revision);
-- 
cgit v1.2.3