4 files changed, 13 insertions, 69 deletions

diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 46e67f3..f5ab2d9 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -126,13 +126,14 @@ class DummySynchronizer : public Sink::Synchronizer {
         });
     }
 
+    bool canReplay(const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE { return false; }
+
 };
 
 DummyResource::DummyResource(const Sink::ResourceContext &resourceContext, const QSharedPointer<Sink::Pipeline> &pipeline)
     : Sink::GenericResource(resourceContext, pipeline)
 {
     setupSynchronizer(QSharedPointer<DummySynchronizer>::create(resourceContext));
-    setupChangereplay(QSharedPointer<Sink::NullChangeReplay>::create(resourceContext));
     setupPreprocessors(ENTITY_TYPE_MAIL,
             QVector<Sink::Preprocessor*>() << new MailPropertyExtractor);
     setupPreprocessors(ENTITY_TYPE_FOLDER,
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 2b9659e..8fc7702 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -28,7 +28,6 @@
 #include "definitions.h"
 #include "inspection.h"
 #include "synchronizer.h"
-#include "sourcewriteback.h"
 #include "remoteidmap.h"
 #include "query.h"
 
@@ -393,22 +392,6 @@ public:
         return KAsync::error<void>("Nothing to do");
     }
 
-public:
-    QString mServer;
-    int mPort;
-    QString mUser;
-    QString mPassword;
-    QByteArray mResourceInstanceIdentifier;
-};
-
-class ImapWriteback : public Sink::SourceWriteBack
-{
-public:
-    ImapWriteback(const ResourceContext &resourceContext) : Sink::SourceWriteBack(resourceContext)
-    {
-
-    }
-
     KAsync::Job<QByteArray> replay(const ApplicationDomain::Mail &mail, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
     {
         auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort);
@@ -595,12 +578,6 @@ ImapResource::ImapResource(const ResourceContext &resourceContext, const QShared
     synchronizer->mUser = mUser;
     synchronizer->mPassword = mPassword;
     setupSynchronizer(synchronizer);
-    auto changereplay = QSharedPointer<ImapWriteback>::create(resourceContext);
-    changereplay->mServer = mServer;
-    changereplay->mPort = mPort;
-    changereplay->mUser = mUser;
-    changereplay->mPassword = mPassword;
-    setupChangereplay(changereplay);
 
     setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MimeMessageMover << new MailPropertyExtractor);
     setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>());
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index fc77315..fed18c4 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -28,7 +28,6 @@
 #include "libmaildir/maildir.h"
 #include "inspection.h"
 #include "synchronizer.h"
-#include "sourcewriteback.h"
 
 #include "facadefactory.h"
 #include "adaptorfactoryregistry.h"
@@ -383,18 +382,6 @@ public:
         return job;
     }
 
-public:
-    QString mMaildirPath;
-};
-
-class MaildirWriteback : public Sink::SourceWriteBack
-{
-public:
-    MaildirWriteback(const Sink::ResourceContext &resourceContext) : Sink::SourceWriteBack(resourceContext)
-    {
-
-    }
-
     KAsync::Job<QByteArray> replay(const ApplicationDomain::Mail &mail, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
     {
         if (operation == Sink::Operation_Creation) {
@@ -453,9 +440,6 @@ MaildirResource::MaildirResource(const Sink::ResourceContext &resourceContext, c
     auto synchronizer = QSharedPointer<MaildirSynchronizer>::create(resourceContext);
     synchronizer->mMaildirPath = mMaildirPath;
     setupSynchronizer(synchronizer);
-    auto changereplay = QSharedPointer<MaildirWriteback>::create(resourceContext);
-    changereplay->mMaildirPath = mMaildirPath;
-    setupChangereplay(changereplay);
 
     setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor);
     setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>() << new FolderPreprocessor(mMaildirPath));
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 3fe551a..0688af6 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -23,7 +23,6 @@
 #include "resourceconfig.h"
 #include "definitions.h"
 #include "domainadaptor.h"
-#include "sourcewriteback.h"
 #include <QDir>
 #include <QFileInfo>
 #include <QSettings>
@@ -45,30 +44,6 @@ SINK_DEBUG_AREA("mailtransportresource")
 
 using namespace Sink;
 
-//TODO fold into synchronizer
-class MailtransportWriteback : public Sink::SourceWriteBack
-{
-public:
-    MailtransportWriteback(const Sink::ResourceContext &resourceContext) : Sink::SourceWriteBack(resourceContext)
-    {
-
-    }
-
-    KAsync::Job<QByteArray> replay(const ApplicationDomain::Mail &mail, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
-    {
-        if (operation == Sink::Operation_Creation) {
-            SinkTrace() << "Dispatching message.";
-            // return send(mail, mSettings);
-        } else if (operation == Sink::Operation_Removal) {
-        } else if (operation == Sink::Operation_Modification) {
-        }
-        return KAsync::null<QByteArray>();
-    }
-
-public:
-    MailtransportResource::Settings mSettings;
-};
-
 class MailtransportSynchronizer : public Sink::Synchronizer {
 public:
     MailtransportSynchronizer(const Sink::ResourceContext &resourceContext)
@@ -134,6 +109,17 @@ public:
         });
     }
 
+    KAsync::Job<QByteArray> replay(const ApplicationDomain::Mail &mail, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
+    {
+        if (operation == Sink::Operation_Creation) {
+            SinkTrace() << "Dispatching message.";
+            // return send(mail, mSettings);
+        } else if (operation == Sink::Operation_Removal) {
+        } else if (operation == Sink::Operation_Modification) {
+        }
+        return KAsync::null<QByteArray>();
+    }
+
 public:
     QByteArray mResourceInstanceIdentifier;
     MailtransportResource::Settings mSettings;
@@ -154,10 +140,6 @@ MailtransportResource::MailtransportResource(const Sink::ResourceContext &resour
     synchronizer->mSettings = mSettings;
     setupSynchronizer(synchronizer);
 
-    auto changereplay = QSharedPointer<MailtransportWriteback>::create(resourceContext);
-    changereplay->mSettings = mSettings;
-    setupChangereplay(changereplay);
-
     setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MimeMessageMover << new MailPropertyExtractor);
 }