From 737d3b499b90290e69365d0e8306a657ef64e4f7 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 21 Jan 2024 20:20:37 +0400
Subject: [PATCH] Use move semantics for tools

---
 apps/essimporter/convertacdt.cpp         | 2 +-
 apps/essimporter/converter.cpp           | 6 +++---
 apps/opencs/model/filter/parser.cpp      | 2 +-
 apps/opencs/model/tools/reportmodel.cpp  | 2 +-
 apps/opencs/model/world/actoradapter.cpp | 8 ++++----
 apps/opencs/model/world/collection.hpp   | 2 +-
 apps/opencs/view/world/tablesubview.cpp  | 2 +-
 apps/wizard/unshield/unshieldworker.cpp  | 7 +++----
 8 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/apps/essimporter/convertacdt.cpp b/apps/essimporter/convertacdt.cpp
index 8342310cf6..a737e0a3a2 100644
--- a/apps/essimporter/convertacdt.cpp
+++ b/apps/essimporter/convertacdt.cpp
@@ -85,7 +85,7 @@ namespace ESSImport
             Misc::StringUtils::lowerCaseInPlace(group);
 
             ESM::AnimationState::ScriptedAnimation scriptedAnim;
-            scriptedAnim.mGroup = group;
+            scriptedAnim.mGroup = std::move(group);
             scriptedAnim.mTime = anis.mTime;
             scriptedAnim.mAbsolute = true;
             // Neither loop count nor queueing seems to be supported by the ess format.
diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index 07146fc388..4c4bd1e438 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -306,12 +306,12 @@ namespace ESSImport
             mMarkers.push_back(marker);
         }
 
-        newcell.mRefs = cellrefs;
+        newcell.mRefs = std::move(cellrefs);
 
         if (cell.isExterior())
-            mExtCells[std::make_pair(cell.mData.mX, cell.mData.mY)] = newcell;
+            mExtCells[std::make_pair(cell.mData.mX, cell.mData.mY)] = std::move(newcell);
         else
-            mIntCells[cell.mName] = newcell;
+            mIntCells[cell.mName] = std::move(newcell);
     }
 
     void ConvertCell::writeCell(const Cell& cell, ESM::ESMWriter& esm)
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index 5443db2854..aadad5f8f5 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -624,7 +624,7 @@ bool CSMFilter::Parser::parse(const std::string& filter, bool allowPredefined)
         }
 
         if (node)
-            mFilter = node;
+            mFilter = std::move(node);
         else
         {
             // Empty filter string equals to filter "true".
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
index 84a8c71f95..f9251acdab 100644
--- a/apps/opencs/model/tools/reportmodel.cpp
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -171,7 +171,7 @@ void CSMTools::ReportModel::flagAsReplaced(int index)
 
     hint[0] = 'r';
 
-    line.mHint = hint;
+    line.mHint = std::move(hint);
 
     emit dataChanged(this->index(index, 0), this->index(index, columnCount()));
 }
diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 0e3725bbb7..37aaf08445 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -468,13 +468,13 @@ namespace CSMWorld
         if (type == UniversalId::Type_Creature)
         {
             // Valid creature record
-            setupCreature(id, data);
+            setupCreature(id, std::move(data));
             emit actorChanged(id);
         }
         else if (type == UniversalId::Type_Npc)
         {
             // Valid npc record
-            setupNpc(id, data);
+            setupNpc(id, std::move(data));
             emit actorChanged(id);
         }
         else
@@ -665,7 +665,7 @@ namespace CSMWorld
             RaceDataPtr data = mCachedRaces.get(race);
             if (data)
             {
-                setupRace(race, data);
+                setupRace(race, std::move(data));
                 // Race was changed. Need to mark actor dependencies as dirty.
                 // Cannot use markDirtyDependency because that would invalidate
                 // the current iterator.
@@ -683,7 +683,7 @@ namespace CSMWorld
             ActorDataPtr data = mCachedActors.get(actor);
             if (data)
             {
-                setupActor(actor, data);
+                setupActor(actor, std::move(data));
             }
         }
         mDirtyActors.clear();
diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 9db6b3b042..dbbff2ed4a 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -504,7 +504,7 @@ namespace CSMWorld
 
         auto record2 = std::make_unique<Record<ESXRecordT>>();
         record2->mState = Record<ESXRecordT>::State_ModifiedOnly;
-        record2->mModified = record;
+        record2->mModified = std::move(record);
 
         insertRecord(std::move(record2), getAppendIndex(id, type), type);
     }
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index 1d4dc37529..891d954ad4 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -195,7 +195,7 @@ void CSVWorld::TableSubView::createFilterRequest(std::vector<CSMWorld::Universal
 
         CSVFilter::FilterData filterData;
         filterData.searchData = qData;
-        filterData.columns = searchColumns;
+        filterData.columns = std::move(searchColumns);
 
         sourceFilterByValue.emplace_back(filterData);
 
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index 767d35d4f5..1d7d21b256 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -810,8 +810,7 @@ bool Wizard::UnshieldWorker::extractFile(
     if (!dir.mkpath(path))
         return false;
 
-    QString fileName(path);
-    fileName.append(QString::fromUtf8(unshield_file_name(unshield, index)));
+    path.append(QString::fromUtf8(unshield_file_name(unshield, index)));
 
     // Calculate the percentage done
     int progress = (((float)counter / (float)unshield_file_count(unshield)) * 100);
@@ -825,13 +824,13 @@ bool Wizard::UnshieldWorker::extractFile(
     emit textChanged(tr("Extracting: %1").arg(QString::fromUtf8(unshield_file_name(unshield, index))));
     emit progressChanged(progress);
 
-    QByteArray array(fileName.toUtf8());
+    QByteArray array(path.toUtf8());
     success = unshield_file_save(unshield, index, array.constData());
 
     if (!success)
     {
         qDebug() << "error";
-        dir.remove(fileName);
+        dir.remove(path);
     }
 
     return success;