From 9c487cd11afa7cffce954948ce1ea57b95816f17 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 18:40:57 +0300 Subject: Move targetcursorsize.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/actorsprite.h | 3 ++- src/being/targetcursorsize.h | 36 ------------------------------------ src/enums/being/targetcursorsize.h | 36 ++++++++++++++++++++++++++++++++++++ src/resources/beinginfo.h | 5 ++--- 6 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 src/being/targetcursorsize.h create mode 100644 src/enums/being/targetcursorsize.h 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/being/targetcursorsize.h deleted file mode 100644 index e985c9dba..000000000 --- a/src/being/targetcursorsize.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef BEING_TARGETCURSORSIZE_H -#define BEING_TARGETCURSORSIZE_H - -namespace TargetCursorSize -{ - enum Size - { - SMALL = 0, - MEDIUM, - LARGE, - NUM_TC - }; -} // TargetCursorSize - -#endif // BEING_TARGETCURSORSIZE_H diff --git a/src/enums/being/targetcursorsize.h b/src/enums/being/targetcursorsize.h new file mode 100644 index 000000000..5344a7ad5 --- /dev/null +++ b/src/enums/being/targetcursorsize.h @@ -0,0 +1,36 @@ +/* + * The ManaPlus Client + * Copyright (C) 2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef ENUMS_BEING_TARGETCURSORSIZE_H +#define ENUMS_BEING_TARGETCURSORSIZE_H + +namespace TargetCursorSize +{ + enum Size + { + SMALL = 0, + MEDIUM, + LARGE, + NUM_TC + }; +} // TargetCursorSize + +#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" -- cgit v1.2.3-70-g09d2