2 files changed, 10 insertions, 10 deletions
diff --git a/xbmc/interfaces/info/InfoBool.cpp b/xbmc/interfaces/info/InfoBool.cpp
index db4926caed..7a81fdb4d0 100644
--- a/xbmc/interfaces/info/InfoBool.cpp
+++ b/xbmc/interfaces/info/InfoBool.cpp
@@ -33,7 +33,7 @@ bool InfoBool::operator==(const InfoBool &right) const
           StringUtils::EqualsNoCase(m_expression, right.m_expression));
 }
 
-InfoSingle::InfoSingle(const CStdString &expression, int context)
+InfoSingle::InfoSingle(const std::string &expression, int context)
 : InfoBool(expression, context)
 {
   m_condition = g_infoManager.TranslateSingleString(expression);
@@ -44,7 +44,7 @@ void InfoSingle::Update(const CGUIListItem *item)
   m_value = g_infoManager.GetBool(m_condition, m_context, item);
 }
 
-InfoExpression::InfoExpression(const CStdString &expression, int context)
+InfoExpression::InfoExpression(const std::string &expression, int context)
 : InfoBool(expression, context)
 {
   Parse(expression);
@@ -77,10 +77,10 @@ short InfoExpression::GetOperator(const char ch) const
     return 0;
 }
 
-void InfoExpression::Parse(const CStdString &expression)
+void InfoExpression::Parse(const std::string &expression)
 {
   stack<char> operators;
-  CStdString operand;
+  std::string operand;
   for (unsigned int i = 0; i < expression.size(); i++)
   {
     if (GetOperator(expression[i]))
diff --git a/xbmc/interfaces/info/InfoBool.h b/xbmc/interfaces/info/InfoBool.h
index 2674cac3f5..1264c4ffe6 100644
--- a/xbmc/interfaces/info/InfoBool.h
+++ b/xbmc/interfaces/info/InfoBool.h
@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <map>
-#include "utils/StdString.h"
+#include <string>
 
 class CGUIListItem;
 
@@ -35,7 +35,7 @@ namespace INFO
 class InfoBool
 {
 public:
-  InfoBool(const CStdString &expression, int context)
+  InfoBool(const std::string &expression, int context)
     : m_value(false),
       m_context(context),
       m_expression(expression),
@@ -75,7 +75,7 @@ protected:
   int m_context;               ///< contextual information to go with the condition
 
 private:
-  CStdString m_expression;     ///< original expression
+  std::string  m_expression;   ///< original expression
   unsigned int m_lastUpdate;   ///< last update time (to determine dirty status)
 };
 
@@ -84,7 +84,7 @@ private:
 class InfoSingle : public InfoBool
 {
 public:
-  InfoSingle(const CStdString &condition, int context);
+  InfoSingle(const std::string &condition, int context);
   virtual ~InfoSingle() {};
 
   virtual void Update(const CGUIListItem *item);
@@ -97,12 +97,12 @@ private:
 class InfoExpression : public InfoBool
 {
 public:
-  InfoExpression(const CStdString &expression, int context);
+  InfoExpression(const std::string &expression, int context);
   virtual ~InfoExpression() {};
 
   virtual void Update(const CGUIListItem *item);
 private:
-  void Parse(const CStdString &expression);
+  void Parse(const std::string &expression);
   bool Evaluate(const CGUIListItem *item, bool &result);
   short GetOperator(const char ch) const;