From d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 24 May 2016 23:09:33 +0300 Subject: Move resourcemanager into subdirectory. --- src/gui/windows/mailviewwindow.cpp | 3 ++- src/gui/windows/minimap.cpp | 3 ++- src/gui/windows/npcdialog.cpp | 3 ++- src/gui/windows/updaterwindow.cpp | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index 8ae2fb76f..78184c671 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -40,7 +40,8 @@ #include "resources/image.h" #include "resources/iteminfo.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "resources/db/itemdb.h" diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 6a28e95af..e21f51742 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -40,11 +40,12 @@ #include "resources/image.h" #include "resources/imagehelper.h" -#include "resources/resourcemanager.h" #include "resources/map/map.h" #include "resources/map/metatile.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/gettext.h" #include "utils/physfstools.h" #include "utils/sdlcheckutils.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 7369e1314..5b573d693 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -58,7 +58,6 @@ #include "gui/widgets/scrollarea.h" #include "resources/npcdialoginfo.h" -#include "resources/resourcemanager.h" #include "resources/db/avatardb.h" #include "resources/db/npcdb.h" @@ -68,6 +67,8 @@ #include "resources/item/complexitem.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "net/npchandler.h" #include "net/packetlimiter.h" diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 66887a258..3d7e23fb3 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -38,10 +38,10 @@ #include "net/download.h" #include "net/updatetypeoperators.h" -#include "resources/resourcemanager.h" - #include "resources/db/moddb.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/delete2.h" #include "utils/files.h" #include "utils/physfstools.h" -- cgit v1.2.3-70-g09d2