Folded the SourceWriteback into the Synchronizer.

By concentrating all communication to the source in one place we get rid
of several oddities.
* Quite a bit of duplication since both need access to the
  synchronizationStore and the source.
* We currently have an akward locking in place because both classes
  access the ync store. This is not easier to resolve cleanly.
* The live of resource implementers becomes easier.
* An implementation could elect to not use changereplay and always do a
  full sync... (maybe?)

1 files changed, 11 insertions, 29 deletions

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);
 }