/*
-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 Lesser General Public License as published by
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>
std::map<std::string, Dest> m_dest;
public:
- ~EventManager()
- {
- }
+ ~EventManager() = default;
+
void put(MtEvent *e)
{
std::map<std::string, Dest>::iterator i = m_dest.find(e->getType());
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->f))(e, i->d);
+ for (FuncSpec &func : funcs) {
+ (*(func.f))(e, func.d);
}
}
delete e;
{
std::map<std::string, Dest>::iterator i = m_dest.find(type);
if(i != m_dest.end()){
- i->second.funcs.push_back(FuncSpec(f, data));
+ i->second.funcs.emplace_back(f, data);
} else{
std::list<FuncSpec> funcs;
Dest dest;
- dest.funcs.push_back(FuncSpec(f, data));
+ dest.funcs.emplace_back(f, data);
m_dest[type] = dest;
}
}
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++){
- std::list<FuncSpec> &funcs = i->second.funcs;
+ for (auto &dest : m_dest) {
+ std::list<FuncSpec> &funcs = dest.second.funcs;
std::list<FuncSpec>::iterator j = funcs.begin();
while(j != funcs.end()){
bool remove = (j->f == f && (!data || j->d == data));
if(remove)
funcs.erase(j++);
else
- j++;
+ ++j;
}
}
}
dereg(type, EventManager::receiverReceive, r);
}
};
-
-#endif
-