[darwin] storage: move implementation to platform folder

6 files changed, 11 insertions, 11 deletions

diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt
index 00f5cf115c..feafe5480a 100644
--- a/cmake/treedata/ios/subdirs.txt
+++ b/cmake/treedata/ios/subdirs.txt
@@ -5,13 +5,13 @@ xbmc/network/linux               network/linux
 xbmc/network/osx                 network/osx
 xbmc/peripherals/bus/osx         peripherals/bus/osx
 xbmc/powermanagement/osx         powermanagement/osx
-xbmc/storage/osx                 storage/osx
 xbmc/platform/posix              posix
-xbmc/platform/darwin             platform_darwin
-xbmc/platform/darwin/ios         platform_ios
-xbmc/platform/darwin/ios-common  platform_ios-common
+xbmc/platform/darwin             platform/darwin
+xbmc/platform/darwin/ios         platform/ios
+xbmc/platform/darwin/ios-common  platform/ios-common
+xbmc/platform/darwin/osx/storage  platform/osx/storage
 xbmc/filesystem/posix            filesystem/posix
-xbmc/utils/posix                 utils_posix
+xbmc/utils/posix                 utils/posix
 xbmc/windowing/osx               windowing/osx
 xbmc/cores/RetroPlayer/process/ios cores/RetroPlayer/process/ios
 xbmc/cores/VideoPlayer/Process/ios cores/VideoPlayer/Process/ios
diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt
index 5b1b3021d6..de61ea4940 100644
--- a/cmake/treedata/osx/subdirs.txt
+++ b/cmake/treedata/osx/subdirs.txt
@@ -3,12 +3,12 @@ xbmc/network/linux           network/linux
 xbmc/network/osx             network/osx
 xbmc/peripherals/bus/osx     peripherals/bus/osx
 xbmc/powermanagement/osx     powermanagement/osx
-xbmc/storage/osx             storage/osx
 xbmc/platform/posix          posix
-xbmc/platform/darwin         platform_darwin
-xbmc/platform/darwin/osx     platform_osx
+xbmc/platform/darwin         platform/darwin
+xbmc/platform/darwin/osx     platform/osx
+xbmc/platform/darwin/osx/storage  platform/osx/storage
 xbmc/filesystem/posix        filesystem/posix
-xbmc/utils/posix             utils_posix
+xbmc/utils/posix             utils/posix
 xbmc/windowing/osx           windowing/osx
 xbmc/cores/RetroPlayer/process/osx cores/RetroPlayer/process/osx
 xbmc/cores/VideoPlayer/Process/osx cores/VideoPlayer/Process/osx
diff --git a/xbmc/platform/darwin/osx/SDLMain.mm b/xbmc/platform/darwin/osx/SDLMain.mm
index f7aa09a81b..a301d845eb 100644
--- a/xbmc/platform/darwin/osx/SDLMain.mm
+++ b/xbmc/platform/darwin/osx/SDLMain.mm
@@ -18,7 +18,7 @@
 #import "platform/darwin/osx/CocoaInterface.h"
 #import "PlatformDefs.h"
 #import "messaging/ApplicationMessenger.h"
-#import "storage/osx/DarwinStorageProvider.h"
+#import "platform/darwin/osx/storage/DarwinStorageProvider.h"
 
 #import "platform/darwin/osx/HotKeyController.h"
 #import "platform/darwin/DarwinUtils.h"
diff --git a/xbmc/storage/osx/CMakeLists.txt b/xbmc/platform/darwin/osx/storage/CMakeLists.txt
index 8d1e86c4c8..9407297191 100644
--- a/xbmc/storage/osx/CMakeLists.txt
+++ b/xbmc/platform/darwin/osx/storage/CMakeLists.txt
@@ -2,4 +2,4 @@ set(SOURCES DarwinStorageProvider.cpp)
 
 set(HEADERS DarwinStorageProvider.h)
 
-core_add_library(storage_osx)
+core_add_library(platform_osx_storage)
diff --git a/xbmc/storage/osx/DarwinStorageProvider.cpp b/xbmc/platform/darwin/osx/storage/DarwinStorageProvider.cpp
index 566c87ba05..566c87ba05 100644
--- a/xbmc/storage/osx/DarwinStorageProvider.cpp
+++ b/xbmc/platform/darwin/osx/storage/DarwinStorageProvider.cpp
diff --git a/xbmc/storage/osx/DarwinStorageProvider.h b/xbmc/platform/darwin/osx/storage/DarwinStorageProvider.h
index 1c01f38493..1c01f38493 100644
--- a/xbmc/storage/osx/DarwinStorageProvider.h
+++ b/xbmc/platform/darwin/osx/storage/DarwinStorageProvider.h