diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-24 23:09:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-24 23:14:31 +0300 |
| commit | d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef (patch) | |
| tree | d7204315244dc0a820df3c7834647893e83653e7 /src/utils | |
| parent | 21ea310d2fa35a38efdd63e01685262dd77f8bad (diff) | |
| download | manaverse-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.tar.gz manaverse-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.tar.bz2 manaverse-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.tar.xz manaverse-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.zip | |
Move resourcemanager into subdirectory.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/chatutils_unittest.cc | 3 | ||||
| -rw-r--r-- | src/utils/files.cpp | 2 | ||||
| -rw-r--r-- | src/utils/files_unittest.cc | 2 | ||||
| -rw-r--r-- | src/utils/paths.cpp | 2 | ||||
| -rw-r--r-- | src/utils/translation/poparser_unittest.cc | 2 | ||||
| -rw-r--r-- | src/utils/xml_unittest.cc | 2 | ||||
| -rw-r--r-- | src/utils/xmlutils_unittest.cc | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc index 33c4ca286..af4cb388a 100644 --- a/src/utils/chatutils_unittest.cc +++ b/src/utils/chatutils_unittest.cc @@ -33,9 +33,10 @@ #include "utils/delete2.h" #include "utils/physfstools.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "debug.h" TEST_CASE("chatutils replaceVars") diff --git a/src/utils/files.cpp b/src/utils/files.cpp index ae56c70da..f5bd8c557 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -23,7 +23,7 @@ #include "logger.h" #if defined(ANDROID) || defined(__native_client__) -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "utils/mkdir.h" #endif diff --git a/src/utils/files_unittest.cc b/src/utils/files_unittest.cc index c876e2b72..5ccfe0e04 100644 --- a/src/utils/files_unittest.cc +++ b/src/utils/files_unittest.cc @@ -25,7 +25,7 @@ #include "utils/physfstools.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index a219346b2..2490c853d 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -31,7 +31,7 @@ #include "utils/stringutils.h" #ifdef USE_X11 -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #endif #ifdef __native_client__ diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc index 1e1b527c1..0fcf2bae5 100644 --- a/src/utils/translation/poparser_unittest.cc +++ b/src/utils/translation/poparser_unittest.cc @@ -25,7 +25,7 @@ #include "utils/translation/podict.h" #include "utils/translation/poparser.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "utils/physfstools.h" diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc index 7c4f12222..e2f68181e 100644 --- a/src/utils/xml_unittest.cc +++ b/src/utils/xml_unittest.cc @@ -25,7 +25,7 @@ #include "utils/physfstools.h" #include "utils/xml.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc index 1a0f303ff..4e78d0b0e 100644 --- a/src/utils/xmlutils_unittest.cc +++ b/src/utils/xmlutils_unittest.cc @@ -27,7 +27,7 @@ #include "utils/physfstools.h" #include "utils/xml.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" |