X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fevent_manager.h;h=54cd728bd6c375d513d85a273c68a9d5b293816c;hb=b5f7249a7edc25077d84b27b38552228b92ff763;hp=33d99b28cc3757ed9c989248c097daa878e73e58;hpb=6d0ea26c2d62c3774ff384cf1bfc2a3372b49a3b;p=oweals%2Fminetest.git diff --git a/src/event_manager.h b/src/event_manager.h index 33d99b28c..54cd728bd 100644 --- a/src/event_manager.h +++ b/src/event_manager.h @@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef EVENT_MANAGER_HEADER -#define EVENT_MANAGER_HEADER +#pragma once #include "event.h" #include @@ -53,7 +52,7 @@ public: if(i != m_dest.end()){ std::list &funcs = i->second.funcs; for(std::list::iterator i = funcs.begin(); - i != funcs.end(); i++){ + i != funcs.end(); ++i){ (*(i->f))(e, i->d); } } @@ -83,12 +82,12 @@ public: if(remove) funcs.erase(j++); else - j++; + ++j; } } } else{ for(std::map::iterator - i = m_dest.begin(); i != m_dest.end(); i++){ + i = m_dest.begin(); i != m_dest.end(); ++i){ std::list &funcs = i->second.funcs; std::list::iterator j = funcs.begin(); while(j != funcs.end()){ @@ -96,7 +95,7 @@ public: if(remove) funcs.erase(j++); else - j++; + ++j; } } } @@ -110,6 +109,3 @@ public: dereg(type, EventManager::receiverReceive, r); } }; - -#endif -