Some cleanup and renaming

* Removed superfluous 'virtual' keyword in *Handler implementations
* Renamed NPCHandler to NpcHandler
* Renamed InvyHandler to InventoryHandler
* Made all *Handler interface methods pure virtual
* Used forward declarations in net.h
* Renamed {start,end}Shoping to {start,end}Shopping

1 files changed, 11 insertions, 11 deletions

diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 59b6de7a..2828b197 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -180,29 +180,29 @@ void StorageWindow::mouseClicked(gcn::MouseEvent &event)
     }
 }
 
-Item* StorageWindow::getSelectedItem() const
+Item *StorageWindow::getSelectedItem() const
 {
     return mItems->getSelectedItem();
 }
 
 void StorageWindow::addStore(Item *item, int amount)
 {
-    // Net::getInvyHandler()->moveItem(Net::InvyHandler::INVENTORY,
-    invyHandler->moveItem(Net::InvyHandler::INVENTORY,
-                                    item->getInvIndex(), amount,
-                                    Net::InvyHandler::STORAGE);
+    // Net::getInventoryHandler()->moveItem(Net::InvyHandler::INVENTORY,
+    inventoryHandler->moveItem(Net::InventoryHandler::INVENTORY,
+                               item->getInvIndex(), amount,
+                               Net::InventoryHandler::STORAGE);
 }
 
 void StorageWindow::removeStore(Item *item, int amount)
 {
-    // Net::getInvyHandler()->moveItem(Net::InvyHandler::STORAGE,
-    invyHandler->moveItem(Net::InvyHandler::STORAGE,
-                                    item->getInvIndex(), amount,
-                                    Net::InvyHandler::INVENTORY);
+    // Net::getInventoryHandler()->moveItem(Net::InvyHandler::STORAGE,
+    inventoryHandler->moveItem(Net::InventoryHandler::STORAGE,
+                               item->getInvIndex(), amount,
+                               Net::InventoryHandler::INVENTORY);
 }
 
 void StorageWindow::close()
 {
-    // Net::getInvyHandler()->closeStorage();
-    invyHandler->closeStorage();
+    // Net::getInventoryHandler()->closeStorage();
+    inventoryHandler->closeStorage();
 }