From dd4d44a07d3a63ced0eec51c30b75887792c4a36 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 9 Apr 2013 14:57:27 +0300
Subject: some more style and cast fixes.

---
 src/gui/inventorywindow.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/gui/inventorywindow.h')

diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 83e26948b..903f15254 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -131,7 +131,7 @@ class InventoryWindow final : public Window,
          * Returns true if any instances exist.
          */
         static bool isStorageActive() A_WARN_UNUSED
-        { return instances.size() > 1; }
+        { return invInstances.size() > 1; }
 
         void updateDropButton();
 
@@ -154,7 +154,7 @@ class InventoryWindow final : public Window,
 
 
         typedef std::list<InventoryWindow*> WindowList;
-        static WindowList instances;
+        static WindowList invInstances;
 
         Inventory *mInventory;
         ItemContainer *mItems;
@@ -169,7 +169,7 @@ class InventoryWindow final : public Window,
         Button *mEquipmentButton;
         Button *mStoreButton;
         Button *mRetrieveButton;
-        Button *mCloseButton;
+        Button *mInvCloseButton;
 
         ProgressBar *mWeightBar;
         ProgressBar *mSlotsBar;
-- 
cgit v1.2.3-70-g09d2