diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/actions/actions.cpp | 2 | ||||
| -rw-r--r-- | src/enums/inventorytype.h | 2 | ||||
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 8 | ||||
| -rw-r--r-- | src/gui/windows/mailviewwindow.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 2 | ||||
| -rw-r--r-- | src/resources/inventory/inventory.cpp | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index a8ad2a63f..d95b240c5 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -266,7 +266,7 @@ static Item *getItemByInvIndex(const int index, case InventoryType::Npc: case InventoryType::Cart: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: default: diff --git a/src/enums/inventorytype.h b/src/enums/inventorytype.h index b5f53b2cb..0656e9d72 100644 --- a/src/enums/inventorytype.h +++ b/src/enums/inventorytype.h @@ -33,7 +33,7 @@ enumStart(InventoryType) Npc, Cart, Vending, - Mail, + MailEdit, Craft, TypeEnd } diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 2ba797bf9..6d4dc8432 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -1701,7 +1701,7 @@ void PopupMenu::showPopup(Window *const parent, case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: default: @@ -2814,7 +2814,7 @@ void PopupMenu::addItemMenu(const Item *const item, case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: default: diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 26c6e2e06..f71a7e35a 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -661,7 +661,7 @@ void ItemContainer::mousePressed(MouseEvent &event) case InventoryType::Cart: src = DragDropSource::Cart; break; - case InventoryType::Mail: + case InventoryType::MailEdit: src = DragDropSource::Mail; break; case InventoryType::Craft: @@ -768,7 +768,7 @@ void ItemContainer::mouseReleased(MouseEvent &event) case InventoryType::Npc: dst = DragDropSource::Npc; break; - case InventoryType::Mail: + case InventoryType::MailEdit: dst = DragDropSource::Mail; break; case InventoryType::Cart: diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index cd688be9b..183c775ee 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -127,7 +127,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: default: @@ -319,7 +319,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: break; @@ -382,7 +382,7 @@ void InventoryWindow::storeSortOrder() const case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: default: @@ -831,7 +831,7 @@ void InventoryWindow::close() case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: break; diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index d99fd602f..e1b3a16de 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -81,7 +81,7 @@ MailViewWindow::MailViewWindow(const MailMessage *const message, // TRANSLATORS: mail view window label mMessageLabel(new Label(this, strprintf("%s %s", _("Message:"), message->text.c_str()))), - mInventory(new Inventory(InventoryType::Mail, itemsCount)), + mInventory(new Inventory(InventoryType::MailEdit, itemsCount)), mItemContainer(new ItemContainer(this, mInventory)), mItemScrollArea(new ScrollArea(this, mItemContainer, fromBool(getOptionBool("showitemsbackground"), Opaque), diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index b16e6db49..fde40c7ad 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -82,7 +82,7 @@ size_t InventoryHandler::getSize(const InventoryTypeT type) const switch (type) { case InventoryType::Inventory: - case InventoryType::Mail: + case InventoryType::MailEdit: return 100; case InventoryType::Storage: return 0; // Comes from server after items diff --git a/src/resources/inventory/inventory.cpp b/src/resources/inventory/inventory.cpp index dd88da99c..dbee2a541 100644 --- a/src/resources/inventory/inventory.cpp +++ b/src/resources/inventory/inventory.cpp @@ -374,7 +374,7 @@ std::string Inventory::getName() const // TRANSLATORS: inventory type name return N_("Cart"); } - case InventoryType::Mail: + case InventoryType::MailEdit: { // TRANSLATORS: inventory type name return N_("Mail"); |