diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-03-25 18:32:22 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-03-25 18:32:22 +0200 |
commit | 8dbd8979de794217d4b7e885d9a5524be444d646 (patch) | |
tree | 1455d46b6765d6ce304c5608076a205a7c1fd40c | |
parent | 08d41b8588c6b9c2e5e41c1ea0cb3d62956d1ea3 (diff) | |
download | sink-8dbd8979de794217d4b7e885d9a5524be444d646.tar.gz sink-8dbd8979de794217d4b7e885d9a5524be444d646.zip |
Fixed new warnings
-rw-r--r-- | common/domaintypeadaptorfactoryinterface.h | 4 | ||||
-rw-r--r-- | common/log.h | 2 | ||||
-rw-r--r-- | common/resourceaccess.h | 2 | ||||
-rw-r--r-- | common/resourcefacade.h | 8 | ||||
-rw-r--r-- | common/resultprovider.h | 2 | ||||
-rw-r--r-- | common/store.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
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: | |||
46 | * Note that this only serialized parameters that are part of ApplicationDomainType::changedProperties() | 46 | * Note that this only serialized parameters that are part of ApplicationDomainType::changedProperties() |
47 | */ | 47 | */ |
48 | virtual bool | 48 | virtual bool |
49 | createBuffer(const Sink::ApplicationDomain::ApplicationDomainType &domainType, flatbuffers::FlatBufferBuilder &fbb, void const *metadataData = 0, size_t metadataSize = 0) = 0; | 49 | createBuffer(const Sink::ApplicationDomain::ApplicationDomainType &domainType, flatbuffers::FlatBufferBuilder &fbb, void const *metadataData = nullptr, size_t metadataSize = 0) = 0; |
50 | virtual bool createBuffer(const QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> &bufferAdaptor, flatbuffers::FlatBufferBuilder &fbb, void const *metadataData = 0, size_t metadataSize = 0) = 0; | 50 | virtual bool createBuffer(const QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> &bufferAdaptor, flatbuffers::FlatBufferBuilder &fbb, void const *metadataData = nullptr, size_t metadataSize = 0) = 0; |
51 | }; | 51 | }; |
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); | |||
72 | void SINK_EXPORT setDebugOutputFields(const QByteArrayList &filter); | 72 | void SINK_EXPORT setDebugOutputFields(const QByteArrayList &filter); |
73 | QByteArrayList SINK_EXPORT debugOutputFields(); | 73 | QByteArrayList SINK_EXPORT debugOutputFields(); |
74 | 74 | ||
75 | QDebug SINK_EXPORT debugStream(DebugLevel debugLevel, int line, const char *file, const char *function, const char *debugArea = 0, const char *debugComponent = 0); | 75 | QDebug SINK_EXPORT debugStream(DebugLevel debugLevel, int line, const char *file, const char *function, const char *debugArea = nullptr, const char *debugComponent = nullptr); |
76 | 76 | ||
77 | struct SINK_EXPORT TraceTime | 77 | struct SINK_EXPORT TraceTime |
78 | { | 78 | { |
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: | |||
111 | typedef QSharedPointer<ResourceAccess> Ptr; | 111 | typedef QSharedPointer<ResourceAccess> Ptr; |
112 | 112 | ||
113 | ResourceAccess(const QByteArray &resourceInstanceIdentifier, const QByteArray &resourceType); | 113 | ResourceAccess(const QByteArray &resourceInstanceIdentifier, const QByteArray &resourceType); |
114 | virtual ~ResourceAccess(); | 114 | virtual ~ResourceAccess() Q_DECL_OVERRIDE; |
115 | 115 | ||
116 | QByteArray resourceName() const; | 116 | QByteArray resourceName() const; |
117 | bool isReady() const; | 117 | 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<DomainType> | |||
81 | { | 81 | { |
82 | public: | 82 | public: |
83 | LocalStorageFacade(const QByteArray &instanceIdentifier, const QByteArray &typeName); | 83 | LocalStorageFacade(const QByteArray &instanceIdentifier, const QByteArray &typeName); |
84 | virtual ~LocalStorageFacade(); | 84 | virtual ~LocalStorageFacade() Q_DECL_OVERRIDE; |
85 | virtual KAsync::Job<void> create(const DomainType &resource) Q_DECL_OVERRIDE; | 85 | virtual KAsync::Job<void> create(const DomainType &resource) Q_DECL_OVERRIDE; |
86 | virtual KAsync::Job<void> modify(const DomainType &resource) Q_DECL_OVERRIDE; | 86 | virtual KAsync::Job<void> modify(const DomainType &resource) Q_DECL_OVERRIDE; |
87 | virtual KAsync::Job<void> move(const DomainType &resource, const QByteArray &) Q_DECL_OVERRIDE; | 87 | virtual KAsync::Job<void> move(const DomainType &resource, const QByteArray &) Q_DECL_OVERRIDE; |
@@ -99,7 +99,7 @@ class ResourceFacade : public LocalStorageFacade<Sink::ApplicationDomain::SinkRe | |||
99 | { | 99 | { |
100 | public: | 100 | public: |
101 | ResourceFacade(); | 101 | ResourceFacade(); |
102 | virtual ~ResourceFacade(); | 102 | virtual ~ResourceFacade() Q_DECL_OVERRIDE; |
103 | virtual KAsync::Job<void> remove(const Sink::ApplicationDomain::SinkResource &resource) Q_DECL_OVERRIDE; | 103 | virtual KAsync::Job<void> remove(const Sink::ApplicationDomain::SinkResource &resource) Q_DECL_OVERRIDE; |
104 | virtual QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename Sink::ApplicationDomain::SinkResource::Ptr>::Ptr> load(const Sink::Query &query, const Sink::Log::Context &) Q_DECL_OVERRIDE; | 104 | virtual QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename Sink::ApplicationDomain::SinkResource::Ptr>::Ptr> load(const Sink::Query &query, const Sink::Log::Context &) Q_DECL_OVERRIDE; |
105 | }; | 105 | }; |
@@ -108,7 +108,7 @@ class AccountFacade : public LocalStorageFacade<Sink::ApplicationDomain::SinkAcc | |||
108 | { | 108 | { |
109 | public: | 109 | public: |
110 | AccountFacade(); | 110 | AccountFacade(); |
111 | virtual ~AccountFacade(); | 111 | virtual ~AccountFacade() Q_DECL_OVERRIDE; |
112 | virtual KAsync::Job<void> remove(const Sink::ApplicationDomain::SinkAccount &resource) Q_DECL_OVERRIDE; | 112 | virtual KAsync::Job<void> remove(const Sink::ApplicationDomain::SinkAccount &resource) Q_DECL_OVERRIDE; |
113 | virtual QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename Sink::ApplicationDomain::SinkAccount::Ptr>::Ptr> load(const Sink::Query &query, const Sink::Log::Context &) Q_DECL_OVERRIDE; | 113 | virtual QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename Sink::ApplicationDomain::SinkAccount::Ptr>::Ptr> load(const Sink::Query &query, const Sink::Log::Context &) Q_DECL_OVERRIDE; |
114 | }; | 114 | }; |
@@ -117,6 +117,6 @@ class IdentityFacade : public LocalStorageFacade<Sink::ApplicationDomain::Identi | |||
117 | { | 117 | { |
118 | public: | 118 | public: |
119 | IdentityFacade(); | 119 | IdentityFacade(); |
120 | virtual ~IdentityFacade(); | 120 | virtual ~IdentityFacade() Q_DECL_OVERRIDE; |
121 | }; | 121 | }; |
122 | 122 | ||
diff --git a/common/resultprovider.h b/common/resultprovider.h index 890e109..e41950d 100644 --- a/common/resultprovider.h +++ b/common/resultprovider.h | |||
@@ -76,7 +76,7 @@ class ResultProvider : public ResultProviderInterface<T> | |||
76 | public: | 76 | public: |
77 | typedef QSharedPointer<ResultProvider<T>> Ptr; | 77 | typedef QSharedPointer<ResultProvider<T>> Ptr; |
78 | 78 | ||
79 | virtual ~ResultProvider() | 79 | virtual ~ResultProvider() Q_DECL_OVERRIDE |
80 | { | 80 | { |
81 | } | 81 | } |
82 | 82 | ||
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<QList<typename DomainType::Ptr>> Store::fetch(const Sink::Query &que | |||
432 | list->append(model->index(i, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).template value<typename DomainType::Ptr>()); | 432 | list->append(model->index(i, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).template value<typename DomainType::Ptr>()); |
433 | } | 433 | } |
434 | } else { | 434 | } else { |
435 | QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, context.data(), [model, &future, list](const QModelIndex &index, int start, int end) { | 435 | QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, context.data(), [model, list](const QModelIndex &index, int start, int end) { |
436 | for (int i = start; i <= end; i++) { | 436 | for (int i = start; i <= end; i++) { |
437 | list->append(model->index(i, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).template value<typename DomainType::Ptr>()); | 437 | list->append(model->index(i, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).template value<typename DomainType::Ptr>()); |
438 | } | 438 | } |