Move virtlist into virtfs directory.

13 files changed, 17 insertions, 16 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50c0c3545..61ddc6332 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -888,8 +888,8 @@ SET(SRCS
     fs/virtfs/virtfsrwops.h
     fs/virtfs/virtfstools.cpp
     fs/virtfs/virtfstools.h
-    fs/virtlist.cpp
-    fs/virtlist.h
+    fs/virtfs/virtlist.cpp
+    fs/virtfs/virtlist.h
     fs/virtfs/virtfs.cpp
     fs/virtfs/virtfs.h
     fs/virtfs/virtdirentry.cpp
@@ -1789,8 +1789,8 @@ SET(DYE_CMD_SRCS
     fs/virtfs/virtfsrwops.h
     fs/virtfs/virtfstools.cpp
     fs/virtfs/virtfstools.h
-    fs/virtlist.cpp
-    fs/virtlist.h
+    fs/virtfs/virtlist.cpp
+    fs/virtfs/virtlist.h
     fs/virtfs/virtfs.cpp
     fs/virtfs/virtfs.h
     fs/virtfs/virtdirentry.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index fe3d0793b..21eba0710 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -575,8 +575,8 @@ BASE_SRC += events/actionevent.h \
 	      fs/virtfs/virtfsrwops.h \
 	      fs/virtfs/virtfstools.cpp \
 	      fs/virtfs/virtfstools.h \
-	      fs/virtlist.cpp \
-	      fs/virtlist.h \
+	      fs/virtfs/virtlist.cpp \
+	      fs/virtfs/virtlist.h \
 	      utils/process.cpp \
 	      utils/process.h \
 	      utils/sdl2helper.cpp \
diff --git a/src/fs/files.cpp b/src/fs/files.cpp
index 44ca4dc1d..91433e287 100644
--- a/src/fs/files.cpp
+++ b/src/fs/files.cpp
@@ -23,9 +23,10 @@
 #include "fs/mkdir.h"
 #if defined(ANDROID) || defined(__native_client__)
 #include "fs/paths.h"
+
 #include "fs/virtfs/virtfs.h"
 #include "fs/virtfs/virtfstools.h"
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 #endif  // defined(ANDROID) || defined(__native_client__)
 
 #include "utils/checkutils.h"
diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp
index 940bdb055..bab10197d 100644
--- a/src/fs/virtfs/virtfs.cpp
+++ b/src/fs/virtfs/virtfs.cpp
@@ -28,7 +28,7 @@
 #include "fs/virtfs/virtfsdir.h"
 #include "fs/virtfs/virtfsfuncs.h"
 #include "fs/virtfs/virtfszip.h"
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 #include "fs/virtfs/virtzipentry.h"
 #include "fs/virtfs/zip.h"
 
diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/fs/virtfs/virtfs_unittest.cc
index 8e060b77f..902620303 100644
--- a/src/fs/virtfs/virtfs_unittest.cc
+++ b/src/fs/virtfs/virtfs_unittest.cc
@@ -25,7 +25,7 @@
 #include "fs/virtfs/virtdirentry.h"
 #include "fs/virtfs/virtfs.h"
 #include "fs/virtfs/virtfstools.h"
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp
index 4e847f6cb..781182b8f 100644
--- a/src/fs/virtfs/virtfsdir.cpp
+++ b/src/fs/virtfs/virtfsdir.cpp
@@ -28,7 +28,7 @@
 #include "fs/virtfs/virtfile.h"
 #include "fs/virtfs/virtfileprivate.h"
 #include "fs/virtfs/virtfsfuncs.h"
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 
 #include "utils/checkutils.h"
 #include "utils/stringutils.h"
diff --git a/src/fs/virtfs/virtfstools.cpp b/src/fs/virtfs/virtfstools.cpp
index 9d2260694..957b73e6e 100644
--- a/src/fs/virtfs/virtfstools.cpp
+++ b/src/fs/virtfs/virtfstools.cpp
@@ -25,7 +25,7 @@
 #include "fs/paths.h"
 
 #include "fs/virtfs/virtfs.h"
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 
 #include "utils/stringutils.h"
 
diff --git a/src/fs/virtfs/virtfszip.cpp b/src/fs/virtfs/virtfszip.cpp
index ce08b935b..78c294f85 100644
--- a/src/fs/virtfs/virtfszip.cpp
+++ b/src/fs/virtfs/virtfszip.cpp
@@ -23,7 +23,7 @@
 #include "fs/virtfs/virtfile.h"
 #include "fs/virtfs/virtfileprivate.h"
 #include "fs/virtfs/virtfsfuncs.h"
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 #include "fs/virtfs/virtzipentry.h"
 #include "fs/virtfs/zip.h"
 #include "fs/virtfs/ziplocalheader.h"
diff --git a/src/fs/virtlist.cpp b/src/fs/virtfs/virtlist.cpp
index d561e6b66..a2e8219f6 100644
--- a/src/fs/virtlist.cpp
+++ b/src/fs/virtfs/virtlist.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 
 #include "debug.h"
 
diff --git a/src/fs/virtlist.h b/src/fs/virtfs/virtlist.h
index 5b1d10924..5b1d10924 100644
--- a/src/fs/virtlist.h
+++ b/src/fs/virtfs/virtlist.h
diff --git a/src/fs/virtfs_unittest.cc b/src/fs/virtfs_unittest.cc
index 271a95c66..1bd815f2b 100644
--- a/src/fs/virtfs_unittest.cc
+++ b/src/fs/virtfs_unittest.cc
@@ -25,7 +25,7 @@
 
 #include "fs/virtfs/virtfs.h"
 #include "fs/virtfs/virtfstools.h"
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 6829971a1..bffd212f7 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -31,7 +31,7 @@
 
 #include "fs/virtfs/virtfs.h"
 #include "fs/virtfs/virtfstools.h"
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 
 #include "gui/skin.h"
 #include "gui/themeinfo.h"
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 553e8c15b..79cb6bbbd 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -25,7 +25,7 @@
 #include "configuration.h"
 
 #include "fs/virtfs/virtfs.h"
-#include "fs/virtlist.h"
+#include "fs/virtfs/virtlist.h"
 
 #include "resources/wallpaperdata.h"