diff options
Diffstat (limited to 'src')
27 files changed, 32 insertions, 30 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e32e628db..50c0c3545 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -886,8 +886,8 @@ SET(SRCS fs/virtfs/virtfsfuncs.h fs/virtfs/virtfsrwops.cpp fs/virtfs/virtfsrwops.h - fs/virtfstools.cpp - fs/virtfstools.h + fs/virtfs/virtfstools.cpp + fs/virtfs/virtfstools.h fs/virtlist.cpp fs/virtlist.h fs/virtfs/virtfs.cpp @@ -1787,8 +1787,8 @@ SET(DYE_CMD_SRCS fs/virtfs/virtfsfuncs.h fs/virtfs/virtfsrwops.cpp fs/virtfs/virtfsrwops.h - fs/virtfstools.cpp - fs/virtfstools.h + fs/virtfs/virtfstools.cpp + fs/virtfs/virtfstools.h fs/virtlist.cpp fs/virtlist.h fs/virtfs/virtfs.cpp diff --git a/src/Makefile.am b/src/Makefile.am index ef2cb3d0e..fe3d0793b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -573,8 +573,8 @@ BASE_SRC += events/actionevent.h \ fs/virtfs/virtfsfuncs.h \ fs/virtfs/virtfsrwops.cpp \ fs/virtfs/virtfsrwops.h \ - fs/virtfstools.cpp \ - fs/virtfstools.h \ + fs/virtfs/virtfstools.cpp \ + fs/virtfs/virtfstools.h \ fs/virtlist.cpp \ fs/virtlist.h \ utils/process.cpp \ diff --git a/src/client.cpp b/src/client.cpp index 5e92f0935..6715290ff 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -43,7 +43,7 @@ #include "enums/being/attributesstrings.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "gui/dialogsmanager.h" #include "gui/gui.h" diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index da0a5b9f8..8be7b125e 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -31,7 +31,7 @@ #include "soundmanager.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "gui/dialogsmanager.h" #include "gui/gui.h" diff --git a/src/fs/files.cpp b/src/fs/files.cpp index efaadfe8f..44ca4dc1d 100644 --- a/src/fs/files.cpp +++ b/src/fs/files.cpp @@ -24,7 +24,7 @@ #if defined(ANDROID) || defined(__native_client__) #include "fs/paths.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "fs/virtlist.h" #endif // defined(ANDROID) || defined(__native_client__) diff --git a/src/fs/files_unittest.cc b/src/fs/files_unittest.cc index b4ff18851..bb9822343 100644 --- a/src/fs/files_unittest.cc +++ b/src/fs/files_unittest.cc @@ -24,7 +24,7 @@ #include "logger.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "utils/delete2.h" diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/fs/virtfs/virtfs_unittest.cc index 57031bd54..8e060b77f 100644 --- a/src/fs/virtfs/virtfs_unittest.cc +++ b/src/fs/virtfs/virtfs_unittest.cc @@ -24,7 +24,7 @@ #include "fs/virtfs/virtdirentry.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "fs/virtlist.h" #include "utils/checkutils.h" diff --git a/src/fs/virtfstools.cpp b/src/fs/virtfs/virtfstools.cpp index 9e290f959..9d2260694 100644 --- a/src/fs/virtfstools.cpp +++ b/src/fs/virtfs/virtfstools.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "logger.h" diff --git a/src/fs/virtfstools.h b/src/fs/virtfs/virtfstools.h index 4f2a77f4c..4f2a77f4c 100644 --- a/src/fs/virtfstools.h +++ b/src/fs/virtfs/virtfstools.h diff --git a/src/fs/virtfs_unittest.cc b/src/fs/virtfs_unittest.cc index 34b2620db..271a95c66 100644 --- a/src/fs/virtfs_unittest.cc +++ b/src/fs/virtfs_unittest.cc @@ -24,7 +24,7 @@ #include "fs/paths.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "fs/virtlist.h" #include "utils/checkutils.h" diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp index bdc6f0495..916c0b9a2 100644 --- a/src/gui/fonts/font.cpp +++ b/src/gui/fonts/font.cpp @@ -68,7 +68,8 @@ #include "fs/files.h" #include "fs/paths.h" -#include "fs/virtfstools.h" + +#include "fs/virtfs/virtfstools.h" #include "gui/fonts/textchunk.h" diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index eb9d4e075..6829971a1 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -30,7 +30,7 @@ #include "const/gui/theme.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "fs/virtlist.h" #include "gui/skin.h" diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index 828e59c65..20e2f0b8b 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -29,7 +29,7 @@ #include "settings.h" #include "spellmanager.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "gui/gui.h" #include "gui/userpalette.h" diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 40016d4f0..c579c7a70 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -35,7 +35,7 @@ #include "const/gui/chat.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "input/inputmanager.h" diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index f10933996..769082516 100644 --- a/src/gui/windows/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -27,7 +27,8 @@ #include "enums/gui/layouttype.h" #include "fs/paths.h" -#include "fs/virtfstools.h" + +#include "fs/virtfs/virtfstools.h" #include "gui/gui.h" diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 8f994271e..6dbc03852 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -34,7 +34,7 @@ #include "fs/paths.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/button.h" diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc index cdd5fecab..280aa1712 100644 --- a/src/integrity_unittest.cc +++ b/src/integrity_unittest.cc @@ -29,7 +29,7 @@ #include "fs/virtfs/virtfs.h" #include "fs/virtfs/virtfsrwops.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "input/inputactionmap.h" diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp index f8a5b608c..90ee9c3e6 100644 --- a/src/render/shaders/shadersmanager.cpp +++ b/src/render/shaders/shadersmanager.cpp @@ -25,7 +25,7 @@ #include "configuration.h" #include "logger.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "render/opengl/mgl.h" #ifdef __native_client__ diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h index 901b5e65e..caa1f4c9a 100644 --- a/src/resources/beingcommon.h +++ b/src/resources/beingcommon.h @@ -21,7 +21,7 @@ #ifndef RESOURCES_BEINGCOMMON_H #define RESOURCES_BEINGCOMMON_H -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "utils/xml.h" diff --git a/src/resources/db/badgesdb.cpp b/src/resources/db/badgesdb.cpp index 59080efe6..f4939ca17 100644 --- a/src/resources/db/badgesdb.cpp +++ b/src/resources/db/badgesdb.cpp @@ -22,7 +22,7 @@ #include "configuration.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "utils/xmlutils.h" diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index e6affd378..dd728d2f9 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -28,7 +28,7 @@ #include "enums/resources/spritedirection.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "resources/iteminfo.h" #include "resources/itemtypemapdata.h" diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp index a17403769..90354b2fe 100644 --- a/src/resources/db/palettedb.cpp +++ b/src/resources/db/palettedb.cpp @@ -22,7 +22,7 @@ #include "configuration.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "utils/checkutils.h" diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp index d73de8841..a24b62343 100644 --- a/src/utils/translation/poparser.cpp +++ b/src/utils/translation/poparser.cpp @@ -21,7 +21,7 @@ #include "utils/translation/poparser.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "utils/stringutils.h" diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index 14751d01c..7c64c1590 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -20,7 +20,7 @@ #include "utils/translation/translationmanager.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "utils/delete2.h" #include "utils/stringutils.h" diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp index cb350a639..87fb2577d 100644 --- a/src/utils/xml/libxml.cpp +++ b/src/utils/xml/libxml.cpp @@ -24,7 +24,7 @@ #include "utils/xml/libxml.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp index 1897bc943..6fada3605 100644 --- a/src/utils/xml/pugixml.cpp +++ b/src/utils/xml/pugixml.cpp @@ -24,7 +24,7 @@ #include "utils/xml/pugixml.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "utils/checkutils.h" #include "utils/delete2.h" diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp index 6805ef48d..1c1f38493 100644 --- a/src/utils/xml/tinyxml2.cpp +++ b/src/utils/xml/tinyxml2.cpp @@ -24,7 +24,7 @@ #include "utils/xml/tinyxml2.h" -#include "fs/virtfstools.h" +#include "fs/virtfs/virtfstools.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" |