Merge pull request #3773 from Rawk/split_carchive_and_iarchivable

Split CArchive and IArchivable to seperate headers

22 files changed, 56 insertions, 16 deletions

diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
index bb82b277b4..7e3bb88672 100644
--- a/xbmc/FileItem.cpp
+++ b/xbmc/FileItem.cpp
@@ -22,6 +22,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
+#include "utils/Archive.h"
 #include "Util.h"
 #include "playlists/PlayListFactory.h"
 #include "utils/Crc32.h"
diff --git a/xbmc/FileItem.h b/xbmc/FileItem.h
index 286bd349b2..019c8cd8e7 100644
--- a/xbmc/FileItem.h
+++ b/xbmc/FileItem.h
@@ -25,7 +25,7 @@
  */
 
 #include "guilib/GUIListItem.h"
-#include "utils/Archive.h"
+#include "utils/IArchivable.h"
 #include "utils/ISerializable.h"
 #include "utils/ISortable.h"
 #include "XBDateTime.h"
diff --git a/xbmc/Temperature.cpp b/xbmc/Temperature.cpp
index 240af9dd06..c5dfa42569 100644
--- a/xbmc/Temperature.cpp
+++ b/xbmc/Temperature.cpp
@@ -22,6 +22,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "Temperature.h"
 #include "utils/StringUtils.h"
+#include "utils/Archive.h"
 
 CTemperature::CTemperature()
 {
diff --git a/xbmc/Temperature.h b/xbmc/Temperature.h
index 88ae4da92b..51b7efd808 100644
--- a/xbmc/Temperature.h
+++ b/xbmc/Temperature.h
@@ -20,7 +20,7 @@
  */
 
 #include <string>
-#include "utils/Archive.h"
+#include "utils/IArchivable.h"
 
 class CTemperature : public IArchivable
 {
diff --git a/xbmc/XBDateTime.cpp b/xbmc/XBDateTime.cpp
index 8d32a5f773..de24b9641a 100644
--- a/xbmc/XBDateTime.cpp
+++ b/xbmc/XBDateTime.cpp
@@ -23,6 +23,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
+#include "utils/Archive.h"
 #ifdef TARGET_POSIX
 #include "XTimeUtils.h"
 #include "XFileUtils.h"
diff --git a/xbmc/XBDateTime.h b/xbmc/XBDateTime.h
index 6851a40ff6..c2d7de2fde 100644
--- a/xbmc/XBDateTime.h
+++ b/xbmc/XBDateTime.h
@@ -21,7 +21,8 @@
  */
 
 #include "utils/StdString.h"
-#include "utils/Archive.h"
+#include "utils/IArchivable.h"
+#include "system.h"
 
 /*! \brief TIME_FORMAT enum/bitmask used for formatting time strings
  Note the use of bitmasking, e.g.
diff --git a/xbmc/addons/GUIViewStateAddonBrowser.cpp b/xbmc/addons/GUIViewStateAddonBrowser.cpp
index 633b9a2ded..6f486f38d3 100644
--- a/xbmc/addons/GUIViewStateAddonBrowser.cpp
+++ b/xbmc/addons/GUIViewStateAddonBrowser.cpp
@@ -20,6 +20,7 @@
 
 #include "GUIViewStateAddonBrowser.h"
 #include "FileItem.h"
+#include "filesystem/File.h"
 #include "guilib/GraphicContext.h"
 #include "guilib/WindowIDs.h"
 #include "view/ViewState.h"
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
index 7c38dfd8a2..17006b6b7b 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
@@ -49,6 +49,11 @@ enum DVDStreamType
 #define DVDSTREAM_BLOCK_SIZE_FILE (2048 * 16)
 #define DVDSTREAM_BLOCK_SIZE_DVD  2048
 
+namespace XFILE
+{
+  class CFile;
+}
+
 namespace PVR
 {
   class CPVRChannel;
diff --git a/xbmc/music/MusicInfoLoader.cpp b/xbmc/music/MusicInfoLoader.cpp
index 48640076df..a5705f5506 100644
--- a/xbmc/music/MusicInfoLoader.cpp
+++ b/xbmc/music/MusicInfoLoader.cpp
@@ -32,6 +32,7 @@
 #include "settings/Settings.h"
 #include "FileItem.h"
 #include "utils/log.h"
+#include "utils/Archive.h"
 #include "Artist.h"
 #include "Album.h"
 #include "MusicThumbLoader.h"
diff --git a/xbmc/music/tags/MusicInfoTag.cpp b/xbmc/music/tags/MusicInfoTag.cpp
index c6289268ae..3d68a625a2 100644
--- a/xbmc/music/tags/MusicInfoTag.cpp
+++ b/xbmc/music/tags/MusicInfoTag.cpp
@@ -24,6 +24,7 @@
 #include "utils/StringUtils.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/Variant.h"
+#include "utils/Archive.h"
 
 using namespace MUSIC_INFO;
 
diff --git a/xbmc/music/tags/MusicInfoTag.h b/xbmc/music/tags/MusicInfoTag.h
index 86047533bb..9380b7659d 100644
--- a/xbmc/music/tags/MusicInfoTag.h
+++ b/xbmc/music/tags/MusicInfoTag.h
@@ -27,7 +27,7 @@ class CArtist;
 #include <string>
 #include <stdint.h>
 
-#include "utils/Archive.h"
+#include "utils/IArchivable.h"
 #include "utils/ISerializable.h"
 #include "utils/ISortable.h"
 #include "XBDateTime.h"
diff --git a/xbmc/osx/smc.h b/xbmc/osx/smc.h
index bbc5f28a2e..a8cae5d056 100644
--- a/xbmc/osx/smc.h
+++ b/xbmc/osx/smc.h
@@ -19,6 +19,7 @@
 
 #ifndef __SMC_H__
 #define __SMC_H__
+#include <libkern/OSTypes.h>
 #endif
 
 #define SMC_VERSION               "0.01"
diff --git a/xbmc/pictures/PictureInfoTag.cpp b/xbmc/pictures/PictureInfoTag.cpp
index cffb691df1..832902131e 100644
--- a/xbmc/pictures/PictureInfoTag.cpp
+++ b/xbmc/pictures/PictureInfoTag.cpp
@@ -24,6 +24,7 @@
 #include "utils/Variant.h"
 #include "utils/CharsetConverter.h"
 #include "utils/StringUtils.h"
+#include "utils/Archive.h"
 
 using namespace std;
 
diff --git a/xbmc/pictures/PictureInfoTag.h b/xbmc/pictures/PictureInfoTag.h
index c47b8e70db..859f33ebc3 100644
--- a/xbmc/pictures/PictureInfoTag.h
+++ b/xbmc/pictures/PictureInfoTag.h
@@ -21,7 +21,7 @@
 
 #include "utils/ISerializable.h"
 #include "utils/ISortable.h"
-#include "utils/Archive.h"
+#include "utils/IArchivable.h"
 #include "DllLibExif.h"
 #include "XBDateTime.h"
 
diff --git a/xbmc/storage/DetectDVDType.cpp b/xbmc/storage/DetectDVDType.cpp
index 79f792837e..07939f3caf 100644
--- a/xbmc/storage/DetectDVDType.cpp
+++ b/xbmc/storage/DetectDVDType.cpp
@@ -28,6 +28,7 @@
 #include "utils/log.h"
 #include "cdioSupport.h"
 #include "filesystem/iso9660.h"
+#include "filesystem/File.h"
 #include "threads/SingleLock.h"
 #ifdef TARGET_POSIX
 #include <sys/types.h>
diff --git a/xbmc/utils/Archive.cpp b/xbmc/utils/Archive.cpp
index 4519e1914f..5f9861b6c5 100644
--- a/xbmc/utils/Archive.cpp
+++ b/xbmc/utils/Archive.cpp
@@ -20,6 +20,7 @@
 
 #include <cstring>
 #include "Archive.h"
+#include "IArchivable.h"
 #include "filesystem/File.h"
 #include "Variant.h"
 #include "utils/log.h"
diff --git a/xbmc/utils/Archive.h b/xbmc/utils/Archive.h
index 0148fcb537..b4d20adcd9 100644
--- a/xbmc/utils/Archive.h
+++ b/xbmc/utils/Archive.h
@@ -29,15 +29,7 @@ namespace XFILE
   class CFile;
 }
 class CVariant;
-
-class CArchive;
-
-class IArchivable
-{
-public:
-  virtual void Archive(CArchive& ar) = 0;
-  virtual ~IArchivable() {}
-};
+class IArchivable;
 
 class CArchive
 {
diff --git a/xbmc/utils/CPUInfo.h b/xbmc/utils/CPUInfo.h
index 093884b12e..2db47aa042 100644
--- a/xbmc/utils/CPUInfo.h
+++ b/xbmc/utils/CPUInfo.h
@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "Archive.h"
 #include <string>
 #include <map>
 #include "threads/SystemClock.h"
diff --git a/xbmc/utils/IArchivable.h b/xbmc/utils/IArchivable.h
new file mode 100644
index 0000000000..3738edacb8
--- /dev/null
+++ b/xbmc/utils/IArchivable.h
@@ -0,0 +1,31 @@
+#pragma once
+
+/*
+ *      Copyright (C) 2005-2013 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+class CArchive;
+
+class IArchivable
+{
+public:
+  virtual void Archive(CArchive& ar) = 0;
+  virtual ~IArchivable() {}
+};
+
diff --git a/xbmc/utils/StreamDetails.cpp b/xbmc/utils/StreamDetails.cpp
index 85edbbd723..06edfbab22 100644
--- a/xbmc/utils/StreamDetails.cpp
+++ b/xbmc/utils/StreamDetails.cpp
@@ -24,6 +24,7 @@
 #include "Variant.h"
 #include "LangInfo.h"
 #include "utils/LangCodeExpander.h"
+#include "utils/Archive.h"
 
 const float VIDEOASPECT_EPSILON = 0.025f;
 
diff --git a/xbmc/utils/StreamDetails.h b/xbmc/utils/StreamDetails.h
index b6306f5ce1..3372cfb4b7 100644
--- a/xbmc/utils/StreamDetails.h
+++ b/xbmc/utils/StreamDetails.h
@@ -20,7 +20,7 @@
  */
 
 #include "utils/StdString.h"
-#include "Archive.h"
+#include "utils/IArchivable.h"
 #include "ISerializable.h"
 #include <vector>
 
diff --git a/xbmc/video/VideoInfoTag.cpp b/xbmc/video/VideoInfoTag.cpp
index 5379ff74e0..373673ee19 100644
--- a/xbmc/video/VideoInfoTag.cpp
+++ b/xbmc/video/VideoInfoTag.cpp
@@ -25,6 +25,7 @@
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
+#include "utils/Archive.h"
 #include "TextureDatabase.h"
 #include "filesystem/File.h"