From bdb01c2c068df326f5a8328ed1492ab1bea388c5 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 20 Jan 2016 19:07:07 +0100
Subject: Renamed Akonadi2 to Sink

(except for documentation).
---
 tests/hawd/CMakeLists.txt | 2 +-
 tests/hawd/dataset.cpp    | 8 ++++----
 tests/hawd/dataset.h      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests/hawd')

diff --git a/tests/hawd/CMakeLists.txt b/tests/hawd/CMakeLists.txt
index 071f2ba..268e7a9 100644
--- a/tests/hawd/CMakeLists.txt
+++ b/tests/hawd/CMakeLists.txt
@@ -26,7 +26,7 @@ set(SRCS
 add_library(lib${PROJECT_NAME} SHARED ${lib_SRCS})
 generate_export_header(lib${PROJECT_NAME} BASE_NAME HAWD EXPORT_FILE_NAME hawd_export.h)
 qt5_use_modules(lib${PROJECT_NAME} Core)
-target_link_libraries(lib${PROJECT_NAME} akonadi2common)
+target_link_libraries(lib${PROJECT_NAME} sinkcommon)
 if (LIBGIT2_FOUND)
    target_link_libraries(lib${PROJECT_NAME} ${LIBGIT2_LIBRARIES})
 endif(LIBGIT2_FOUND)
diff --git a/tests/hawd/dataset.cpp b/tests/hawd/dataset.cpp
index 93eb5cd..fd931e8 100644
--- a/tests/hawd/dataset.cpp
+++ b/tests/hawd/dataset.cpp
@@ -215,7 +215,7 @@ QString Dataset::Row::toString(const QStringList &cols, int standardCols, const
 
 Dataset::Dataset(const QString &name, const State &state)
     : m_definition(state.datasetDefinition(name)),
-      m_storage(state.resultsPath(), name, Akonadi2::Storage::ReadWrite),
+      m_storage(state.resultsPath(), name, Sink::Storage::ReadWrite),
       m_commitHash(state.commitHash()),
       m_transaction(std::move(m_storage.createTransaction()))
 {
@@ -270,13 +270,13 @@ void Dataset::eachRow(const std::function<void(const Row &row)> &resultHandler)
                        resultHandler(row);
                        return true;
                    },
-                   Akonadi2::Storage::basicErrorHandler());
+                   Sink::Storage::basicErrorHandler());
 }
 
 Dataset::Row Dataset::row(qint64 key)
 {
     if (key < 1) {
-        Row row(*this, Akonadi2::Storage::maxRevision(m_transaction));
+        Row row(*this, Sink::Storage::maxRevision(m_transaction));
         row.setCommitHash(m_commitHash);
         return row;
     }
@@ -287,7 +287,7 @@ Dataset::Row Dataset::row(qint64 key)
                 row.fromBinary(value);
                 return true;
             },
-            Akonadi2::Storage::basicErrorHandler()
+            Sink::Storage::basicErrorHandler()
             );
     return row;
 }
diff --git a/tests/hawd/dataset.h b/tests/hawd/dataset.h
index cdfd3f2..0fca8f0 100644
--- a/tests/hawd/dataset.h
+++ b/tests/hawd/dataset.h
@@ -84,8 +84,8 @@ public:
 
 private:
     DatasetDefinition m_definition;
-    Akonadi2::Storage m_storage;
-    Akonadi2::Storage::Transaction m_transaction;
+    Sink::Storage m_storage;
+    Sink::Storage::Transaction m_transaction;
     QString m_commitHash;
 };
 
-- 
cgit v1.2.3