From 64ac1a0b833838bb8668683f6ec145fe42917681 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 4 Jul 2016 00:23:11 +0300
Subject: Move skilltype into enums directory.

---
 src/CMakeLists.txt              |  2 +-
 src/Makefile.am                 |  2 +-
 src/enums/resources/skilltype.h | 38 ++++++++++++++++++++++++++++++++++++++
 src/gui/widgets/skillinfo.h     |  3 ++-
 src/gui/windows/skilldialog.h   |  3 ++-
 src/resources/skilltype.h       | 38 --------------------------------------
 6 files changed, 44 insertions(+), 42 deletions(-)
 create mode 100644 src/enums/resources/skilltype.h
 delete mode 100644 src/resources/skilltype.h

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/enums/resources/skilltype.h b/src/enums/resources/skilltype.h
new file mode 100644
index 000000000..c91589034
--- /dev/null
+++ b/src/enums/resources/skilltype.h
@@ -0,0 +1,38 @@
+/*
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ENUMS_RESOURCES_SKILLTYPE_H
+#define ENUMS_RESOURCES_SKILLTYPE_H
+
+namespace SkillType
+{
+    enum SkillType
+    {
+        Unknown    = 0,
+        Attack     = 1,
+        Ground     = 2,
+        Self       = 4,
+        Unused     = 8,
+        Support    = 16,
+        TargetTrap = 32
+    };
+}  // namespace SkillType
+
+#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;
diff --git a/src/resources/skilltype.h b/src/resources/skilltype.h
deleted file mode 100644
index a8c9ce6a8..000000000
--- a/src/resources/skilltype.h
+++ /dev/null
@@ -1,38 +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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESOURCES_SKILLTYPE_H
-#define RESOURCES_SKILLTYPE_H
-
-namespace SkillType
-{
-    enum SkillType
-    {
-        Unknown    = 0,
-        Attack     = 1,
-        Ground     = 2,
-        Self       = 4,
-        Unused     = 8,
-        Support    = 16,
-        TargetTrap = 32
-    };
-}  // namespace SkillType
-
-#endif  // RESOURCES_SKILLTYPE_H
-- 
cgit v1.2.3-60-g2f50