diff options
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/being/being.cpp | 3 | ||||
| -rw-r--r-- | src/dragdrop.h | 3 | ||||
| -rw-r--r-- | src/gui/models/skillmodel.cpp | 2 | ||||
| -rw-r--r-- | src/gui/popups/skillpopup.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/skillinfo.cpp | 4 | ||||
| -rw-r--r-- | src/resources/skill/skilldata.cpp (renamed from src/gui/widgets/skilldata.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/skill/skilldata.h (renamed from src/gui/widgets/skilldata.h) | 0 |
9 files changed, 14 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8b1ce79a0..d555931ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -264,8 +264,8 @@ SET(SRCS gui/widgets/shoplistbox.h gui/widgets/shortcutcontainer.cpp gui/widgets/shortcutcontainer.h - gui/widgets/skilldata.cpp - gui/widgets/skilldata.h + resources/skill/skilldata.cpp + resources/skill/skilldata.h gui/widgets/skillinfo.cpp gui/widgets/skillinfo.h gui/widgets/skilllistbox.h diff --git a/src/Makefile.am b/src/Makefile.am index fd9db6e8e..02966844a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1029,8 +1029,8 @@ manaplus_SOURCES += main.cpp \ gui/widgets/shoplistbox.h \ gui/widgets/shortcutcontainer.cpp \ gui/widgets/shortcutcontainer.h \ - gui/widgets/skilldata.cpp \ - gui/widgets/skilldata.h \ + resources/skill/skilldata.cpp \ + resources/skill/skilldata.h \ gui/widgets/skillinfo.cpp \ gui/widgets/skillinfo.h \ gui/widgets/skilllistbox.h \ diff --git a/src/being/being.cpp b/src/being/being.cpp index 0b52592d4..fd4b37e2c 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -90,10 +90,11 @@ #include "resources/map/map.h" +#include "resources/skill/skilldata.h" + #include "resources/sprite/animatedsprite.h" #include "gui/widgets/createwidget.h" -#include "gui/widgets/skilldata.h" #include "gui/widgets/skillinfo.h" #include "gui/widgets/tabs/chat/langtab.h" diff --git a/src/dragdrop.h b/src/dragdrop.h index 3d04f111d..9c5a6399f 100644 --- a/src/dragdrop.h +++ b/src/dragdrop.h @@ -28,11 +28,12 @@ #include "enums/dragdropsource.h" -#include "gui/widgets/skilldata.h" #include "gui/widgets/skillinfo.h" #include "resources/image/image.h" +#include "resources/skill/skilldata.h" + #include "localconsts.h" class DragDrop final diff --git a/src/gui/models/skillmodel.cpp b/src/gui/models/skillmodel.cpp index 7e49de9a3..7f130addd 100644 --- a/src/gui/models/skillmodel.cpp +++ b/src/gui/models/skillmodel.cpp @@ -22,7 +22,7 @@ #include "gui/models/skillmodel.h" -#include "gui/widgets/skilldata.h" +#include "resources/skill/skilldata.h" #include "debug.h" diff --git a/src/gui/popups/skillpopup.cpp b/src/gui/popups/skillpopup.cpp index 879e48a80..b88fa83ca 100644 --- a/src/gui/popups/skillpopup.cpp +++ b/src/gui/popups/skillpopup.cpp @@ -28,13 +28,14 @@ #include "gui/fonts/font.h" #include "gui/widgets/label.h" -#include "gui/widgets/skilldata.h" #include "gui/widgets/skillinfo.h" #include "gui/widgets/textbox.h" #include "utils/gettext.h" #include "utils/stringutils.h" +#include "resources/skill/skilldata.h" + #include "debug.h" SkillPopup *skillPopup = nullptr; diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp index 906aff101..8c7fbefea 100644 --- a/src/gui/widgets/skillinfo.cpp +++ b/src/gui/widgets/skillinfo.cpp @@ -24,14 +24,14 @@ #include "being/playerinfo.h" -#include "gui/widgets/skilldata.h" - #include "gui/models/skillmodel.h" #include "utils/stringutils.h" #include "resources/skilltypelist.h" +#include "resources/skill/skilldata.h" + #include "debug.h" SkillInfo::SkillInfo() : diff --git a/src/gui/widgets/skilldata.cpp b/src/resources/skill/skilldata.cpp index 3b8328474..65d454260 100644 --- a/src/gui/widgets/skilldata.cpp +++ b/src/resources/skill/skilldata.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/skilldata.h" +#include "resources/skill/skilldata.h" #include "configuration.h" diff --git a/src/gui/widgets/skilldata.h b/src/resources/skill/skilldata.h index 20365593f..20365593f 100644 --- a/src/gui/widgets/skilldata.h +++ b/src/resources/skill/skilldata.h |