diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-01-31 18:57:07 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-01-31 18:57:07 +0300 |
commit | 5719a23f9b0729f04ed1fa5dc6cc680c58d514d4 (patch) | |
tree | d4fc1a73ea263a737e56d740a266bea34a1bbfcd /src/gui/widgets | |
parent | 31e7a7d05f36495df0176fc31d5894e216c3cdf4 (diff) | |
download | manaplus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.gz manaplus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.bz2 manaplus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.xz manaplus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.zip |
Move units into db directory.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/characterdisplay.cpp | 6 | ||||
-rw-r--r-- | src/gui/widgets/selldialog.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp index 8ebc311f7..696b8c2bf 100644 --- a/src/gui/widgets/characterdisplay.cpp +++ b/src/gui/widgets/characterdisplay.cpp @@ -22,8 +22,6 @@ #include "gui/widgets/characterdisplay.h" -#include "units.h" - #include "gui/gui.h" #include "gui/windows/charselectdialog.h" @@ -37,6 +35,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "resources/db/unitsdb.h" + #include "net/character.h" #include "debug.h" @@ -139,7 +139,7 @@ void CharacterDisplay::mouseMoved(MouseEvent &event A_UNUSED) CAST_U32( mCharacter->data.mAttributes[Attributes::PLAYER_LEVEL])), // TRANSLATORS: character money - strprintf(_("Money: %s"), Units::formatCurrency( + strprintf(_("Money: %s"), UnitsDb::formatCurrency( mCharacter->data.mAttributes[Attributes::MONEY]).c_str())); } else diff --git a/src/gui/widgets/selldialog.cpp b/src/gui/widgets/selldialog.cpp index 39584050d..7f96e14ff 100644 --- a/src/gui/widgets/selldialog.cpp +++ b/src/gui/widgets/selldialog.cpp @@ -22,8 +22,6 @@ #include "gui/widgets/selldialog.h" -#include "units.h" - #include "enums/gui/layouttype.h" #include "gui/windows/setupwindow.h" @@ -43,6 +41,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "resources/db/unitsdb.h" + #include "resources/item/shopitem.h" #include "debug.h" @@ -358,8 +358,8 @@ void SellDialog::updateButtonsAndLabels() { // TRANSLATORS: sell dialog label mMoneyLabel->setCaption(strprintf(_("Price: %s / Total: %s"), - Units::formatCurrency(income).c_str(), - Units::formatCurrency(mPlayerMoney + income).c_str())); + UnitsDb::formatCurrency(income).c_str(), + UnitsDb::formatCurrency(mPlayerMoney + income).c_str())); } if (item) item->update(); |