Rename virtfs into fs.

46 files changed, 49 insertions, 49 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 331b10c7a..584ede582 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -897,8 +897,8 @@ SET(SRCS
     fs/virtfs/tools.h
     fs/virtfs/virtlist.cpp
     fs/virtfs/virtlist.h
-    fs/virtfs/virtfs.cpp
-    fs/virtfs/virtfs.h
+    fs/virtfs/fs.cpp
+    fs/virtfs/fs.h
     fs/virtfs/rwopstypes.h
     fs/virtfs/direntry.cpp
     fs/virtfs/direntry.h
@@ -1806,8 +1806,8 @@ SET(DYE_CMD_SRCS
     fs/virtfs/tools.h
     fs/virtfs/virtlist.cpp
     fs/virtfs/virtlist.h
-    fs/virtfs/virtfs.cpp
-    fs/virtfs/virtfs.h
+    fs/virtfs/fs.cpp
+    fs/virtfs/fs.h
     fs/virtfs/rwopstypes.h
     fs/virtfs/direntry.cpp
     fs/virtfs/direntry.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 94414f868..dd4234b83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -848,8 +848,8 @@ BASE_SRC += events/actionevent.h \
 	      fs/virtfs/rwopstypes.h \
 	      fs/virtfs/direntry.cpp \
 	      fs/virtfs/direntry.h \
-	      fs/virtfs/virtfs.cpp \
-	      fs/virtfs/virtfs.h \
+	      fs/virtfs/fs.cpp \
+	      fs/virtfs/fs.h \
 	      fs/virtfs/virtfsdir.cpp \
 	      fs/virtfs/virtfsdir.h \
 	      fs/virtfs/virtfsdirrwops.cpp \
diff --git a/src/client.cpp b/src/client.cpp
index a47d68098..a59490ba3 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -42,7 +42,7 @@
 
 #include "enums/being/attributesstrings.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/tools.h"
 
 #include "gui/dialogsmanager.h"
diff --git a/src/configuration.cpp b/src/configuration.cpp
index da2d2265e..3b6c6b021 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -27,7 +27,7 @@
 #include "fs/files.h"
 #include "fs/paths.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "listeners/configlistener.h"
 
diff --git a/src/dirs.cpp b/src/dirs.cpp
index 31af61165..26374ed0f 100644
--- a/src/dirs.cpp
+++ b/src/dirs.cpp
@@ -31,7 +31,7 @@
 #include "fs/mkdir.h"
 #include "fs/paths.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/base64.h"
 #if defined(__native_client__) || (defined(ANDROID) && defined(USE_SDL2))
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 9c33b2edd..b7ac6ac4b 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -30,7 +30,7 @@
 #include "settings.h"
 #include "soundmanager.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/tools.h"
 
 #include "gui/dialogsmanager.h"
diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp
index fd64088f7..9a5b35be6 100644
--- a/src/dyetool/dyemain.cpp
+++ b/src/dyetool/dyemain.cpp
@@ -24,7 +24,7 @@
 #include "maingui.h"
 #include "sdlshared.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "resources/imagewriter.h"
 
diff --git a/src/fs/files.cpp b/src/fs/files.cpp
index e805a5f1a..f0d15a328 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/virtfs/fs.h"
 #include "fs/virtfs/tools.h"
 #include "fs/virtfs/virtlist.h"
 #endif  // defined(ANDROID) || defined(__native_client__)
diff --git a/src/fs/files_unittest.cc b/src/fs/files_unittest.cc
index be3cf9256..05953f04f 100644
--- a/src/fs/files_unittest.cc
+++ b/src/fs/files_unittest.cc
@@ -23,7 +23,7 @@
 #include "catch.hpp"
 #include "logger.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/tools.h"
 
 #include "utils/delete2.h"
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp
index 4c7d66ce5..418e2fcf7 100644
--- a/src/fs/paths.cpp
+++ b/src/fs/paths.cpp
@@ -26,7 +26,7 @@
 
 #include "fs/paths.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/checkutils.h"
 #include "utils/stringutils.h"
diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/fs.cpp
index 58dec670e..e96ad23b4 100644
--- a/src/fs/virtfs/virtfs.cpp
+++ b/src/fs/virtfs/fs.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "fs/files.h"
 #include "fs/paths.h"
diff --git a/src/fs/virtfs/virtfs.h b/src/fs/virtfs/fs.h
index 8b5df99ef..8b5df99ef 100644
--- a/src/fs/virtfs/virtfs.h
+++ b/src/fs/virtfs/fs.h
diff --git a/src/fs/virtfs/rwops.cpp b/src/fs/virtfs/rwops.cpp
index 854c5510d..3a18d53c2 100644
--- a/src/fs/virtfs/rwops.cpp
+++ b/src/fs/virtfs/rwops.cpp
@@ -47,7 +47,7 @@
 #include "logger.h"
 
 #include "fs/virtfs/file.h"
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/fsfuncs.h"
 
 #include "utils/fuzzer.h"
diff --git a/src/fs/virtfs/tools.cpp b/src/fs/virtfs/tools.cpp
index 6573e6141..ea897e861 100644
--- a/src/fs/virtfs/tools.cpp
+++ b/src/fs/virtfs/tools.cpp
@@ -24,7 +24,7 @@
 
 #include "fs/paths.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/virtlist.h"
 
 #include "utils/stringutils.h"
diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc
index b4bdcbb09..b1084d605 100644
--- a/src/fs/virtfs/virtfs1_unittest.cc
+++ b/src/fs/virtfs/virtfs1_unittest.cc
@@ -23,7 +23,7 @@
 #include "fs/files.h"
 
 #include "fs/virtfs/direntry.h"
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/rwops.h"
 #include "fs/virtfs/virtlist.h"
 
diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/fs/virtfs/virtfs_unittest.cc
index 2734e9ab2..3c0b65679 100644
--- a/src/fs/virtfs/virtfs_unittest.cc
+++ b/src/fs/virtfs/virtfs_unittest.cc
@@ -23,7 +23,7 @@
 #include "fs/files.h"
 #include "fs/paths.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/virtlist.h"
 
 #include "utils/checkutils.h"
diff --git a/src/fs/virtfs/virtfsziprwops.cpp b/src/fs/virtfs/virtfsziprwops.cpp
index 5d21d70b0..d0c386bab 100644
--- a/src/fs/virtfs/virtfsziprwops.cpp
+++ b/src/fs/virtfs/virtfsziprwops.cpp
@@ -23,7 +23,7 @@
 #include "logger.h"
 
 #include "fs/virtfs/file.h"
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include <SDL_rwops.h>
 
diff --git a/src/game.cpp b/src/game.cpp
index e3e293151..ed04a905d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -43,7 +43,7 @@
 
 #include "fs/mkdir.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/dialogsmanager.h"
 #include "gui/gui.h"
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index db1d1ee39..42ac00d23 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -29,7 +29,7 @@
 
 #include "const/gui/theme.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/virtlist.h"
 
 #include "gui/skin.h"
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index e86aa6b0e..bed2ec2bd 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -27,7 +27,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index b19844ac9..dd80b7d5d 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -32,7 +32,7 @@
 
 #include "const/resources/currency.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 #include "gui/mailmessage.h"
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 5d4d867bf..9b12ee1fd 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -31,7 +31,7 @@
 
 #include "enums/resources/map/blockmask.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/popupmanager.h"
 #include "gui/viewport.h"
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 823a92c3d..a88aba197 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -33,7 +33,7 @@
 #include "fs/mkdir.h"
 #include "fs/paths.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc
index 955c0457f..9b5c31455 100644
--- a/src/integrity_unittest.cc
+++ b/src/integrity_unittest.cc
@@ -27,7 +27,7 @@
 
 #include "fs/files.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/rwops.h"
 
 #include "gui/gui.h"
diff --git a/src/maingui.cpp b/src/maingui.cpp
index 301b088a0..4eb7c8624 100644
--- a/src/maingui.cpp
+++ b/src/maingui.cpp
@@ -26,7 +26,7 @@
 #include "commandline.h"
 #include "settings.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/delete2.h"
 #ifdef ANDROID
diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc
index f31097cbe..b21b03016 100644
--- a/src/resources/dye/dye_unittest.cc
+++ b/src/resources/dye/dye_unittest.cc
@@ -26,7 +26,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 
diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc
index 280a74ead..338e7c23d 100644
--- a/src/resources/dye/dyepalette_unittest.cc
+++ b/src/resources/dye/dyepalette_unittest.cc
@@ -28,7 +28,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 #include "gui/theme.h"
diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc
index 817985114..1d9b515f7 100644
--- a/src/resources/map/maplayer_unittest.cc
+++ b/src/resources/map/maplayer_unittest.cc
@@ -26,7 +26,7 @@
 #include "enums/resources/map/blockmask.h"
 #include "enums/resources/map/mapitemtype.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/theme.h"
 
diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc
index d43daaac8..57dc3b98b 100644
--- a/src/resources/map/speciallayer_unittest.cc
+++ b/src/resources/map/speciallayer_unittest.cc
@@ -28,7 +28,7 @@
 
 #include "enums/resources/map/mapitemtype.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index bd298ac90..cd5a1feb7 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -33,7 +33,7 @@
 #include "enums/resources/map/collisiontype.h"
 #include "enums/resources/map/mapitemtype.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "resources/map/map.h"
 #include "resources/map/mapheights.h"
diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc
index 24b8a214f..2595beb76 100644
--- a/src/resources/resourcemanager/resourcemanager_unittest.cc
+++ b/src/resources/resourcemanager/resourcemanager_unittest.cc
@@ -26,7 +26,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 
diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc
index f48b10b4b..4f8053b57 100644
--- a/src/resources/sprite/animatedsprite_unittest.cc
+++ b/src/resources/sprite/animatedsprite_unittest.cc
@@ -31,7 +31,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 #include "gui/theme.h"
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index bf04d6ce5..a405298e8 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -24,7 +24,7 @@
 
 #include "configuration.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 #include "fs/virtfs/virtlist.h"
 
 #include "resources/wallpaperdata.h"
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index 7d085fff4..4b7cca8f1 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -28,7 +28,7 @@
 #include "being/localplayer.h"
 #endif  // DYECMD
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "resources/sdlmusic.h"
 #include "resources/soundeffect.h"
diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc
index d613665dc..d07578992 100644
--- a/src/utils/chatutils_unittest.cc
+++ b/src/utils/chatutils_unittest.cc
@@ -30,7 +30,7 @@
 
 #include "being/localplayer.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 #include "gui/theme.h"
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp
index 1dbe01226..f7f02ba32 100644
--- a/src/utils/gettexthelper.cpp
+++ b/src/utils/gettexthelper.cpp
@@ -28,7 +28,7 @@
 #include "client.h"
 #include "logger.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include <libintl.h>
 
diff --git a/src/utils/stringutils_unittest.cc b/src/utils/stringutils_unittest.cc
index 7a303e2ac..9a99972b3 100644
--- a/src/utils/stringutils_unittest.cc
+++ b/src/utils/stringutils_unittest.cc
@@ -24,7 +24,7 @@
 
 #include "const/utils/utf8.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index af436b7de..8244fd627 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -20,7 +20,7 @@
 
 #include "utils/translation/poparser.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/stringutils.h"
 
diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc
index 7ba006f82..d4cf806dc 100644
--- a/src/utils/translation/poparser_unittest.cc
+++ b/src/utils/translation/poparser_unittest.cc
@@ -27,7 +27,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 #include "gui/theme.h"
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index 808ad5f2f..67527b06a 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -20,7 +20,7 @@
 
 #include "utils/translation/translationmanager.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/delete2.h"
 #include "utils/stringutils.h"
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp
index f7319f7ee..32e0cc556 100644
--- a/src/utils/xml/libxml.cpp
+++ b/src/utils/xml/libxml.cpp
@@ -24,7 +24,7 @@
 
 #include "utils/xml/libxml.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/checkutils.h"
 #include "utils/fuzzer.h"
diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp
index 09bdd75aa..0c9e2bee9 100644
--- a/src/utils/xml/pugixml.cpp
+++ b/src/utils/xml/pugixml.cpp
@@ -24,7 +24,7 @@
 
 #include "utils/xml/pugixml.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
diff --git a/src/utils/xml/pugixmlwriter.cpp b/src/utils/xml/pugixmlwriter.cpp
index 29e79cc76..b8c6aafec 100644
--- a/src/utils/xml/pugixmlwriter.cpp
+++ b/src/utils/xml/pugixmlwriter.cpp
@@ -24,7 +24,7 @@
 
 #include "logger.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/delete2.h"
 #include "utils/fuzzer.h"
diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp
index 214d08f42..60e9070d9 100644
--- a/src/utils/xml/tinyxml2.cpp
+++ b/src/utils/xml/tinyxml2.cpp
@@ -24,7 +24,7 @@
 
 #include "utils/xml/tinyxml2.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "utils/checkutils.h"
 #include "utils/fuzzer.h"
diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc
index 27bb18cd3..41297339c 100644
--- a/src/utils/xml_unittest.cc
+++ b/src/utils/xml_unittest.cc
@@ -27,7 +27,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"
 #include "gui/theme.h"
diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc
index 4752eaa53..3d9983d7e 100644
--- a/src/utils/xmlutils_unittest.cc
+++ b/src/utils/xmlutils_unittest.cc
@@ -26,7 +26,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs/virtfs.h"
+#include "fs/virtfs/fs.h"
 
 #include "gui/gui.h"