From 8aca3361806f6d00c5b9c0b318354230ac2fab1c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 18:48:21 +0300 Subject: Move targetcursortype.h into enum namespace. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/actorsprite.h | 2 +- src/being/targetcursortype.h | 36 ------------------------------------ src/enums/being/targetcursortype.h | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 src/being/targetcursortype.h create mode 100644 src/enums/being/targetcursortype.h (limited to 'src') 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/being/targetcursortype.h deleted file mode 100644 index 4a9797c4a..000000000 --- a/src/being/targetcursortype.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_TARGETCURSORTYPE_H -#define BEING_TARGETCURSORTYPE_H - -namespace TargetCursorType -{ - enum Type - { - NONE = -1, - NORMAL = 0, - IN_RANGE, - NUM_TCT - }; -} - -#endif // BEING_TARGETCURSORTYPE_H diff --git a/src/enums/being/targetcursortype.h b/src/enums/being/targetcursortype.h new file mode 100644 index 000000000..a47b1ede0 --- /dev/null +++ b/src/enums/being/targetcursortype.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_TARGETCURSORTYPE_H +#define ENUMS_BEING_TARGETCURSORTYPE_H + +namespace TargetCursorType +{ + enum Type + { + NONE = -1, + NORMAL = 0, + IN_RANGE, + NUM_TCT + }; +} + +#endif // ENUMS_BEING_TARGETCURSORTYPE_H -- cgit v1.2.3-60-g2f50