From 3d8edba63291f46641b002b4e97867dd2e357326 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 21 Aug 2018 16:13:19 +0200
Subject: Inline sizeTToByteArray and byteArrayToSizeT functions in wrappers

---
 common/storage_lmdb.cpp | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 6afa1a8..6f2142f 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -382,8 +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 = sizeTToByteArray(key);
-    return write(baKey, value, errorHandler);
+    return write(sizeTToByteArray(key), value, errorHandler);
 }
 
 bool DataStore::NamedDatabase::write(const QByteArray &sKey, const QByteArray &sValue, const std::function<void(const DataStore::Error &error)> &errorHandler)
@@ -425,8 +424,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 = sizeTToByteArray(key);
-    return remove(baKey, errorHandler);
+    return remove(sizeTToByteArray(key), errorHandler);
 }
 
 void DataStore::NamedDatabase::remove(const QByteArray &k, const std::function<void(const DataStore::Error &error)> &errorHandler)
@@ -437,8 +435,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 = sizeTToByteArray(key);
-    return remove(baKey, value, errorHandler);
+    return remove(sizeTToByteArray(key), value, errorHandler);
 }
 
 void DataStore::NamedDatabase::remove(const QByteArray &k, const QByteArray &value, const std::function<void(const DataStore::Error &error)> &errorHandler)
@@ -478,11 +475,9 @@ 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 = sizeTToByteArray(key);
-    return scan(baKey,
+    return scan(sizeTToByteArray(key),
         [&resultHandler](const QByteArray &key, const QByteArray &value) {
-            size_t integerKey = byteArrayToSizeT(value);
-            return resultHandler(integerKey, value);
+            return resultHandler(byteArrayToSizeT(value), value);
         },
         errorHandler, /* findSubstringKeys = */ false, skipInternalKeys);
 }
@@ -578,11 +573,9 @@ void DataStore::NamedDatabase::findLatest(size_t key,
     const std::function<void(size_t key, const QByteArray &value)> &resultHandler,
     const std::function<void(const DataStore::Error &error)> &errorHandler) const
 {
-    auto baKey = sizeTToByteArray(key);
-    return findLatest(baKey,
+    return findLatest(sizeTToByteArray(key),
         [&resultHandler](const QByteArray &key, const QByteArray &value) {
-            size_t integerKey = byteArrayToSizeT(value);
-            resultHandler(integerKey, value);
+            resultHandler(byteArrayToSizeT(value), value);
         },
         errorHandler);
 }
@@ -664,12 +657,9 @@ int DataStore::NamedDatabase::findAllInRange(const size_t lowerBound, const size
     const std::function<void(size_t key, const QByteArray &value)> &resultHandler,
     const std::function<void(const DataStore::Error &error)> &errorHandler) const
 {
-    auto baLowerBound = sizeTToByteArray(lowerBound);
-    auto baUpperBound = sizeTToByteArray(upperBound);
-    return findAllInRange(baLowerBound, baUpperBound,
+    return findAllInRange(sizeTToByteArray(lowerBound), sizeTToByteArray(upperBound),
         [&resultHandler](const QByteArray &key, const QByteArray &value) {
-            size_t integerKey = byteArrayToSizeT(value);
-            resultHandler(integerKey, value);
+            resultHandler(byteArrayToSizeT(value), value);
         },
         errorHandler);
 }
-- 
cgit v1.2.3