diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/being/being.cpp | 2 | ||||
| -rw-r--r-- | src/dragdrop.h | 3 | ||||
| -rw-r--r-- | src/gui/models/skillmodel.h | 3 | ||||
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 3 | ||||
| -rw-r--r-- | src/gui/popups/skillpopup.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/skillrecv.cpp | 3 | ||||
| -rw-r--r-- | src/resources/skill/skillinfo.cpp (renamed from src/gui/widgets/skillinfo.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/skill/skillinfo.h (renamed from src/gui/widgets/skillinfo.h) | 0 |
10 files changed, 14 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d555931ef..22abd909c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -266,8 +266,8 @@ SET(SRCS gui/widgets/shortcutcontainer.h resources/skill/skilldata.cpp resources/skill/skilldata.h - gui/widgets/skillinfo.cpp - gui/widgets/skillinfo.h + resources/skill/skillinfo.cpp + resources/skill/skillinfo.h gui/widgets/skilllistbox.h gui/models/skillmodel.cpp gui/models/skillmodel.h diff --git a/src/Makefile.am b/src/Makefile.am index 02966844a..676f90bdf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1031,8 +1031,8 @@ manaplus_SOURCES += main.cpp \ gui/widgets/shortcutcontainer.h \ resources/skill/skilldata.cpp \ resources/skill/skilldata.h \ - gui/widgets/skillinfo.cpp \ - gui/widgets/skillinfo.h \ + resources/skill/skillinfo.cpp \ + resources/skill/skillinfo.h \ gui/widgets/skilllistbox.h \ gui/widgets/tabs/shortcuttab.h \ gui/widgets/tabs/skilltab.h \ diff --git a/src/being/being.cpp b/src/being/being.cpp index fd4b37e2c..73e088fe7 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -91,11 +91,11 @@ #include "resources/map/map.h" #include "resources/skill/skilldata.h" +#include "resources/skill/skillinfo.h" #include "resources/sprite/animatedsprite.h" #include "gui/widgets/createwidget.h" -#include "gui/widgets/skillinfo.h" #include "gui/widgets/tabs/chat/langtab.h" diff --git a/src/dragdrop.h b/src/dragdrop.h index 9c5a6399f..e1f6ae9e8 100644 --- a/src/dragdrop.h +++ b/src/dragdrop.h @@ -28,11 +28,10 @@ #include "enums/dragdropsource.h" -#include "gui/widgets/skillinfo.h" - #include "resources/image/image.h" #include "resources/skill/skilldata.h" +#include "resources/skill/skillinfo.h" #include "localconsts.h" diff --git a/src/gui/models/skillmodel.h b/src/gui/models/skillmodel.h index d7695253d..8695e548d 100644 --- a/src/gui/models/skillmodel.h +++ b/src/gui/models/skillmodel.h @@ -23,9 +23,10 @@ #ifndef GUI_MODELS_SKILLMODEL_H #define GUI_MODELS_SKILLMODEL_H -#include "gui/widgets/skillinfo.h" #include "gui/models/listmodel.h" +#include "resources/skill/skillinfo.h" + #include "localconsts.h" class SkillModel final : public ListModel diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 7bed7446f..4c417036b 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -60,7 +60,6 @@ #include "gui/widgets/createwidget.h" #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/skillinfo.h" #include "gui/widgets/textfield.h" #include "gui/widgets/tabs/chat/whispertab.h" @@ -92,6 +91,8 @@ #include "resources/map/mapitem.h" #include "resources/map/speciallayer.h" +#include "resources/skill/skillinfo.h" + #include "utils/copynpaste.h" #include "utils/gettext.h" #include "utils/process.h" diff --git a/src/gui/popups/skillpopup.cpp b/src/gui/popups/skillpopup.cpp index b88fa83ca..efd9e1f50 100644 --- a/src/gui/popups/skillpopup.cpp +++ b/src/gui/popups/skillpopup.cpp @@ -28,13 +28,13 @@ #include "gui/fonts/font.h" #include "gui/widgets/label.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 "resources/skill/skillinfo.h" #include "debug.h" diff --git a/src/net/eathena/skillrecv.cpp b/src/net/eathena/skillrecv.cpp index f937deb22..254676f77 100644 --- a/src/net/eathena/skillrecv.cpp +++ b/src/net/eathena/skillrecv.cpp @@ -32,7 +32,6 @@ #include "enums/resources/notifytypes.h" #include "gui/widgets/createwidget.h" -#include "gui/widgets/skillinfo.h" #include "gui/windows/skilldialog.h" #include "gui/windows/textselectdialog.h" @@ -47,6 +46,8 @@ #include "resources/db/itemdb.h" +#include "resources/skill/skillinfo.h" + #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/skillinfo.cpp b/src/resources/skill/skillinfo.cpp index 8c7fbefea..c65fadc2b 100644 --- a/src/gui/widgets/skillinfo.cpp +++ b/src/resources/skill/skillinfo.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/skillinfo.h" +#include "resources/skill/skillinfo.h" #include "being/playerinfo.h" diff --git a/src/gui/widgets/skillinfo.h b/src/resources/skill/skillinfo.h index dc83a1a63..dc83a1a63 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/resources/skill/skillinfo.h |