aboutsummaryrefslogtreecommitdiff
path: root/src/game.h
diff options
context:
space:
mode:
authorIlya Zhuravlev <zhuravlevilya@ya.ru>2012-12-20 21:19:49 +0400
committerkwolekr <kwolekr@minetest.net>2013-03-11 19:08:39 -0400
commit6a1670dbc31cc0e44178bbd9ad34ff0d5981a060 (patch)
treece32cd4be20e9be30367f2ad25d9dae6a0482898 /src/game.h
parente204bedf1d781e43b8caa334a99319efc5b7ce46 (diff)
downloadminetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.tar.gz
minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.tar.bz2
minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.zip
Migrate to STL containers/algorithms.
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/game.h b/src/game.h
index fef777fea..a2c1fc09c 100644
--- a/src/game.h
+++ b/src/game.h
@@ -23,17 +23,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_extrabloated.h"
#include <string>
#include "keycode.h"
+#include <list>
-class KeyList : protected core::list<KeyPress>
+class KeyList : protected std::list<KeyPress>
{
- typedef core::list<KeyPress> super;
- typedef super::Iterator Iterator;
- typedef super::ConstIterator ConstIterator;
+ typedef std::list<KeyPress> super;
+ typedef super::iterator iterator;
+ typedef super::const_iterator const_iterator;
- virtual ConstIterator find(const KeyPress &key) const
+ virtual const_iterator find(const KeyPress &key) const
{
- ConstIterator f(begin());
- ConstIterator e(end());
+ const_iterator f(begin());
+ const_iterator e(end());
while (f!=e) {
if (*f == key)
return f;
@@ -42,10 +43,10 @@ class KeyList : protected core::list<KeyPress>
return e;
}
- virtual Iterator find(const KeyPress &key)
+ virtual iterator find(const KeyPress &key)
{
- Iterator f(begin());
- Iterator e(end());
+ iterator f(begin());
+ iterator e(end());
while (f!=e) {
if (*f == key)
return f;
@@ -65,14 +66,14 @@ public:
void unset(const KeyPress &key)
{
- Iterator p(find(key));
+ iterator p(find(key));
if (p != end())
erase(p);
}
void toggle(const KeyPress &key)
{
- Iterator p(this->find(key));
+ iterator p(this->find(key));
if (p != end())
erase(p);
else