diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-01-24 19:51:16 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-01-26 22:38:41 +0100 |
| commit | bd7ad9aedd87c857477bbfcf7653af91a80f4df6 (patch) | |
| tree | 6e0c678f37ebf7b0c020ec95773c79c552834140 /src/event.h | |
| parent | 20c224aacc6b9669828f3c7e7b2c19b9b95d90ff (diff) | |
| download | mana-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.tar.gz mana-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.tar.bz2 mana-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.tar.xz mana-bd7ad9aedd87c857477bbfcf7653af91a80f4df6.zip | |
Removed 'inline' keyword where it's not of any value
Members that are implemented inline are already inline, there is no need
to mark them as such.
Made two inline members of OpenGLGraphics private since because they are
marked as inline, they can't be used from other classes.
Reviewed-by: Erik Schilling
Diffstat (limited to 'src/event.h')
| -rw-r--r-- | src/event.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/event.h b/src/event.h index c4dcfc9b..d547d3f4 100644 --- a/src/event.h +++ b/src/event.h @@ -145,7 +145,7 @@ public: * Returns the given variable if it is set and an integer, returning the * given default otherwise. */ - inline int getInt(const std::string &key, int defaultValue) const + int getInt(const std::string &key, int defaultValue) const { try { return getInt(key); } catch (BadEvent) { return defaultValue; }} /** @@ -169,8 +169,8 @@ public: * Returns the given variable if it is set and a string, returning the * given default otherwise. */ - inline std::string getString(const std::string &key, - const std::string &defaultValue) const + std::string getString(const std::string &key, + const std::string &defaultValue) const { try { return getString(key); } catch (BadEvent) { return defaultValue; }} /** @@ -195,7 +195,7 @@ public: * Returns the given variable if it is set and a floating-point, returning * the given default otherwise. */ - inline double getFloat(const std::string &key, float defaultValue) const + double getFloat(const std::string &key, float defaultValue) const { try { return getFloat(key); } catch (BadEvent) { return defaultValue; }} /** @@ -219,7 +219,7 @@ public: * Returns the given variable if it is set and a boolean, returning the * given default otherwise. */ - inline bool getBool(const std::string &key, bool defaultValue) const + bool getBool(const std::string &key, bool defaultValue) const { try { return getBool(key); } catch (BadEvent) { return defaultValue; }} /** @@ -243,7 +243,7 @@ public: * Returns the given variable if it is set and an Item, returning the * given default otherwise. */ - inline Item *getItem(const std::string &key, Item *defaultValue) const + Item *getItem(const std::string &key, Item *defaultValue) const { try { return getItem(key); } catch (BadEvent) { return defaultValue; }} /** @@ -267,8 +267,8 @@ public: * Returns the given variable if it is set and an actor, returning the * given default otherwise. */ - inline ActorSprite *getActor(const std::string &key, - ActorSprite *defaultValue) const + ActorSprite *getActor(const std::string &key, + ActorSprite *defaultValue) const { try { return getActor(key); } catch (BadEvent) { return defaultValue; }} /** @@ -281,7 +281,7 @@ public: /** * Sends this event to all classes listening to the given channel. */ - inline void trigger(Channel channel) const + void trigger(Channel channel) const { trigger(channel, *this); } /** @@ -293,7 +293,7 @@ public: * Sends an empty event with the given name to all classes listening to the * given channel. */ - static inline void trigger(Channel channel, Type type) + static void trigger(Channel channel, Type type) { trigger(channel, Event(type)); } protected: |