diff options
| author | Jonathan Marshall <jmarshall@xbmc.org> | 2014-07-05 18:25:25 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@xbmc.org> | 2014-07-14 09:18:11 +1200 |
| commit | fc2fcc3c20ae9eab6dbb17c90a8e1d3ff8ec5ac9 (patch) | |
| tree | b7128b31e46ae7096aa69c3c455a29a9217dedff | |
| parent | 9567db7008cc183e14b05058f79c1754c463ae30 (diff) | |
[stdstring] get rid of CStdString in interfaces/
| -rw-r--r-- | xbmc/GUIInfoManager.cpp | 2 | ||||
| -rw-r--r-- | xbmc/interfaces/info/SkinVariable.cpp | 4 | ||||
| -rw-r--r-- | xbmc/interfaces/info/SkinVariable.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index 8f62d7e836..1364ce1c4b 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -5541,7 +5541,7 @@ int CGUIInfoManager::TranslateSkinVariableString(const CStdString& name, int con for (vector<CSkinVariableString>::const_iterator it = m_skinVariableStrings.begin(); it != m_skinVariableStrings.end(); ++it) { - if (it->GetName().Equals(name) && it->GetContext() == context) + if (StringUtils::EqualsNoCase(it->GetName(), name) && it->GetContext() == context) return it - m_skinVariableStrings.begin() + CONDITIONAL_LABEL_START; } return 0; diff --git a/xbmc/interfaces/info/SkinVariable.cpp b/xbmc/interfaces/info/SkinVariable.cpp index c5c2df961f..496e8ef79c 100644 --- a/xbmc/interfaces/info/SkinVariable.cpp +++ b/xbmc/interfaces/info/SkinVariable.cpp @@ -66,12 +66,12 @@ int CSkinVariableString::GetContext() const return m_context; } -const CStdString& CSkinVariableString::GetName() const +const std::string& CSkinVariableString::GetName() const { return m_name; } -CStdString CSkinVariableString::GetValue(bool preferImage /* = false*/, const CGUIListItem *item /* = NULL */) +std::string CSkinVariableString::GetValue(bool preferImage /* = false*/, const CGUIListItem *item /* = NULL */) { for (VECCONDITIONLABELPAIR::const_iterator it = m_conditionLabelPairs.begin() ; it != m_conditionLabelPairs.end(); ++it) { diff --git a/xbmc/interfaces/info/SkinVariable.h b/xbmc/interfaces/info/SkinVariable.h index 0f99c5f657..0fa6c53a43 100644 --- a/xbmc/interfaces/info/SkinVariable.h +++ b/xbmc/interfaces/info/SkinVariable.h @@ -38,13 +38,13 @@ public: class CSkinVariableString { public: - const CStdString& GetName() const; + const std::string& GetName() const; int GetContext() const; - CStdString GetValue(bool preferImage = false, const CGUIListItem *item = NULL ); + std::string GetValue(bool preferImage = false, const CGUIListItem *item = NULL ); private: CSkinVariableString(); - CStdString m_name; + std::string m_name; int m_context; struct ConditionLabelPair |