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/windows/inventorywindow.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/gui/windows/inventorywindow.cpp') diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 440d8ab6d..7e303af28 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -23,7 +23,6 @@ #include "gui/windows/inventorywindow.h" #include "configuration.h" -#include "units.h" #include "being/playerinfo.h" @@ -65,6 +64,8 @@ #include "resources/iteminfo.h" +#include "resources/db/unitsdb.h" + #include "resources/item/item.h" #include "utils/delete2.h" @@ -701,7 +702,7 @@ void InventoryWindow::mouseMoved(MouseEvent &event) { // TRANSLATORS: money label textPopup->show(rect.x + x, rect.y + y, strprintf(_("Money: %s"), - Units::formatCurrency(PlayerInfo::getAttribute( + UnitsDb::formatCurrency(PlayerInfo::getAttribute( Attributes::MONEY)).c_str())); } else @@ -856,8 +857,8 @@ void InventoryWindow::updateWeight() mWeightBar->setProgress(static_cast(total) / static_cast(max)); mWeightBar->setText(strprintf("%s/%s", - Units::formatWeight(total).c_str(), - Units::formatWeight(max).c_str())); + UnitsDb::formatWeight(total).c_str(), + UnitsDb::formatWeight(max).c_str())); } void InventoryWindow::slotsChanged(const Inventory *const inventory) -- cgit v1.2.3-60-g2f50