diff options
author | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
commit | f030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch) | |
tree | cd92baf9e4fa8a136523b9eb570e9811846c9250 /src/client/keyboard.h | |
parent | 5636fad174f0bcff857c357c394c4cc8d424b302 (diff) |
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/client/keyboard.h')
-rw-r--r-- | src/client/keyboard.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/client/keyboard.h b/src/client/keyboard.h index f63bce1..f533838 100644 --- a/src/client/keyboard.h +++ b/src/client/keyboard.h @@ -16,7 +16,8 @@ #include "client/action.h" #include "client/key.h" -namespace client { +namespace client +{ class Keyboard { @@ -65,15 +66,19 @@ public: typedef std::map<unsigned int, Key *>::iterator iterator; - inline iterator begin() { return keys.begin(); } - - inline iterator end() { return keys.end(); } + inline iterator begin() { + return keys.begin(); + } + + inline iterator end() { + return keys.end(); + } /// convert SDL_keysym to a keystroke static unsigned int translate_keysym(int keysym, int modifier); private: - Key *add_key(const char *name, const unsigned int keysym, const char ascii=0, const char *bind=0); + Key *add_key(const char *name, const unsigned int keysym, const char ascii = 0, const char *bind = 0); Action *add_action(const char *name, Action::Identifier action, const char *info = 0); |