Merge pull request #4676 from jmarshallnz/dont_set_scraper_on_tvshow_on_nfo

[vuplus_xbmc] / xbmc / LangInfo.h

diff --git a/xbmc/LangInfo.h b/xbmc/LangInfo.h
index 1c2b100..b432da7 100644 (file)
--- a/xbmc/LangInfo.h
+++ b/xbmc/LangInfo.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "settings/ISettingCallback.h"
+#include "settings/lib/ISettingCallback.h"
 #include "utils/StdString.h"
 
 #include <map>
@@ -58,14 +58,14 @@ public:
   // language can either be a two char language code as defined in ISO639
   // or a three char language code
   // or a language name in english (as used by XBMC)
-  void SetAudioLanguage(const CStdString &language);
+  void SetAudioLanguage(const std::string& language);
   
   // three char language code (not win32 specific)
   const CStdString& GetSubtitleLanguage() const;
   // language can either be a two char language code as defined in ISO639
   // or a three char language code
   // or a language name in english (as used by XBMC)
-  void SetSubtitleLanguage(const CStdString &language);
+  void SetSubtitleLanguage(const std::string& language);
 
   const std::string GetDVDMenuLanguage() const;
   const std::string GetDVDAudioLanguage() const;