do not std::move out of functions

gwdevhub · Dec 20, 2023 · 739cea0 · 739cea0
1 parent 3c82b3c
commit 739cea0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/GWToolboxdll/Utils/GuiUtils.cpp b/GWToolboxdll/Utils/GuiUtils.cpp
@@ -494,7 +494,7 @@ namespace GuiUtils {
         ASSERT(size_needed != 0);
         std::string str_to(size_needed, 0);
         ASSERT(WideCharToMultiByte(CP_UTF8, 0, str.data(), static_cast<int>(str.size()), str_to.data(), size_needed, NULL, NULL));
-        return std::move(str_to);
+        return str_to;
     }
 
     // Makes sure the file name doesn't have chars that won't be allowed on disk
@@ -968,7 +968,7 @@ namespace GuiUtils {
         out.resize(size + 1);
         ASSERT(vsnprintf(out.data(), out.size(), msg, args) <= size);
         va_end(args);
-        return std::move(out);
+        return out;
     }
 
     std::wstring format(const wchar_t* msg, ...)
@@ -980,7 +980,7 @@ namespace GuiUtils {
         out.resize(size + 1);
         ASSERT(_vsnwprintf(out.data(), out.size(), msg, args) <= size);
         va_end(args);
-        return std::move(out);
+        return out;
     }
 
     std::string& EncString::string()

diff --git a/GWToolboxdll/Utils/ToolboxUtils.cpp b/GWToolboxdll/Utils/ToolboxUtils.cpp
@@ -653,6 +653,6 @@ namespace ToolboxUtils {
             original += L"\x2\x102\x2\x108\x107" L"Customized\x1";
         }
 
-        return std::move(original);
+        return original;
     }
 }
diff --git a/plugins/Base/PluginUtils.ixx b/plugins/Base/PluginUtils.ixx
@@ -496,7 +496,7 @@ namespace PluginUtils {
         PLUGIN_ASSERT(size_needed != 0);
         std::string strTo(size_needed, 0);
         PLUGIN_ASSERT(WideCharToMultiByte(CP_UTF8, 0, s.data(), static_cast<int>(s.size()), strTo.data(), size_needed, NULL, NULL));
-        return std::move(strTo);
+        return strTo;
     }
 
     // Makes sure the file name doesn't have chars that won't be allowed on disk
@@ -568,7 +568,7 @@ namespace PluginUtils {
         PLUGIN_ASSERT(size_needed != 0);
         std::wstring wstrTo(size_needed, 0);
         PLUGIN_ASSERT(MultiByteToWideChar(CP_UTF8, 0, str.data(), static_cast<int>(str.size()), wstrTo.data(), size_needed));
-        return std::move(wstrTo);
+        return wstrTo;
     }
 
     std::wstring SanitizePlayerName(const std::wstring& s)
@@ -970,7 +970,7 @@ namespace PluginUtils {
         out.resize(size + 1);
         PLUGIN_ASSERT(vsnprintf(out.data(), out.size(), msg, args) <= size);
         va_end(args);
-        return std::move(out);
+        return out;
     }
 
     std::wstring format(const wchar_t* msg, ...)
@@ -982,7 +982,7 @@ namespace PluginUtils {
         out.resize(size + 1);
         PLUGIN_ASSERT(_vsnwprintf(out.data(), out.size(), msg, args) <= size);
         va_end(args);
-        return std::move(out);
+        return out;
     }
 
     std::string& EncString::string()