Merge pull request #4630 from Red-F/gotham-resume-pvr-lastplayedposition

[vuplus_xbmc] / xbmc / SystemGlobals.cpp

diff --git a/xbmc/SystemGlobals.cpp b/xbmc/SystemGlobals.cpp
index 7363ddd..2dd1734 100644 (file)
--- a/xbmc/SystemGlobals.cpp
+++ b/xbmc/SystemGlobals.cpp
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2005-2012 Team XBMC
+ *      Copyright (C) 2005-2013 Team XBMC
  *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -23,10 +23,7 @@
 #include "Application.h"
 #include "GUILargeTextureManager.h"
 #include "guilib/TextureManager.h"
-#include "settings/GUISettings.h"
-#include "settings/Settings.h"
 #include "utils/AlarmClock.h"
-#include "utils/DownloadQueueManager.h"
 #include "GUIInfoManager.h"
 #include "filesystem/DllLibCurl.h"
 #include "filesystem/DirectoryCache.h"
@@ -55,16 +52,12 @@
 #include "linux/RBP.h"
 #endif
 
-  CGUISettings       g_guiSettings;
-  CSettings          g_settings;
-
   CXBMCRenderManager g_renderManager;
   CLangInfo          g_langInfo;
   CLangCodeExpander  g_LangCodeExpander;
   CLocalizeStrings   g_localizeStrings;
   CLocalizeStrings   g_localizeStringsTemp;
 
-  CGUIWindowManager  g_windowManager;
   XFILE::CDirectoryCache g_directoryCache;
 
   CGUITextureManager g_TextureManager;
@@ -77,7 +70,6 @@
   CGUIInfoManager    g_infoManager;
 
   XCURL::DllLibCurlGlobal g_curlInterface;
-  CDownloadQueueManager g_DownloadManager;
   CPartyModeManager     g_partyModeManager;
 
 #ifdef HAS_PYTHON
@@ -85,7 +77,6 @@
 #endif
   CAlarmClock        g_alarmClock;
   PLAYLIST::CPlayListPlayer g_playlistPlayer;
-  CApplication       g_application;
 
 #ifdef TARGET_RASPBERRY_PI
   CRBP               g_RBP;