From e1c6979863b4994eabeb7ae35208472c234b24f6 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sat, 3 Jan 2015 12:42:42 +0100
Subject: Pass entity to preprocessor.

---
 common/pipeline.cpp | 14 ++++++--------
 common/pipeline.h   |  3 +--
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'common')

diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 18b6d51..10bae54 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -189,7 +189,6 @@ public:
     Pipeline *pipeline;
     Pipeline::Type type;
     QByteArray key;
-    Akonadi2::Entity *entity;
     QVectorIterator<Preprocessor *> filterIt;
     bool idle;
 };
@@ -240,11 +239,6 @@ Pipeline::Type PipelineState::type() const
     return d->type;
 }
 
-const Akonadi2::Entity &PipelineState::entity() const
-{
-    return *d->entity;
-}
-
 void PipelineState::step()
 {
     if (!d->pipeline) {
@@ -253,7 +247,11 @@ void PipelineState::step()
 
     d->idle = false;
     if (d->filterIt.hasNext()) {
-        d->filterIt.next()->process(*this);
+        d->pipeline->storage().scan(d->key.toStdString(), [this](void *keyValue, int keySize, void *dataValue, int dataSize) -> bool {
+            auto entity = Akonadi2::GetEntity(dataValue);
+            d->filterIt.next()->process(*this, *entity);
+            return false;
+        });
     } else {
         d->pipeline->pipelineCompleted(*this);
     }
@@ -276,7 +274,7 @@ Preprocessor::~Preprocessor()
 {
 }
 
-void Preprocessor::process(PipelineState state)
+void Preprocessor::process(PipelineState state, const Akonadi2::Entity &)
 {
     processingCompleted(state);
 }
diff --git a/common/pipeline.h b/common/pipeline.h
index 6005331..6b847f5 100644
--- a/common/pipeline.h
+++ b/common/pipeline.h
@@ -114,7 +114,6 @@ public:
     bool isIdle() const;
     QByteArray key() const;
     Pipeline::Type type() const;
-    const Akonadi2::Entity &entity() const;
 
     void step();
     void processingCompleted(Preprocessor *filter);
@@ -130,7 +129,7 @@ public:
     Preprocessor();
     virtual ~Preprocessor();
 
-    virtual void process(PipelineState state);
+    virtual void process(PipelineState state, const Akonadi2::Entity &);
 
 protected:
     void processingCompleted(PipelineState state);
-- 
cgit v1.2.3