mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Cleanup: don't std::move() temporaries
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:
parent
46088e63fd
commit
f6d3efc6f8
1 changed files with 10 additions and 10 deletions
|
@ -88,12 +88,12 @@ bool AddDiveSite::workToBeDone()
|
|||
|
||||
void AddDiveSite::redo()
|
||||
{
|
||||
sitesToRemove = std::move(addDiveSites(sitesToAdd));
|
||||
sitesToRemove = addDiveSites(sitesToAdd);
|
||||
}
|
||||
|
||||
void AddDiveSite::undo()
|
||||
{
|
||||
sitesToAdd = std::move(removeDiveSites(sitesToRemove));
|
||||
sitesToAdd = removeDiveSites(sitesToRemove);
|
||||
}
|
||||
|
||||
ImportDiveSites::ImportDiveSites(struct dive_site_table *sites, const QString &source)
|
||||
|
@ -124,12 +124,12 @@ bool ImportDiveSites::workToBeDone()
|
|||
|
||||
void ImportDiveSites::redo()
|
||||
{
|
||||
sitesToRemove = std::move(addDiveSites(sitesToAdd));
|
||||
sitesToRemove = addDiveSites(sitesToAdd);
|
||||
}
|
||||
|
||||
void ImportDiveSites::undo()
|
||||
{
|
||||
sitesToAdd = std::move(removeDiveSites(sitesToRemove));
|
||||
sitesToAdd = removeDiveSites(sitesToRemove);
|
||||
}
|
||||
|
||||
DeleteDiveSites::DeleteDiveSites(const QVector<dive_site *> &sites) : sitesToRemove(sites.toStdVector())
|
||||
|
@ -144,12 +144,12 @@ bool DeleteDiveSites::workToBeDone()
|
|||
|
||||
void DeleteDiveSites::redo()
|
||||
{
|
||||
sitesToAdd = std::move(removeDiveSites(sitesToRemove));
|
||||
sitesToAdd = removeDiveSites(sitesToRemove);
|
||||
}
|
||||
|
||||
void DeleteDiveSites::undo()
|
||||
{
|
||||
sitesToRemove = std::move(addDiveSites(sitesToAdd));
|
||||
sitesToRemove = addDiveSites(sitesToAdd);
|
||||
}
|
||||
|
||||
PurgeUnusedDiveSites::PurgeUnusedDiveSites()
|
||||
|
@ -169,12 +169,12 @@ bool PurgeUnusedDiveSites::workToBeDone()
|
|||
|
||||
void PurgeUnusedDiveSites::redo()
|
||||
{
|
||||
sitesToAdd = std::move(removeDiveSites(sitesToRemove));
|
||||
sitesToAdd = removeDiveSites(sitesToRemove);
|
||||
}
|
||||
|
||||
void PurgeUnusedDiveSites::undo()
|
||||
{
|
||||
sitesToRemove = std::move(addDiveSites(sitesToAdd));
|
||||
sitesToRemove = addDiveSites(sitesToAdd);
|
||||
}
|
||||
|
||||
// Helper function: swap C and Qt string
|
||||
|
@ -356,7 +356,7 @@ bool MergeDiveSites::workToBeDone()
|
|||
void MergeDiveSites::redo()
|
||||
{
|
||||
// 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
|
||||
QVector<dive *> divesChanged;
|
||||
|
@ -387,7 +387,7 @@ void MergeDiveSites::undo()
|
|||
}
|
||||
}
|
||||
|
||||
sitesToRemove = std::move(addDiveSites(sitesToAdd));
|
||||
sitesToRemove = addDiveSites(sitesToAdd);
|
||||
|
||||
emit diveListNotifier.divesChanged(divesChanged, DiveField::DIVESITE);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue