Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid unqualified calls to `std::move`

This commit is contained in:
Martchus 2023-02-20 19:54:42 +01:00
parent 15d74bbfb0
commit 981db492e4
14 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
abstractattachment.cpp
View File

@ -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;
}

2
flac/flacmetadata.cpp
View File

@ -98,7 +98,7 @@ void FlacMetaDataBlockPicture::parse(istream &inputStream, std::uint32_t maxSize
if (size) {
auto data = make_unique<char[]>(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();
}

2
flac/flacstream.cpp
View File

@ -139,7 +139,7 @@ void FlacStream::internalParseHeader(Diagnostics &diag, AbortableProgressFeedbac
m_vorbisComment = make_unique<VorbisComment>();
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 &) {

2
id3/id3v2tag.cpp
View File

@ -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;

4
matroska/ebmlelement.cpp
View File

@ -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;
}
}

10
matroska/matroskacontainer.cpp
View File

@ -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;

4
matroska/matroskatagfield.cpp
View File

@ -74,10 +74,10 @@ void MatroskaTagField::reparse(EbmlElement &simpleTagElement, Diagnostics &diag,
child->stream().read(buffer.get(), static_cast<streamoff>(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 {

8
mediafileinfo.cpp
View File

@ -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<streamoff>(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<std::streamoff>(mediaDataSize), ios_base::cur);

2
mp4/mp4tag.cpp
View File

@ -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 &) {
}
}

6
mp4/mp4tagfield.cpp
View File

@ -153,7 +153,7 @@ void Mp4TagField::reparse(Mp4Atom &ilstChild, Diagnostics &diag)
const auto coverSize = static_cast<streamoff>(dataAtom->dataSize() - 8);
auto coverData = make_unique<char[]>(static_cast<size_t>(coverSize));
stream.read(coverData.get(), coverSize);
val->assignData(move(coverData), static_cast<size_t>(coverSize), TagDataType::Picture);
val->assignData(std::move(coverData), static_cast<size_t>(coverSize), TagDataType::Picture);
break;
}
case RawDataType::BeSignedInt: {
@ -229,9 +229,9 @@ void Mp4TagField::reparse(Mp4Atom &ilstChild, Diagnostics &diag)
auto data = make_unique<char[]>(static_cast<size_t>(dataSize));
stream.read(data.get(), dataSize);
if (ilstChild.id() == Mp4TagAtomIds::Cover) {
val->assignData(move(data), static_cast<size_t>(dataSize), TagDataType::Picture);
val->assignData(std::move(data), static_cast<size_t>(dataSize), TagDataType::Picture);
} else {
val->assignData(move(data), static_cast<size_t>(dataSize), TagDataType::Undefined);
val->assignData(std::move(data), static_cast<size_t>(dataSize), TagDataType::Undefined);
}
}
}

2
tagtarget.cpp
View File

@ -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));

2
tagvalue.cpp
View File

@ -1179,7 +1179,7 @@ void TagValue::assignData(unique_ptr<char[]> &&data, size_t length, TagDataType
m_size = length;
m_type = type;
m_encoding = encoding;
m_ptr = move(data);
m_ptr = std::move(data);
}
/*!

2
tagvalue.h
View File

@ -406,7 +406,7 @@ inline TagValue::TagValue(std::unique_ptr<char[]> &&data, std::size_t length, Ta
, m_flags(TagValueFlags::None)
{
if (length) {
m_ptr = move(data);
m_ptr = std::move(data);
}
}

4
vorbis/vorbiscomment.cpp
View File

@ -178,7 +178,7 @@ template <class StreamType> void VorbisComment::internalParse(StreamType &stream
if (vendorSize <= maxSize) {
auto buff = make_unique<char[]>(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 <class StreamType> 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 &) {