From 5719a23f9b0729f04ed1fa5dc6cc680c58d514d4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 31 Jan 2017 18:57:07 +0300 Subject: Move units into db directory. --- src/gui/widgets/characterdisplay.cpp | 6 +++--- src/gui/widgets/selldialog.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/widgets') 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(); -- cgit v1.2.3-70-g09d2