summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-03-03 21:31:39 +0200
committerAndrei Karas <akaras@inbox.ru>2011-03-03 21:31:39 +0200
commitbb73cadd0afdc9fa55ea66ecedd8be53a6f3198e (patch)
tree8e4da86724032979f76b13be685878d5c84a11ea /src/gui/widgets
parentcb8ccdd838b0cc08a1620f1ed9c311d75f1aceba (diff)
downloadmanaverse-bb73cadd0afdc9fa55ea66ecedd8be53a6f3198e.tar.gz
manaverse-bb73cadd0afdc9fa55ea66ecedd8be53a6f3198e.tar.bz2
manaverse-bb73cadd0afdc9fa55ea66ecedd8be53a6f3198e.tar.xz
manaverse-bb73cadd0afdc9fa55ea66ecedd8be53a6f3198e.zip
Chnage same methods with different parameters number to different names.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/shopitems.cpp2
-rw-r--r--src/gui/widgets/shopitems.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp
index 36994801f..3e46f51a4 100644
--- a/src/gui/widgets/shopitems.cpp
+++ b/src/gui/widgets/shopitems.cpp
@@ -61,7 +61,7 @@ void ShopItems::addItemNoDup(int id, int amount, int price)
mShopItems.push_back(new ShopItem(-1, id, amount, price));
}
-void ShopItems::addItem(int inventoryIndex, int id, int quantity, int price)
+void ShopItems::addItem2(int inventoryIndex, int id, int quantity, int price)
{
ShopItem *item = 0;
if (mMergeDuplicates)
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index 0e9a45f1d..949dcfc78 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -66,7 +66,7 @@ class ShopItems : public gcn::ListModel
* @param quantity number of available copies of the item
* @param price price of the item
*/
- void addItem(int inventoryIndex, int id, int amount, int price);
+ void addItem2(int inventoryIndex, int id, int amount, int price);
void addItemNoDup(int id, int amount, int price);