diff options
Diffstat (limited to 'tests/hawd')
-rw-r--r-- | tests/hawd/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/hawd/dataset.cpp | 8 | ||||
-rw-r--r-- | tests/hawd/dataset.h | 4 |
3 files changed, 7 insertions, 7 deletions
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 | |||
26 | add_library(lib${PROJECT_NAME} SHARED ${lib_SRCS}) | 26 | add_library(lib${PROJECT_NAME} SHARED ${lib_SRCS}) |
27 | generate_export_header(lib${PROJECT_NAME} BASE_NAME HAWD EXPORT_FILE_NAME hawd_export.h) | 27 | generate_export_header(lib${PROJECT_NAME} BASE_NAME HAWD EXPORT_FILE_NAME hawd_export.h) |
28 | qt5_use_modules(lib${PROJECT_NAME} Core) | 28 | qt5_use_modules(lib${PROJECT_NAME} Core) |
29 | target_link_libraries(lib${PROJECT_NAME} akonadi2common) | 29 | target_link_libraries(lib${PROJECT_NAME} sinkcommon) |
30 | if (LIBGIT2_FOUND) | 30 | if (LIBGIT2_FOUND) |
31 | target_link_libraries(lib${PROJECT_NAME} ${LIBGIT2_LIBRARIES}) | 31 | target_link_libraries(lib${PROJECT_NAME} ${LIBGIT2_LIBRARIES}) |
32 | endif(LIBGIT2_FOUND) | 32 | 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 | |||
215 | 215 | ||
216 | Dataset::Dataset(const QString &name, const State &state) | 216 | Dataset::Dataset(const QString &name, const State &state) |
217 | : m_definition(state.datasetDefinition(name)), | 217 | : m_definition(state.datasetDefinition(name)), |
218 | m_storage(state.resultsPath(), name, Akonadi2::Storage::ReadWrite), | 218 | m_storage(state.resultsPath(), name, Sink::Storage::ReadWrite), |
219 | m_commitHash(state.commitHash()), | 219 | m_commitHash(state.commitHash()), |
220 | m_transaction(std::move(m_storage.createTransaction())) | 220 | m_transaction(std::move(m_storage.createTransaction())) |
221 | { | 221 | { |
@@ -270,13 +270,13 @@ void Dataset::eachRow(const std::function<void(const Row &row)> &resultHandler) | |||
270 | resultHandler(row); | 270 | resultHandler(row); |
271 | return true; | 271 | return true; |
272 | }, | 272 | }, |
273 | Akonadi2::Storage::basicErrorHandler()); | 273 | Sink::Storage::basicErrorHandler()); |
274 | } | 274 | } |
275 | 275 | ||
276 | Dataset::Row Dataset::row(qint64 key) | 276 | Dataset::Row Dataset::row(qint64 key) |
277 | { | 277 | { |
278 | if (key < 1) { | 278 | if (key < 1) { |
279 | Row row(*this, Akonadi2::Storage::maxRevision(m_transaction)); | 279 | Row row(*this, Sink::Storage::maxRevision(m_transaction)); |
280 | row.setCommitHash(m_commitHash); | 280 | row.setCommitHash(m_commitHash); |
281 | return row; | 281 | return row; |
282 | } | 282 | } |
@@ -287,7 +287,7 @@ Dataset::Row Dataset::row(qint64 key) | |||
287 | row.fromBinary(value); | 287 | row.fromBinary(value); |
288 | return true; | 288 | return true; |
289 | }, | 289 | }, |
290 | Akonadi2::Storage::basicErrorHandler() | 290 | Sink::Storage::basicErrorHandler() |
291 | ); | 291 | ); |
292 | return row; | 292 | return row; |
293 | } | 293 | } |
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: | |||
84 | 84 | ||
85 | private: | 85 | private: |
86 | DatasetDefinition m_definition; | 86 | DatasetDefinition m_definition; |
87 | Akonadi2::Storage m_storage; | 87 | Sink::Storage m_storage; |
88 | Akonadi2::Storage::Transaction m_transaction; | 88 | Sink::Storage::Transaction m_transaction; |
89 | QString m_commitHash; | 89 | QString m_commitHash; |
90 | }; | 90 | }; |
91 | 91 | ||