From 58141a0e9ee3c313507a37974e4cf8286b128608 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 19:33:17 +0300 Subject: Move beingdirection into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/being.h | 2 +- src/being/beingdirection.h | 40 ---------------------------------------- src/enums/being/beingdirection.h | 40 ++++++++++++++++++++++++++++++++++++++++ src/gui/windows/chatwindow.h | 2 +- 6 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 src/being/beingdirection.h create mode 100644 src/enums/being/beingdirection.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8b2e18f87..7c47aa32c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -834,7 +834,7 @@ SET(SRCS being/being.h enums/being/beingaction.h being/beingcacheentry.h - being/beingdirection.h + enums/being/beingdirection.h being/beingflag.h being/beingspeech.h beingequipbackend.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 0c9bf28c1..aadd758a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -956,7 +956,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being/being.h \ enums/being/beingaction.h \ being/beingcacheentry.h \ - being/beingdirection.h \ + enums/being/beingdirection.h \ being/beingflag.h \ being/beingspeech.h \ beingequipbackend.cpp \ diff --git a/src/being/being.h b/src/being/being.h index 548381ae4..6b8a4dd52 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -28,9 +28,9 @@ #include "position.h" #include "being/actorsprite.h" -#include "being/beingdirection.h" #include "enums/being/beingaction.h" +#include "enums/being/beingdirection.h" #include "enums/being/gender.h" #include "listeners/configlistener.h" diff --git a/src/being/beingdirection.h b/src/being/beingdirection.h deleted file mode 100644 index eda7e2abb..000000000 --- a/src/being/beingdirection.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-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_BEINGDIRECTION_H -#define BEING_BEINGDIRECTION_H - -namespace BeingDirection -{ - /** - * Directions, to be used as bitmask values - */ - enum Type - { - DOWN = 1, - LEFT = 2, - UP = 4, - RIGHT = 8 - }; -} // namespace BeingDirection - -#endif // BEING_BEINGDIRECTION_H diff --git a/src/enums/being/beingdirection.h b/src/enums/being/beingdirection.h new file mode 100644 index 000000000..73c95d675 --- /dev/null +++ b/src/enums/being/beingdirection.h @@ -0,0 +1,40 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-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_BEINGDIRECTION_H +#define ENUMS_BEING_BEINGDIRECTION_H + +namespace BeingDirection +{ + /** + * Directions, to be used as bitmask values + */ + enum Type + { + DOWN = 1, + LEFT = 2, + UP = 4, + RIGHT = 8 + }; +} // namespace BeingDirection + +#endif // ENUMS_BEING_BEINGDIRECTION_H diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index 7891a7292..7287410d9 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_CHATWINDOW_H #define GUI_WINDOWS_CHATWINDOW_H -#include "being/beingdirection.h" +#include "enums/being/beingdirection.h" #include "enums/gui/chatmsgtype.h" -- cgit v1.2.3-70-g09d2