diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-21 17:57:26 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-21 17:57:26 +0300 |
| commit | 21f6509d7648f96c348b77babdca164cec2f0c61 (patch) | |
| tree | b00fe7750917e8904697c226fd562e33cf0bb5f8 | |
| parent | 033d99ed3c25f64d006731f687e8d5847646e2d1 (diff) | |
| download | plus-21f6509d7648f96c348b77babdca164cec2f0c61.tar.gz plus-21f6509d7648f96c348b77babdca164cec2f0c61.tar.bz2 plus-21f6509d7648f96c348b77babdca164cec2f0c61.tar.xz plus-21f6509d7648f96c348b77babdca164cec2f0c61.zip | |
Move actionmanager into actions directory and rename to actions.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/actions/actions.cpp (renamed from src/actionmanager.cpp) | 2 | ||||
| -rw-r--r-- | src/actions/actions.h (renamed from src/actionmanager.h) | 6 | ||||
| -rw-r--r-- | src/input/inputactionmap.h | 3 |
5 files changed, 10 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9caf67129..1b529e6f6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -713,8 +713,8 @@ SET(SRCS test/testlauncher.h test/testmain.cpp test/testmain.h - actionmanager.cpp - actionmanager.h + actions/actions.cpp + actions/actions.h being/actor.cpp being/actor.h being/actorsprite.cpp diff --git a/src/Makefile.am b/src/Makefile.am index b73da9369..2d0f249e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -831,8 +831,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ test/testlauncher.h \ test/testmain.cpp \ test/testmain.h \ - actionmanager.cpp \ - actionmanager.h \ + actions/actions.cpp \ + actions/actions.h \ being/actor.cpp \ being/actor.h \ being/actorsprite.cpp \ diff --git a/src/actionmanager.cpp b/src/actions/actions.cpp index 56447d206..bf5c03966 100644 --- a/src/actionmanager.cpp +++ b/src/actions/actions.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "actionmanager.h" +#include "actions/actions.h" #include "actormanager.h" #include "dropshortcut.h" diff --git a/src/actionmanager.h b/src/actions/actions.h index e4ec0d3f0..a1b7f3287 100644 --- a/src/actionmanager.h +++ b/src/actions/actions.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ACTIONMANAGER_H -#define ACTIONMANAGER_H +#ifndef ACTIONS_ACTIONS_H +#define ACTIONS_ACTIONS_H #define decHandler(name) bool name(const InputEvent &event) @@ -129,4 +129,4 @@ namespace ActionManager #undef decHandler -#endif // ACTIONMANAGER_H +#endif // ACTIONS_ACTIONS_H diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 94bfb070a..b2a03e0a8 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -23,9 +23,10 @@ #ifndef INPUT_INPUTACTIONMAP_H #define INPUT_INPUTACTIONMAP_H -#include "actionmanager.h" #include "sdlshared.h" +#include "actions/actions.h" + #include "input/inputaction.h" #include "input/inputactiondata.h" #include "input/inputcondition.h" |