Removed convenience API

3 files changed, 14 insertions, 14 deletions

diff --git a/tests/hawd/dataset.cpp b/tests/hawd/dataset.cpp
index 96479e0..e1cc3a4 100644
--- a/tests/hawd/dataset.cpp
+++ b/tests/hawd/dataset.cpp
@@ -237,7 +237,7 @@ qint64 Dataset::insertRow(const Row &row)
     }
 
     qint64 key = row.key();
-    m_transaction.write(QByteArray::fromRawData((const char *)&key, sizeof(qint64)), row.toBinary());
+    m_transaction.openDatabase().write(QByteArray::fromRawData((const char *)&key, sizeof(qint64)), row.toBinary());
     return key;
 }
 
@@ -253,7 +253,7 @@ void Dataset::eachRow(const std::function<void(const Row &row)> &resultHandler)
     }
 
     Row row(*this);
-    m_transaction.scan("",
+    m_transaction.openDatabase().scan("",
                    [&](const QByteArray &key, const QByteArray &value) -> bool {
                        if (key.size() != sizeof(qint64)) {
                            return true;
@@ -276,7 +276,7 @@ Dataset::Row Dataset::row(qint64 key)
     }
 
     Row row(*this, key);
-    m_transaction.scan(QByteArray::fromRawData((const char *)&key, sizeof(qint64)),
+    m_transaction.openDatabase().scan(QByteArray::fromRawData((const char *)&key, sizeof(qint64)),
             [&row](const QByteArray &key, const QByteArray &value) -> bool {
                 row.fromBinary(value);
                 return true;
diff --git a/tests/storagebenchmark.cpp b/tests/storagebenchmark.cpp
index f143c4d..e6ab049 100644
--- a/tests/storagebenchmark.cpp
+++ b/tests/storagebenchmark.cpp
@@ -98,7 +98,7 @@ private Q_SLOTS:
             if (store) {
                 auto transaction = store->createTransaction(Akonadi2::Storage::ReadWrite);
                 for (int i = 0; i < count; i++) {
-                    transaction.write(keyPrefix + QByteArray::number(i), event);
+                    transaction.openDatabase().write(keyPrefix + QByteArray::number(i), event);
                     if ((i % 10000) == 0) {
                         transaction.commit();
                         transaction = store->createTransaction(Akonadi2::Storage::ReadWrite);
@@ -149,7 +149,7 @@ private Q_SLOTS:
 
         QBENCHMARK {
             int hit = 0;
-            store->createTransaction(Akonadi2::Storage::ReadOnly).scan("", [&](const QByteArray &key, const QByteArray &value) -> bool {
+            store->createTransaction(Akonadi2::Storage::ReadOnly).openDatabase().scan("", [&](const QByteArray &key, const QByteArray &value) -> bool {
                 if (key == "key10000") {
                     //qDebug() << "hit";
                     hit++;
@@ -166,7 +166,7 @@ private Q_SLOTS:
 
         QBENCHMARK {
             int hit = 0;
-            store->createTransaction(Akonadi2::Storage::ReadOnly).scan("key40000", [&](const QByteArray &key, const QByteArray &value) -> bool {
+            store->createTransaction(Akonadi2::Storage::ReadOnly).openDatabase().scan("key40000", [&](const QByteArray &key, const QByteArray &value) -> bool {
                 hit++;
                 return true;
             });
diff --git a/tests/storagetest.cpp b/tests/storagetest.cpp
index 2e69634..7060ef2 100644
--- a/tests/storagetest.cpp
+++ b/tests/storagetest.cpp
@@ -29,7 +29,7 @@ private:
                     transaction = std::move(storage.createTransaction(Akonadi2::Storage::ReadWrite));
                 }
             }
-            transaction.write(keyPrefix + QByteArray::number(i), keyPrefix + QByteArray::number(i));
+            transaction.openDatabase().write(keyPrefix + QByteArray::number(i), keyPrefix + QByteArray::number(i));
         }
         transaction.commit();
     }
@@ -39,7 +39,7 @@ private:
         bool success = true;
         bool keyMatch = true;
         const auto reference = keyPrefix + QByteArray::number(i);
-        storage.createTransaction(Akonadi2::Storage::ReadOnly).scan(keyPrefix + QByteArray::number(i),
+        storage.createTransaction(Akonadi2::Storage::ReadOnly).openDatabase().scan(keyPrefix + QByteArray::number(i),
             [&keyMatch, &reference](const QByteArray &key, const QByteArray &value) -> bool {
                 if (value != reference) {
                     qDebug() << "Mismatch while reading";
@@ -103,7 +103,7 @@ private Q_SLOTS:
         {
             int hit = 0;
             Akonadi2::Storage store(testDataPath, dbName);
-            store.createTransaction(Akonadi2::Storage::ReadOnly).scan("", [&](const QByteArray &key, const QByteArray &value) -> bool {
+            store.createTransaction(Akonadi2::Storage::ReadOnly).openDatabase().scan("", [&](const QByteArray &key, const QByteArray &value) -> bool {
                 if (key == "key50") {
                     hit++;
                 }
@@ -117,7 +117,7 @@ private Q_SLOTS:
             int hit = 0;
             bool foundInvalidValue = false;
             Akonadi2::Storage store(testDataPath, dbName);
-            store.createTransaction(Akonadi2::Storage::ReadOnly).scan("key50", [&](const QByteArray &key, const QByteArray &value) -> bool {
+            store.createTransaction(Akonadi2::Storage::ReadOnly).openDatabase().scan("key50", [&](const QByteArray &key, const QByteArray &value) -> bool {
                 if (key != "key50") {
                     foundInvalidValue = true;
                 }
@@ -134,8 +134,8 @@ private Q_SLOTS:
         populate(3);
         Akonadi2::Storage store(testDataPath, dbName, Akonadi2::Storage::ReadWrite);
         auto transaction = store.createTransaction(Akonadi2::Storage::ReadWrite);
-        transaction.scan("key1", [&](const QByteArray &key, const QByteArray &value) -> bool {
-            transaction.remove(key, [](const Akonadi2::Storage::Error &) {
+        transaction.openDatabase().scan("key1", [&](const QByteArray &key, const QByteArray &value) -> bool {
+            transaction.openDatabase().remove(key, [](const Akonadi2::Storage::Error &) {
                 QVERIFY(false);
             });
             return false;
@@ -146,8 +146,8 @@ private Q_SLOTS:
     {
         populate(3);
         Akonadi2::Storage store(testDataPath, dbName, Akonadi2::Storage::ReadWrite);
-        store.createTransaction(Akonadi2::Storage::ReadOnly).scan("key1", [&](const QByteArray &key, const QByteArray &value) -> bool {
-            store.createTransaction(Akonadi2::Storage::ReadWrite).remove(key, [](const Akonadi2::Storage::Error &) {
+        store.createTransaction(Akonadi2::Storage::ReadOnly).openDatabase().scan("key1", [&](const QByteArray &key, const QByteArray &value) -> bool {
+            store.createTransaction(Akonadi2::Storage::ReadWrite).openDatabase().remove(key, [](const Akonadi2::Storage::Error &) {
                 QVERIFY(false);
             });
             return false;