diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/gui/inventorywindow.cpp | |
parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
download | manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/gui/inventorywindow.cpp')
-rw-r--r-- | src/gui/inventorywindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index f52151698..8ffebebff 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -96,7 +96,7 @@ public: InventoryWindow::WindowList InventoryWindow::instances; InventoryWindow::InventoryWindow(Inventory *inventory): - Window("Inventory", false, 0, "inventory.xml"), + Window("Inventory", false, nullptr, "inventory.xml"), mInventory(inventory), mDropButton(0), mSplit(false), @@ -238,7 +238,7 @@ InventoryWindow::InventoryWindow(Inventory *inventory): loadWindowState(); slotsChanged(mInventory); - widgetResized(0); + widgetResized(nullptr); if (!isMainInventory()) setVisible(true); } @@ -250,7 +250,7 @@ InventoryWindow::~InventoryWindow() if (!instances.empty()) instances.front()->updateDropButton(); delete mSortModel; - mSortModel = 0; + mSortModel = nullptr; } void InventoryWindow::action(const gcn::ActionEvent &event) @@ -644,7 +644,7 @@ void InventoryWindow::updateDropButton() } else { - Item *item = 0; + Item *item = nullptr; if (mItems) item = mItems->getSelectedItem(); |