Revert "fixed: fallout after r29510 (except build system stuff)"

This reverts commit 8c6f08079a556c2e4e91c2c374202536ba178c72.

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

10 files changed, 3 insertions, 10 deletions

diff --git a/guilib/GUIBaseContainer.cpp b/guilib/GUIBaseContainer.cpp
index d3e8125cdc..575fef38b4 100644
--- a/guilib/GUIBaseContainer.cpp
+++ b/guilib/GUIBaseContainer.cpp
@@ -34,7 +34,6 @@
 #include "MathUtils.h"
 
 using namespace std;
-using namespace ADDON;
 
 #define HOLD_TIME_START 100
 #define HOLD_TIME_END   3000
diff --git a/guilib/GUIButtonScroller.cpp b/guilib/GUIButtonScroller.cpp
index b1911651b6..c04aba751c 100644
--- a/guilib/GUIButtonScroller.cpp
+++ b/guilib/GUIButtonScroller.cpp
@@ -32,7 +32,6 @@
 #include "Key.h"
 
 using namespace std;
-using namespace ADDON;
 
 #define SCROLL_SPEED 6.0f
 #define ANALOG_SCROLL_START 0.8f
diff --git a/guilib/GUIColorManager.cpp b/guilib/GUIColorManager.cpp
index ec9c14d157..efbaddfd13 100644
--- a/guilib/GUIColorManager.cpp
+++ b/guilib/GUIColorManager.cpp
@@ -54,7 +54,7 @@ void CGUIColorManager::Load(const CStdString &colorFile)
 
   // first load the default color map if it exists
   CStdString path, basePath;
-  CUtil::AddFileToFolder(ADDON::g_SkinInfo.GetBaseDir(), "colors", basePath);
+  CUtil::AddFileToFolder(g_SkinInfo.GetBaseDir(), "colors", basePath);
   CUtil::AddFileToFolder(basePath, "defaults.xml", path);
 
   if (xmlDoc.LoadFile(PTH_IC(path)))
diff --git a/guilib/GUIControlFactory.cpp b/guilib/GUIControlFactory.cpp
index 948926881f..e77d87dfb8 100644
--- a/guilib/GUIControlFactory.cpp
+++ b/guilib/GUIControlFactory.cpp
@@ -66,7 +66,6 @@
 #include "StringUtils.h"
 
 using namespace std;
-using namespace ADDON;
 
 typedef struct
 {
diff --git a/guilib/GUIFontManager.cpp b/guilib/GUIFontManager.cpp
index 65212e7a92..ccbeb1b96a 100644
--- a/guilib/GUIFontManager.cpp
+++ b/guilib/GUIFontManager.cpp
@@ -402,7 +402,7 @@ void GUIFontManager::LoadFonts(const TiXmlNode* fontNode)
 bool GUIFontManager::OpenFontFile(TiXmlDocument& xmlDoc)
 {
   // Get the file to load fonts from:
-  CStdString strPath = ADDON::g_SkinInfo.GetSkinPath("Font.xml", &m_skinResolution);
+  CStdString strPath = g_SkinInfo.GetSkinPath("Font.xml", &m_skinResolution);
   CLog::Log(LOGINFO, "Loading fonts from %s", strPath.c_str());
 
   // first try our preferred file
diff --git a/guilib/GUIIncludes.cpp b/guilib/GUIIncludes.cpp
index 63ba1813ab..3b9fd7025b 100644
--- a/guilib/GUIIncludes.cpp
+++ b/guilib/GUIIncludes.cpp
@@ -26,7 +26,6 @@
 #include "tinyXML/tinyxml.h"
 
 using namespace std;
-using namespace ADDON;
 
 CGUIIncludes::CGUIIncludes()
 {
diff --git a/guilib/GUIListItemLayout.cpp b/guilib/GUIListItemLayout.cpp
index a9c68a429d..ce923c3648 100644
--- a/guilib/GUIListItemLayout.cpp
+++ b/guilib/GUIListItemLayout.cpp
@@ -29,7 +29,6 @@
 #include "tinyXML/tinyxml.h"
 
 using namespace std;
-using namespace ADDON;
 
 CGUIListItemLayout::CGUIListItemLayout()
 : m_group(0, 0, 0, 0, 0, 0)
diff --git a/guilib/GUIWindow.cpp b/guilib/GUIWindow.cpp
index 7855c06169..1c5c29be88 100644
--- a/guilib/GUIWindow.cpp
+++ b/guilib/GUIWindow.cpp
@@ -45,7 +45,6 @@
 #endif
 
 using namespace std;
-using namespace ADDON;
 
 CGUIWindow::CGUIWindow(int id, const CStdString &xmlFile)
 {
diff --git a/guilib/GUIWindowManager.cpp b/guilib/GUIWindowManager.cpp
index 552f805352..a165f8d3a6 100644
--- a/guilib/GUIWindowManager.cpp
+++ b/guilib/GUIWindowManager.cpp
@@ -363,7 +363,7 @@ void CGUIWindowManager::ActivateWindow_Internal(int iWindowID, const vector<CStd
   }
   if (iWindowID == WINDOW_START)
   { // virtual start window
-    iWindowID = ADDON::g_SkinInfo.GetStartWindow();
+    iWindowID = g_SkinInfo.GetStartWindow();
   }
 
   // debug
diff --git a/guilib/VisibleEffect.cpp b/guilib/VisibleEffect.cpp
index 114be0d68d..2f90d0357d 100644
--- a/guilib/VisibleEffect.cpp
+++ b/guilib/VisibleEffect.cpp
@@ -28,7 +28,6 @@
 #include "tinyXML/tinyxml.h"
 
 using namespace std;
-using namespace ADDON;
 
 CAnimEffect::CAnimEffect(const TiXmlElement *node, EFFECT_TYPE effect)
 {