From a48edff7a21ef6426baa1cc6eca501930cb35645 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 12 Jan 2017 16:12:05 +0100 Subject: Fixed build issues with pedantic enabled --- common/commandprocessor.cpp | 6 ++++++ common/commandprocessor.h | 2 +- common/datastorequery.cpp | 9 +++++++-- common/datastorequery.h | 3 ++- common/domain/applicationdomaintype.cpp | 8 ++++---- common/indexer.h | 1 + common/inspector.cpp | 5 +++++ common/mailpreprocessor.cpp | 2 +- common/pipeline.cpp | 4 +--- common/queryrunner.cpp | 2 -- common/resource.h | 2 +- common/resourceaccess.cpp | 1 - common/resultset.h | 1 + common/storage.h | 1 - common/storage/entitystore.cpp | 2 +- common/storage_lmdb.cpp | 4 ++++ common/synchronizer.cpp | 5 +++++ 17 files changed, 40 insertions(+), 18 deletions(-) (limited to 'common') diff --git a/common/commandprocessor.cpp b/common/commandprocessor.cpp index 87a120b..a6371be 100644 --- a/common/commandprocessor.cpp +++ b/common/commandprocessor.cpp @@ -380,3 +380,9 @@ KAsync::Job CommandProcessor::processAllMessages() } }); } + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" +#include "commandprocessor.moc" +#include "moc_commandprocessor.cpp" +#pragma clang diagnostic pop diff --git a/common/commandprocessor.h b/common/commandprocessor.h index eeb7ecf..a4beed6 100644 --- a/common/commandprocessor.h +++ b/common/commandprocessor.h @@ -34,7 +34,7 @@ namespace Sink { class Pipeline; class Inspector; class Synchronizer; - class QueuedCommand; + struct QueuedCommand; class QueryBase; /** diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp index 82a396e..d90d546 100644 --- a/common/datastorequery.cpp +++ b/common/datastorequery.cpp @@ -239,7 +239,7 @@ public: } QVariantList list; - for (const auto r : results) { + for (const auto &r : results) { readEntity(r, [&, this](const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Operation operation) { for (auto &aggregator : mAggregators) { if (!aggregator.property.isEmpty()) { @@ -293,7 +293,7 @@ public: while(!foundValue && mSource->next([this, callback, &foundValue](const ResultSet::Result &result) { auto bloomValue = result.entity.getProperty(mBloomProperty); auto results = indexLookup(mBloomProperty, bloomValue); - for (const auto r : results) { + for (const auto &r : results) { readEntity(r, [&, this](const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Operation operation) { callback({entity, Sink::Operation_Creation}); foundValue = true; @@ -312,6 +312,11 @@ DataStoreQuery::DataStoreQuery(const Sink::QueryBase &query, const QByteArray &t setupQuery(); } +DataStoreQuery::~DataStoreQuery() +{ + +} + void DataStoreQuery::readEntity(const QByteArray &key, const BufferCallback &resultCallback) { mStore.readLatest(mType, key, resultCallback); diff --git a/common/datastorequery.h b/common/datastorequery.h index a4c8c18..4ac0e2d 100644 --- a/common/datastorequery.h +++ b/common/datastorequery.h @@ -33,6 +33,7 @@ public: typedef QSharedPointer Ptr; DataStoreQuery(const Sink::QueryBase &query, const QByteArray &type, Sink::Storage::EntityStore &store); + ~DataStoreQuery(); ResultSet execute(); ResultSet update(qint64 baseRevision); @@ -43,7 +44,7 @@ private: QVector indexLookup(const QByteArray &property, const QVariant &value); - virtual void readEntity(const QByteArray &key, const BufferCallback &resultCallback); + void readEntity(const QByteArray &key, const BufferCallback &resultCallback); ResultSet createFilteredSet(ResultSet &resultSet, const FilterFunction &); QVector loadIncrementalResultSet(qint64 baseRevision); diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp index 60f5311..75438d5 100644 --- a/common/domain/applicationdomaintype.cpp +++ b/common/domain/applicationdomaintype.cpp @@ -73,18 +73,18 @@ ApplicationDomainType::ApplicationDomainType() ApplicationDomainType::ApplicationDomainType(const QByteArray &resourceInstanceIdentifier) :mAdaptor(new MemoryBufferAdaptor()), - mResourceInstanceIdentifier(resourceInstanceIdentifier), - mChangeSet(new QSet()) + mChangeSet(new QSet()), + mResourceInstanceIdentifier(resourceInstanceIdentifier) { } ApplicationDomainType::ApplicationDomainType(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer &adaptor) : mAdaptor(adaptor), + mChangeSet(new QSet()), mResourceInstanceIdentifier(resourceInstanceIdentifier), mIdentifier(identifier), - mRevision(revision), - mChangeSet(new QSet()) + mRevision(revision) { } diff --git a/common/indexer.h b/common/indexer.h index 7e148d1..26887fb 100644 --- a/common/indexer.h +++ b/common/indexer.h @@ -30,6 +30,7 @@ namespace ApplicationDomain { class Indexer { public: + virtual ~Indexer() = default; typedef QSharedPointer Ptr; virtual void add(const ApplicationDomain::ApplicationDomainType &entity) = 0; virtual void modify(const ApplicationDomain::ApplicationDomainType &old, const ApplicationDomain::ApplicationDomainType &entity) = 0; diff --git a/common/inspector.cpp b/common/inspector.cpp index 8b4c93a..78053a2 100644 --- a/common/inspector.cpp +++ b/common/inspector.cpp @@ -83,3 +83,8 @@ KAsync::Job Inspector::inspect(int inspectionType, const QByteArray &inspe return KAsync::error(-1, "Inspection not implemented."); } +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" +#include "inspector.moc" +#include "moc_inspector.cpp" +#pragma clang diagnostic pop diff --git a/common/mailpreprocessor.cpp b/common/mailpreprocessor.cpp index 1366718..dff3b3d 100644 --- a/common/mailpreprocessor.cpp +++ b/common/mailpreprocessor.cpp @@ -91,7 +91,7 @@ static Sink::ApplicationDomain::Mail::Contact getContact(const KMime::Headers::G static QList getContactList(const KMime::Headers::Generics::AddressList *header) { QList list; - for (const auto mb : header->mailboxes()) { + for (const auto &mb : header->mailboxes()) { list << Sink::ApplicationDomain::Mail::Contact{mb.name(), mb.address()}; } return list; diff --git a/common/pipeline.cpp b/common/pipeline.cpp index 32f6454..701c720 100644 --- a/common/pipeline.cpp +++ b/common/pipeline.cpp @@ -41,8 +41,6 @@ #include "storage/entitystore.h" #include "store.h" -SINK_DEBUG_AREA("pipeline") - using namespace Sink; using namespace Sink::Storage; @@ -271,7 +269,7 @@ KAsync::Job Pipeline::modifiedEntity(void const *command, size_t size) } // Remove deletions - for (const auto property : deletions) { + for (const auto &property : deletions) { newEntity.setProperty(property, QVariant()); } newEntity.setResource(targetResource); diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp index 6730894..0862378 100644 --- a/common/queryrunner.cpp +++ b/common/queryrunner.cpp @@ -26,8 +26,6 @@ #include "asyncutils.h" #include "datastorequery.h" -SINK_DEBUG_AREA("queryrunner") - using namespace Sink; using namespace Sink::Storage; diff --git a/common/resource.h b/common/resource.h index d756521..046f236 100644 --- a/common/resource.h +++ b/common/resource.h @@ -27,7 +27,7 @@ namespace Sink { class FacadeFactory; class AdaptorFactoryRegistry; -class ResourceContext; +struct ResourceContext; class QueryBase; /** diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp index 29d5a1c..4885b9f 100644 --- a/common/resourceaccess.cpp +++ b/common/resourceaccess.cpp @@ -220,7 +220,6 @@ KAsync::Job ResourceAccess::Private::initializeSocket() SinkWarning() << "Failed to start resource"; return KAsync::error(-1, "Failed to start resource"); } - return KAsync::null(); } else { SinkTrace() << "Connected to resource, without having to start it."; Q_ASSERT(s); diff --git a/common/resultset.h b/common/resultset.h index db7d1e0..707bc7e 100644 --- a/common/resultset.h +++ b/common/resultset.h @@ -35,6 +35,7 @@ class ResultSet { public: struct Result { + Result(const Sink::ApplicationDomain::ApplicationDomainType &e, Sink::Operation op, const QMap &v = QMap{}) : entity(e), operation(op), aggregateValues(v) {} Sink::ApplicationDomain::ApplicationDomainType entity; Sink::Operation operation; QMap aggregateValues; diff --git a/common/storage.h b/common/storage.h index 039a54f..a8e14a6 100644 --- a/common/storage.h +++ b/common/storage.h @@ -216,4 +216,3 @@ private: } // namespace Sink QDebug& SINK_EXPORT operator<<(QDebug &dbg, const Sink::Storage::DataStore::Error &error); - diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp index 055499c..b1b3c86 100644 --- a/common/storage/entitystore.cpp +++ b/common/storage/entitystore.cpp @@ -228,7 +228,7 @@ bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::Applic } // Remove deletions - for (const auto property : deletions) { + for (const auto &property : deletions) { //SinkTrace() << "Removing property: " << property; newEntity.setProperty(property, QVariant()); } diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp index fa99a80..f534029 100644 --- a/common/storage_lmdb.cpp +++ b/common/storage_lmdb.cpp @@ -41,6 +41,10 @@ SINK_DEBUG_AREA("storage") namespace Sink { namespace Storage { +extern QMutex sMutex; +extern QHash sEnvironments; + + QMutex sMutex; QHash sEnvironments; diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp index bb1a3f4..a341f63 100644 --- a/common/synchronizer.cpp +++ b/common/synchronizer.cpp @@ -488,3 +488,8 @@ bool Synchronizer::allChangesReplayed() SINK_REGISTER_TYPES() +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" +#include "synchronizer.moc" +#include "moc_synchronizer.cpp" +#pragma clang diagnostic pop -- cgit v1.2.3