Skip to content
This repository
Browse code

Merge pull request #2183 from Montellese/view_lib

move all view related files into xbmc/view
  • Loading branch information...
commit 3f8b637840acec1e23f21c8a7f283aadefe4c46f 2 parents a2de8ff + 2fd3323
jmarshallnz authored February 04, 2013

Showing 38 changed files with 70 additions and 47 deletions. Show diff stats Hide diff stats

  1. 1  Makefile.in
  2. 14  project/VS2010Express/XBMC.vcxproj
  3. 31  project/VS2010Express/XBMC.vcxproj.filters
  4. 2  xbmc/DatabaseManager.cpp
  5. 3  xbmc/Makefile.in
  6. 2  xbmc/addons/GUIViewStateAddonBrowser.cpp
  7. 2  xbmc/addons/GUIViewStateAddonBrowser.h
  8. 2  xbmc/dialogs/GUIDialogFileBrowser.h
  9. 2  xbmc/dialogs/GUIDialogSelect.h
  10. 2  xbmc/music/GUIViewStateMusic.h
  11. 2  xbmc/network/upnp/UPnPServer.cpp
  12. 2  xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h
  13. 2  xbmc/pictures/GUIViewStatePictures.cpp
  14. 2  xbmc/pictures/GUIViewStatePictures.h
  15. 2  xbmc/programs/GUIViewStatePrograms.cpp
  16. 2  xbmc/programs/GUIViewStatePrograms.h
  17. 2  xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
  18. 2  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
  19. 2  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h
  20. 2  xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h
  21. 2  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
  22. 2  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h
  23. 2  xbmc/pvr/windows/GUIViewStatePVR.h
  24. 2  xbmc/settings/GUIWindowSettingsCategory.cpp
  25. 2  xbmc/settings/Settings.h
  26. 2  xbmc/video/GUIViewStateVideo.h
  27. 2  xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
  28. 2  xbmc/video/dialogs/GUIDialogVideoBookmarks.h
  29. 0  xbmc/{ → view}/GUIViewControl.cpp
  30. 2  xbmc/{ → view}/GUIViewControl.h
  31. 4  xbmc/{ → view}/GUIViewState.cpp
  32. 0  xbmc/{ → view}/GUIViewState.h
  33. 8  xbmc/view/Makefile
  34. 2  xbmc/{ → view}/ViewDatabase.cpp
  35. 0  xbmc/{ → view}/ViewDatabase.h
  36. 0  xbmc/{ → view}/ViewState.h
  37. 2  xbmc/windows/GUIMediaWindow.h
  38. 2  xbmc/windows/GUIWindowLoginScreen.h
1  Makefile.in
@@ -83,6 +83,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
83 83
                    xbmc/video/dialogs/videodialogs.a \
84 84
                    xbmc/video/video.a \
85 85
                    xbmc/video/windows/videowindows.a \
  86
+                   xbmc/view/view.a \
86 87
                    xbmc/windowing/windowing.a \
87 88
                    xbmc/windows/windows.a \
88 89
                    xbmc/xbmc.a \
14  project/VS2010Express/XBMC.vcxproj
@@ -693,8 +693,6 @@
693 693
     <ClCompile Include="..\..\xbmc\guilib\XBTF.cpp" />
694 694
     <ClCompile Include="..\..\xbmc\guilib\XBTFReader.cpp" />
695 695
     <ClCompile Include="..\..\xbmc\GUIPassword.cpp" />
696  
-    <ClCompile Include="..\..\xbmc\GUIViewControl.cpp" />
697  
-    <ClCompile Include="..\..\xbmc\GUIViewState.cpp" />
698 696
     <ClCompile Include="..\..\xbmc\input\ButtonTranslator.cpp" />
699 697
     <ClCompile Include="..\..\xbmc\input\InertialScrollingHandler.cpp" />
700 698
     <ClCompile Include="..\..\xbmc\input\KeyboardLayoutConfiguration.cpp" />
@@ -1646,7 +1644,9 @@
1646 1644
     <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoBase.cpp" />
1647 1645
     <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoNav.cpp" />
1648 1646
     <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.cpp" />
1649  
-    <ClCompile Include="..\..\xbmc\ViewDatabase.cpp" />
  1647
+    <ClCompile Include="..\..\xbmc\view\GUIViewControl.cpp" />
  1648
+    <ClCompile Include="..\..\xbmc\view\GUIViewState.cpp" />
  1649
+    <ClCompile Include="..\..\xbmc\view\ViewDatabase.cpp" />
1650 1650
     <ClCompile Include="..\..\xbmc\win32\pch.cpp">
1651 1651
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Create</PrecompiledHeader>
1652 1652
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Create</PrecompiledHeader>
@@ -2143,8 +2143,6 @@
2143 2143
     <ClInclude Include="..\..\xbmc\guilib\XBTFReader.h" />
2144 2144
     <ClInclude Include="..\..\xbmc\GUIPassword.h" />
2145 2145
     <ClInclude Include="..\..\xbmc\GUIUserMessages.h" />
2146  
-    <ClInclude Include="..\..\xbmc\GUIViewControl.h" />
2147  
-    <ClInclude Include="..\..\xbmc\GUIViewState.h" />
2148 2146
     <ClInclude Include="..\..\xbmc\input\ButtonTranslator.h" />
2149 2147
     <ClInclude Include="..\..\xbmc\input\InertialScrollingHandler.h" />
2150 2148
     <ClInclude Include="..\..\xbmc\input\KeyboardLayoutConfiguration.h" />
@@ -2492,8 +2490,10 @@
2492 2490
     <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoBase.h" />
2493 2491
     <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoNav.h" />
2494 2492
     <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.h" />
2495  
-    <ClInclude Include="..\..\xbmc\ViewDatabase.h" />
2496  
-    <ClInclude Include="..\..\xbmc\ViewState.h" />
  2493
+    <ClInclude Include="..\..\xbmc\view\GUIViewControl.h" />
  2494
+    <ClInclude Include="..\..\xbmc\view\GUIViewState.h" />
  2495
+    <ClInclude Include="..\..\xbmc\view\ViewDatabase.h" />
  2496
+    <ClInclude Include="..\..\xbmc\view\ViewState.h" />
2497 2497
     <ClInclude Include="..\..\xbmc\win32\pch.h" />
2498 2498
     <ClInclude Include="..\..\xbmc\win32\PlatformDefs.h" />
2499 2499
     <ClInclude Include="..\..\xbmc\XBDateTime.h" />
31  project/VS2010Express/XBMC.vcxproj.filters
@@ -280,6 +280,9 @@
280 280
     <Filter Include="interfaces\python\test">
281 281
       <UniqueIdentifier>{0a84b5ee-2ad4-4ae2-9a8d-fc585c6d8aae}</UniqueIdentifier>
282 282
     </Filter>
  283
+    <Filter Include="view">
  284
+      <UniqueIdentifier>{90f512bb-8cda-4f04-b938-4f48d29bc82a}</UniqueIdentifier>
  285
+    </Filter>
283 286
   </ItemGroup>
284 287
   <ItemGroup>
285 288
     <ClCompile Include="..\..\xbmc\win32\pch.cpp">
@@ -2496,7 +2499,6 @@
2496 2499
     <ClCompile Include="..\..\xbmc\utils\Screenshot.cpp">
2497 2500
       <Filter>utils</Filter>
2498 2501
     </ClCompile>
2499  
-    <ClCompile Include="..\..\xbmc\ViewDatabase.cpp" />
2500 2502
     <ClCompile Include="..\..\xbmc\ApplicationMessenger.cpp" />
2501 2503
     <ClCompile Include="..\..\xbmc\Autorun.cpp" />
2502 2504
     <ClCompile Include="..\..\xbmc\AutoSwitch.cpp" />
@@ -2522,8 +2524,6 @@
2522 2524
     <ClCompile Include="..\..\xbmc\XBApplicationEx.cpp" />
2523 2525
     <ClCompile Include="..\..\xbmc\XBDateTime.cpp" />
2524 2526
     <ClCompile Include="..\..\xbmc\GUILargeTextureManager.cpp" />
2525  
-    <ClCompile Include="..\..\xbmc\GUIViewControl.cpp" />
2526  
-    <ClCompile Include="..\..\xbmc\GUIViewState.cpp" />
2527 2527
     <ClCompile Include="..\..\xbmc\ThumbLoader.cpp" />
2528 2528
     <ClCompile Include="..\..\xbmc\BackgroundInfoLoader.cpp" />
2529 2529
     <ClCompile Include="..\..\xbmc\pictures\PictureThumbLoader.cpp">
@@ -2963,6 +2963,15 @@
2963 2963
     <ClCompile Include="..\..\xbmc\video\FFmpegVideoDecoder.cpp">
2964 2964
       <Filter>video</Filter>
2965 2965
     </ClCompile>
  2966
+    <ClCompile Include="..\..\xbmc\view\GUIViewControl.cpp">
  2967
+      <Filter>view</Filter>
  2968
+    </ClCompile>
  2969
+    <ClCompile Include="..\..\xbmc\view\GUIViewState.cpp">
  2970
+      <Filter>view</Filter>
  2971
+    </ClCompile>
  2972
+    <ClCompile Include="..\..\xbmc\view\ViewDatabase.cpp">
  2973
+      <Filter>view</Filter>
  2974
+    </ClCompile>
2966 2975
   </ItemGroup>
2967 2976
   <ItemGroup>
2968 2977
     <ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -5480,7 +5489,6 @@
5480 5489
     <ClInclude Include="..\..\xbmc\video\VideoDatabase.h">
5481 5490
       <Filter>video</Filter>
5482 5491
     </ClInclude>
5483  
-    <ClInclude Include="..\..\xbmc\ViewDatabase.h" />
5484 5492
     <ClInclude Include="..\..\xbmc\ApplicationMessenger.h" />
5485 5493
     <ClInclude Include="..\..\xbmc\Autorun.h" />
5486 5494
     <ClInclude Include="..\..\xbmc\AutoSwitch.h" />
@@ -5510,9 +5518,6 @@
5510 5518
     <ClInclude Include="..\..\xbmc\XBApplicationEx.h" />
5511 5519
     <ClInclude Include="..\..\xbmc\XBDateTime.h" />
5512 5520
     <ClInclude Include="..\..\xbmc\GUILargeTextureManager.h" />
5513  
-    <ClInclude Include="..\..\xbmc\GUIViewControl.h" />
5514  
-    <ClInclude Include="..\..\xbmc\GUIViewState.h" />
5515  
-    <ClInclude Include="..\..\xbmc\ViewState.h" />
5516 5521
     <ClInclude Include="..\..\xbmc\ThumbLoader.h" />
5517 5522
     <ClInclude Include="..\..\xbmc\pictures\PictureThumbLoader.h">
5518 5523
       <Filter>pictures</Filter>
@@ -5788,6 +5793,18 @@
5788 5793
     <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h">
5789 5794
       <Filter>video</Filter>
5790 5795
     </ClInclude>
  5796
+    <ClInclude Include="..\..\xbmc\view\GUIViewControl.h">
  5797
+      <Filter>view</Filter>
  5798
+    </ClInclude>
  5799
+    <ClInclude Include="..\..\xbmc\view\GUIViewState.h">
  5800
+      <Filter>view</Filter>
  5801
+    </ClInclude>
  5802
+    <ClInclude Include="..\..\xbmc\view\ViewDatabase.h">
  5803
+      <Filter>view</Filter>
  5804
+    </ClInclude>
  5805
+    <ClInclude Include="..\..\xbmc\view\ViewState.h">
  5806
+      <Filter>view</Filter>
  5807
+    </ClInclude>
5791 5808
   </ItemGroup>
5792 5809
   <ItemGroup>
5793 5810
     <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
2  xbmc/DatabaseManager.cpp
@@ -21,7 +21,7 @@
21 21
 #include "DatabaseManager.h"
22 22
 #include "utils/log.h"
23 23
 #include "addons/AddonDatabase.h"
24  
-#include "ViewDatabase.h"
  24
+#include "view/ViewDatabase.h"
25 25
 #include "TextureDatabase.h"
26 26
 #include "music/MusicDatabase.h"
27 27
 #include "video/VideoDatabase.h"
3  xbmc/Makefile.in
@@ -13,8 +13,6 @@ SRCS=Application.cpp \
13 13
      GUIInfoManager.cpp \
14 14
      GUILargeTextureManager.cpp \
15 15
      GUIPassword.cpp \
16  
-     GUIViewControl.cpp \
17  
-     GUIViewState.cpp \
18 16
      MediaSource.cpp \
19 17
      NfoFile.cpp \
20 18
      PasswordManager.cpp \
@@ -30,7 +28,6 @@ SRCS=Application.cpp \
30 28
      ThumbnailCache.cpp \
31 29
      URL.cpp \
32 30
      Util.cpp \
33  
-     ViewDatabase.cpp \
34 31
      XBApplicationEx.cpp \
35 32
      XBDateTime.cpp \
36 33
      xbmc.cpp \
2  xbmc/addons/GUIViewStateAddonBrowser.cpp
@@ -21,7 +21,7 @@
21 21
 #include "GUIViewStateAddonBrowser.h"
22 22
 #include "FileItem.h"
23 23
 #include "guilib/Key.h"
24  
-#include "ViewState.h"
  24
+#include "view/ViewState.h"
25 25
 #include "settings/Settings.h"
26 26
 #include "addons/Addon.h"
27 27
 #include "addons/AddonManager.h"
2  xbmc/addons/GUIViewStateAddonBrowser.h
@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23  
-#include "GUIViewState.h"
  23
+#include "view/GUIViewState.h"
24 24
 
25 25
 class CGUIViewStateAddonBrowser : public CGUIViewState
26 26
 {
2  xbmc/dialogs/GUIDialogFileBrowser.h
@@ -23,7 +23,7 @@
23 23
 #include "guilib/GUIDialog.h"
24 24
 #include "filesystem/VirtualDirectory.h"
25 25
 #include "filesystem/DirectoryHistory.h"
26  
-#include "GUIViewControl.h"
  26
+#include "view/GUIViewControl.h"
27 27
 #include "pictures/PictureThumbLoader.h"
28 28
 
29 29
 class CFileItem;
2  xbmc/dialogs/GUIDialogSelect.h
@@ -22,7 +22,7 @@
22 22
 
23 23
 #include "GUIDialogBoxBase.h"
24 24
 #include "guilib/GUIListItem.h"
25  
-#include "GUIViewControl.h"
  25
+#include "view/GUIViewControl.h"
26 26
 
27 27
 class CFileItem;
28 28
 class CFileItemList;
2  xbmc/music/GUIViewStateMusic.h
@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23  
-#include "GUIViewState.h"
  23
+#include "view/GUIViewState.h"
24 24
 
25 25
 class CGUIViewStateWindowMusic : public CGUIViewState
26 26
 {
2  xbmc/network/upnp/UPnPServer.cpp
... ...
@@ -1,7 +1,7 @@
1 1
 #include "UPnPServer.h"
2 2
 #include "UPnPInternal.h"
3 3
 #include "Application.h"
4  
-#include "GUIViewState.h"
  4
+#include "view/GUIViewState.h"
5 5
 #include "Platinum.h"
6 6
 #include "video/VideoThumbLoader.h"
7 7
 #include "music/Artist.h"
2  xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h
@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 #include "guilib/GUIDialog.h"
23  
-#include "GUIViewControl.h"
  23
+#include "view/GUIViewControl.h"
24 24
 
25 25
 namespace PERIPHERALS
26 26
 {
2  xbmc/pictures/GUIViewStatePictures.cpp
@@ -20,7 +20,7 @@
20 20
 
21 21
 #include "GUIViewStatePictures.h"
22 22
 #include "FileItem.h"
23  
-#include "ViewState.h"
  23
+#include "view/ViewState.h"
24 24
 #include "settings/GUISettings.h"
25 25
 #include "settings/AdvancedSettings.h"
26 26
 #include "settings/Settings.h"
2  xbmc/pictures/GUIViewStatePictures.h
@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23  
-#include "GUIViewState.h"
  23
+#include "view/GUIViewState.h"
24 24
 
25 25
 class CGUIViewStateWindowPictures : public CGUIViewState
26 26
 {
2  xbmc/programs/GUIViewStatePrograms.cpp
@@ -20,7 +20,7 @@
20 20
 
21 21
 #include "GUIViewStatePrograms.h"
22 22
 #include "FileItem.h"
23  
-#include "ViewState.h"
  23
+#include "view/ViewState.h"
24 24
 #include "settings/GUISettings.h"
25 25
 #include "settings/Settings.h"
26 26
 #include "filesystem/Directory.h"
2  xbmc/programs/GUIViewStatePrograms.h
@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23  
-#include "GUIViewState.h"
  23
+#include "view/GUIViewState.h"
24 24
 
25 25
 class CGUIViewStateWindowPrograms : public CGUIViewState
26 26
 {
2  xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
@@ -21,7 +21,7 @@
21 21
 
22 22
 #include "guilib/GUIDialog.h"
23 23
 #include "dialogs/GUIDialogContextMenu.h"
24  
-#include "GUIViewControl.h"
  24
+#include "view/GUIViewControl.h"
25 25
 #include "../channels/PVRChannelGroup.h"
26 26
 
27 27
 namespace PVR
2  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
@@ -27,7 +27,7 @@
27 27
 #include "dialogs/GUIDialogKaiToast.h"
28 28
 #include "dialogs/GUIDialogOK.h"
29 29
 #include "GUIDialogPVRGuideInfo.h"
30  
-#include "ViewState.h"
  30
+#include "view/ViewState.h"
31 31
 #include "settings/GUISettings.h"
32 32
 #include "GUIInfoManager.h"
33 33
 
2  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h
@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 #include "guilib/GUIDialog.h"
23  
-#include "GUIViewControl.h"
  23
+#include "view/GUIViewControl.h"
24 24
 #include "utils/Observer.h"
25 25
 #include "pvr/channels/PVRChannelGroupsContainer.h"
26 26
 #include <map>
2  xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h
@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 #include "guilib/GUIDialog.h"
23  
-#include "GUIViewControl.h"
  23
+#include "view/GUIViewControl.h"
24 24
 #include "../channels/PVRChannelGroup.h"
25 25
 
26 26
 class CFileItemList;
2  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
@@ -23,7 +23,7 @@
23 23
 #include "FileItem.h"
24 24
 #include "GUIDialogPVRGuideInfo.h"
25 25
 #include "guilib/GUIWindowManager.h"
26  
-#include "ViewState.h"
  26
+#include "view/ViewState.h"
27 27
 #include "epg/Epg.h"
28 28
 
29 29
 #include "pvr/PVRManager.h"
2  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h
@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 #include "guilib/GUIDialog.h"
23  
-#include "GUIViewControl.h"
  23
+#include "view/GUIViewControl.h"
24 24
 
25 25
 class CFileItemList;
26 26
 
2  xbmc/pvr/windows/GUIViewStatePVR.h
@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23  
-#include "GUIViewState.h"
  23
+#include "view/GUIViewState.h"
24 24
 #include "GUIWindowPVRCommon.h"
25 25
 
26 26
 namespace PVR
2  xbmc/settings/GUIWindowSettingsCategory.cpp
@@ -34,7 +34,7 @@
34 34
 #include "utils/Weather.h"
35 35
 #include "music/MusicDatabase.h"
36 36
 #include "video/VideoDatabase.h"
37  
-#include "ViewDatabase.h"
  37
+#include "view/ViewDatabase.h"
38 38
 #ifdef HAS_LCD
39 39
 #include "utils/LCDFactory.h"
40 40
 #endif
2  xbmc/settings/Settings.h
@@ -45,7 +45,7 @@
45 45
 
46 46
 #include "settings/VideoSettings.h"
47 47
 #include "Profile.h"
48  
-#include "ViewState.h"
  48
+#include "view/ViewState.h"
49 49
 #include "guilib/Resolution.h"
50 50
 #include "guilib/GraphicContext.h"
51 51
 
2  xbmc/video/GUIViewStateVideo.h
@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23  
-#include "GUIViewState.h"
  23
+#include "view/GUIViewState.h"
24 24
 
25 25
 class CGUIViewStateWindowVideo : public CGUIViewState
26 26
 {
2  xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -28,7 +28,7 @@
28 28
 #endif
29 29
 #include "pictures/Picture.h"
30 30
 #include "dialogs/GUIDialogContextMenu.h"
31  
-#include "ViewState.h"
  31
+#include "view/ViewState.h"
32 32
 #include "settings/Settings.h"
33 33
 #include "settings/AdvancedSettings.h"
34 34
 #include "FileItem.h"
2  xbmc/video/dialogs/GUIDialogVideoBookmarks.h
@@ -21,7 +21,7 @@
21 21
  */
22 22
 
23 23
 #include "guilib/GUIDialog.h"
24  
-#include "GUIViewControl.h"
  24
+#include "view/GUIViewControl.h"
25 25
 #include "video/VideoDatabase.h"
26 26
 
27 27
 class CFileItemList;
0  xbmc/GUIViewControl.cpp → xbmc/view/GUIViewControl.cpp
File renamed without changes
2  xbmc/GUIViewControl.h → xbmc/view/GUIViewControl.h
@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23  
-#include "GUIViewState.h"
  23
+#include "view/GUIViewState.h"
24 24
 
25 25
 #include "guilib/GUIBaseContainer.h"
26 26
 
4  xbmc/GUIViewState.cpp → xbmc/view/GUIViewState.cpp
@@ -18,7 +18,7 @@
18 18
  *
19 19
  */
20 20
 
21  
-#include "GUIViewState.h"
  21
+#include "view/GUIViewState.h"
22 22
 #include "pvr/windows/GUIViewStatePVR.h"
23 23
 #include "addons/GUIViewStateAddonBrowser.h"
24 24
 #include "music/GUIViewStateMusic.h"
@@ -35,7 +35,7 @@
35 35
 #include "addons/Addon.h"
36 36
 #include "addons/AddonManager.h"
37 37
 #include "addons/PluginSource.h"
38  
-#include "ViewState.h"
  38
+#include "view/ViewState.h"
39 39
 #include "settings/GUISettings.h"
40 40
 #include "settings/AdvancedSettings.h"
41 41
 #include "settings/Settings.h"
0  xbmc/GUIViewState.h → xbmc/view/GUIViewState.h
File renamed without changes
8  xbmc/view/Makefile
... ...
@@ -0,0 +1,8 @@
  1
+SRCS=GUIViewControl.cpp \
  2
+     GUIViewState.cpp \
  3
+     ViewDatabase.cpp \
  4
+
  5
+LIB=view.a
  6
+
  7
+include ../../Makefile.include
  8
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
2  xbmc/ViewDatabase.cpp → xbmc/view/ViewDatabase.cpp
@@ -21,7 +21,7 @@
21 21
 #include "ViewDatabase.h"
22 22
 #include "utils/URIUtils.h"
23 23
 #include "settings/Settings.h"
24  
-#include "ViewState.h"
  24
+#include "view/ViewState.h"
25 25
 #include "utils/log.h"
26 26
 #ifdef _LINUX
27 27
 #include "linux/ConvUtils.h" // GetLastError()
0  xbmc/ViewDatabase.h → xbmc/view/ViewDatabase.h
File renamed without changes
0  xbmc/ViewState.h → xbmc/view/ViewState.h
File renamed without changes
2  xbmc/windows/GUIMediaWindow.h
@@ -23,7 +23,7 @@
23 23
 #include "guilib/GUIWindow.h"
24 24
 #include "filesystem/VirtualDirectory.h"
25 25
 #include "filesystem/DirectoryHistory.h"
26  
-#include "GUIViewControl.h"
  26
+#include "view/GUIViewControl.h"
27 27
 #include "dialogs/GUIDialogContextMenu.h"
28 28
 #include "playlists/SmartPlayList.h"
29 29
 
2  xbmc/windows/GUIWindowLoginScreen.h
@@ -21,7 +21,7 @@
21 21
  */
22 22
 
23 23
 #include "guilib/GUIDialog.h"
24  
-#include "GUIViewControl.h"
  24
+#include "view/GUIViewControl.h"
25 25
 #include "utils/Stopwatch.h"
26 26
 
27 27
 class CFileItemList;

0 notes on commit 3f8b637

Please sign in to comment.
Something went wrong with that request. Please try again.