aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Fedchin <anightik@gmail.com>2018-04-03 17:09:05 +0300
committerAnton Fedchin <anightik@gmail.com>2018-04-04 11:32:46 +0300
commitcde9602e736292ad651304cf6816794d64734fa1 (patch)
tree3a214353eeb35546bde2c4c8485c11a8b75f5363
parent66047942b9cd900c071f21b397b5c336ae8191d5 (diff)
[win32] filesystem: move implementation to platform folder
-rw-r--r--cmake/treedata/windows/subdirs.txt28
-rw-r--r--cmake/treedata/windowsstore/subdirs.txt12
-rw-r--r--xbmc/filesystem/CacheStrategy.cpp2
-rw-r--r--xbmc/filesystem/DirectoryFactory.cpp4
-rw-r--r--xbmc/filesystem/FileFactory.cpp4
-rw-r--r--xbmc/platform/win32/filesystem/CMakeLists.txt (renamed from xbmc/filesystem/win32/CMakeLists.txt)0
-rw-r--r--xbmc/platform/win32/filesystem/Win32Directory.cpp (renamed from xbmc/filesystem/win32/Win32Directory.cpp)0
-rw-r--r--xbmc/platform/win32/filesystem/Win32Directory.h (renamed from xbmc/filesystem/win32/Win32Directory.h)0
-rw-r--r--xbmc/platform/win32/filesystem/Win32File.cpp (renamed from xbmc/filesystem/win32/Win32File.cpp)0
-rw-r--r--xbmc/platform/win32/filesystem/Win32File.h (renamed from xbmc/filesystem/win32/Win32File.h)0
-rw-r--r--xbmc/platform/win32/filesystem/Win32SMBDirectory.cpp (renamed from xbmc/filesystem/win32/Win32SMBDirectory.cpp)0
-rw-r--r--xbmc/platform/win32/filesystem/Win32SMBDirectory.h (renamed from xbmc/filesystem/win32/Win32SMBDirectory.h)0
-rw-r--r--xbmc/platform/win32/filesystem/Win32SMBFile.cpp (renamed from xbmc/filesystem/win32/Win32SMBFile.cpp)0
-rw-r--r--xbmc/platform/win32/filesystem/Win32SMBFile.h (renamed from xbmc/filesystem/win32/Win32SMBFile.h)0
14 files changed, 25 insertions, 25 deletions
diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt
index b08283fcb4..0a894ecc59 100644
--- a/cmake/treedata/windows/subdirs.txt
+++ b/cmake/treedata/windows/subdirs.txt
@@ -1,17 +1,17 @@
-xbmc/platform/win32 platform/win32
-xbmc/platform/win32/input platworm/win32/input
-xbmc/input/touch input/touch
-xbmc/input/touch/generic input/touch/generic
-xbmc/network/windows network/windows
-xbmc/network/mdns network/mdns
-xbmc/peripherals/bus/win32 peripherals/bus/win32
-xbmc/powermanagement/windows powermanagement/windows
-xbmc/storage/windows storage/windows
-xbmc/filesystem/win32 filesystem/win32
-xbmc/utils/win32 utils/win32
-xbmc/rendering/dx rendering/dx
-xbmc/threads/platform/win threads/win
-xbmc/windowing/windows windowing/windows
+xbmc/platform/win32 platform/win32
+xbmc/platform/win32/input platworm/win32/input
+xbmc/platform/win32/filesystem platform/win32/filesystem
+xbmc/input/touch input/touch
+xbmc/input/touch/generic input/touch/generic
+xbmc/network/windows network/windows
+xbmc/network/mdns network/mdns
+xbmc/peripherals/bus/win32 peripherals/bus/win32
+xbmc/powermanagement/windows powermanagement/windows
+xbmc/storage/windows storage/windows
+xbmc/utils/win32 utils/win32
+xbmc/rendering/dx rendering/dx
+xbmc/threads/platform/win threads/win
+xbmc/windowing/windows windowing/windows
xbmc/cores/RetroPlayer/process/windows cores/RetroPlayer/process/windows
xbmc/cores/RetroPlayer/rendering/VideoShaders/windows cores/RetroPlayer/rendering/VideoShaders/windows
xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows
diff --git a/cmake/treedata/windowsstore/subdirs.txt b/cmake/treedata/windowsstore/subdirs.txt
index 1d16c86535..4b94e81e44 100644
--- a/cmake/treedata/windowsstore/subdirs.txt
+++ b/cmake/treedata/windowsstore/subdirs.txt
@@ -1,5 +1,6 @@
-xbmc/platform/win10 platform_win10
-xbmc/platform/win10/filesystem platform_win10_filesystem
+xbmc/platform/win10 platform/win10
+xbmc/platform/win10/filesystem platform/win10/filesystem
+xbmc/platform/win32/filesystem platform/win32/filesystem
xbmc/input/touch input/touch
xbmc/input/touch/generic input/touch/generic
xbmc/network/win10 network/win10
@@ -7,9 +8,8 @@ xbmc/network/mdns network/mdns
xbmc/peripherals/bus/win10 peripherals/bus/win10
xbmc/powermanagement/win10 powermanagement/win10
xbmc/storage/win10 storage/win10
-xbmc/filesystem/win32 filesystem/win32
-xbmc/utils/win32 utils_win32
-xbmc/rendering/dx rendering_dx
-xbmc/threads/platform/win threads_win
+xbmc/utils/win32 utils/win32
+xbmc/rendering/dx rendering/dx
+xbmc/threads/platform/win threads/win
xbmc/windowing/win10 windowing/win10
xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows
diff --git a/xbmc/filesystem/CacheStrategy.cpp b/xbmc/filesystem/CacheStrategy.cpp
index 10c332e500..442cb2ddc9 100644
--- a/xbmc/filesystem/CacheStrategy.cpp
+++ b/xbmc/filesystem/CacheStrategy.cpp
@@ -33,7 +33,7 @@
#include "posix/PosixFile.h"
#define CacheLocalFile CPosixFile
#elif defined(TARGET_WINDOWS)
-#include "win32/Win32File.h"
+#include "platform/win32/filesystem/Win32File.h"
#define CacheLocalFile CWin32File
#endif // TARGET_WINDOWS
diff --git a/xbmc/filesystem/DirectoryFactory.cpp b/xbmc/filesystem/DirectoryFactory.cpp
index 7eb82ccd8b..16309d7182 100644
--- a/xbmc/filesystem/DirectoryFactory.cpp
+++ b/xbmc/filesystem/DirectoryFactory.cpp
@@ -44,14 +44,14 @@
#ifdef TARGET_POSIX
#include "posix/PosixDirectory.h"
#elif defined(TARGET_WINDOWS)
-#include "win32/Win32Directory.h"
+#include "platform/win32/filesystem/Win32Directory.h"
#ifdef TARGET_WINDOWS_STORE
#include "platform/win10/filesystem/WinLibraryDirectory.h"
#endif
#endif
#ifdef HAS_FILESYSTEM_SMB
#ifdef TARGET_WINDOWS
-#include "win32/Win32SMBDirectory.h"
+#include "platform/win32/filesystem/Win32SMBDirectory.h"
#else
#include "SMBDirectory.h"
#endif
diff --git a/xbmc/filesystem/FileFactory.cpp b/xbmc/filesystem/FileFactory.cpp
index 0feaeea1fa..7cf6e6f776 100644
--- a/xbmc/filesystem/FileFactory.cpp
+++ b/xbmc/filesystem/FileFactory.cpp
@@ -23,7 +23,7 @@
#ifdef TARGET_POSIX
#include "posix/PosixFile.h"
#elif defined(TARGET_WINDOWS)
-#include "win32/Win32File.h"
+#include "platform/win32/filesystem/Win32File.h"
#ifdef TARGET_WINDOWS_STORE
#include "platform/win10/filesystem/WinLibraryFile.h"
#endif
@@ -33,7 +33,7 @@
#include "ShoutcastFile.h"
#ifdef HAS_FILESYSTEM_SMB
#ifdef TARGET_WINDOWS
-#include "win32/Win32SMBFile.h"
+#include "platform/win32/filesystem/Win32SMBFile.h"
#else
#include "SMBFile.h"
#endif
diff --git a/xbmc/filesystem/win32/CMakeLists.txt b/xbmc/platform/win32/filesystem/CMakeLists.txt
index 1ed9cab3c8..1ed9cab3c8 100644
--- a/xbmc/filesystem/win32/CMakeLists.txt
+++ b/xbmc/platform/win32/filesystem/CMakeLists.txt
diff --git a/xbmc/filesystem/win32/Win32Directory.cpp b/xbmc/platform/win32/filesystem/Win32Directory.cpp
index 6fe8a806e0..6fe8a806e0 100644
--- a/xbmc/filesystem/win32/Win32Directory.cpp
+++ b/xbmc/platform/win32/filesystem/Win32Directory.cpp
diff --git a/xbmc/filesystem/win32/Win32Directory.h b/xbmc/platform/win32/filesystem/Win32Directory.h
index ed9edf67a0..ed9edf67a0 100644
--- a/xbmc/filesystem/win32/Win32Directory.h
+++ b/xbmc/platform/win32/filesystem/Win32Directory.h
diff --git a/xbmc/filesystem/win32/Win32File.cpp b/xbmc/platform/win32/filesystem/Win32File.cpp
index 7730e59263..7730e59263 100644
--- a/xbmc/filesystem/win32/Win32File.cpp
+++ b/xbmc/platform/win32/filesystem/Win32File.cpp
diff --git a/xbmc/filesystem/win32/Win32File.h b/xbmc/platform/win32/filesystem/Win32File.h
index ddac963275..ddac963275 100644
--- a/xbmc/filesystem/win32/Win32File.h
+++ b/xbmc/platform/win32/filesystem/Win32File.h
diff --git a/xbmc/filesystem/win32/Win32SMBDirectory.cpp b/xbmc/platform/win32/filesystem/Win32SMBDirectory.cpp
index d55b4e5adf..d55b4e5adf 100644
--- a/xbmc/filesystem/win32/Win32SMBDirectory.cpp
+++ b/xbmc/platform/win32/filesystem/Win32SMBDirectory.cpp
diff --git a/xbmc/filesystem/win32/Win32SMBDirectory.h b/xbmc/platform/win32/filesystem/Win32SMBDirectory.h
index fcd3e6a418..fcd3e6a418 100644
--- a/xbmc/filesystem/win32/Win32SMBDirectory.h
+++ b/xbmc/platform/win32/filesystem/Win32SMBDirectory.h
diff --git a/xbmc/filesystem/win32/Win32SMBFile.cpp b/xbmc/platform/win32/filesystem/Win32SMBFile.cpp
index 12c03ff25b..12c03ff25b 100644
--- a/xbmc/filesystem/win32/Win32SMBFile.cpp
+++ b/xbmc/platform/win32/filesystem/Win32SMBFile.cpp
diff --git a/xbmc/filesystem/win32/Win32SMBFile.h b/xbmc/platform/win32/filesystem/Win32SMBFile.h
index 589098883d..589098883d 100644
--- a/xbmc/filesystem/win32/Win32SMBFile.h
+++ b/xbmc/platform/win32/filesystem/Win32SMBFile.h