mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: don't std::move() temporaries

Browse source 
clang correctly warns about std::move()ing objects returned from
functions. This is a pessimization, because the compiler can't
copy elide the object. Remove.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-11-13 21:34:22 +01:00 • committed by bstoeger
parent 46088e63fd
commit f6d3efc6f8
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
desktop-widgets/command_divesite.cpp
View file

@ -88,12 +88,12 @@ bool AddDiveSite::workToBeDone()
void AddDiveSite::redo() void AddDiveSite::redo()
{ {
sitesToRemove = std::move(addDiveSites(sitesToAdd)); sitesToRemove = addDiveSites(sitesToAdd);
} }
void AddDiveSite::undo() void AddDiveSite::undo()
{ {
sitesToAdd = std::move(removeDiveSites(sitesToRemove)); sitesToAdd = removeDiveSites(sitesToRemove);
} }
ImportDiveSites::ImportDiveSites(struct dive_site_table *sites, const QString &source) ImportDiveSites::ImportDiveSites(struct dive_site_table *sites, const QString &source)
@ -124,12 +124,12 @@ bool ImportDiveSites::workToBeDone()
void ImportDiveSites::redo() void ImportDiveSites::redo()
{ {
sitesToRemove = std::move(addDiveSites(sitesToAdd)); sitesToRemove = addDiveSites(sitesToAdd);
} }
void ImportDiveSites::undo() void ImportDiveSites::undo()
{ {
sitesToAdd = std::move(removeDiveSites(sitesToRemove)); sitesToAdd = removeDiveSites(sitesToRemove);
} }
DeleteDiveSites::DeleteDiveSites(const QVector<dive_site *> &sites) : sitesToRemove(sites.toStdVector()) DeleteDiveSites::DeleteDiveSites(const QVector<dive_site *> &sites) : sitesToRemove(sites.toStdVector())
@ -144,12 +144,12 @@ bool DeleteDiveSites::workToBeDone()
void DeleteDiveSites::redo() void DeleteDiveSites::redo()
{ {
sitesToAdd = std::move(removeDiveSites(sitesToRemove)); sitesToAdd = removeDiveSites(sitesToRemove);
} }
void DeleteDiveSites::undo() void DeleteDiveSites::undo()
{ {
sitesToRemove = std::move(addDiveSites(sitesToAdd)); sitesToRemove = addDiveSites(sitesToAdd);
} }
PurgeUnusedDiveSites::PurgeUnusedDiveSites() PurgeUnusedDiveSites::PurgeUnusedDiveSites()
@ -169,12 +169,12 @@ bool PurgeUnusedDiveSites::workToBeDone()
void PurgeUnusedDiveSites::redo() void PurgeUnusedDiveSites::redo()
{ {
sitesToAdd = std::move(removeDiveSites(sitesToRemove)); sitesToAdd = removeDiveSites(sitesToRemove);
} }
void PurgeUnusedDiveSites::undo() void PurgeUnusedDiveSites::undo()
{ {
sitesToRemove = std::move(addDiveSites(sitesToAdd)); sitesToRemove = addDiveSites(sitesToAdd);
} }
// Helper function: swap C and Qt string // Helper function: swap C and Qt string
@ -356,7 +356,7 @@ bool MergeDiveSites::workToBeDone()
void MergeDiveSites::redo() void MergeDiveSites::redo()
{ {
// First, remove all dive sites // First, remove all dive sites
sitesToAdd = std::move(removeDiveSites(sitesToRemove)); sitesToAdd = removeDiveSites(sitesToRemove);
// Remember which dives changed so that we can send a single dives-edited signal // Remember which dives changed so that we can send a single dives-edited signal
QVector<dive *> divesChanged; QVector<dive *> divesChanged;
@ -387,7 +387,7 @@ void MergeDiveSites::undo()
} }
} }
sitesToRemove = std::move(addDiveSites(sitesToAdd)); sitesToRemove = addDiveSites(sitesToAdd);
emit diveListNotifier.divesChanged(divesChanged, DiveField::DIVESITE); emit diveListNotifier.divesChanged(divesChanged, DiveField::DIVESITE);
} }