From 337a52a41ea44570da65586403f14248042f0169 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 29 Jun 2017 21:44:11 +0300
Subject: Use std::move in some places.

---
 src/gui/popups/itempopup.cpp         | 20 ++++++++++----------
 src/gui/widgets/setupitem.cpp        |  3 ++-
 src/gui/widgets/staticbrowserbox.cpp |  3 ++-
 src/gui/windows/logindialog.cpp      |  3 ++-
 src/gui/windows/minimap.cpp          |  3 ++-
 5 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 5c5dfd19e..5179627e1 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -34,7 +34,14 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/textbox.h"
 
+#include "net/beinghandler.h"
+#include "net/net.h"
+
+#include "utils/foreach.h"
 #include "utils/gettext.h"
+#include "utils/stdmove.h"
+
+#include "utils/translation/podict.h"
 
 #include "resources/iteminfo.h"
 
@@ -49,13 +56,6 @@
 
 #include "resources/loaders/imageloader.h"
 
-#include "net/beinghandler.h"
-#include "net/net.h"
-
-#include "utils/foreach.h"
-
-#include "utils/translation/podict.h"
-
 #include "debug.h"
 
 ItemPopup *itemPopup = nullptr;
@@ -208,8 +208,8 @@ void ItemPopup::setItem(const ItemInfo &item,
         cardsStr = getCardsString(cards);
         optionsStr = getOptionsString(options);
     }
-    mItemOptionsStr = optionsStr;
-    mCardsStr = cardsStr;
+    mItemOptionsStr = STD_MOVE(optionsStr);
+    mCardsStr = STD_MOVE(cardsStr);
 
     if (id == -1)
         id = item.getId();
@@ -269,7 +269,7 @@ void ItemPopup::setItem(const ItemInfo &item,
     mItemWeight->setTextWrapped(strprintf(_("Weight: %s"),
         UnitsDb::formatWeight(item.getWeight()).c_str()), 196);
     mItemCards->setTextWrapped(mCardsStr, 196);
-    mItemOptions->setTextWrapped(optionsStr, 196);
+    mItemOptions->setTextWrapped(mItemOptionsStr, 196);
 
     int minWidth = mItemName->getWidth() + space;
 
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 8d6296d52..e4b40f9be 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -44,6 +44,7 @@
 
 #include "utils/base64.h"
 #include "utils/gettext.h"
+#include "utils/stdmove.h"
 #include "utils/mathutils.h"
 
 #include "debug.h"
@@ -324,7 +325,7 @@ void SetupItemTextField::save()
         std::string normalValue = mValue;
         mValue = encodeBase64String(mValue);
         SetupItem::save();
-        mValue = normalValue;
+        mValue = STD_MOVE(normalValue);
     }
     else
     {
diff --git a/src/gui/widgets/staticbrowserbox.cpp b/src/gui/widgets/staticbrowserbox.cpp
index ef51660c0..7be4b780e 100644
--- a/src/gui/widgets/staticbrowserbox.cpp
+++ b/src/gui/widgets/staticbrowserbox.cpp
@@ -46,6 +46,7 @@
 #include "utils/browserboxtools.h"
 #include "utils/checkutils.h"
 #include "utils/foreach.h"
+#include "utils/stdmove.h"
 #include "utils/stringutils.h"
 #include "utils/translation/podict.h"
 
@@ -256,7 +257,7 @@ void StaticBrowserBox::addRow(const std::string &row,
         mTextRowLinksCount.push_back(linksCount);
     }
 
-    std::string plain = newRow;
+    std::string plain = STD_MOVE(newRow);
     // workaround if used only one string started from bold
     // width for this string can be calculated wrong
     // this workaround fix width if string start from bold sign
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index e99d1b68e..21af69b91 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -48,6 +48,7 @@
 #include "net/updatetypeoperators.h"
 
 #include "utils/delete2.h"
+#include "utils/stdmove.h"
 
 #include "debug.h"
 
@@ -357,7 +358,7 @@ void LoginDialog::prepareUpdate()
         if (!str.empty() && checkPath(str))
         {
             mLoginData->updateHost = str;
-            *mUpdateHost = str;
+            *mUpdateHost = STD_MOVE(str);
         }
         else
         {
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 95d606618..7f48f4a10 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -54,6 +54,7 @@
 #include "utils/gettext.h"
 #include "utils/foreach.h"
 #include "utils/sdlcheckutils.h"
+#include "utils/stdmove.h"
 
 #include "debug.h"
 
@@ -190,7 +191,7 @@ void Minimap::setMap(const Map *const map)
                 tempname = pathJoin("graphics/minimaps",
                     map->getFilename()).append(".png");
                 if (VirtFs::exists(tempname))
-                    minimapName = tempname;
+                    minimapName = STD_MOVE(tempname);
             }
 
             if (!minimapName.empty())
-- 
cgit v1.2.3-70-g09d2