Code modernization: src/m* (part 2)

[oweals/minetest.git] / src / event_manager.h

diff --git a/src/event_manager.h b/src/event_manager.h
index 9492a2fd978281d047921f5d3d3f4c95885a9069..54cd728bd6c375d513d85a273c68a9d5b293816c 100644 (file)
--- a/src/event_manager.h
+++ b/src/event_manager.h
@@ -1,24 +1,23 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 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 <list>
@@ -53,7 +52,7 @@ public:
                if(i != m_dest.end()){
                        std::list<FuncSpec> &funcs = i->second.funcs;
                        for(std::list<FuncSpec>::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<std::string, Dest>::iterator
-                                       i = m_dest.begin(); i != m_dest.end(); i++){
+                                       i = m_dest.begin(); i != m_dest.end(); ++i){
                                std::list<FuncSpec> &funcs = i->second.funcs;
                                std::list<FuncSpec>::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
-