From a648c97bbc9470c29cfc9700fc30a083c7752ffc Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 12 Apr 2017 15:05:25 +0200
Subject: cleanup

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

diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 78eb29b..f5cf995 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -270,7 +270,7 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
 
     foreach (const auto &processor, d->processors[bufferType]) {
         bool exitLoop = false;
-        const auto result = processor->processModification(Preprocessor::Modification, current, newEntity);
+        const auto result = processor->process(Preprocessor::Modification, current, newEntity);
         switch (result.action) {
             case Preprocessor::MoveToResource:
                 isMove = true;
@@ -412,18 +412,18 @@ void Preprocessor::deletedEntity(const ApplicationDomain::ApplicationDomainType
 
 }
 
-Preprocessor::Result Preprocessor::processModification(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff)
+Preprocessor::Result Preprocessor::process(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff)
 {
     switch(type) {
         case Creation:
             newEntity(diff);
-            return {NoAction};
+            break;
         case Modification:
             modifiedEntity(current, diff);
-            return {NoAction};
+            break;
         case Deletion:
             deletedEntity(current);
-            return {NoAction};
+            break;
         default:
             break;
     }
diff --git a/common/pipeline.h b/common/pipeline.h
index 11d52fd..684100e 100644
--- a/common/pipeline.h
+++ b/common/pipeline.h
@@ -98,7 +98,7 @@ public:
     virtual void newEntity(ApplicationDomain::ApplicationDomainType &newEntity);
     virtual void modifiedEntity(const ApplicationDomain::ApplicationDomainType &oldEntity, ApplicationDomain::ApplicationDomainType &newEntity);
     virtual void deletedEntity(const ApplicationDomain::ApplicationDomainType &oldEntity);
-    virtual Result processModification(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff);
+    virtual Result process(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff);
     virtual void finalizeBatch();
 
     void setup(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier, Pipeline *, Storage::EntityStore *entityStore);
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 8a4ef92..c73219f 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -66,7 +66,7 @@ public:
         return targetResource.identifier();
     }
 
-    virtual Result processModification(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff) Q_DECL_OVERRIDE
+    virtual Result process(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff) Q_DECL_OVERRIDE
     {
         if (type == Preprocessor::Modification) {
             using namespace Sink::ApplicationDomain;
-- 
cgit v1.2.3