Avoid unqualified calls to `std::move`
This commit is contained in:
parent
37a6d14dc5
commit
9b143ffbef
|
@ -628,7 +628,7 @@ FieldDenotations parseFieldDenotations(const Argument &fieldsArg, bool readOnly)
|
|||
}
|
||||
}
|
||||
scope.allTracks = allTracks;
|
||||
scope.trackIds = move(trackIds);
|
||||
scope.trackIds = std::move(trackIds);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ static void lazyInitializeLyricsWikiaSongId(SongDescription &desc)
|
|||
}
|
||||
|
||||
LyricsWikiaResultsModel::LyricsWikiaResultsModel(SongDescription &&initialSongDescription, QNetworkReply *reply)
|
||||
: HttpResultsModel(move(initialSongDescription), reply)
|
||||
: HttpResultsModel(std::move(initialSongDescription), reply)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -158,7 +158,7 @@ void LyricsWikiaResultsModel::parseInitialResults(const QByteArray &data)
|
|||
song.album = album;
|
||||
song.year = year;
|
||||
song.totalTracks = songs.size();
|
||||
m_results << move(song);
|
||||
m_results << std::move(song);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -433,7 +433,7 @@ QueryResultsModel *queryLyricsWikia(SongDescription &&songDescription)
|
|||
// be done manually when parsing results.
|
||||
|
||||
// make request
|
||||
return new LyricsWikiaResultsModel(move(songDescription), Utility::networkAccessManager().get(QNetworkRequest(url)));
|
||||
return new LyricsWikiaResultsModel(std::move(songDescription), Utility::networkAccessManager().get(QNetworkRequest(url)));
|
||||
}
|
||||
|
||||
} // namespace QtGui
|
||||
|
|
|
@ -25,7 +25,7 @@ static QUrl makeItPersonalApiUrl()
|
|||
}
|
||||
|
||||
MakeItPersonalResultsModel::MakeItPersonalResultsModel(SongDescription &&initialSongDescription, QNetworkReply *reply)
|
||||
: HttpResultsModel(move(initialSongDescription), reply)
|
||||
: HttpResultsModel(std::move(initialSongDescription), reply)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,7 @@ void MakeItPersonalResultsModel::parseInitialResults(const QByteArray &data)
|
|||
desc.artistId = m_initialDescription.artist;
|
||||
desc.lyrics = QString::fromUtf8(data).trimmed();
|
||||
if (desc.lyrics != QLatin1String("Sorry, We don't have lyrics for this song yet.")) {
|
||||
m_results << move(desc);
|
||||
m_results << std::move(desc);
|
||||
}
|
||||
|
||||
// promote changes
|
||||
|
@ -63,7 +63,7 @@ QueryResultsModel *queryMakeItPersonal(SongDescription &&songDescription)
|
|||
url.setQuery(query);
|
||||
|
||||
// make request
|
||||
return new MakeItPersonalResultsModel(move(songDescription), Utility::networkAccessManager().get(QNetworkRequest(url)));
|
||||
return new MakeItPersonalResultsModel(std::move(songDescription), Utility::networkAccessManager().get(QNetworkRequest(url)));
|
||||
}
|
||||
|
||||
} // namespace QtGui
|
||||
|
|
|
@ -34,7 +34,7 @@ template <> struct hash<QString> {
|
|||
namespace QtGui {
|
||||
|
||||
MusicBrainzResultsModel::MusicBrainzResultsModel(SongDescription &&initialSongDescription, QNetworkReply *reply)
|
||||
: HttpResultsModel(move(initialSongDescription), reply)
|
||||
: HttpResultsModel(std::move(initialSongDescription), reply)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -95,7 +95,7 @@ void MusicBrainzResultsModel::parseInitialResults(const QByteArray &data)
|
|||
|
||||
// parse XML tree
|
||||
QXmlStreamReader xmlReader(data);
|
||||
// clang-format off
|
||||
// clang-format off
|
||||
#include <qtutilities/misc/xmlparsermacros.h>
|
||||
children {
|
||||
iftag("metadata") {
|
||||
|
@ -184,7 +184,7 @@ void MusicBrainzResultsModel::parseInitialResults(const QByteArray &data)
|
|||
}
|
||||
else_skip
|
||||
}
|
||||
releasesByRecording[currentDescription.songId].emplace_back(move(releaseInfo));
|
||||
releasesByRecording[currentDescription.songId].emplace_back(std::move(releaseInfo));
|
||||
}
|
||||
else_skip
|
||||
}
|
||||
|
@ -206,7 +206,7 @@ void MusicBrainzResultsModel::parseInitialResults(const QByteArray &data)
|
|||
}
|
||||
else_skip
|
||||
}
|
||||
recordings.emplace_back(move(currentDescription));
|
||||
recordings.emplace_back(std::move(currentDescription));
|
||||
}
|
||||
else_skip
|
||||
}
|
||||
|
@ -246,7 +246,7 @@ void MusicBrainzResultsModel::parseInitialResults(const QByteArray &data)
|
|||
if (!release.year.isEmpty()) {
|
||||
releaseSpecificRecording.year = release.year;
|
||||
}
|
||||
recordingsByRelease[release.year % QChar('-') % release.albumId].emplace_back(move(releaseSpecificRecording));
|
||||
recordingsByRelease[release.year % QChar('-') % release.albumId].emplace_back(std::move(releaseSpecificRecording));
|
||||
}
|
||||
}
|
||||
// -> sort recordings within each release by track number and add recordings to results
|
||||
|
@ -259,7 +259,7 @@ void MusicBrainzResultsModel::parseInitialResults(const QByteArray &data)
|
|||
return recording1.track < recording2.track;
|
||||
});
|
||||
for (auto &recording : recordingsOfRelease) {
|
||||
m_results << move(recording);
|
||||
m_results << std::move(recording);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -307,7 +307,7 @@ QueryResultsModel *queryMusicBrainz(SongDescription &&songDescription)
|
|||
// make request
|
||||
QNetworkRequest request(url);
|
||||
request.setHeader(QNetworkRequest::UserAgentHeader, QStringLiteral("Mozilla/5.0 (X11; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0"));
|
||||
return new MusicBrainzResultsModel(move(songDescription), Utility::networkAccessManager().get(request));
|
||||
return new MusicBrainzResultsModel(std::move(songDescription), Utility::networkAccessManager().get(request));
|
||||
}
|
||||
|
||||
QNetworkReply *queryCoverArtArchive(const QString &albumId)
|
||||
|
|
|
@ -149,7 +149,7 @@ FilteredFileSystemItemModel *RenamingEngine::previewModel()
|
|||
void RenamingEngine::processPreviewGenerated()
|
||||
{
|
||||
finalizeTaskCompletion();
|
||||
setRootItem(move(m_newlyGeneratedRootItem));
|
||||
setRootItem(std::move(m_newlyGeneratedRootItem));
|
||||
}
|
||||
|
||||
void RenamingEngine::processChangingsApplied()
|
||||
|
@ -181,7 +181,7 @@ void RenamingEngine::finalizeTaskCompletion()
|
|||
inline void RenamingEngine::setRootItem(unique_ptr<FileSystemItem> &&rootItem)
|
||||
{
|
||||
updateModel(rootItem.get());
|
||||
m_rootItem = move(rootItem);
|
||||
m_rootItem = std::move(rootItem);
|
||||
}
|
||||
|
||||
void RenamingEngine::updateModel(FileSystemItem *rootItem)
|
||||
|
|
Loading…
Reference in New Issue