From e0514307bfa5d7affb3dba5c8b61bf59b8bc3b81 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 4 Jul 2016 00:26:50 +0300 Subject: Move skillowner into enum directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/resources/skillowner.h | 35 +++++++++++++++++++++++++++++++++++ src/gui/widgets/skillinfo.h | 3 +-- src/gui/windows/skilldialog.h | 3 +-- src/resources/skillowner.h | 35 ----------------------------------- 6 files changed, 39 insertions(+), 41 deletions(-) create mode 100644 src/enums/resources/skillowner.h delete mode 100644 src/resources/skillowner.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index efd724bbf..a39d4c22c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -767,7 +767,7 @@ SET(SRCS resources/sdlscreenshothelper.h const/net/skill.h const/resources/skill.h - resources/skillowner.h + enums/resources/skillowner.h enums/resources/skilltype.h resources/db/sounddb.cpp resources/db/sounddb.h diff --git a/src/Makefile.am b/src/Makefile.am index 612f3fd31..d85db0d37 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -438,7 +438,7 @@ SRC += events/actionevent.h \ resources/sdlscreenshothelper.h \ const/net/skill.h \ const/resources/skill.h \ - resources/skillowner.h \ + enums/resources/skillowner.h \ enums/resources/skilltype.h \ resources/soundeffect.cpp \ resources/soundeffect.h \ diff --git a/src/enums/resources/skillowner.h b/src/enums/resources/skillowner.h new file mode 100644 index 000000000..30301b423 --- /dev/null +++ b/src/enums/resources/skillowner.h @@ -0,0 +1,35 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2016 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_RESOURCES_SKILLOWNER_H +#define ENUMS_RESOURCES_SKILLOWNER_H + +namespace SkillOwner +{ + enum Type + { + Player = 0, + Mercenary = 1, + Homunculus = 2, + Guild = 3 + }; +} // namespace SkillOwner + +#endif // ENUMS_RESOURCES_SKILLOWNER_H diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h index cb323a860..dc83a1a63 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -26,10 +26,9 @@ #include "enums/simpletypes/modifiable.h" #include "enums/simpletypes/visible.h" +#include "enums/resources/skillowner.h" #include "enums/resources/skilltype.h" -#include "resources/skillowner.h" - #include #include #include diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index bcc0ad6ea..fe3e31c80 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -29,12 +29,11 @@ #include "enums/simpletypes/skiperror.h" #include "enums/simpletypes/modifiable.h" +#include "enums/resources/skillowner.h" #include "enums/resources/skilltype.h" #include "listeners/actionlistener.h" -#include "resources/skillowner.h" - class Being; class Button; class Label; diff --git a/src/resources/skillowner.h b/src/resources/skillowner.h deleted file mode 100644 index df424a24a..000000000 --- a/src/resources/skillowner.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2016 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 RESOURCES_SKILLOWNER_H -#define RESOURCES_SKILLOWNER_H - -namespace SkillOwner -{ - enum Type - { - Player = 0, - Mercenary = 1, - Homunculus = 2, - Guild = 3 - }; -} // namespace SkillOwner - -#endif // RESOURCES_SKILLOWNER_H -- cgit v1.2.3-60-g2f50