remove all "using namespace" from header files

diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index 8836fde..d562f8c 100644 (file)
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -99,6 +99,9 @@
 
 using namespace std;
 
+#ifdef HAS_DVD_DRIVE
+using namespace MEDIA_DETECT;
+#endif
 
 #define clamp(x) (x) > 255.f ? 255 : ((x) < 0 ? 0 : (BYTE)(x+0.5f)) // Valid ranges: brightness[-1 -> 1 (0 is default)] contrast[0 -> 2 (1 is default)]  gamma[0.5 -> 3.5 (1 is default)] default[ramp is linear]
 static const int64_t SECS_BETWEEN_EPOCHS = 11644473600LL;

diff --git a/xbmc/addons/AddonDll.h b/xbmc/addons/AddonDll.h
index 5b082f3..b48fd1e 100644 (file)
--- a/xbmc/addons/AddonDll.h
+++ b/xbmc/addons/AddonDll.h
@@ -34,8 +34,6 @@
 #include "interfaces/AnnouncementManager.h"
 #include "utils/XMLUtils.h"
 
-using namespace XFILE;
-
 namespace ADDON
 {
   template<class TheDll, typename TheStruct, typename TheProps>
@@ -172,8 +170,8 @@ bool CAddonDll<TheDll, TheStruct, TheProps>::LoadDll()
     URIUtils::RemoveExtension(strFileName);
     strFileName += "-" + ID() + extension;
 
-    if (!CFile::Exists(strFileName))
-      CFile::Copy(LibPath(), strFileName);
+    if (!XFILE::CFile::Exists(strFileName))
+      XFILE::CFile::Copy(LibPath(), strFileName);
 
     CLog::Log(LOGNOTICE, "ADDON: Loaded virtual child addon %s", strFileName.c_str());
   }
@@ -182,19 +180,19 @@ bool CAddonDll<TheDll, TheStruct, TheProps>::LoadDll()
 #if defined(TARGET_ANDROID)
   // Android libs MUST live in this path, else multi-arch will break.
   // The usual soname requirements apply. no subdirs, and filename is ^lib.*\.so$
-  if (!CFile::Exists(strFileName))
+  if (!XFILE::CFile::Exists(strFileName))
   {
     CStdString tempbin = getenv("XBMC_ANDROID_LIBS");
     strFileName = tempbin + "/" + m_strLibName;
   }
 #endif
-  if (!CFile::Exists(strFileName))
+  if (!XFILE::CFile::Exists(strFileName))
   {
     CStdString temp = CSpecialProtocol::TranslatePath("special://xbmc/");
     CStdString tempbin = CSpecialProtocol::TranslatePath("special://xbmcbin/");
     strFileName.erase(0, temp.size());
     strFileName = tempbin + strFileName;
-    if (!CFile::Exists(strFileName))
+    if (!XFILE::CFile::Exists(strFileName))
     {
       CLog::Log(LOGERROR, "ADDON: Could not locate %s", m_strLibName.c_str());
       return false;

diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index 34b170c..a4daf38 100644 (file)
--- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@ -53,6 +53,7 @@
 
 using namespace std;
 using namespace PVR;
+using namespace XFILE;
 
 namespace ADDON
 {

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
index e58681b..3085c43 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -37,6 +37,7 @@
 #include "DVDCodecs/DVDCodecUtils.h"
 #include "cores/VideoRenderers/RenderFlags.h"
 
+using namespace Actor;
 using namespace VDPAU;
 #define NUM_RENDER_PICS 7
 #define NUM_CROP_PIX 3

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
index 8efadc1..d3cef69 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
@@ -64,9 +64,6 @@ extern "C" {
 #include "libavcodec/vdpau.h"
 }
 
-using namespace Actor;
-
-
 #define FULLHD_WIDTH                       1920
 #define MAX_PIC_Q_LENGTH                   20 //for non-interop_yuv this controls the max length of the decoded pic to render completion Q
 
@@ -240,7 +237,7 @@ private:
 // Mixer
 //-----------------------------------------------------------------------------
 
-class CMixerControlProtocol : public Protocol
+class CMixerControlProtocol : public Actor::Protocol
 {
 public:
   CMixerControlProtocol(std::string name, CEvent* inEvent, CEvent *outEvent) : Protocol(name, inEvent, outEvent) {};
@@ -257,7 +254,7 @@ public:
   };
 };
 
-class CMixerDataProtocol : public Protocol
+class CMixerDataProtocol : public Actor::Protocol
 {
 public:
   CMixerDataProtocol(std::string name, CEvent* inEvent, CEvent *outEvent) : Protocol(name, inEvent, outEvent) {};
@@ -291,7 +288,7 @@ protected:
   void OnStartup();
   void OnExit();
   void Process();
-  void StateMachine(int signal, Protocol *port, Message *msg);
+  void StateMachine(int signal, Actor::Protocol *port, Actor::Message *msg);
   void Init();
   void Uninit();
   void Flush();
@@ -377,10 +374,10 @@ struct VdpauBufferPool
   CCriticalSection renderPicSec;
 };
 
-class COutputControlProtocol : public Protocol
+class COutputControlProtocol : public Actor::Protocol
 {
 public:
-  COutputControlProtocol(std::string name, CEvent* inEvent, CEvent *outEvent) : Protocol(name, inEvent, outEvent) {};
+  COutputControlProtocol(std::string name, CEvent* inEvent, CEvent *outEvent) : Actor::Protocol(name, inEvent, outEvent) {};
   enum OutSignal
   {
     INIT,
@@ -396,10 +393,10 @@ public:
   };
 };
 
-class COutputDataProtocol : public Protocol
+class COutputDataProtocol : public Actor::Protocol
 {
 public:
-  COutputDataProtocol(std::string name, CEvent* inEvent, CEvent *outEvent) : Protocol(name, inEvent, outEvent) {};
+  COutputDataProtocol(std::string name, CEvent* inEvent, CEvent *outEvent) : Actor::Protocol(name, inEvent, outEvent) {};
   enum OutSignal
   {
     NEWFRAME = 0,
@@ -430,7 +427,7 @@ protected:
   void OnStartup();
   void OnExit();
   void Process();
-  void StateMachine(int signal, Protocol *port, Message *msg);
+  void StateMachine(int signal, Actor::Protocol *port, Actor::Message *msg);
   bool HasWork();
   CVdpauRenderPicture *ProcessMixerPicture();
   void QueueReturnPicture(CVdpauRenderPicture *pic);

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp
index 5031df8..36f226a 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp
@@ -59,6 +59,8 @@ int NP2( unsigned x ) {
   return ++x;
 }
 
+using namespace android;
+
 CStageFrightVideoPrivate::CStageFrightVideoPrivate()
     : decode_thread(NULL), source(NULL)
     , eglDisplay(EGL_NO_DISPLAY), eglSurface(EGL_NO_SURFACE), eglContext(EGL_NO_CONTEXT)

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h
index 34e9c50..ebd19ce 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h
@@ -59,8 +59,6 @@ class CAdvancedSettings;
 class CApplication;
 class CApplicationMessenger;
 
-using namespace android;
-
 struct stSlot
 {
   GLuint texid;
@@ -70,12 +68,12 @@ struct stSlot
 
 struct Frame
 {
-  status_t status;
+  android::status_t status;
   int32_t width, height;
   int64_t pts;
   ERenderFormat format;
   EGLImageKHR eglimg;
-  MediaBuffer* medbuf;
+  android::MediaBuffer* medbuf;
 };
 
 enum StageFrightQuirks
@@ -84,14 +82,14 @@ enum StageFrightQuirks
   QuirkSWRender = 0x01,
 };
 
-class CStageFrightVideoPrivate : public MediaBufferObserver
+class CStageFrightVideoPrivate : public android::MediaBufferObserver
 {
 public:
   CStageFrightVideoPrivate();
 
-  virtual void signalBufferReturned(MediaBuffer *buffer);
+  virtual void signalBufferReturned(android::MediaBuffer *buffer);
 
-  MediaBuffer* getBuffer(size_t size);
+  android::MediaBuffer* getBuffer(size_t size);
   bool inputBufferAvailable();
 
   stSlot* getSlot(EGLImageKHR eglimg);
@@ -106,9 +104,9 @@ public:
 public:
   CStageFrightDecodeThread* decode_thread;
 
-  sp<MediaSource> source;
+  android::sp<android::MediaSource> source;
 
-  MediaBuffer* inbuf[INBUFCOUNT];
+  android::MediaBuffer* inbuf[INBUFCOUNT];
 
   GLuint mPgm;
   GLint mPositionHandle;
@@ -128,7 +126,7 @@ public:
 
   stSlot texslots[NUMFBOTEX];
 
-  sp<MetaData> meta;
+  android::sp<android::MetaData> meta;
   int64_t framecount;
   std::list<Frame*> in_queue;
   std::map<int64_t, Frame*> out_queue;
@@ -146,8 +144,8 @@ public:
   int width, height;
   int texwidth, texheight;
 
-  OMXClient *client;
-  sp<MediaSource> decoder;
+  android::OMXClient *client;
+  android::sp<android::MediaSource> decoder;
   const char *decoder_component;
   int videoColorFormat;
   int videoStride;
@@ -162,7 +160,7 @@ public:
   unsigned int mVideoTextureId;
   CJNISurfaceTexture* mSurfTexture;
   CJNISurface* mSurface;
-  sp<ANativeWindow> mVideoNativeWindow;
+  android::sp<ANativeWindow> mVideoNativeWindow;
 
   static void  CallbackInitSurfaceTexture(void*);
   bool InitSurfaceTexture();

diff --git a/xbmc/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp
index 262a004..6e20ead 100644 (file)
--- a/xbmc/cores/omxplayer/OMXImage.cpp
+++ b/xbmc/cores/omxplayer/OMXImage.cpp
@@ -54,6 +54,9 @@
 #endif
 #define CLASSNAME "COMXImage"
 
+using namespace std;
+using namespace XFILE;
+
 COMXImage::COMXImage()
 : CThread("CRBPWorker")
 {

diff --git a/xbmc/cores/omxplayer/OMXImage.h b/xbmc/cores/omxplayer/OMXImage.h
index ec7a229..3b30741 100644 (file)
--- a/xbmc/cores/omxplayer/OMXImage.h
+++ b/xbmc/cores/omxplayer/OMXImage.h
@@ -39,9 +39,6 @@
 #include <EGL/eglext.h>
 #include "threads/Thread.h"
 
-using namespace XFILE;
-using namespace std;
-
 class COMXImageFile;
 
 class COMXImage : public CThread

diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
index d3348ec..4ed8d17 100644 (file)
--- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
@@ -47,6 +47,8 @@
 #include <iostream>
 #include <sstream>
 
+using namespace std;
+
 class COMXMsgAudioCodecChange : public CDVDMsg
 {
 public:

diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.h b/xbmc/cores/omxplayer/OMXPlayerAudio.h
index 685a686..57af63c 100644 (file)
--- a/xbmc/cores/omxplayer/OMXPlayerAudio.h
+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.h
@@ -37,8 +37,6 @@
 #include "utils/BitstreamStats.h"
 #include "xbmc/linux/DllBCM.h"
 
-using namespace std;
-
 class OMXPlayerAudio : public CThread
 {
 protected:

diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
index 2fdbe18..af439e7 100644 (file)
--- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
@@ -51,6 +51,7 @@
 #include "linux/RBP.h"
 
 using namespace RenderManager;
+using namespace std;
 
 class COMXMsgVideoCodecChange : public CDVDMsg
 {

diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h
index 6f19395..0e5d488 100644 (file)
--- a/xbmc/cores/omxplayer/OMXPlayerVideo.h
+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.h
@@ -39,8 +39,6 @@
 #include "linux/DllBCM.h"
 #include "cores/VideoRenderers/RenderManager.h"
 
-using namespace std;
-
 class OMXPlayerVideo : public CThread
 {
 protected:

diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp
index 1de9db9..0ce4e08 100644 (file)
--- a/xbmc/filesystem/FTPParse.cpp
+++ b/xbmc/filesystem/FTPParse.cpp
@@ -30,6 +30,8 @@
 #include <cmath>
 #include "FTPParse.h"
 
+using namespace std;
+
 CFTPParse::CFTPParse()
 {
   m_name = "";

diff --git a/xbmc/filesystem/FTPParse.h b/xbmc/filesystem/FTPParse.h
index 52a8b64..2a2912f 100644 (file)
--- a/xbmc/filesystem/FTPParse.h
+++ b/xbmc/filesystem/FTPParse.h
@@ -23,24 +23,22 @@
 #include <ctime>
 #include <stdint.h>
 
-using namespace std;
-
 class CFTPParse
 {
 public:
   CFTPParse();
-  int FTPParse(string str);
-  string getName();
+  int FTPParse(std::string str);
+  std::string getName();
   int getFlagtrycwd();
   int getFlagtryretr();
   uint64_t getSize();
   time_t getTime();
 private:
-  string m_name;            // not necessarily 0-terminated
+  std::string m_name;            // not necessarily 0-terminated
   int m_flagtrycwd;         // 0 if cwd is definitely pointless, 1 otherwise
   int m_flagtryretr;        // 0 if retr is definitely pointless, 1 otherwise
   uint64_t m_size;              // number of octets
   time_t m_time;            // modification time
-  void setTime(string str); // Method used to set m_time from a string
+  void setTime(std::string str); // Method used to set m_time from a string
   int getDayOfWeek(int month, int date, int year); // Method to get day of week
 };

diff --git a/xbmc/guilib/GUIShader.cpp b/xbmc/guilib/GUIShader.cpp
index 11089b8..23cb84f 100644 (file)
--- a/xbmc/guilib/GUIShader.cpp
+++ b/xbmc/guilib/GUIShader.cpp
@@ -27,6 +27,8 @@
 #include "MatrixGLES.h"
 #include "utils/log.h"
 
+using namespace Shaders;
+
 CGUIShader::CGUIShader( const char *shader ) : CGLSLShaderProgram("guishader_vert.glsl", shader)
 {
   // Initialise values

diff --git a/xbmc/guilib/GUIShader.h b/xbmc/guilib/GUIShader.h
index c7e95aa..f7b5d9a 100644 (file)
--- a/xbmc/guilib/GUIShader.h
+++ b/xbmc/guilib/GUIShader.h
@@ -25,9 +25,7 @@
 
 #include "Shader.h"
 
-using namespace Shaders;
-
-class CGUIShader : public CGLSLShaderProgram
+class CGUIShader : public Shaders::CGLSLShaderProgram
 {
 public:
   CGUIShader( const char *shader = 0 );

diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
index e2dde83..a430ce3 100644 (file)
--- a/xbmc/music/MusicDatabase.cpp
+++ b/xbmc/music/MusicDatabase.cpp
@@ -78,6 +78,7 @@ using ADDON::AddonPtr;
 
 #ifdef HAS_DVD_DRIVE
 using namespace CDDB;
+using namespace MEDIA_DETECT;
 #endif
 
 static void AnnounceRemove(const std::string& content, int id)

diff --git a/xbmc/music/windows/GUIWindowMusicSongs.cpp b/xbmc/music/windows/GUIWindowMusicSongs.cpp
index 00d66a4..865dbcf 100644 (file)
--- a/xbmc/music/windows/GUIWindowMusicSongs.cpp
+++ b/xbmc/music/windows/GUIWindowMusicSongs.cpp
@@ -54,6 +54,9 @@
 #define CONTROL_BTNREC            10
 #define CONTROL_BTNRIP            11
 
+#ifdef HAS_DVD_DRIVE
+using namespace MEDIA_DETECT;
+#endif
 
 CGUIWindowMusicSongs::CGUIWindowMusicSongs(void)
     : CGUIWindowMusicBase(WINDOW_MUSIC_FILES, "MyMusicSongs.xml")

diff --git a/xbmc/pvr/channels/PVRChannel.cpp b/xbmc/pvr/channels/PVRChannel.cpp
index e0954db..88a9e91 100644 (file)
--- a/xbmc/pvr/channels/PVRChannel.cpp
+++ b/xbmc/pvr/channels/PVRChannel.cpp
@@ -766,7 +766,7 @@ bool CPVRChannel::IsUserSetIcon(void) const
 
 bool CPVRChannel::IsIconExists() const
 {
-  return  CFile::Exists(IconPath());
+  return XFILE::CFile::Exists(IconPath());
 }
 
 bool CPVRChannel::IsUserSetName() const

diff --git a/xbmc/pvr/channels/PVRChannelGroup.cpp b/xbmc/pvr/channels/PVRChannelGroup.cpp
index 20eb9be..d52c0be 100644 (file)
--- a/xbmc/pvr/channels/PVRChannelGroup.cpp
+++ b/xbmc/pvr/channels/PVRChannelGroup.cpp
@@ -247,7 +247,7 @@ void CPVRChannelGroup::SearchAndSetChannelIcons(bool bUpdateDb /* = false */)
 
   /* fetch files in icon path for fast lookup */
   CFileItemList fileItemList;
-  CDirectory::GetDirectory(iconPath, fileItemList, ".jpg|.png|.tbn");
+  XFILE::CDirectory::GetDirectory(iconPath, fileItemList, ".jpg|.png|.tbn");
 
   if (fileItemList.IsEmpty())
     return;

diff --git a/xbmc/pvr/recordings/PVRRecordings.cpp b/xbmc/pvr/recordings/PVRRecordings.cpp
index a574bc1..5805c69 100644 (file)
--- a/xbmc/pvr/recordings/PVRRecordings.cpp
+++ b/xbmc/pvr/recordings/PVRRecordings.cpp
@@ -383,7 +383,7 @@ bool CPVRRecordings::SetRecordingsPlayCount(const CFileItemPtr &item, int count)
     if (item->m_bIsFolder)
     {
       CStdString strPath = item->GetPath();
-      CDirectory::GetDirectory(strPath, items);
+      XFILE::CDirectory::GetDirectory(strPath, items);
     }
     else
       items.Add(item);

diff --git a/xbmc/pvr/windows/GUIWindowPVRCommon.cpp b/xbmc/pvr/windows/GUIWindowPVRCommon.cpp
index 0f87b14..00473eb 100644 (file)
--- a/xbmc/pvr/windows/GUIWindowPVRCommon.cpp
+++ b/xbmc/pvr/windows/GUIWindowPVRCommon.cpp
@@ -671,7 +671,7 @@ bool CGUIWindowPVRCommon::PlayRecording(CFileItem *item, bool bPlayMinimized /*
       CStdString dir = stream.substr(0, found).c_str();
 
       CFileItemList items;
-      CDirectory::GetDirectory(dir, items);
+      XFILE::CDirectory::GetDirectory(dir, items);
       items.Sort(SortByFile, SortOrderAscending);
 
       vector<int> stack;
@@ -684,7 +684,7 @@ bool CGUIWindowPVRCommon::PlayRecording(CFileItem *item, bool bPlayMinimized /*
       if (stack.size() > 0)
       {
         /* If we have a stack change the path of the item to it */
-        CStackDirectory dir;
+        XFILE::CStackDirectory dir;
         CStdString stackPath = dir.ConstructStackPath(items, stack);
         item->SetPath(stackPath);
       }

diff --git a/xbmc/storage/IoSupport.cpp b/xbmc/storage/IoSupport.cpp
index 4ac2991..85e9391 100644 (file)
--- a/xbmc/storage/IoSupport.cpp
+++ b/xbmc/storage/IoSupport.cpp
@@ -66,6 +66,9 @@
 #include "XHandle.h"
 #endif
 
+#ifdef HAS_DVD_DRIVE
+using namespace MEDIA_DETECT;
+#endif
 
 PVOID CIoSupport::m_rawXferBuffer;
 

diff --git a/xbmc/storage/MediaManager.cpp b/xbmc/storage/MediaManager.cpp
index 5d08030..9cd68e6 100644 (file)
--- a/xbmc/storage/MediaManager.cpp
+++ b/xbmc/storage/MediaManager.cpp
@@ -71,6 +71,10 @@
 using namespace std;
 using namespace XFILE;
 
+#ifdef HAS_DVD_DRIVE
+using namespace MEDIA_DETECT;
+#endif
+
 const char MEDIA_SOURCES_XML[] = { "special://profile/mediasources.xml" };
 
 class CMediaManager g_mediaManager;

diff --git a/xbmc/storage/MediaManager.h b/xbmc/storage/MediaManager.h
index ddab4d1..8bafd4f 100644 (file)
--- a/xbmc/storage/MediaManager.h
+++ b/xbmc/storage/MediaManager.h
@@ -25,10 +25,6 @@
 #include "IStorageProvider.h"
 #include "threads/CriticalSection.h"
 
-#ifdef HAS_DVD_DRIVE
-using namespace MEDIA_DETECT;
-#endif
-
 #define TRAY_OPEN     16
 #define TRAY_CLOSED_NO_MEDIA  64
 #define TRAY_CLOSED_MEDIA_PRESENT 96
@@ -76,7 +72,7 @@ public:
   CStdString TranslateDevicePath(const CStdString& devicePath, bool bReturnAsDevice=false);
   DWORD GetDriveStatus(const CStdString& devicePath="");
 #ifdef HAS_DVD_DRIVE
-  CCdInfo* GetCdInfo(const CStdString& devicePath="");
+  MEDIA_DETECT::CCdInfo* GetCdInfo(const CStdString& devicePath="");
   bool RemoveCdInfo(const CStdString& devicePath="");
   CStdString GetDiskLabel(const CStdString& devicePath="");
   CStdString GetDiskUniqueId(const CStdString& devicePath="");
@@ -103,7 +99,7 @@ protected:
 
   CCriticalSection m_muAutoSource, m_CritSecStorageProvider;
 #ifdef HAS_DVD_DRIVE
-  std::map<CStdString,CCdInfo*> m_mapCdInfo;
+  std::map<CStdString,MEDIA_DETECT::CCdInfo*> m_mapCdInfo;
 #endif
   bool m_bhasoptical;
   CStdString m_strFirstAvailDrive;

diff --git a/xbmc/utils/WindowsShortcut.cpp b/xbmc/utils/WindowsShortcut.cpp
index 8905b14..1ba6325 100644 (file)
--- a/xbmc/utils/WindowsShortcut.cpp
+++ b/xbmc/utils/WindowsShortcut.cpp
@@ -42,6 +42,9 @@ static char THIS_FILE[] = __FILE__;
 
 #define VOLUME_LOCAL        1
 #define VOLUME_NETWORK      2
+
+using namespace std;
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

diff --git a/xbmc/utils/WindowsShortcut.h b/xbmc/utils/WindowsShortcut.h
index 18e3bb0..a79e95f 100644 (file)
--- a/xbmc/utils/WindowsShortcut.h
+++ b/xbmc/utils/WindowsShortcut.h
@@ -30,7 +30,7 @@
  */
 
 #include <string>
-using namespace std;
+
 class CWindowsShortcut
 {
 public:

diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.cpp
index cf46f25..411851e 100644 (file)
--- a/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.cpp
+++ b/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.cpp
@@ -21,6 +21,8 @@
 #include <new>
 #include <stdio.h>
 
+using namespace std;
+
 Mesh::Mesh()
 {
        m_iRefCount = 1;

diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.h b/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.h
index e13f595..ff63266 100644 (file)
--- a/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.h
+++ b/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.h
@@ -23,13 +23,11 @@
 #include "Renderer.h"
 #include <string>
 
-using namespace std;
-
 class Mesh
 {
 public:
                Mesh();
-               void CreateTextMesh( string& InString, bool bCentered = true );
+               void CreateTextMesh( std::string& InString, bool bCentered = true );
 
                void AddRef();
                void Release();

diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Texture.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Texture.cpp
index 9630d17..0090b64 100644 (file)
--- a/xbmc/visualizations/Vortex/VortexVis/Core/Texture.cpp
+++ b/xbmc/visualizations/Vortex/VortexVis/Core/Texture.cpp
@@ -22,6 +22,8 @@
 #include <new>
 #include <stdio.h>
 
+using namespace std;
+
 Texture::Texture()
 {
        m_iRefCount = 1;

diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Texture.h b/xbmc/visualizations/Vortex/VortexVis/Core/Texture.h
index c512800..44c88b1 100644 (file)
--- a/xbmc/visualizations/Vortex/VortexVis/Core/Texture.h
+++ b/xbmc/visualizations/Vortex/VortexVis/Core/Texture.h
@@ -23,14 +23,12 @@
 #include "Renderer.h"
 #include <string>
 
-using namespace std;
-
 class Texture
 {
 public:
        Texture();
        void CreateTexture();
-       void LoadTexture( string& filename );
+       void LoadTexture( std::string& filename );
 
        void AddRef();
        void Release();

diff --git a/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.cpp b/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.cpp
index b7b966e..6b6b19a 100644 (file)
--- a/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.cpp
+++ b/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.cpp
@@ -22,6 +22,8 @@
 #include "Shader.h"
 #include "angelscript.h"
 
+using namespace std;
+
 char ColourRemapPixelShaderSrc[] =
 {
        " sampler2D SpectrumTexture : tex0;                                                                             \n"

diff --git a/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.h b/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.h
index 6f316e2..4a13546 100644 (file)
--- a/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.h
+++ b/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.h
@@ -25,8 +25,6 @@
 #include "EffectBase.h"
 #include <string>
 
-using namespace std;
-
 class VoicePrint : public EffectBase
 {
 public:
@@ -35,7 +33,7 @@ public:
        ~VoicePrint();
        void Init();
        void Render();
-       void LoadColourMap( string& filename );
+       void LoadColourMap( std::string& filename );
        void SetRect(float minX, float minY, float maxX, float maxY);
        void SetSpeed(float speed);
 

diff --git a/xbmc/windowing/osx/WinSystemIOS.mm b/xbmc/windowing/osx/WinSystemIOS.mm
index 97918ae..4968f16 100644 (file)
--- a/xbmc/windowing/osx/WinSystemIOS.mm
+++ b/xbmc/windowing/osx/WinSystemIOS.mm
@@ -300,7 +300,7 @@ bool CWinSystemIOS::IsExtSupported(const char* extension)
   name += extension;
   name += " ";
 
-  return m_eglext.find(name) != string::npos;
+  return m_eglext.find(name) != std::string::npos;
 }
 
 bool CWinSystemIOS::BeginRender()