diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-09 11:44:37 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-09 11:44:37 +0300 |
| commit | 49540a3cac67413e8639ba371782e3635ece74df (patch) | |
| tree | 1787719bfa551c151be5e72de873a638ad46ab71 /src/gui | |
| parent | 5427c348b135df91731e60b76015bc4051933e55 (diff) | |
| download | manaverse-49540a3cac67413e8639ba371782e3635ece74df.tar.gz manaverse-49540a3cac67413e8639ba371782e3635ece74df.tar.bz2 manaverse-49540a3cac67413e8639ba371782e3635ece74df.tar.xz manaverse-49540a3cac67413e8639ba371782e3635ece74df.zip | |
Fix code style.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/models/shopitems.cpp | 8 | ||||
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp index 52a0d60b2..1a9b89994 100644 --- a/src/gui/models/shopitems.cpp +++ b/src/gui/models/shopitems.cpp @@ -51,10 +51,10 @@ std::string ShopItems::getElementAt(int i) } ShopItem *ShopItems::addItem(const int id, - const int type, - const unsigned char color, - const int amount, - const int price) + const int type, + const unsigned char color, + const int amount, + const int price) { ShopItem *const item = new ShopItem(-1, id, type, color, amount, price); mShopItems.push_back(item); diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 48bb4100c..e46f4bec4 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -1724,6 +1724,7 @@ void PopupMenu::showPopup(Window *const parent, case InventoryType::CART: case InventoryType::TRADE: case InventoryType::NPC: + case InventoryType::VENDING: case InventoryType::TYPE_END: default: break; diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 64c1ad50a..c557b960d 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -427,6 +427,7 @@ void ItemContainer::mousePressed(MouseEvent &event) src = DRAGDROP_SOURCE_CART; break; default: + case InventoryType::VENDING: case InventoryType::TYPE_END: break; } @@ -526,6 +527,7 @@ void ItemContainer::mouseReleased(MouseEvent &event) dst = DRAGDROP_SOURCE_CART; break; default: + case InventoryType::VENDING: case InventoryType::TYPE_END: break; } diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index d1ac4ba7b..7bd21e258 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::VENDING: case InventoryType::TYPE_END: default: mSortDropDown->setSelected(config.getIntValue( @@ -300,6 +301,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : default: case InventoryType::TRADE: case InventoryType::NPC: + case InventoryType::VENDING: case InventoryType::TYPE_END: break; }; @@ -356,6 +358,7 @@ void InventoryWindow::storeSortOrder() const case InventoryType::INVENTORY: case InventoryType::TRADE: case InventoryType::NPC: + case InventoryType::VENDING: case InventoryType::TYPE_END: default: config.setValue("inventorySortOrder", @@ -790,6 +793,7 @@ void InventoryWindow::close() default: case InventoryType::TRADE: case InventoryType::NPC: + case InventoryType::VENDING: case InventoryType::TYPE_END: break; } |