projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CSM] Don't Load the package library (#6944)
[oweals/minetest.git]
/
src
/
event_manager.h
diff --git
a/src/event_manager.h
b/src/event_manager.h
index c2e9f792f17be343ff3ee0e2e2ac3e81316b9b60..f64d05869ab80dfabb93e0cc0e3888abc86a3668 100644
(file)
--- a/
src/event_manager.h
+++ b/
src/event_manager.h
@@
-1,6
+1,6
@@
/*
Minetest
/*
Minetest
-Copyright (C) 201
2
celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 201
3
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
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
@@
-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.
*/
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>
#include "event.h"
#include <list>
@@
-44,17
+43,15
@@
class EventManager: public MtEventManager
std::map<std::string, Dest> m_dest;
public:
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;
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;
}
}
delete e;
@@
-63,11
+60,11
@@
public:
{
std::map<std::string, Dest>::iterator i = m_dest.find(type);
if(i != m_dest.end()){
{
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;
} else{
std::list<FuncSpec> funcs;
Dest dest;
- dest.funcs.
push_back(FuncSpec(f, data)
);
+ dest.funcs.
emplace_back(f, data
);
m_dest[type] = dest;
}
}
m_dest[type] = dest;
}
}
@@
-83,20
+80,19
@@
public:
if(remove)
funcs.erase(j++);
else
if(remove)
funcs.erase(j++);
else
-
j++
;
+
++j
;
}
}
} else{
}
}
} 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
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
;
}
}
}
}
}
}
@@
-110,6
+106,3
@@
public:
dereg(type, EventManager::receiverReceive, r);
}
};
dereg(type, EventManager::receiverReceive, r);
}
};
-
-#endif
-