General code cleanups

* Use default member initializers
* Use range-based for loops
* Avoid needless pointer references for ShopItem::mDuplicates
* Removed type aliases that are only used once or twice
* Removed more unused includes
* Removed some unused functions
* Removed superfluous .c_str()
* Rely on default copy and assignment operators for Vector class
* Use std::unique_ptr in some places
* Removed duplicated mPlayerMoney updating in SellDialog
* Removed duplicated Game::handleInput call
* Removed unused SDLInput::mMouseInWindow
* Removed remnant of manual widget positioning in HelpWindow
* Removed superfluous initialization of static pointers

1 files changed, 2 insertions, 35 deletions

diff --git a/src/event.h b/src/event.h
index 0fc0c1ef..5f053724 100644
--- a/src/event.h
+++ b/src/event.h
@@ -36,10 +36,7 @@ enum BadEvent {
 };
 
 class EventListener;
-
-using ListenerSet = std::set<EventListener *>;
 class VariableData;
-using VariableMap = std::map<std::string, VariableData *>;
 
 class Event
 {
@@ -148,11 +145,6 @@ public:
     int getInt(const std::string &key, int defaultValue) const
     { try { return getInt(key); } catch (BadEvent) { return defaultValue; }}
 
-    /**
-     * Returns true if the given variable exists and is an integer.
-     */
-    bool hasInt(const std::string &key) const;
-
 // Strings
 
     /**
@@ -173,11 +165,6 @@ public:
                           const std::string &defaultValue) const
     { try { return getString(key); } catch (BadEvent) { return defaultValue; }}
 
-    /**
-     * Returns true if the given variable exists and is a string.
-     */
-    bool hasString(const std::string &key) const;
-
 // Floats
 
     /**
@@ -198,11 +185,6 @@ public:
     double getFloat(const std::string &key, float defaultValue) const
     { try { return getFloat(key); } catch (BadEvent) { return defaultValue; }}
 
-    /**
-     * Returns true if the given variable exists and is a floating-point.
-     */
-    bool hasFloat(const std::string &key) const;
-
 // Booleans
 
     /**
@@ -222,11 +204,6 @@ public:
     bool getBool(const std::string &key, bool defaultValue) const
     { try { return getBool(key); } catch (BadEvent) { return defaultValue; }}
 
-    /**
-     * Returns true if the given variable exists and is a boolean.
-     */
-    bool hasBool(const std::string &key) const;
-
 // Items
 
     /**
@@ -246,11 +223,6 @@ public:
     Item *getItem(const std::string &key, Item *defaultValue) const
     { try { return getItem(key); } catch (BadEvent) { return defaultValue; }}
 
-    /**
-     * Returns true if the given variable exists and is an Item.
-     */
-    bool hasItem(const std::string &key) const;
-
 // ActorSprites
 
     /**
@@ -271,11 +243,6 @@ public:
                           ActorSprite *defaultValue) const
     { try { return getActor(key); } catch (BadEvent) { return defaultValue; }}
 
-    /**
-     * Returns true if the given variable exists and is an actor.
-     */
-    bool hasActor(const std::string &key) const;
-
 // Triggers
 
     /**
@@ -317,11 +284,11 @@ protected:
     static void remove(EventListener *listener);
 
 private:
-    using ListenMap = std::map<Channel, ListenerSet>;
+    using ListenMap = std::map<Channel, std::set<EventListener *>>;
     static ListenMap mBindings;
 
     Type mType;
-    VariableMap mData;
+    std::map<std::string, VariableData *> mData;
 };
 
 #define SERVER_NOTICE(message) { \