Removed an unnecessary member variable

4 files changed, 5 insertions, 13 deletions

diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 4250a02..5e6764a 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -327,12 +327,11 @@ int GenericResource::error() const
 
 void GenericResource::enqueueCommand(MessageQueue &mq, int commandId, const QByteArray &data)
 {
-    //TODO get rid of m_fbb member variable
-    m_fbb.Clear();
-    auto commandData = Akonadi2::EntityBuffer::appendAsVector(m_fbb, data.constData(), data.size());
-    auto buffer = Akonadi2::CreateQueuedCommand(m_fbb, commandId, commandData);
-    Akonadi2::FinishQueuedCommandBuffer(m_fbb, buffer);
-    mq.enqueue(m_fbb.GetBufferPointer(), m_fbb.GetSize());
+    flatbuffers::FlatBufferBuilder fbb;
+    auto commandData = Akonadi2::EntityBuffer::appendAsVector(fbb, data.constData(), data.size());
+    auto buffer = Akonadi2::CreateQueuedCommand(fbb, commandId, commandData);
+    Akonadi2::FinishQueuedCommandBuffer(fbb, buffer);
+    mq.enqueue(fbb.GetBufferPointer(), fbb.GetSize());
 }
 
 void GenericResource::processCommand(int commandId, const QByteArray &data)
diff --git a/common/genericresource.h b/common/genericresource.h
index 82c8a49..1aa4206 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -60,7 +60,6 @@ protected:
     virtual KAsync::Job<void> replay(const QByteArray &type, const QByteArray &key, const QByteArray &value);
     void onProcessorError(int errorCode, const QString &errorMessage);
     void enqueueCommand(MessageQueue &mq, int commandId, const QByteArray &data);
-    flatbuffers::FlatBufferBuilder m_fbb;
     MessageQueue mUserQueue;
     MessageQueue mSynchronizerQueue;
     QByteArray mResourceInstanceIdentifier;
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 6bb87f6..a24ff27 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -123,8 +123,6 @@ void DummyResource::synchronize(const QString &bufferType, const QMap<QString, Q
         }, true);
 
         if (!found) { //A new entity
-            m_fbb.Clear();
-
             flatbuffers::FlatBufferBuilder entityFbb;
             createEntity(remoteId, it.value(), entityFbb, synchronizationTransaction);
 
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 909eb10..9769444 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -121,8 +121,6 @@ void MaildirResource::synchronizeFolders(Akonadi2::Storage::Transaction &transac
         }, true);
 
         if (!found) { //A new entity
-            m_fbb.Clear();
-
             KPIM::Maildir md(folder, folder == mMaildirPath);
 
             Akonadi2::ApplicationDomain::Folder folder;
@@ -189,8 +187,6 @@ void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transacti
         }, true);
 
         if (!found) { //A new entity
-            m_fbb.Clear();
-
             KMime::Message *msg = new KMime::Message;
             auto filepath = listingPath + QDir::separator() + fileName;
             msg->setHead(KMime::CRLFtoLF(maildir.readEntryHeadersFromFile(filepath)));