Move virt fs related files into fs directory.

9 files changed, 22 insertions, 13 deletions

diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index 61bb93453..877f112e0 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -66,6 +66,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "fs/virtfstools.h"
+
 #include "gui/fonts/textchunk.h"
 
 #include "render/graphics.h"
@@ -79,7 +81,6 @@
 #include "utils/sdlcheckutils.h"
 #include "utils/stringutils.h"
 #include "utils/timer.h"
-#include "utils/virtfstools.h"
 
 #include "debug.h"
 
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 1888627d1..206d8f9a5 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -29,6 +29,10 @@
 
 #include "const/gui/theme.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
+#include "fs/virtlist.h"
+
 #include "gui/skin.h"
 #include "gui/themeinfo.h"
 
@@ -45,9 +49,6 @@
 #include "resources/loaders/xmlloader.h"
 
 #include "utils/dtor.h"
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
-#include "utils/virtlist.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index 68a38300d..4e2244a2f 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -24,6 +24,8 @@
 
 #include "being/actorsprite.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/gui.h"
 
 #include "gui/fonts/font.h"
@@ -31,7 +33,6 @@
 #include "gui/widgets/browserbox.h"
 
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
 
 #include "render/sdlgraphics.h"
 
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 28a57e7e0..ce0b0132d 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -29,6 +29,8 @@
 #include "settings.h"
 #include "spellmanager.h"
 
+#include "fs/virtfstools.h"
+
 #include "gui/gui.h"
 #include "gui/userpalette.h"
 
@@ -59,7 +61,6 @@
 #include "utils/delete2.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/sdlhelper.h"
-#include "utils/virtfstools.h"
 #ifdef __native_client__
 #include "utils/naclmessages.h"
 #endif  // __native_client__
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 68fc3852b..902068376 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -29,6 +29,8 @@
 
 #include "const/resources/currency.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/gui.h"
 #include "gui/mailmessage.h"
 #include "gui/userpalette.h"
@@ -117,7 +119,6 @@
 #include "utils/delete2.h"
 #include "utils/env.h"
 #include "utils/gettext.h"
-#include "utils/virtfs.h"
 
 #include "utils/translation/translationmanager.h"
 
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 094faea6d..40016d4f0 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -35,6 +35,8 @@
 
 #include "const/gui/chat.h"
 
+#include "fs/virtfstools.h"
+
 #include "input/inputmanager.h"
 
 #include "gui/focushandler.h"
@@ -71,7 +73,6 @@
 
 #include "utils/copynpaste.h"
 #include "utils/delete2.h"
-#include "utils/virtfstools.h"
 
 #include <sys/stat.h>
 
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index e1ba2de30..91bdbe13e 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -26,7 +26,7 @@
 
 #include "enums/gui/layouttype.h"
 
-#include "input/inputmanager.h"
+#include "fs/virtfstools.h"
 
 #include "gui/gui.h"
 
@@ -37,10 +37,11 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
 
+#include "input/inputmanager.h"
+
 #include "utils/gettext.h"
 #include "utils/paths.h"
 #include "utils/process.h"
-#include "utils/virtfstools.h"
 
 #include "utils/translation/podict.h"
 #include "utils/translation/translationmanager.h"
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index f19fb2239..e261dead7 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -31,6 +31,8 @@
 
 #include "enums/resources/map/blockmask.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/popupmanager.h"
 #include "gui/viewport.h"
 #include "gui/userpalette.h"
@@ -50,7 +52,6 @@
 #include "resources/loaders/imageloader.h"
 
 #include "utils/gettext.h"
-#include "utils/virtfs.h"
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index ddb265bc7..4d0ff9f3a 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -29,6 +29,9 @@
 
 #include "enums/gui/layouttype.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
+
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/containerplacer.h"
@@ -45,8 +48,6 @@
 
 #include "utils/delete2.h"
 #include "utils/files.h"
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
 #include "utils/gettext.h"
 #include "utils/mkdir.h"
 #include "utils/paths.h"