From a3c3fb61e08523a563ce3cba86dc50c9c5fc2c5d Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 13 Jul 2016 14:43:37 +0200 Subject: Fixed new diagnostics errors --- common/bufferutils.h | 2 +- common/domainadaptor.h | 2 +- common/messagequeue.cpp | 4 ++-- common/pipeline.cpp | 6 +++--- common/propertymapper.cpp | 2 +- common/store.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'common') diff --git a/common/bufferutils.h b/common/bufferutils.h index d6008c4..6763ced 100644 --- a/common/bufferutils.h +++ b/common/bufferutils.h @@ -26,7 +26,7 @@ static QByteArray extractBuffer(const flatbuffers::FlatBufferBuilder &fbb) static QList fromVector(const flatbuffers::Vector> &vector) { QList list; - for (const auto &data : vector) { + for (const flatbuffers::String *data : vector) { Q_ASSERT(data); list << QByteArray::fromStdString(data->str()); } diff --git a/common/domainadaptor.h b/common/domainadaptor.h index 25448f3..e0912e4 100644 --- a/common/domainadaptor.h +++ b/common/domainadaptor.h @@ -115,7 +115,7 @@ public: /** * Returns all available properties for which a mapping exists (no matter what the buffer contains) */ - virtual QList availableProperties() const + virtual QList availableProperties() const Q_DECL_OVERRIDE { return mResourceMapper->availableProperties() + mLocalMapper->availableProperties(); } diff --git a/common/messagequeue.cpp b/common/messagequeue.cpp index a6e44e3..3567a10 100644 --- a/common/messagequeue.cpp +++ b/common/messagequeue.cpp @@ -55,7 +55,7 @@ void MessageQueue::startTransaction() return; } processRemovals(); - mWriteTransaction = std::move(mStorage.createTransaction(Sink::Storage::ReadWrite)); + mWriteTransaction = mStorage.createTransaction(Sink::Storage::ReadWrite); } void MessageQueue::commit() @@ -87,7 +87,7 @@ void MessageQueue::processRemovals() if (mWriteTransaction) { return; } - auto transaction = std::move(mStorage.createTransaction(Sink::Storage::ReadWrite)); + auto transaction = mStorage.createTransaction(Sink::Storage::ReadWrite); for (const auto &key : mPendingRemoval) { transaction.openDatabase().remove(key); } diff --git a/common/pipeline.cpp b/common/pipeline.cpp index f1a4a32..000d2b2 100644 --- a/common/pipeline.cpp +++ b/common/pipeline.cpp @@ -119,9 +119,9 @@ void Pipeline::startTransaction() if (d->storage.exists()) { while (!d->transaction.validateNamedDatabases()) { SinkWarning() << "Opened an invalid transaction!!!!!!"; - d->transaction = std::move(storage().createTransaction(Storage::ReadWrite, [](const Sink::Storage::Error &error) { + d->transaction = storage().createTransaction(Storage::ReadWrite, [](const Sink::Storage::Error &error) { SinkWarning() << error.message; - })); + }); } } } @@ -316,7 +316,7 @@ KAsync::Job Pipeline::modifiedEntity(void const *command, size_t size) // Remove deletions if (modifyEntity->deletions()) { - for (const auto &property : *modifyEntity->deletions()) { + for (const flatbuffers::String *property : *modifyEntity->deletions()) { newAdaptor->setProperty(BufferUtils::extractBuffer(property), QVariant()); } } diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp index 130ba0b..9fe2d30 100644 --- a/common/propertymapper.cpp +++ b/common/propertymapper.cpp @@ -53,7 +53,7 @@ flatbuffers::uoffset_t variantToProperty(const QVariant &propert if (property.isValid()) { const auto list = property.value(); std::vector> vector; - for (const auto value : list) { + for (const auto &value : list) { auto offset = fbb.CreateString(value.toStdString()); vector.push_back(offset); } diff --git a/common/store.cpp b/common/store.cpp index 363878c..07f41f8 100644 --- a/common/store.cpp +++ b/common/store.cpp @@ -360,7 +360,7 @@ QList Store::read(const Sink::Query &q) SinkTrace() << "Found value: " << value->identifier(); list << *value; }); - for (const auto resourceInstanceIdentifier : resources.keys()) { + for (const auto &resourceInstanceIdentifier : resources.keys()) { const auto resourceType = resources.value(resourceInstanceIdentifier); SinkTrace() << "Looking for " << resourceType << resourceInstanceIdentifier; auto facade = FacadeFactory::instance().getFacade(resourceType, resourceInstanceIdentifier); -- cgit v1.2.3