Merge pull request #14565 from SuperSamus/cpp-argument-move-reference

Improve usage of std::move and const references parameters

10 files changed, 17 insertions, 15 deletions

diff --git a/Source/Core/Common/Assembler/GekkoIRGen.cpp b/Source/Core/Common/Assembler/GekkoIRGen.cpp
index b32c0fd582..f7f62d3d7f 100644
--- a/Source/Core/Common/Assembler/GekkoIRGen.cpp
+++ b/Source/Core/Common/Assembler/GekkoIRGen.cpp
@@ -538,7 +538,7 @@ void GekkoIRPlugin::AddSymbolResolve(std::string_view sym, bool absolute)
   };
 
   m_fixup_stack.emplace(
-      [this, sym, absolute, source_address, err_on_fail = std::move(err_on_fail)] {
+      [this, sym, absolute, source_address, err_on_fail = std::move(err_on_fail)] mutable {
         auto label_it = m_labels.find(sym);
         if (label_it != m_labels.end())
         {
@@ -575,7 +575,7 @@ void GekkoIRPlugin::AddNumLabelSymResolve(std::string_view sym, u32 num)
   // Searching forward only
   size_t search_start_idx = static_cast<size_t>(m_numlabs.size());
   m_fixup_stack.emplace(
-      [this, num, source_address, search_start_idx, err_on_fail = std::move(err_on_fail)] {
+      [this, num, source_address, search_start_idx, err_on_fail = std::move(err_on_fail)] mutable {
         for (size_t i = search_start_idx; i < m_numlabs.size(); i++)
         {
           if (num == m_numlabs[i].first)
diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp
index c8b85eb387..e3f87d9b9b 100644
--- a/Source/Core/Common/Crypto/ec.cpp
+++ b/Source/Core/Common/Crypto/ec.cpp
@@ -133,7 +133,7 @@ static Elt operator/(const Elt& dividend, const Elt& divisor)
 struct Point
 {
   Point() = default;
-  constexpr explicit Point(Elt x, Elt y) : m_data{{std::move(x), std::move(y)}} {}
+  constexpr explicit Point(Elt x, Elt y) : m_data{{x, y}} {}
   explicit Point(const u8* data) { std::copy_n(data, sizeof(m_data), Data()); }
 
   bool IsZero() const { return X().IsZero() && Y().IsZero(); }
diff --git a/Source/Core/Common/FatFsUtil.cpp b/Source/Core/Common/FatFsUtil.cpp
index 004d84b688..150b73493c 100644
--- a/Source/Core/Common/FatFsUtil.cpp
+++ b/Source/Core/Common/FatFsUtil.cpp
@@ -598,7 +598,7 @@ bool SyncSDFolderToSDImage(const std::function<bool()>& cancelled, bool determin
   return true;
 }
 
-static bool Unpack(const std::function<bool()>& cancelled, const std::string path,
+static bool Unpack(const std::function<bool()>& cancelled, const std::string& path,
                    bool is_directory, const char* name, std::vector<u8>& tmp_buffer)
 {
   if (cancelled())
diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp
index ebaa9f37b0..a90b385ad9 100644
--- a/Source/Core/Common/FileSearch.cpp
+++ b/Source/Core/Common/FileSearch.cpp
@@ -71,13 +71,13 @@ std::vector<std::string> DoFileSearch(std::span<const std::string_view> director
       std::error_code error;
       if (recursive)
       {
-        for (auto it = fs::recursive_directory_iterator(std::move(directory_path), error);
+        for (auto it = fs::recursive_directory_iterator(directory_path, error);
              it != fs::recursive_directory_iterator(); it.increment(error))
           add_filtered(*it);
       }
       else
       {
-        for (auto it = fs::directory_iterator(std::move(directory_path), error);
+        for (auto it = fs::directory_iterator(directory_path, error);
              it != fs::directory_iterator(); it.increment(error))
           add_filtered(*it);
       }
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index 1dbbb4ac41..9f17a58675 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -425,7 +425,7 @@ static FSTEntry ScanDirectoryTreeAndroidContent(std::string directory, bool recu
 #endif
 
 // Recursive or non-recursive list of files and directories under directory.
-FSTEntry ScanDirectoryTree(std::string directory, bool recursive)
+FSTEntry ScanDirectoryTree(const std::string& directory, bool recursive)
 {
   DEBUG_LOG_FMT(COMMON, "{}: directory {}", __func__, directory);
 
diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
index cfe6eddffb..d5c8285305 100644
--- a/Source/Core/Common/FileUtil.h
+++ b/Source/Core/Common/FileUtil.h
@@ -193,7 +193,7 @@ bool CopyRegularFile(std::string_view source_path, std::string_view destination_
 bool CreateEmptyFile(const std::string& filename);
 
 // Recursive or non-recursive list of files and directories under directory.
-FSTEntry ScanDirectoryTree(std::string directory, bool recursive);
+FSTEntry ScanDirectoryTree(const std::string& directory, bool recursive);
 
 // deletes the given directory and anything under it. Returns true on success.
 bool DeleteDirRecursively(const std::string& directory);
diff --git a/Source/Core/Common/Profiler.cpp b/Source/Core/Common/Profiler.cpp
index 3a8eeb2746..cf3c0b4a3c 100644
--- a/Source/Core/Common/Profiler.cpp
+++ b/Source/Core/Common/Profiler.cpp
@@ -8,6 +8,7 @@
 #include <iomanip>
 #include <ios>
 #include <sstream>
+#include <utility>
 
 #include "Common/Timer.h"
 
@@ -26,8 +27,9 @@ u64 Profiler::s_usecs_frame;
 std::string Profiler::s_lazy_result;
 int Profiler::s_lazy_delay = 0;
 
-Profiler::Profiler(const std::string& name)
-    : m_name(name), m_usecs(0), m_usecs_min(UINT64_MAX), m_usecs_max(0), m_usecs_quad(0), m_calls(0)
+Profiler::Profiler(std::string name)
+    : m_name(std::move(name)), m_usecs(0), m_usecs_min(UINT64_MAX), m_usecs_max(0), m_usecs_quad(0),
+      m_calls(0)
 {
   s_max_length = std::max<u32>(s_max_length, u32(m_name.length()));
 
diff --git a/Source/Core/Common/Profiler.h b/Source/Core/Common/Profiler.h
index 5110e41571..91d9827564 100644
--- a/Source/Core/Common/Profiler.h
+++ b/Source/Core/Common/Profiler.h
@@ -14,7 +14,7 @@ namespace Common
 class Profiler
 {
 public:
-  Profiler(const std::string& name);
+  Profiler(std::string name);
   ~Profiler();
 
   static std::string ToString();
diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp
index 44b8390f90..2e0fb8e2ad 100644
--- a/Source/Core/Common/TraversalClient.cpp
+++ b/Source/Core/Common/TraversalClient.cpp
@@ -5,6 +5,7 @@
 #include <cstddef>
 #include <cstring>
 #include <string>
+#include <utility>
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
@@ -14,9 +15,9 @@
 
 namespace Common
 {
-TraversalClient::TraversalClient(ENetHost* netHost, const std::string& server, const u16 port,
+TraversalClient::TraversalClient(ENetHost* netHost, std::string server, const u16 port,
                                  const u16 port_alt)
-    : m_NetHost(netHost), m_Server(server), m_port(port), m_portAlt(port_alt)
+    : m_NetHost(netHost), m_Server(std::move(server)), m_port(port), m_portAlt(port_alt)
 {
   netHost->intercept = TraversalClient::InterceptCallback;
 
diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h
index 759edd653a..d3cd8149c0 100644
--- a/Source/Core/Common/TraversalClient.h
+++ b/Source/Core/Common/TraversalClient.h
@@ -43,8 +43,7 @@ public:
     SocketSendError,
     ResendTimeout,
   };
-  TraversalClient(ENetHost* netHost, const std::string& server, const u16 port,
-                  const u16 port_alt = 0);
+  TraversalClient(ENetHost* netHost, std::string server, const u16 port, const u16 port_alt = 0);
   ~TraversalClient();
 
   TraversalHostId GetHostID() const;