diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-07-14 22:00:44 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-07-14 22:00:44 +0200 |
commit | b738d67f76336641468e3f77cef472a52a6e5ad3 (patch) | |
tree | d03f1c177c92060e7be7e78c61217ea5c663755f | |
parent | 7ae52ac5392607f5cb56dffa9ae45ae5a2f14bd1 (diff) | |
download | mana-client-b738d67f76336641468e3f77cef472a52a6e5ad3.tar.gz mana-client-b738d67f76336641468e3f77cef472a52a6e5ad3.tar.bz2 mana-client-b738d67f76336641468e3f77cef472a52a6e5ad3.tar.xz mana-client-b738d67f76336641468e3f77cef472a52a6e5ad3.zip |
Removed unnecessary semicolons after namespaces
Please don't, it causes warnings with my settings, which makes my build
fail. ;)
-rw-r--r-- | src/event.cpp | 2 | ||||
-rw-r--r-- | src/event.h | 7 | ||||
-rw-r--r-- | src/eventmanager.cpp | 2 | ||||
-rw-r--r-- | src/eventmanager.h | 6 | ||||
-rw-r--r-- | src/listener.cpp | 2 | ||||
-rw-r--r-- | src/listener.h | 5 | ||||
-rw-r--r-- | src/variabledata.h | 14 |
7 files changed, 20 insertions, 18 deletions
diff --git a/src/event.cpp b/src/event.cpp index 87179ae1..65fdee8a 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -96,4 +96,4 @@ double Event::getFloat(const std::string &key) const throw (BadEvent) return static_cast<FloatData *>(it->second)->getData(); } -}; // namespace Mana +} // namespace Mana diff --git a/src/event.h b/src/event.h index d856bd6c..03751739 100644 --- a/src/event.h +++ b/src/event.h @@ -39,7 +39,7 @@ typedef std::map<std::string, VariableData *> VariableMap; class Event { - public: +public: // String passed can be retivered with getName() // and is to used to identify what type of event // this is. @@ -63,11 +63,12 @@ class Event void setFloat(const std::string &key, double value) throw (BadEvent); double getFloat(const std::string &key) const throw (BadEvent); - private: +private: std::string mEventName; VariableMap mData; }; -}; // namespace Mana +} // namespace Mana + #endif diff --git a/src/eventmanager.cpp b/src/eventmanager.cpp index ec589bbf..86b61781 100644 --- a/src/eventmanager.cpp +++ b/src/eventmanager.cpp @@ -64,4 +64,4 @@ void EventManager::unbind(Listener *listener, const std::string &channel) mBindings[channel].erase(listener); } -}; // namespace Mana +} // namespace Mana diff --git a/src/eventmanager.h b/src/eventmanager.h index 5823ef62..611c4eca 100644 --- a/src/eventmanager.h +++ b/src/eventmanager.h @@ -36,7 +36,7 @@ typedef std::map<std::string, ListenerSet > ListenMap; class EventManager { - public: +public: // Sends event to all listener on the channel static void trigger(const std::string &channel, const Event &event); @@ -47,10 +47,10 @@ class EventManager static void bind(Listener *listener, const std::string &channel); static void unbind(Listener *listener, const std::string &channel); - private: +private: static ListenMap mBindings; }; -}; // namespace Mana +} // namespace Mana #endif diff --git a/src/listener.cpp b/src/listener.cpp index 5ba3b16a..5aac7b66 100644 --- a/src/listener.cpp +++ b/src/listener.cpp @@ -40,4 +40,4 @@ void Listener::ignore(const std::string &channel) EventManager::unbind(this, channel); } -}; // namespace Mana +} // namespace Mana diff --git a/src/listener.h b/src/listener.h index edac13e9..2a5654b7 100644 --- a/src/listener.h +++ b/src/listener.h @@ -30,7 +30,7 @@ class Event; class Listener { - public: +public: ~Listener(); void listen(const std::string &channel); @@ -40,5 +40,6 @@ class Listener virtual void event(const std::string &channel, const Event &event) = 0; }; -}; // namespace Mana +} // namespace Mana + #endif diff --git a/src/variabledata.h b/src/variabledata.h index 6ba76318..c2eca3fb 100644 --- a/src/variabledata.h +++ b/src/variabledata.h @@ -43,43 +43,43 @@ class VariableData class IntData : public VariableData { - public: +public: IntData(int value) { mData = value; } int getData() const { return mData; } int getType() const { return DATA_INT; } - private: +private: int mData; }; class StringData : public VariableData { - public: +public: StringData(const std::string &value) { mData = value; } const std::string &getData() const { return mData; } int getType() const { return DATA_STRING; } - private: +private: std::string mData; }; class FloatData : public VariableData { - public: +public: FloatData(double value) { mData = value; } double getData() const { return mData; } int getType() const { return DATA_FLOAT; } - private: +private: double mData; }; -}; // namespace Mana +} // namespace Mana #endif |