diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-07-04 00:23:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-07-04 00:23:11 +0300 |
| commit | 64ac1a0b833838bb8668683f6ec145fe42917681 (patch) | |
| tree | f07de1b27b8085b688e8ea897b5e3000d755d788 | |
| parent | 8e934f0f72bb12423b3f33fdb59dbe1c53b630b1 (diff) | |
| download | manaplus-64ac1a0b833838bb8668683f6ec145fe42917681.tar.gz manaplus-64ac1a0b833838bb8668683f6ec145fe42917681.tar.bz2 manaplus-64ac1a0b833838bb8668683f6ec145fe42917681.tar.xz manaplus-64ac1a0b833838bb8668683f6ec145fe42917681.zip | |
Move skilltype into enums directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/enums/resources/skilltype.h (renamed from src/resources/skilltype.h) | 6 | ||||
| -rw-r--r-- | src/gui/widgets/skillinfo.h | 3 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.h | 3 |
5 files changed, 9 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d6a4a62e3..efd724bbf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -768,7 +768,7 @@ SET(SRCS const/net/skill.h const/resources/skill.h resources/skillowner.h - resources/skilltype.h + enums/resources/skilltype.h resources/db/sounddb.cpp resources/db/sounddb.h resources/db/statdb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index f3beb3f4c..612f3fd31 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -439,7 +439,7 @@ SRC += events/actionevent.h \ const/net/skill.h \ const/resources/skill.h \ resources/skillowner.h \ - resources/skilltype.h \ + enums/resources/skilltype.h \ resources/soundeffect.cpp \ resources/soundeffect.h \ resources/soundinfo.h \ diff --git a/src/resources/skilltype.h b/src/enums/resources/skilltype.h index a8c9ce6a8..c91589034 100644 --- a/src/resources/skilltype.h +++ b/src/enums/resources/skilltype.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_SKILLTYPE_H -#define RESOURCES_SKILLTYPE_H +#ifndef ENUMS_RESOURCES_SKILLTYPE_H +#define ENUMS_RESOURCES_SKILLTYPE_H namespace SkillType { @@ -35,4 +35,4 @@ namespace SkillType }; } // namespace SkillType -#endif // RESOURCES_SKILLTYPE_H +#endif // ENUMS_RESOURCES_SKILLTYPE_H diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h index 30c99b474..cb323a860 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -26,8 +26,9 @@ #include "enums/simpletypes/modifiable.h" #include "enums/simpletypes/visible.h" +#include "enums/resources/skilltype.h" + #include "resources/skillowner.h" -#include "resources/skilltype.h" #include <string> #include <vector> diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 146b67bab..bcc0ad6ea 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -29,10 +29,11 @@ #include "enums/simpletypes/skiperror.h" #include "enums/simpletypes/modifiable.h" +#include "enums/resources/skilltype.h" + #include "listeners/actionlistener.h" #include "resources/skillowner.h" -#include "resources/skilltype.h" class Being; class Button; |