summaryrefslogtreecommitdiff
path: root/src/gui/popups
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-29 21:44:11 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-29 21:44:11 +0300
commit337a52a41ea44570da65586403f14248042f0169 (patch)
tree27f58dd5f9c9f50310c94c649595a9e7f8e00455 /src/gui/popups
parent36c45ae7d8d2577a900ec266b64448d4b488013d (diff)
downloadmanaplus-337a52a41ea44570da65586403f14248042f0169.tar.gz
manaplus-337a52a41ea44570da65586403f14248042f0169.tar.bz2
manaplus-337a52a41ea44570da65586403f14248042f0169.tar.xz
manaplus-337a52a41ea44570da65586403f14248042f0169.zip
Use std::move in some places.
Diffstat (limited to 'src/gui/popups')
-rw-r--r--src/gui/popups/itempopup.cpp20
1 files changed, 10 insertions, 10 deletions
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;