From 4a427d42fa8596f5aa1fd8a9ba346e809f9d7fae Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 28 Jul 2016 16:25:16 +0300 Subject: Remove macro A_TMWA_UNUSED. --- src/gui/popups/itempopup.cpp | 2 +- src/gui/windows/itemamountwindow.cpp | 2 +- src/gui/windows/npcdialog.cpp | 8 ++++---- src/localconsts.h | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 158f8c57c..9fe4f2216 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -161,7 +161,7 @@ void ItemPopup::setItem(const ItemInfo &item, const ItemColor color, const bool showImage, int id, - const int *const cards A_TMWA_UNUSED) + const int *const cards) { if (!mIcon || (item.getName() == mLastName && color == mLastColor && id == mLastId)) diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 54e856539..e41e276fc 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -466,7 +466,7 @@ void ItemAmountWindow::showWindow(const ItemAmountWindowUsageT usage, Window *const parent, Item *const item, int maxRange, - int tag A_TMWA_UNUSED) + int tag) { if (!item) return; diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 16705a414..ccb52f8c4 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -794,7 +794,7 @@ void NpcDialog::itemIndexRequest(const int size) buildLayout(); } -void NpcDialog::itemCraftRequest(const int size A_TMWA_UNUSED) +void NpcDialog::itemCraftRequest(const int size) { mActionState = NPC_ACTION_INPUT; mInputState = NPC_INPUT_ITEM_CRAFT; @@ -1368,9 +1368,9 @@ std::string NpcDialog::complexItemToStr(const ComplexItem *const item) return str; } -void NpcDialog::addCraftItem(Item *const item A_TMWA_UNUSED, - const int amount A_TMWA_UNUSED, - const int slot A_TMWA_UNUSED) +void NpcDialog::addCraftItem(Item *const item, + const int amount, + const int slot) { if (mInputState != NPC_INPUT_ITEM_CRAFT) return; diff --git a/src/localconsts.h b/src/localconsts.h index 83d843c3c..c21070ba2 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -97,7 +97,6 @@ #define A_UNUSED __attribute__ ((unused)) #define A_WARN_UNUSED __attribute__ ((warn_unused_result)) #define DEPRECATED __attribute__ ((deprecated)) -#define A_TMWA_UNUSED #ifdef DYECMD #define A_DYECMD_UNUSED __attribute__ ((unused)) #else // DYECMD -- cgit v1.2.3-60-g2f50