summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/genericresource.cpp2
-rw-r--r--common/genericresource.h2
-rw-r--r--common/resource.cpp3
-rw-r--r--common/resource.h2
4 files changed, 4 insertions, 5 deletions
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 5dfa9b5..ae06ef4 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -194,7 +194,7 @@ void GenericResource::enqueueCommand(MessageQueue &mq, int commandId, const QByt
194 mq.enqueue(m_fbb.GetBufferPointer(), m_fbb.GetSize()); 194 mq.enqueue(m_fbb.GetBufferPointer(), m_fbb.GetSize());
195} 195}
196 196
197void GenericResource::processCommand(int commandId, const QByteArray &data, uint size, Akonadi2::Pipeline *pipeline) 197void GenericResource::processCommand(int commandId, const QByteArray &data, Akonadi2::Pipeline *pipeline)
198{ 198{
199 //TODO instead of copying the command including the full entity first into the command queue, we could directly 199 //TODO instead of copying the command including the full entity first into the command queue, we could directly
200 //create a new revision, only pushing a handle into the commandqueue with the relevant changeset (for changereplay). 200 //create a new revision, only pushing a handle into the commandqueue with the relevant changeset (for changereplay).
diff --git a/common/genericresource.h b/common/genericresource.h
index c44989e..e9d5d59 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -37,7 +37,7 @@ public:
37 GenericResource(const QByteArray &resourceInstanceIdentifier); 37 GenericResource(const QByteArray &resourceInstanceIdentifier);
38 virtual ~GenericResource(); 38 virtual ~GenericResource();
39 39
40 virtual void processCommand(int commandId, const QByteArray &data, uint size, Pipeline *pipeline) Q_DECL_OVERRIDE; 40 virtual void processCommand(int commandId, const QByteArray &data, Pipeline *pipeline) Q_DECL_OVERRIDE;
41 virtual KAsync::Job<void> synchronizeWithSource(Pipeline *pipeline) Q_DECL_OVERRIDE = 0; 41 virtual KAsync::Job<void> synchronizeWithSource(Pipeline *pipeline) Q_DECL_OVERRIDE = 0;
42 virtual KAsync::Job<void> processAllMessages() Q_DECL_OVERRIDE; 42 virtual KAsync::Job<void> processAllMessages() Q_DECL_OVERRIDE;
43 43
diff --git a/common/resource.cpp b/common/resource.cpp
index bd69afd..40ad04c 100644
--- a/common/resource.cpp
+++ b/common/resource.cpp
@@ -44,11 +44,10 @@ void Resource::configurePipeline(Pipeline *pipeline)
44 44
45} 45}
46 46
47void Resource::processCommand(int commandId, const QByteArray &data, uint size, Pipeline *pipeline) 47void Resource::processCommand(int commandId, const QByteArray &data, Pipeline *pipeline)
48{ 48{
49 Q_UNUSED(commandId) 49 Q_UNUSED(commandId)
50 Q_UNUSED(data) 50 Q_UNUSED(data)
51 Q_UNUSED(size)
52 Q_UNUSED(pipeline) 51 Q_UNUSED(pipeline)
53 pipeline->null(); 52 pipeline->null();
54} 53}
diff --git a/common/resource.h b/common/resource.h
index ebbc2e1..009050e 100644
--- a/common/resource.h
+++ b/common/resource.h
@@ -36,7 +36,7 @@ public:
36 Resource(); 36 Resource();
37 virtual ~Resource(); 37 virtual ~Resource();
38 38
39 virtual void processCommand(int commandId, const QByteArray &data, uint size, Pipeline *pipeline); 39 virtual void processCommand(int commandId, const QByteArray &data, Pipeline *pipeline);
40 virtual KAsync::Job<void> synchronizeWithSource(Pipeline *pipeline); 40 virtual KAsync::Job<void> synchronizeWithSource(Pipeline *pipeline);
41 virtual KAsync::Job<void> processAllMessages(); 41 virtual KAsync::Job<void> processAllMessages();
42 42