[cstdstring] replace all CStdStrings with std::string

remove a few functions that become duplicates after the change
night199uk · Feb 18, 2014 · d1078a1 · d1078a1
1 parent e16af6c
commit d1078a1
Show file tree

Hide file tree

Showing 1,048 changed files with 9,149 additions and 9,188 deletions.
diff --git a/lib/UnrarXLib/file.cpp b/lib/UnrarXLib/file.cpp
@@ -167,7 +167,7 @@ bool File::Create(const char *Name,const wchar *NameW)
 #else
   hFile=fopen(Name,CREATEBINARY);
 #endif*/
-  CStdString strPath = URIUtils::GetDirectory(Name);
+  string strPath = URIUtils::GetDirectory(Name);
   CUtil::CreateDirectoryEx(strPath);
   m_File.OpenForWrite(Name,true);
   NewFile=true;

diff --git a/lib/UnrarXLib/pathfn.cpp b/lib/UnrarXLib/pathfn.cpp
@@ -197,7 +197,7 @@ void SetSFXExt(wchar *SFXName)
 
 char *GetExt(const char *Name)
 {
-  CStdString strExtension = URIUtils::GetExtension(Name);
+  string strExtension = URIUtils::GetExtension(Name);
   return((char *)strstr((char *)Name,strExtension.c_str()));
 }
 

diff --git a/lib/UnrarXLib/ulinks.cpp b/lib/UnrarXLib/ulinks.cpp
@@ -15,7 +15,7 @@ int ExtractLink(ComprDataIO &DataIO,Archive &Arc,char *DestName,uint &LinkCRC,bo
     FileName[DataSize]=0;
     if (Create)
     {
-      CStdString strPath = URIUtils::GetDirectory(DestName);
+      string strPath = URIUtils::GetDirectory(DestName);
       CUtil::CreateDirectoryEx(strPath);
       if (symlink(FileName,DestName)==-1)
       {

diff --git a/xbmc/AppParamParser.cpp b/xbmc/AppParamParser.cpp
@@ -119,7 +119,7 @@ void CAppParamParser::EnableDebugMode()
   CLog::SetLogLevel(g_advancedSettings.m_logLevel);
 }
 
-void CAppParamParser::ParseArg(const CStdString &arg)
+void CAppParamParser::ParseArg(const string &arg)
 {
   if (arg == "-fs" || arg == "--fullscreen")
     g_advancedSettings.m_startFullScreen = true;

diff --git a/xbmc/AppParamParser.h b/xbmc/AppParamParser.h
@@ -30,7 +30,7 @@ class CAppParamParser
   private:
     bool m_testmode;
     CFileItemList m_playlist;
-    void ParseArg(const CStdString &arg);
+    void ParseArg(const std::string &arg);
     void DisplayHelp();
     void DisplayVersion();
     void EnableDebugMode();