From 95fab4cac8217446684cfe6bd3f0218b0655530b Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 27 Mar 2015 16:47:40 +0100 Subject: Minor cleanup, less warnings. --- common/clientapi.cpp | 1 + common/clientapi.h | 5 +++++ common/domainadaptor.h | 1 + dummyresource/domainadaptor.h | 1 + dummyresource/resourcefactory.cpp | 2 +- 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/common/clientapi.cpp b/common/clientapi.cpp index 190bb57..10115da 100644 --- a/common/clientapi.cpp +++ b/common/clientapi.cpp @@ -34,6 +34,7 @@ QString getTypeName() void Store::shutdown(const QString &identifier) { Akonadi2::ResourceAccess resourceAccess(identifier); + //FIXME this starts the resource, just to shut it down again if it's not running in the first place. resourceAccess.open(); resourceAccess.sendCommand(Akonadi2::Commands::ShutdownCommand).then([](Async::Future &f){ //TODO wait for disconnect diff --git a/common/clientapi.h b/common/clientapi.h index aa47802..aa3aab8 100644 --- a/common/clientapi.h +++ b/common/clientapi.h @@ -179,6 +179,7 @@ namespace Domain { */ class BufferAdaptor { public: + virtual ~BufferAdaptor() {} virtual QVariant getProperty(const QString &key) const { return QVariant(); } virtual void setProperty(const QString &key, const QVariant &value) {} virtual QStringList availableProperties() const { return QStringList(); } @@ -199,6 +200,8 @@ public: } } + virtual ~MemoryBufferAdaptor() {} + virtual QVariant getProperty(const QString &key) const { return mValues.value(key); } virtual void setProperty(const QString &key, const QVariant &value) { mValues.insert(key, value); } virtual QStringList availableProperties() const { return mValues.keys(); } @@ -227,6 +230,8 @@ public: { } + virtual ~AkonadiDomainType() {} + virtual QVariant getProperty(const QString &key) const { return mAdaptor->getProperty(key); } virtual void setProperty(const QString &key, const QVariant &value){ mChangeSet.insert(key, value); mAdaptor->setProperty(key, value); } diff --git a/common/domainadaptor.h b/common/domainadaptor.h index 164c749..e46e893 100644 --- a/common/domainadaptor.h +++ b/common/domainadaptor.h @@ -67,6 +67,7 @@ template class DomainTypeAdaptorFactory/* */ { public: + virtual ~DomainTypeAdaptorFactory() {}; virtual QSharedPointer createAdaptor(const Akonadi2::Entity &entity) = 0; virtual void createBuffer(const Akonadi2::Domain::Event &event, flatbuffers::FlatBufferBuilder &fbb) {}; diff --git a/dummyresource/domainadaptor.h b/dummyresource/domainadaptor.h index 239ceca..9474176 100644 --- a/dummyresource/domainadaptor.h +++ b/dummyresource/domainadaptor.h @@ -10,6 +10,7 @@ class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory createAdaptor(const Akonadi2::Entity &entity); virtual void createBuffer(const Akonadi2::Domain::Event &event, flatbuffers::FlatBufferBuilder &fbb); }; diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp index fab3df9..d1beb1d 100644 --- a/dummyresource/resourcefactory.cpp +++ b/dummyresource/resourcefactory.cpp @@ -248,7 +248,7 @@ void DummyResource::configurePipeline(Akonadi2::Pipeline *pipeline) auto eventFactory = QSharedPointer::create(); //FIXME we should setup for each resource entity type, not for each domain type //i.e. If a resource stores tags as part of each message it needs to update the tag index - //TODO setup preprocessors for each domain type and pipeline type allowing full customization + //TODO setup preprocessors for each resource entity type and pipeline type allowing full customization //Eventually the order should be self configuring, for now it's hardcoded. auto eventIndexer = new SimpleProcessor("summaryprocessor", [eventFactory](const Akonadi2::PipelineState &state, const Akonadi2::Entity &entity) { auto adaptor = eventFactory->createAdaptor(entity); -- cgit v1.2.3