summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 18:40:57 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 18:40:57 +0300
commit9c487cd11afa7cffce954948ce1ea57b95816f17 (patch)
tree774dba2675d0e6cf9d5111fceade9622d3f69fdd
parent0fa972c8b0640aaa5f3f3503a59062948c6e330d (diff)
downloadmv-9c487cd11afa7cffce954948ce1ea57b95816f17.tar.gz
mv-9c487cd11afa7cffce954948ce1ea57b95816f17.tar.bz2
mv-9c487cd11afa7cffce954948ce1ea57b95816f17.tar.xz
mv-9c487cd11afa7cffce954948ce1ea57b95816f17.zip
Move targetcursorsize.h into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/being/actorsprite.h3
-rw-r--r--src/enums/being/targetcursorsize.h (renamed from src/being/targetcursorsize.h)6
-rw-r--r--src/resources/beinginfo.h5
5 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e5bb343f..fa5ee1c29 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1020,7 +1020,7 @@ SET(SRCS
being/playerrelations.cpp
being/playerrelations.h
being/rank.h
- being/targetcursorsize.h
+ enums/being/targetcursorsize.h
being/targetcursortype.h
listeners/playerrelationslistener.h
listeners/renamelistener.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 74fa885bf..9acd5be53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1140,7 +1140,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
being/playerrelations.cpp \
being/playerrelations.h \
being/rank.h \
- being/targetcursorsize.h \
+ enums/being/targetcursorsize.h \
being/targetcursortype.h \
listeners/playerrelationslistener.h \
listeners/renamelistener.cpp \
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index 95a9d11a0..7b4cac93a 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -28,9 +28,10 @@
#include "being/actor.h"
#include "being/actortype.h"
#include "being/compoundsprite.h"
-#include "being/targetcursorsize.h"
#include "being/targetcursortype.h"
+#include "enums/being/targetcursorsize.h"
+
#include "particle/particlelist.h"
#include "particle/particlevector.h"
diff --git a/src/being/targetcursorsize.h b/src/enums/being/targetcursorsize.h
index e985c9dba..5344a7ad5 100644
--- a/src/being/targetcursorsize.h
+++ b/src/enums/being/targetcursorsize.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEING_TARGETCURSORSIZE_H
-#define BEING_TARGETCURSORSIZE_H
+#ifndef ENUMS_BEING_TARGETCURSORSIZE_H
+#define ENUMS_BEING_TARGETCURSORSIZE_H
namespace TargetCursorSize
{
@@ -33,4 +33,4 @@ namespace TargetCursorSize
};
} // TargetCursorSize
-#endif // BEING_TARGETCURSORSIZE_H
+#endif // ENUMS_BEING_TARGETCURSORSIZE_H
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index b8038fa6d..c0d00e1c6 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -23,11 +23,10 @@
#ifndef RESOURCES_BEINGINFO_H
#define RESOURCES_BEINGINFO_H
-#include "resources/cursor.h"
-
-#include "being/targetcursorsize.h"
+#include "enums/being/targetcursorsize.h"
#include "resources/beingmenuitem.h"
+#include "resources/cursor.h"
#include "resources/soundinfo.h"
#include "resources/spritedisplay.h"