summaryrefslogtreecommitdiff
path: root/src/gui/windows/inventorywindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-30 22:15:24 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-30 22:15:24 +0300
commitd70d41864853924a456595875b6811b74222dd7c (patch)
tree99485951528734a54cd2f8ad297e76860f7ba9d4 /src/gui/windows/inventorywindow.cpp
parenta619290b502486ea5b1ff5dd604864ab78c5edc9 (diff)
downloadmanaverse-d70d41864853924a456595875b6811b74222dd7c.tar.gz
manaverse-d70d41864853924a456595875b6811b74222dd7c.tar.bz2
manaverse-d70d41864853924a456595875b6811b74222dd7c.tar.xz
manaverse-d70d41864853924a456595875b6811b74222dd7c.zip
Fix code style.
Diffstat (limited to 'src/gui/windows/inventorywindow.cpp')
-rw-r--r--src/gui/windows/inventorywindow.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 0a6c4c37f..bd6bdfc7f 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -120,6 +120,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
case InventoryType::INVENTORY:
case InventoryType::TRADE:
case InventoryType::NPC:
+ case InventoryType::TYPE_END:
default:
mSortDropDown->setSelected(config.getIntValue(
"inventorySortOrder"));
@@ -207,7 +208,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
mShopButton = new Button(this, _("S"), "shop", this);
// TRANSLATORS: inventory equipment button
mEquipmentButton = new Button(this, _("E"), "equipment", this);
- mWeightBar = new ProgressBar(this, 0.0F, 100, 0, Theme::PROG_WEIGHT,
+ mWeightBar = new ProgressBar(this, 0.0F, 100, 0,
+ Theme::PROG_WEIGHT,
"weightprogressbar.xml", "weightprogressbar_fill.xml");
mWeightBar->setColor(getThemeColor(Theme::WEIGHT_BAR),
getThemeColor(Theme::WEIGHT_BAR_OUTLINE));
@@ -247,7 +249,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
// TRANSLATORS: storage button
mStoreButton = new Button(this, _("Store"), "store", this);
// TRANSLATORS: storage button
- mRetrieveButton = new Button(this, _("Retrieve"), "retrieve", this);
+ mRetrieveButton = new Button(this, _("Retrieve"),
+ "retrieve", this);
// TRANSLATORS: storage button
mInvCloseButton = new Button(this, _("Close"), "close", this);
@@ -269,11 +272,13 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
// TRANSLATORS: storage button
mStoreButton = new Button(this, _("Store"), "store", this);
// TRANSLATORS: storage button
- mRetrieveButton = new Button(this, _("Retrieve"), "retrieve", this);
+ mRetrieveButton = new Button(this, _("Retrieve"),
+ "retrieve", this);
// TRANSLATORS: storage button
mInvCloseButton = new Button(this, _("Close"), "close", this);
- mWeightBar = new ProgressBar(this, 0.0F, 100, 0, Theme::PROG_WEIGHT,
+ mWeightBar = new ProgressBar(this, 0.0F, 100, 0,
+ Theme::PROG_WEIGHT,
"weightprogressbar.xml", "weightprogressbar_fill.xml");
mWeightBar->setColor(getThemeColor(Theme::WEIGHT_BAR),
getThemeColor(Theme::WEIGHT_BAR_OUTLINE));
@@ -295,6 +300,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
default:
case InventoryType::TRADE:
case InventoryType::NPC:
+ case InventoryType::TYPE_END:
break;
};
@@ -348,6 +354,7 @@ void InventoryWindow::storeSortOrder() const
case InventoryType::INVENTORY:
case InventoryType::TRADE:
case InventoryType::NPC:
+ case InventoryType::TYPE_END:
default:
config.setValue("inventorySortOrder",
mSortDropDown->getSelected());
@@ -781,6 +788,7 @@ void InventoryWindow::close()
default:
case InventoryType::TRADE:
case InventoryType::NPC:
+ case InventoryType::TYPE_END:
break;
}
}