diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-10-29 00:43:15 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-10-29 00:43:15 +0100 |
commit | 70faf80be4146b17a59f9616404b21625d7400f6 (patch) | |
tree | 4fd4b44be533720f2804e8fd5f5434991138eb80 /common/genericresource.cpp | |
parent | 20f049b65c4bd8c3d0c16bbf398641675648a93f (diff) | |
parent | bb1b238d6982abe1e640fbf424234b2c5389642b (diff) | |
download | sink-70faf80be4146b17a59f9616404b21625d7400f6.tar.gz sink-70faf80be4146b17a59f9616404b21625d7400f6.zip |
Merge branch 'feature/preprocessor' into develop
Diffstat (limited to 'common/genericresource.cpp')
-rw-r--r-- | common/genericresource.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/common/genericresource.cpp b/common/genericresource.cpp index dcae43d..652154d 100644 --- a/common/genericresource.cpp +++ b/common/genericresource.cpp | |||
@@ -54,7 +54,7 @@ public Q_SLOTS: | |||
54 | { | 54 | { |
55 | auto mainStoreTransaction = mStorage.createTransaction(Storage::ReadOnly); | 55 | auto mainStoreTransaction = mStorage.createTransaction(Storage::ReadOnly); |
56 | auto replayStoreTransaction = mChangeReplayStore.createTransaction(Storage::ReadWrite); | 56 | auto replayStoreTransaction = mChangeReplayStore.createTransaction(Storage::ReadWrite); |
57 | qint64 lastReplayedRevision = 0; | 57 | qint64 lastReplayedRevision = 1; |
58 | replayStoreTransaction.openDatabase().scan("lastReplayedRevision", [&lastReplayedRevision](const QByteArray &key, const QByteArray &value) -> bool { | 58 | replayStoreTransaction.openDatabase().scan("lastReplayedRevision", [&lastReplayedRevision](const QByteArray &key, const QByteArray &value) -> bool { |
59 | lastReplayedRevision = value.toLongLong(); | 59 | lastReplayedRevision = value.toLongLong(); |
60 | return false; | 60 | return false; |
@@ -285,10 +285,13 @@ GenericResource::~GenericResource() | |||
285 | delete mSourceChangeReplay; | 285 | delete mSourceChangeReplay; |
286 | } | 286 | } |
287 | 287 | ||
288 | // void GenericResource::revisionChanged() | 288 | void GenericResource::removeFromDisk(const QByteArray &instanceIdentifier) |
289 | // { | 289 | { |
290 | // //TODO replay revision | 290 | Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier, Akonadi2::Storage::ReadWrite).removeFromDisk(); |
291 | // } | 291 | Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".userqueue", Akonadi2::Storage::ReadWrite).removeFromDisk(); |
292 | Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".synchronizerqueue", Akonadi2::Storage::ReadWrite).removeFromDisk(); | ||
293 | Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".changereplay", Akonadi2::Storage::ReadWrite).removeFromDisk(); | ||
294 | } | ||
292 | 295 | ||
293 | void GenericResource::onProcessorError(int errorCode, const QString &errorMessage) | 296 | void GenericResource::onProcessorError(int errorCode, const QString &errorMessage) |
294 | { | 297 | { |