summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/resources/skillowner.h (renamed from src/resources/skillowner.h)6
-rw-r--r--src/gui/widgets/skillinfo.h3
-rw-r--r--src/gui/windows/skilldialog.h3
5 files changed, 7 insertions, 9 deletions
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/resources/skillowner.h b/src/enums/resources/skillowner.h
index df424a24a..30301b423 100644
--- a/src/resources/skillowner.h
+++ b/src/enums/resources/skillowner.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RESOURCES_SKILLOWNER_H
-#define RESOURCES_SKILLOWNER_H
+#ifndef ENUMS_RESOURCES_SKILLOWNER_H
+#define ENUMS_RESOURCES_SKILLOWNER_H
namespace SkillOwner
{
@@ -32,4 +32,4 @@ namespace SkillOwner
};
} // namespace SkillOwner
-#endif // RESOURCES_SKILLOWNER_H
+#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 <string>
#include <vector>
#include <map>
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;