1 files changed, 21 insertions, 21 deletions

diff --git a/xbmc/storage/MediaManager.h b/xbmc/storage/MediaManager.h
index 8bafd4f667..a2c71a5ec0 100644
--- a/xbmc/storage/MediaManager.h
+++ b/xbmc/storage/MediaManager.h
@@ -41,7 +41,7 @@ class CNetworkLocation
 public:
   CNetworkLocation() { id = 0; };
   int id;
-  CStdString path;
+  std::string path;
 };
 
 class CMediaManager : public IStorageEventsCallback, public IJobCallback
@@ -59,39 +59,39 @@ public:
   void GetRemovableDrives(VECSOURCES &removableDrives);
   void GetNetworkLocations(VECSOURCES &locations, bool autolocations = true);
 
-  bool AddNetworkLocation(const CStdString &path);
-  bool HasLocation(const CStdString& path) const;
-  bool RemoveLocation(const CStdString& path);
-  bool SetLocationPath(const CStdString& oldPath, const CStdString& newPath);
+  bool AddNetworkLocation(const std::string &path);
+  bool HasLocation(const std::string& path) const;
+  bool RemoveLocation(const std::string& path);
+  bool SetLocationPath(const std::string& oldPath, const std::string& newPath);
 
   void AddAutoSource(const CMediaSource &share, bool bAutorun=false);
   void RemoveAutoSource(const CMediaSource &share);
-  bool IsDiscInDrive(const CStdString& devicePath="");
-  bool IsAudio(const CStdString& devicePath="");
+  bool IsDiscInDrive(const std::string& devicePath="");
+  bool IsAudio(const std::string& devicePath="");
   bool HasOpticalDrive();
-  CStdString TranslateDevicePath(const CStdString& devicePath, bool bReturnAsDevice=false);
-  DWORD GetDriveStatus(const CStdString& devicePath="");
+  std::string TranslateDevicePath(const std::string& devicePath, bool bReturnAsDevice=false);
+  DWORD GetDriveStatus(const std::string& devicePath="");
 #ifdef HAS_DVD_DRIVE
-  MEDIA_DETECT::CCdInfo* GetCdInfo(const CStdString& devicePath="");
-  bool RemoveCdInfo(const CStdString& devicePath="");
-  CStdString GetDiskLabel(const CStdString& devicePath="");
-  CStdString GetDiskUniqueId(const CStdString& devicePath="");
+  MEDIA_DETECT::CCdInfo* GetCdInfo(const std::string& devicePath="");
+  bool RemoveCdInfo(const std::string& devicePath="");
+  std::string GetDiskLabel(const std::string& devicePath="");
+  std::string GetDiskUniqueId(const std::string& devicePath="");
 #endif
-  CStdString GetDiscPath();
+  std::string GetDiscPath();
   void SetHasOpticalDrive(bool bstatus);
 
-  bool Eject(CStdString mountpath);
+  bool Eject(const std::string& mountpath);
   void EjectTray( const bool bEject=true, const char cDriveLetter='\0' );
   void CloseTray(const char cDriveLetter='\0');
   void ToggleTray(const char cDriveLetter='\0');
 
   void ProcessEvents();
 
-  std::vector<CStdString> GetDiskUsage();
+  std::vector<std::string> GetDiskUsage();
 
-  virtual void OnStorageAdded(const CStdString &label, const CStdString &path);
-  virtual void OnStorageSafelyRemoved(const CStdString &label);
-  virtual void OnStorageUnsafelyRemoved(const CStdString &label);
+  virtual void OnStorageAdded(const std::string &label, const std::string &path);
+  virtual void OnStorageSafelyRemoved(const std::string &label);
+  virtual void OnStorageUnsafelyRemoved(const std::string &label);
 
   virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job) { }
 protected:
@@ -99,10 +99,10 @@ protected:
 
   CCriticalSection m_muAutoSource, m_CritSecStorageProvider;
 #ifdef HAS_DVD_DRIVE
-  std::map<CStdString,MEDIA_DETECT::CCdInfo*> m_mapCdInfo;
+  std::map<std::string,MEDIA_DETECT::CCdInfo*> m_mapCdInfo;
 #endif
   bool m_bhasoptical;
-  CStdString m_strFirstAvailDrive;
+  std::string m_strFirstAvailDrive;
 
 private:
   IStorageProvider *m_platformStorage;