[epg] Sort included files alphabetical

diff --git a/xbmc/epg/Epg.cpp b/xbmc/epg/Epg.cpp
index ef0453b..d966788 100644 (file)
--- a/xbmc/epg/Epg.cpp
+++ b/xbmc/epg/Epg.cpp
@@ -18,7 +18,10 @@
  *
  */
 
+#include "addons/include/xbmc_epg_types.h"
 #include "guilib/LocalizeStrings.h"
+#include "pvr/PVRManager.h"
+#include "pvr/addons/PVRClients.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "threads/SingleLock.h"
@@ -26,10 +29,6 @@
 
 #include "EpgDatabase.h"
 #include "EpgContainer.h"
-#include "pvr/PVRManager.h"
-#include "pvr/addons/PVRClients.h"
-
-#include "../addons/include/xbmc_epg_types.h"
 
 using namespace PVR;
 using namespace EPG;

diff --git a/xbmc/epg/Epg.h b/xbmc/epg/Epg.h
index 9411563..208ad66 100644 (file)
--- a/xbmc/epg/Epg.h
+++ b/xbmc/epg/Epg.h
@@ -1,5 +1,4 @@
 #pragma once
-
 /*
  *      Copyright (C) 2012-2013 Team XBMC
  *      http://xbmc.org
@@ -21,12 +20,12 @@
  */
 
 #include "FileItem.h"
-
+#include "pvr/channels/PVRChannel.h"
 #include "threads/CriticalSection.h"
+#include "utils/Observer.h"
 
 #include "EpgInfoTag.h"
 #include "EpgSearchFilter.h"
-#include "utils/Observer.h"
 
 namespace PVR
 {

diff --git a/xbmc/epg/EpgContainer.cpp b/xbmc/epg/EpgContainer.cpp
index 763cd70..24c58e5 100644 (file)
--- a/xbmc/epg/EpgContainer.cpp
+++ b/xbmc/epg/EpgContainer.cpp
@@ -19,20 +19,20 @@
  */
 
 #include "Application.h"
-#include "threads/SingleLock.h"
-#include "settings/AdvancedSettings.h"
-#include "settings/lib/Setting.h"
-#include "settings/Settings.h"
 #include "dialogs/GUIDialogExtendedProgressBar.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
-#include "utils/log.h"
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/recordings/PVRRecordings.h"
+#include "settings/AdvancedSettings.h"
+#include "settings/lib/Setting.h"
+#include "settings/Settings.h"
+#include "threads/SingleLock.h"
+#include "utils/log.h"
 
-#include "EpgContainer.h"
 #include "Epg.h"
+#include "EpgContainer.h"
 #include "EpgSearchFilter.h"
 
 using namespace std;

diff --git a/xbmc/epg/EpgContainer.h b/xbmc/epg/EpgContainer.h
index e5c9c1e..5060f0e 100644 (file)
--- a/xbmc/epg/EpgContainer.h
+++ b/xbmc/epg/EpgContainer.h
@@ -1,5 +1,4 @@
 #pragma once
-
 /*
  *      Copyright (C) 2012-2013 Team XBMC
  *      http://xbmc.org
@@ -20,6 +19,8 @@
  *
  */
 
+#include <map>
+
 #include "XBDateTime.h"
 #include "settings/lib/ISettingCallback.h"
 #include "threads/CriticalSection.h"
@@ -29,8 +30,6 @@
 #include "Epg.h"
 #include "EpgDatabase.h"
 
-#include <map>
-
 class CFileItemList;
 class CGUIDialogProgressBarHandle;
 

diff --git a/xbmc/epg/EpgDatabase.cpp b/xbmc/epg/EpgDatabase.cpp
index 400a8f6..a7dc914 100644 (file)
--- a/xbmc/epg/EpgDatabase.cpp
+++ b/xbmc/epg/EpgDatabase.cpp
@@ -17,17 +17,18 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+
 #include <cstdlib>
 
+#include "system.h"
+#include "addons/include/xbmc_pvr_types.h"
 #include "dbwrappers/dataset.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
-#include "addons/include/xbmc_pvr_types.h"
 
-#include "EpgDatabase.h"
 #include "EpgContainer.h"
-#include "system.h"
+#include "EpgDatabase.h"
 
 using namespace std;
 using namespace dbiplus;

diff --git a/xbmc/epg/EpgDatabase.h b/xbmc/epg/EpgDatabase.h
index c778510..990390c 100644 (file)
--- a/xbmc/epg/EpgDatabase.h
+++ b/xbmc/epg/EpgDatabase.h
@@ -19,10 +19,11 @@
  *
  */
 
-#include "dbwrappers/Database.h"
-#include "XBDateTime.h"
 #include <map>
 
+#include "XBDateTime.h"
+#include "dbwrappers/Database.h"
+
 namespace EPG
 {
   class CEpg;

diff --git a/xbmc/epg/EpgInfoTag.cpp b/xbmc/epg/EpgInfoTag.cpp
index 63e0829..b917275 100644 (file)
--- a/xbmc/epg/EpgInfoTag.cpp
+++ b/xbmc/epg/EpgInfoTag.cpp
@@ -18,11 +18,8 @@
  *
  */
 
+#include "addons/include/xbmc_pvr_types.h"
 #include "guilib/LocalizeStrings.h"
-#include "Epg.h"
-#include "EpgInfoTag.h"
-#include "EpgContainer.h"
-#include "EpgDatabase.h"
 #include "pvr/PVRManager.h"
 #include "pvr/addons/PVRClients.h"
 #include "settings/AdvancedSettings.h"
@@ -30,7 +27,11 @@
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
-#include "addons/include/xbmc_pvr_types.h"
+
+#include "Epg.h"
+#include "EpgInfoTag.h"
+#include "EpgContainer.h"
+#include "EpgDatabase.h"
 
 using namespace std;
 using namespace EPG;

diff --git a/xbmc/epg/EpgInfoTag.h b/xbmc/epg/EpgInfoTag.h
index 9cef97f..55abadd 100644 (file)
--- a/xbmc/epg/EpgInfoTag.h
+++ b/xbmc/epg/EpgInfoTag.h
@@ -1,5 +1,4 @@
 #pragma once
-
 /*
  *      Copyright (C) 2012-2013 Team XBMC
  *      http://xbmc.org
@@ -20,14 +19,14 @@
  *
  */
 
-#include "addons/include/xbmc_pvr_types.h"
+#include <memory>
+#include <string>
+
 #include "XBDateTime.h"
-#include "utils/ISerializable.h"
+#include "addons/include/xbmc_pvr_types.h"
 #include "pvr/channels/PVRChannel.h"
 #include "pvr/timers/PVRTimerInfoTag.h"
-
-#include <memory>
-#include <string>
+#include "utils/ISerializable.h"
 
 #define EPG_DEBUGGING 0
 

diff --git a/xbmc/epg/EpgSearchFilter.cpp b/xbmc/epg/EpgSearchFilter.cpp
index 8171e2f..931dd0c 100644 (file)
--- a/xbmc/epg/EpgSearchFilter.cpp
+++ b/xbmc/epg/EpgSearchFilter.cpp
@@ -18,18 +18,17 @@
  *
  */
 
-#include "utils/TextSearch.h"
-#include "utils/log.h"
 #include "FileItem.h"
-#include "../addons/include/xbmc_pvr_types.h"
-
-#include "EpgSearchFilter.h"
-#include "EpgContainer.h"
-
+#include "addons/include/xbmc_pvr_types.h"
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/recordings/PVRRecordings.h"
 #include "pvr/timers/PVRTimers.h"
+#include "utils/TextSearch.h"
+#include "utils/log.h"
+
+#include "EpgContainer.h"
+#include "EpgSearchFilter.h"
 
 using namespace std;
 using namespace EPG;

diff --git a/xbmc/epg/EpgSearchFilter.h b/xbmc/epg/EpgSearchFilter.h
index 803e79b..0696068 100644 (file)
--- a/xbmc/epg/EpgSearchFilter.h
+++ b/xbmc/epg/EpgSearchFilter.h
@@ -1,5 +1,4 @@
 #pragma once
-
 /*
  *      Copyright (C) 2012-2013 Team XBMC
  *      http://xbmc.org

diff --git a/xbmc/epg/GUIEPGGridContainer.cpp b/xbmc/epg/GUIEPGGridContainer.cpp
index 2ed77c1..9cc3775 100644 (file)
--- a/xbmc/epg/GUIEPGGridContainer.cpp
+++ b/xbmc/epg/GUIEPGGridContainer.cpp
@@ -18,25 +18,24 @@
  *
  */
 
-#include "input/Key.h"
+#include <assert.h>
+#include <tinyxml.h>
+
+#include "GUIInfoManager.h"
+#include "guilib/DirtyRegion.h"
 #include "guilib/GUIControlFactory.h"
 #include "guilib/GUIListItem.h"
-#include "guilib/DirtyRegion.h"
-#include <tinyxml.h>
+#include "input/Key.h"
+#include "pvr/channels/PVRChannel.h"
 #include "utils/log.h"
 #include "utils/MathUtils.h"
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
 #include "threads/SystemClock.h"
-#include "GUIInfoManager.h"
-
-#include "epg/Epg.h"
-#include "pvr/channels/PVRChannel.h"
 
+#include "Epg.h"
 #include "GUIEPGGridContainer.h"
 
-#include <assert.h>
-
 using namespace PVR;
 using namespace EPG;
 using namespace std;

diff --git a/xbmc/epg/GUIEPGGridContainer.h b/xbmc/epg/GUIEPGGridContainer.h
index fce88d4..c4d636c 100644 (file)
--- a/xbmc/epg/GUIEPGGridContainer.h
+++ b/xbmc/epg/GUIEPGGridContainer.h
@@ -1,5 +1,4 @@
 #pragma once
-
 /*
  *      Copyright (C) 2012-2013 Team XBMC
  *      http://xbmc.org