From 8dbd8979de794217d4b7e885d9a5524be444d646 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sun, 25 Mar 2018 18:32:22 +0200 Subject: Fixed new warnings --- common/domaintypeadaptorfactoryinterface.h | 4 ++-- common/log.h | 2 +- common/resourceaccess.h | 2 +- common/resourcefacade.h | 8 ++++---- common/resultprovider.h | 2 +- common/store.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'common') diff --git a/common/domaintypeadaptorfactoryinterface.h b/common/domaintypeadaptorfactoryinterface.h index 4becbe5..ef42628 100644 --- a/common/domaintypeadaptorfactoryinterface.h +++ b/common/domaintypeadaptorfactoryinterface.h @@ -46,6 +46,6 @@ public: * Note that this only serialized parameters that are part of ApplicationDomainType::changedProperties() */ virtual bool - createBuffer(const Sink::ApplicationDomain::ApplicationDomainType &domainType, flatbuffers::FlatBufferBuilder &fbb, void const *metadataData = 0, size_t metadataSize = 0) = 0; - virtual bool createBuffer(const QSharedPointer &bufferAdaptor, flatbuffers::FlatBufferBuilder &fbb, void const *metadataData = 0, size_t metadataSize = 0) = 0; + createBuffer(const Sink::ApplicationDomain::ApplicationDomainType &domainType, flatbuffers::FlatBufferBuilder &fbb, void const *metadataData = nullptr, size_t metadataSize = 0) = 0; + virtual bool createBuffer(const QSharedPointer &bufferAdaptor, flatbuffers::FlatBufferBuilder &fbb, void const *metadataData = nullptr, size_t metadataSize = 0) = 0; }; diff --git a/common/log.h b/common/log.h index 8266fdb..93b6ba3 100644 --- a/common/log.h +++ b/common/log.h @@ -72,7 +72,7 @@ QByteArrayList SINK_EXPORT debugOutputFilter(FilterType type); void SINK_EXPORT setDebugOutputFields(const QByteArrayList &filter); QByteArrayList SINK_EXPORT debugOutputFields(); -QDebug SINK_EXPORT debugStream(DebugLevel debugLevel, int line, const char *file, const char *function, const char *debugArea = 0, const char *debugComponent = 0); +QDebug SINK_EXPORT debugStream(DebugLevel debugLevel, int line, const char *file, const char *function, const char *debugArea = nullptr, const char *debugComponent = nullptr); struct SINK_EXPORT TraceTime { diff --git a/common/resourceaccess.h b/common/resourceaccess.h index 9387e99..ea3329d 100644 --- a/common/resourceaccess.h +++ b/common/resourceaccess.h @@ -111,7 +111,7 @@ public: typedef QSharedPointer Ptr; ResourceAccess(const QByteArray &resourceInstanceIdentifier, const QByteArray &resourceType); - virtual ~ResourceAccess(); + virtual ~ResourceAccess() Q_DECL_OVERRIDE; QByteArray resourceName() const; bool isReady() const; diff --git a/common/resourcefacade.h b/common/resourcefacade.h index 36049c4..6b66f63 100644 --- a/common/resourcefacade.h +++ b/common/resourcefacade.h @@ -81,7 +81,7 @@ class LocalStorageFacade : public Sink::StoreFacade { public: LocalStorageFacade(const QByteArray &instanceIdentifier, const QByteArray &typeName); - virtual ~LocalStorageFacade(); + virtual ~LocalStorageFacade() Q_DECL_OVERRIDE; virtual KAsync::Job create(const DomainType &resource) Q_DECL_OVERRIDE; virtual KAsync::Job modify(const DomainType &resource) Q_DECL_OVERRIDE; virtual KAsync::Job move(const DomainType &resource, const QByteArray &) Q_DECL_OVERRIDE; @@ -99,7 +99,7 @@ class ResourceFacade : public LocalStorageFacade remove(const Sink::ApplicationDomain::SinkResource &resource) Q_DECL_OVERRIDE; virtual QPair, typename Sink::ResultEmitter::Ptr> load(const Sink::Query &query, const Sink::Log::Context &) Q_DECL_OVERRIDE; }; @@ -108,7 +108,7 @@ class AccountFacade : public LocalStorageFacade remove(const Sink::ApplicationDomain::SinkAccount &resource) Q_DECL_OVERRIDE; virtual QPair, typename Sink::ResultEmitter::Ptr> load(const Sink::Query &query, const Sink::Log::Context &) Q_DECL_OVERRIDE; }; @@ -117,6 +117,6 @@ class IdentityFacade : public LocalStorageFacade public: typedef QSharedPointer> Ptr; - virtual ~ResultProvider() + virtual ~ResultProvider() Q_DECL_OVERRIDE { } diff --git a/common/store.cpp b/common/store.cpp index 34d547b..4c9ef4c 100644 --- a/common/store.cpp +++ b/common/store.cpp @@ -432,7 +432,7 @@ KAsync::Job> Store::fetch(const Sink::Query &que list->append(model->index(i, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).template value()); } } else { - QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, context.data(), [model, &future, list](const QModelIndex &index, int start, int end) { + QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, context.data(), [model, list](const QModelIndex &index, int start, int end) { for (int i = start; i <= end; i++) { list->append(model->index(i, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).template value()); } -- cgit v1.2.3