summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-28 16:25:16 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-28 16:34:59 +0300
commit4a427d42fa8596f5aa1fd8a9ba346e809f9d7fae (patch)
tree1891aae048075f7d4d01129bf0e0bfb2740b6fbc
parentb96e6eeba6e1511568c8291bd8cb6a6d3706635c (diff)
downloadmv-4a427d42fa8596f5aa1fd8a9ba346e809f9d7fae.tar.gz
mv-4a427d42fa8596f5aa1fd8a9ba346e809f9d7fae.tar.bz2
mv-4a427d42fa8596f5aa1fd8a9ba346e809f9d7fae.tar.xz
mv-4a427d42fa8596f5aa1fd8a9ba346e809f9d7fae.zip
Remove macro A_TMWA_UNUSED.
-rw-r--r--src/gui/popups/itempopup.cpp2
-rw-r--r--src/gui/windows/itemamountwindow.cpp2
-rw-r--r--src/gui/windows/npcdialog.cpp8
-rw-r--r--src/localconsts.h1
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