aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarlson2k <k2k@narod.ru>2013-11-21 18:37:48 +0400
committerKarlson2k <k2k@narod.ru>2013-12-09 14:39:12 +0400
commitd3f48165087ae526d00e15cfb3178064699735dd (patch)
tree03427ee802dcff3c205893c06ffd9c3efc52306f
parentf0fbc8bcdf0c5bdebc86f10768de98e513fc2bc6 (diff)
StringUtils::TrimLeft/TrimRight: pass trimming chars as constant character strings
-rw-r--r--xbmc/utils/StringUtils.cpp4
-rw-r--r--xbmc/utils/StringUtils.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp
index e34a2a5785..e035829cb0 100644
--- a/xbmc/utils/StringUtils.cpp
+++ b/xbmc/utils/StringUtils.cpp
@@ -261,7 +261,7 @@ std::string& StringUtils::TrimLeft(std::string &str)
return str;
}
-std::string& StringUtils::TrimLeft(std::string &str, const std::string& chars)
+std::string& StringUtils::TrimLeft(std::string &str, const char* const chars)
{
size_t nidx = str.find_first_not_of(chars);
str.erase(0, nidx);
@@ -274,7 +274,7 @@ std::string& StringUtils::TrimRight(std::string &str)
return str;
}
-std::string& StringUtils::TrimRight(std::string &str, const std::string& chars)
+std::string& StringUtils::TrimRight(std::string &str, const char* const chars)
{
size_t nidx = str.find_last_not_of(chars);
str.erase(str.npos == nidx ? 0 : ++nidx);
diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h
index 1d1aade92a..d0adb06078 100644
--- a/xbmc/utils/StringUtils.h
+++ b/xbmc/utils/StringUtils.h
@@ -68,9 +68,9 @@ public:
static std::string Right(const std::string &str, size_t count);
static std::string& Trim(std::string &str);
static std::string& TrimLeft(std::string &str);
- static std::string& TrimLeft(std::string &str, const std::string &chars);
+ static std::string& TrimLeft(std::string &str, const char* const chars);
static std::string& TrimRight(std::string &str);
- static std::string& TrimRight(std::string &str, const std::string &chars);
+ static std::string& TrimRight(std::string &str, const char* const chars);
static std::string& RemoveDuplicatedSpacesAndTabs(std::string& str);
static int Replace(std::string &str, char oldChar, char newChar);
static int Replace(std::string &str, const std::string &oldStr, const std::string &newStr);