From 981db492e49f545d14a779b3583ce7c805c78242 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 20 Feb 2023 19:54:42 +0100 Subject: [PATCH] Avoid unqualified calls to `std::move` --- abstractattachment.cpp | 2 +- flac/flacmetadata.cpp | 2 +- flac/flacstream.cpp | 2 +- id3/id3v2tag.cpp | 2 +- matroska/ebmlelement.cpp | 4 ++-- matroska/matroskacontainer.cpp | 10 +++++----- matroska/matroskatagfield.cpp | 4 ++-- mediafileinfo.cpp | 8 ++++---- mp4/mp4tag.cpp | 2 +- mp4/mp4tagfield.cpp | 6 +++--- tagtarget.cpp | 2 +- tagvalue.cpp | 2 +- tagvalue.h | 2 +- vorbis/vorbiscomment.cpp | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/abstractattachment.cpp b/abstractattachment.cpp index 1a69a69..e89f605 100644 --- a/abstractattachment.cpp +++ b/abstractattachment.cpp @@ -180,7 +180,7 @@ void AbstractAttachment::setFile(string_view path, Diagnostics &diag, AbortableP if (!mimeType.empty()) { m_mimeType = mimeType; } - m_data = move(file); + m_data = std::move(file); m_isDataFromFile = true; } diff --git a/flac/flacmetadata.cpp b/flac/flacmetadata.cpp index ae3f4e4..b212a63 100644 --- a/flac/flacmetadata.cpp +++ b/flac/flacmetadata.cpp @@ -98,7 +98,7 @@ void FlacMetaDataBlockPicture::parse(istream &inputStream, std::uint32_t maxSize if (size) { auto data = make_unique(size); inputStream.read(data.get(), size); - m_value.assignData(move(data), size, TagDataType::Picture); + m_value.assignData(std::move(data), size, TagDataType::Picture); } else { m_value.clearData(); } diff --git a/flac/flacstream.cpp b/flac/flacstream.cpp index a68eb93..e6e7b3a 100644 --- a/flac/flacstream.cpp +++ b/flac/flacstream.cpp @@ -139,7 +139,7 @@ void FlacStream::internalParseHeader(Diagnostics &diag, AbortableProgressFeedbac m_vorbisComment = make_unique(); m_vorbisComment->setVendor(TagValue(APP_NAME " v" APP_VERSION, TagTextEncoding::Utf8)); } - m_vorbisComment->fields().insert(make_pair(coverField.id(), move(coverField))); + m_vorbisComment->fields().insert(make_pair(coverField.id(), std::move(coverField))); } } catch (const TruncatedDataException &) { diff --git a/id3/id3v2tag.cpp b/id3/id3v2tag.cpp index e08bac5..d175c4c 100644 --- a/id3/id3v2tag.cpp +++ b/id3/id3v2tag.cpp @@ -552,7 +552,7 @@ void Id3v2Tag::parse(istream &stream, const std::uint64_t maximalSize, Diagnosti if (Id3v2FrameIds::isTextFrame(frame.id()) && fields().count(frame.id()) == 1) { diag.emplace_back(DiagLevel::Warning, "The text frame " % frame.idToString() + " exists more than once.", context); } - fields().emplace(frame.id(), move(frame)); + fields().emplace(frame.id(), std::move(frame)); } catch (const NoDataFoundException &) { if (frame.hasPaddingReached()) { m_paddingSize = startOffset + m_size - pos; diff --git a/matroska/ebmlelement.cpp b/matroska/ebmlelement.cpp index c3f8637..b6b59d0 100644 --- a/matroska/ebmlelement.cpp +++ b/matroska/ebmlelement.cpp @@ -119,13 +119,13 @@ void EbmlElement::internalParse(Diagnostics &diag) if (m_parent->firstChild() == this) { // ... parent m_parent->m_firstChild.release(); - m_parent->m_firstChild = move(m_nextSibling); + m_parent->m_firstChild = std::move(m_nextSibling); } else { // ... previous sibling for (EbmlElement *sibling = m_parent->firstChild(); sibling; sibling = sibling->nextSibling()) { if (sibling->nextSibling() == this) { sibling->m_nextSibling.release(); - sibling->m_nextSibling = move(m_nextSibling); + sibling->m_nextSibling = std::move(m_nextSibling); break; } } diff --git a/matroska/matroskacontainer.cpp b/matroska/matroskacontainer.cpp index 33a1156..d3ebd0e 100644 --- a/matroska/matroskacontainer.cpp +++ b/matroska/matroskacontainer.cpp @@ -526,31 +526,31 @@ void MatroskaContainer::internalParseHeader(Diagnostics &diag, AbortableProgress switch (element->id()) { case MatroskaIds::SegmentInfo: if (excludesOffset(m_segmentInfoElements, offset)) { - m_additionalElements.emplace_back(move(element)); + m_additionalElements.emplace_back(std::move(element)); m_segmentInfoElements.emplace_back(m_additionalElements.back().get()); } break; case MatroskaIds::Tracks: if (excludesOffset(m_tracksElements, offset)) { - m_additionalElements.emplace_back(move(element)); + m_additionalElements.emplace_back(std::move(element)); m_tracksElements.emplace_back(m_additionalElements.back().get()); } break; case MatroskaIds::Tags: if (excludesOffset(m_tagsElements, offset)) { - m_additionalElements.emplace_back(move(element)); + m_additionalElements.emplace_back(std::move(element)); m_tagsElements.emplace_back(m_additionalElements.back().get()); } break; case MatroskaIds::Chapters: if (excludesOffset(m_chaptersElements, offset)) { - m_additionalElements.emplace_back(move(element)); + m_additionalElements.emplace_back(std::move(element)); m_chaptersElements.emplace_back(m_additionalElements.back().get()); } break; case MatroskaIds::Attachments: if (excludesOffset(m_attachmentsElements, offset)) { - m_additionalElements.emplace_back(move(element)); + m_additionalElements.emplace_back(std::move(element)); m_attachmentsElements.emplace_back(m_additionalElements.back().get()); } break; diff --git a/matroska/matroskatagfield.cpp b/matroska/matroskatagfield.cpp index 33cff07..581e35d 100644 --- a/matroska/matroskatagfield.cpp +++ b/matroska/matroskatagfield.cpp @@ -74,10 +74,10 @@ void MatroskaTagField::reparse(EbmlElement &simpleTagElement, Diagnostics &diag, child->stream().read(buffer.get(), static_cast(child->dataSize())); switch (child->id()) { case MatroskaIds::TagString: - value().assignData(move(buffer), child->dataSize(), TagDataType::Text, TagTextEncoding::Utf8); + value().assignData(std::move(buffer), child->dataSize(), TagDataType::Text, TagTextEncoding::Utf8); break; case MatroskaIds::TagBinary: - value().assignData(move(buffer), child->dataSize(), TagDataType::Undefined); + value().assignData(std::move(buffer), child->dataSize(), TagDataType::Undefined); break; } } else { diff --git a/mediafileinfo.cpp b/mediafileinfo.cpp index 8dacce2..8f08233 100644 --- a/mediafileinfo.cpp +++ b/mediafileinfo.cpp @@ -245,7 +245,7 @@ startParsingSignature: } catch (const Failure &) { m_containerParsingStatus = ParsingStatus::CriticalFailure; } - m_container = move(container); + m_container = std::move(container); break; } case ContainerFormat::Ogg: @@ -962,7 +962,7 @@ string MediaFileInfo::technicalSummary() const for (size_t i = 0; i != trackCount; ++i) { const string description(m_container->track(i)->description()); if (!description.empty()) { - parts.emplace_back(move(description)); + parts.emplace_back(std::move(description)); } } return joinStrings(parts, " / "); @@ -1810,8 +1810,8 @@ void MediaFileInfo::makeMp3File(Diagnostics &diag, AbortableProgressFeedback &pr } backupStream.seekg(static_cast(streamOffset)); CopyHelper<0x4000> copyHelper; - copyHelper.callbackCopy(backupStream, stream(), mediaDataSize, bind(&AbortableProgressFeedback::isAborted, ref(progress)), - bind(&AbortableProgressFeedback::updateStepPercentage, ref(progress), _1)); + copyHelper.callbackCopy(backupStream, stream(), mediaDataSize, std::bind(&AbortableProgressFeedback::isAborted, std::ref(progress)), + std::bind(&AbortableProgressFeedback::updateStepPercentage, std::ref(progress), _1)); } else { // just skip actual stream data outputStream.seekp(static_cast(mediaDataSize), ios_base::cur); diff --git a/mp4/mp4tag.cpp b/mp4/mp4tag.cpp index 19cd807..7709bf8 100644 --- a/mp4/mp4tag.cpp +++ b/mp4/mp4tag.cpp @@ -413,7 +413,7 @@ void Mp4Tag::parse(Mp4Atom &metaAtom, Diagnostics &diag) try { child->parse(diag); tagField.reparse(*child, diag); - fields().emplace(child->id(), move(tagField)); + fields().emplace(child->id(), std::move(tagField)); } catch (const Failure &) { } } diff --git a/mp4/mp4tagfield.cpp b/mp4/mp4tagfield.cpp index 97f6589..a32b016 100644 --- a/mp4/mp4tagfield.cpp +++ b/mp4/mp4tagfield.cpp @@ -153,7 +153,7 @@ void Mp4TagField::reparse(Mp4Atom &ilstChild, Diagnostics &diag) const auto coverSize = static_cast(dataAtom->dataSize() - 8); auto coverData = make_unique(static_cast(coverSize)); stream.read(coverData.get(), coverSize); - val->assignData(move(coverData), static_cast(coverSize), TagDataType::Picture); + val->assignData(std::move(coverData), static_cast(coverSize), TagDataType::Picture); break; } case RawDataType::BeSignedInt: { @@ -229,9 +229,9 @@ void Mp4TagField::reparse(Mp4Atom &ilstChild, Diagnostics &diag) auto data = make_unique(static_cast(dataSize)); stream.read(data.get(), dataSize); if (ilstChild.id() == Mp4TagAtomIds::Cover) { - val->assignData(move(data), static_cast(dataSize), TagDataType::Picture); + val->assignData(std::move(data), static_cast(dataSize), TagDataType::Picture); } else { - val->assignData(move(data), static_cast(dataSize), TagDataType::Undefined); + val->assignData(std::move(data), static_cast(dataSize), TagDataType::Undefined); } } } diff --git a/tagtarget.cpp b/tagtarget.cpp index 1d6bc6c..cc5eacb 100644 --- a/tagtarget.cpp +++ b/tagtarget.cpp @@ -81,7 +81,7 @@ std::string TagTarget::toString(TagTargetLevel tagTargetLevel) const if (levelString.empty()) { parts.emplace_back("undefined target"); } else { - parts.emplace_back(move(levelString)); + parts.emplace_back(std::move(levelString)); } for (auto v : tracks()) { parts.emplace_back("track " + numberToString(v)); diff --git a/tagvalue.cpp b/tagvalue.cpp index 0b87846..59754dd 100644 --- a/tagvalue.cpp +++ b/tagvalue.cpp @@ -1179,7 +1179,7 @@ void TagValue::assignData(unique_ptr &&data, size_t length, TagDataType m_size = length; m_type = type; m_encoding = encoding; - m_ptr = move(data); + m_ptr = std::move(data); } /*! diff --git a/tagvalue.h b/tagvalue.h index 11633e8..1f57ddf 100644 --- a/tagvalue.h +++ b/tagvalue.h @@ -406,7 +406,7 @@ inline TagValue::TagValue(std::unique_ptr &&data, std::size_t length, Ta , m_flags(TagValueFlags::None) { if (length) { - m_ptr = move(data); + m_ptr = std::move(data); } } diff --git a/vorbis/vorbiscomment.cpp b/vorbis/vorbiscomment.cpp index 52ce5f1..3459cc7 100644 --- a/vorbis/vorbiscomment.cpp +++ b/vorbis/vorbiscomment.cpp @@ -178,7 +178,7 @@ template void VorbisComment::internalParse(StreamType &stream if (vendorSize <= maxSize) { auto buff = make_unique(vendorSize); stream.read(buff.get(), vendorSize); - m_vendor.assignData(move(buff), vendorSize, TagDataType::Text, TagTextEncoding::Utf8); + m_vendor.assignData(std::move(buff), vendorSize, TagDataType::Text, TagTextEncoding::Utf8); // TODO: Is the vendor string actually UTF-8 (like the field values)? } else { diag.emplace_back(DiagLevel::Critical, "Vendor information is truncated.", context); @@ -195,7 +195,7 @@ template void VorbisComment::internalParse(StreamType &stream VorbisCommentField field; try { field.parse(stream, maxSize, diag); - fields().emplace(field.id(), move(field)); + fields().emplace(field.id(), std::move(field)); } catch (const TruncatedDataException &) { throw; } catch (const Failure &) {