Added virtual destructors, some implicit casts, and a couple of type changes.

Many warnings removed.

Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>

18 files changed, 37 insertions, 4 deletions

diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index 26ef59ba..1a19088d 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -49,6 +49,8 @@ class AdminHandler
 
         virtual void mute(int playerId, int type, int limit) = 0;
 
+        virtual ~AdminHandler() {}
+
         // TODO
 };
 
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index 52ae2b51..c3ebff79 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -61,6 +61,8 @@ class CharHandler
         virtual unsigned int hairSprite() const = 0;
 
         virtual unsigned int maxSprite() const = 0;
+
+        virtual ~CharHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index d7e36c8a..f62c1899 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -53,6 +53,8 @@ class ChatHandler
         virtual void kickUser(int channelId, const std::string &name) = 0;
 
         virtual void who() = 0;
+
+        virtual ~ChatHandler() {}
 };
 }
 
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 9a1dcdd1..3c9d8e0f 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -158,12 +158,12 @@ int Download::downloadProgress(void *clientp, double dltotal, double dlnow,
 
     if (d->mOptions.cancel)
     {
-        return d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_CANCELLED, dltotal,
-                                  dlnow);
+        return d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_CANCELLED, (size_t) dltotal,
+                                  (size_t) dlnow);
         return -5;
     }
 
-    return d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_IDLE, dltotal, dlnow);
+    return d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_IDLE, (size_t) dltotal, (size_t) dlnow);
 }
 
 int Download::downloadThread(void *ptr)
diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index 113da6b1..d7190c63 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -48,6 +48,8 @@ class GameHandler
         virtual void ping(int tick) = 0;
 
         virtual bool removeDeadBeings() const = 0;
+
+        virtual ~GameHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h
index 1da1fddf..4b799f40 100644
--- a/src/net/generalhandler.h
+++ b/src/net/generalhandler.h
@@ -42,6 +42,8 @@ class GeneralHandler
         virtual void guiWindowsUnloaded() = 0;
 
         virtual void clearHandlers() = 0;
+
+        virtual ~GeneralHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index da44e6cd..b1d9d027 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.h
@@ -56,6 +56,8 @@ class GuildHandler
                                              bool response) = 0;
 
         virtual void endAlliance(int guildId, int otherGuildId) = 0;
+
+        virtual ~GuildHandler() {}
 };
 
 }
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 520e390e..a5a3204c 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -62,6 +62,8 @@ class InventoryHandler
                               StorageType destination) = 0;
 
         virtual size_t getSize(StorageType type) const = 0;
+
+        virtual ~InventoryHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 7fedae57..51fdc81a 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -92,6 +92,8 @@ class LoginHandler
 
         virtual Worlds getWorlds() const = 0;
 
+        virtual ~LoginHandler () {}
+
     protected:
         ServerInfo mServer;
 };
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index bf022afd..80f84b99 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -39,6 +39,8 @@ class MessageHandler
         const Uint16 *handledMessages;
 
         virtual void handleMessage(MessageIn &msg) = 0;
+
+        virtual ~MessageHandler() {}
 };
 
 }
diff --git a/src/net/messagein.h b/src/net/messagein.h
index fe48a455..cf0cc9e1 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -86,6 +86,8 @@ class MessageIn
          */
         virtual std::string readString(int length = -1);
 
+        virtual ~MessageIn() {}
+
     protected:
         /**
          * Constructor.
diff --git a/src/net/messageout.h b/src/net/messageout.h
index d4769335..de74dc43 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -56,6 +56,8 @@ class MessageOut
          */
         virtual unsigned int getDataSize() const;
 
+        virtual ~MessageOut() {}
+
     protected:
         /**
          * Constructor.
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 9c05595d..593d9cb7 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -199,4 +199,5 @@ void unload()
     }
 }
 
-} // namespace Net
\ No newline at end of file
+} // namespace Net
+
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index e0199ebc..db7bdd7f 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -55,6 +55,8 @@ class NpcHandler
         virtual void sellItem(int beingId, int itemId, int amount) = 0;
 
         virtual void endShopping(int beingId) = 0;
+
+        virtual ~NpcHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index 8f3489eb..3add4ad9 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -69,6 +69,8 @@ class PartyHandler
         // virtual void options() = 0;
 
         // virtual void message() = 0;
+
+        virtual ~PartyHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 895e3164..d190be01 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -60,6 +60,8 @@ class PlayerHandler
         virtual bool canCorrectAttributes() = 0;
 
         virtual int getJobLocation() = 0;
+
+        virtual ~PlayerHandler() {}
 };
 
 } // namespace Net
diff --git a/src/net/specialhandler.h b/src/net/specialhandler.h
index 602003aa..57381cf5 100644
--- a/src/net/specialhandler.h
+++ b/src/net/specialhandler.h
@@ -35,6 +35,8 @@ class SpecialHandler
         virtual void use(int id, int level, int x, int y) = 0;
 
         virtual void use(int id, const std::string &map) = 0;
+
+        virtual ~SpecialHandler () {}
 };
 }
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 5bad1b11..866d365d 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -45,6 +45,8 @@ class TradeHandler
         virtual void finish() {}
 
         virtual void cancel() {}
+
+        virtual ~TradeHandler() {}
 };
 }