changed: moved CScreenSaver to addon namespace

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28922 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 14 insertions, 4 deletions

diff --git a/xbmc/GUIWindowScreensaver.cpp b/xbmc/GUIWindowScreensaver.cpp
index aa9ae7efcd..61cb456623 100644
--- a/xbmc/GUIWindowScreensaver.cpp
+++ b/xbmc/GUIWindowScreensaver.cpp
@@ -29,6 +29,8 @@
 #include "GUIWindowManager.h"
 #include "utils/SingleLock.h"
 
+using namespace ADDON;
+
 CGUIWindowScreensaver::CGUIWindowScreensaver(void)
     : CGUIWindow(WINDOW_SCREENSAVER, "")
 {
@@ -130,8 +132,8 @@ bool CGUIWindowScreensaver::OnMessage(CGUIMessage& message)
 
       m_addon.reset();
       // Setup new screensaver instance
-      ADDON::AddonPtr addon;
-      if (!ADDON::CAddonMgr::Get()->GetAddon(g_guiSettings.GetString("screensaver.mode"), addon, ADDON::ADDON_SCREENSAVER))
+      AddonPtr addon;
+      if (!CAddonMgr::Get()->GetAddon(g_guiSettings.GetString("screensaver.mode"), addon, ADDON_SCREENSAVER))
         return false;
 
       m_addon = boost::dynamic_pointer_cast<CScreenSaver>(addon);
diff --git a/xbmc/GUIWindowScreensaver.h b/xbmc/GUIWindowScreensaver.h
index dfc1e14cd4..d5db751d1b 100644
--- a/xbmc/GUIWindowScreensaver.h
+++ b/xbmc/GUIWindowScreensaver.h
@@ -49,6 +49,6 @@ private:
   bool m_bInitialized;
   CCriticalSection m_critSection;
 #ifdef HAS_SCREENSAVER
-  boost::shared_ptr<CScreenSaver> m_addon;
+  boost::shared_ptr<ADDON::CScreenSaver> m_addon;
 #endif
 };
diff --git a/xbmc/addons/ScreenSaver.cpp b/xbmc/addons/ScreenSaver.cpp
index 1599c825ad..fcb991c159 100644
--- a/xbmc/addons/ScreenSaver.cpp
+++ b/xbmc/addons/ScreenSaver.cpp
@@ -22,7 +22,8 @@
 #include "Settings.h"
 #include "WindowingFactory.h"
 
-using namespace ADDON;
+namespace ADDON
+{
 
 bool CScreenSaver::CreateScreenSaver()
 {
@@ -67,3 +68,6 @@ void CScreenSaver::GetInfo(SCR_INFO *info)
   // get info from screensaver
   if (Initialized()) m_pStruct->GetInfo(info);
 }
+
+} /*namespace ADDON*/
+
diff --git a/xbmc/addons/ScreenSaver.h b/xbmc/addons/ScreenSaver.h
index d93f2d5ab5..676e9b9719 100644
--- a/xbmc/addons/ScreenSaver.h
+++ b/xbmc/addons/ScreenSaver.h
@@ -23,6 +23,9 @@
 #include "AddonDll.h"
 #include "DllScreenSaver.h"
 
+namespace ADDON
+{
+
 class CScreenSaver : public ADDON::CAddonDll<DllScreenSaver, ScreenSaver, SCR_PROPS>
 {
 public:
@@ -36,3 +39,4 @@ public:
   void GetInfo(SCR_INFO *info);
 };
 
+} /*namespace ADDON*/