Writing from facade.

1 files changed, 10 insertions, 31 deletions

diff --git a/common/pipeline.h b/common/pipeline.h
index 6b847f5..918d21e 100644
--- a/common/pipeline.h
+++ b/common/pipeline.h
@@ -27,7 +27,7 @@
 
 #include <akonadi2common_export.h>
 #include <storage.h>
-#include <clientapi.h> //For domain types
+#include "async/src/async.h"
 
 #include "entity_generated.h"
 
@@ -49,34 +49,13 @@ public:
 
     Storage &storage() const;
 
-    // template <typename T>
-    // Storage &storage() const;
-
-    template <typename T>
-    void setPreprocessors(Type type, const QVector<Preprocessor *> &preprocessors)
-    {
-        setPreprocessors(Akonadi2::Domain::getTypeName<T>(), type, preprocessors);
-    }
+    void setPreprocessors(const QString &entityType, Type pipelineType, const QVector<Preprocessor *> &preprocessors);
 
     void null();
 
-    template <typename T>
-    void newEntity(const QByteArray &key, void *resourceBufferData, size_t size)
-    {
-        newEntity(Akonadi2::Domain::getTypeName<T>(), key, resourceBufferData, size);
-    }
-
-    template <typename T>
-    void modifiedEntity(const QByteArray &key, void *data, size_t size)
-    {
-        modifiedEntity(Akonadi2::Domain::getTypeName<T>(), key, data, size);
-    }
-
-    template <typename T>
-    void deletedEntity(const QByteArray &key)
-    {
-        deletedEntity(Akonadi2::Domain::getTypeName<T>(), key);
-    }
+    Async::Job<void> newEntity(void const *command, size_t size);
+    void modifiedEntity(const QString &entityType, const QByteArray &key, void *data, size_t size);
+    void deletedEntity(const QString &entityType, const QByteArray &key);
 
 Q_SIGNALS:
     void revisionUpdated();
@@ -86,10 +65,6 @@ private Q_SLOTS:
     void stepPipelines();
 
 private:
-    void setPreprocessors(const QString &entityType, Type pipelineType, const QVector<Preprocessor *> &preprocessors);
-    void newEntity(const QString &entityType, const QByteArray &key, void *resourceBufferData, size_t size);
-    void modifiedEntity(const QString &entityType, const QByteArray &key, void *data, size_t size);
-    void deletedEntity(const QString &entityType, const QByteArray &key);
     void pipelineStepped(const PipelineState &state);
     void pipelineCompleted(const PipelineState &state);
     void scheduleStep();
@@ -104,7 +79,7 @@ class AKONADI2COMMON_EXPORT PipelineState
 {
 public:
     PipelineState();
-    PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector<Preprocessor *> &filters);
+    PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector<Preprocessor *> &filters, const std::function<void()> &callback);
     PipelineState(const PipelineState &other);
     ~PipelineState();
 
@@ -114,6 +89,7 @@ public:
     bool isIdle() const;
     QByteArray key() const;
     Pipeline::Type type() const;
+    //TODO expose command
 
     void step();
     void processingCompleted(Preprocessor *filter);
@@ -129,7 +105,10 @@ public:
     Preprocessor();
     virtual ~Preprocessor();
 
+    //TODO pass actual command as well, for changerecording
     virtual void process(PipelineState state, const Akonadi2::Entity &);
+    //TODO to record progress
+    // virtual QString id();
 
 protected:
     void processingCompleted(PipelineState state);