added: a std::string constructor for CVariant

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

diff --git a/xbmc/FileSystem/IDirectory.cpp b/xbmc/FileSystem/IDirectory.cpp
index 5a3716c..9ff65b7 100644 (file)
--- a/xbmc/FileSystem/IDirectory.cpp
+++ b/xbmc/FileSystem/IDirectory.cpp
@@ -144,7 +144,7 @@ bool IDirectory::ProcessRequirements()
     CStdString input;
     if (CGUIDialogKeyboard::ShowAndGetInput(input, GetLocalized(m_requirements["heading"]), false))
     {
-      m_requirements["input"] = input.c_str();
+      m_requirements["input"] = input;
       return true;
     }
   }
@@ -200,7 +200,7 @@ void IDirectory::RequireAuthentication(const CStdString &url)
 {
   m_requirements.clear();
   m_requirements["type"] = "authenticate";
-  m_requirements["url"] = url.c_str();
+  m_requirements["url"] = url;
 }
 
 CStdString IDirectory::GetLocalized(const CVariant &var) const

diff --git a/xbmc/utils/Variant.cpp b/xbmc/utils/Variant.cpp
index 1035d83..aca56cf 100644 (file)
--- a/xbmc/utils/Variant.cpp
+++ b/xbmc/utils/Variant.cpp
@@ -76,6 +76,12 @@ CVariant::CVariant(const char *str)
   m_data.string = new string(str);
 }
 
+CVariant::CVariant(const string &str)
+{
+  m_type = VariantTypeString;
+  m_data.string = new string(str);
+}
+
 CVariant::CVariant(const CVariant &variant)
 {
   m_type = variant.m_type;

diff --git a/xbmc/utils/Variant.h b/xbmc/utils/Variant.h
index 39f9136..9840099 100644 (file)
--- a/xbmc/utils/Variant.h
+++ b/xbmc/utils/Variant.h
@@ -46,6 +46,7 @@ public:
   CVariant(uint64_t unsignedinteger);
   CVariant(bool boolean);
   CVariant(const char *str);
+  CVariant(const std::string &str);
   CVariant(const CVariant &variant);
 
   ~CVariant();