diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-06 18:48:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-06 18:48:21 +0300 |
| commit | 8aca3361806f6d00c5b9c0b318354230ac2fab1c (patch) | |
| tree | b8d2be1eb40a13ae17c059f868263c16e34e9e04 | |
| parent | bfdd5aa4be7fb4f16488fbdd893cf12eee20187d (diff) | |
| download | plus-8aca3361806f6d00c5b9c0b318354230ac2fab1c.tar.gz plus-8aca3361806f6d00c5b9c0b318354230ac2fab1c.tar.bz2 plus-8aca3361806f6d00c5b9c0b318354230ac2fab1c.tar.xz plus-8aca3361806f6d00c5b9c0b318354230ac2fab1c.zip | |
Move targetcursortype.h into enum namespace.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/being/actorsprite.h | 2 | ||||
| -rw-r--r-- | src/enums/being/targetcursortype.h (renamed from src/being/targetcursortype.h) | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 38a2d8782..2dfc25006 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1021,7 +1021,7 @@ SET(SRCS being/playerrelations.h being/rank.h enums/being/targetcursorsize.h - being/targetcursortype.h + enums/being/targetcursortype.h listeners/playerrelationslistener.h listeners/renamelistener.cpp listeners/renamelistener.h diff --git a/src/Makefile.am b/src/Makefile.am index 041fc9320..6029725d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1141,7 +1141,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being/playerrelations.h \ being/rank.h \ enums/being/targetcursorsize.h \ - being/targetcursortype.h \ + enums/being/targetcursortype.h \ listeners/playerrelationslistener.h \ listeners/renamelistener.cpp \ listeners/renamelistener.h \ diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h index 7b4cac93a..abc0e8690 100644 --- a/src/being/actorsprite.h +++ b/src/being/actorsprite.h @@ -28,9 +28,9 @@ #include "being/actor.h" #include "being/actortype.h" #include "being/compoundsprite.h" -#include "being/targetcursortype.h" #include "enums/being/targetcursorsize.h" +#include "enums/being/targetcursortype.h" #include "particle/particlelist.h" #include "particle/particlevector.h" diff --git a/src/being/targetcursortype.h b/src/enums/being/targetcursortype.h index 4a9797c4a..a47b1ede0 100644 --- a/src/being/targetcursortype.h +++ b/src/enums/being/targetcursortype.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BEING_TARGETCURSORTYPE_H -#define BEING_TARGETCURSORTYPE_H +#ifndef ENUMS_BEING_TARGETCURSORTYPE_H +#define ENUMS_BEING_TARGETCURSORTYPE_H namespace TargetCursorType { @@ -33,4 +33,4 @@ namespace TargetCursorType }; } -#endif // BEING_TARGETCURSORTYPE_H +#endif // ENUMS_BEING_TARGETCURSORTYPE_H |