From 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 8 Nov 2011 00:44:17 +0300
Subject: Fix more gcc 4.7 warnings.

---
 src/inventory.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/inventory.cpp')

diff --git a/src/inventory.cpp b/src/inventory.cpp
index f907b2cc2..4521613ba 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -51,7 +51,7 @@ Inventory::Inventory(int type, int size):
     mUsed(0)
 {
     mItems = new Item*[mSize];
-    std::fill_n(mItems, mSize, static_cast<Item*>(0));
+    std::fill_n(mItems, mSize, static_cast<Item*>(nullptr));
 }
 
 Inventory::~Inventory()
@@ -60,7 +60,7 @@ Inventory::~Inventory()
         delete mItems[i];
 
     delete [] mItems;
-    mItems = 0;
+    mItems = nullptr;
 }
 
 Item *Inventory::getItem(int index) const
@@ -68,7 +68,7 @@ Item *Inventory::getItem(int index) const
     if (index < 0 || index >= static_cast<int>(mSize) || !mItems[index]
         || mItems[index]->getQuantity() <= 0)
     {
-        return 0;
+        return nullptr;
     }
 
     return mItems[index];
@@ -88,7 +88,7 @@ Item *Inventory::findItem(int itemId, unsigned char color) const
         }
     }
 
-    return 0;
+    return nullptr;
 }
 
 void Inventory::addItem(int id, int quantity, int refine,
@@ -145,7 +145,7 @@ void Inventory::removeItem(int id)
 void Inventory::removeItemAt(int index)
 {
     delete mItems[index];
-    mItems[index] = 0;
+    mItems[index] = nullptr;
     mUsed--;
     if (mUsed < 0) // Already at 0, no need to distribute event
         mUsed = 0;
@@ -237,7 +237,7 @@ Item *Inventory::findItemBySprite(std::string spritePath, Gender gender)
     if (partialIndex != -1)
         return mItems[partialIndex];
 
-    return 0;
+    return nullptr;
 }
 
 std::string Inventory::getName()
-- 
cgit v1.2.3-70-g09d2