pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Pass by value

Browse Source
This commit is contained in:
Michael Carlberg 2016-06-21 06:01:21 +02:00
parent 957f2e001c
commit e36cf8518a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/utils/string.hpp
View File

@ -13,19 +13,19 @@ namespace string
std::string replace(std::string haystack, std::string needle, std::string replacement); std::string replace(std::string haystack, std::string needle, std::string replacement);
std::string replace_all(std::string haystack, std::string needle, std::string replacement); std::string replace_all(std::string haystack, std::string needle, std::string replacement);
std::string squeeze(std::string haystack, const char &needle); std::string squeeze(std::string haystack, char needle);
// std::string strip(std::string haystack, const char &needle); // std::string strip(std::string haystack, char needle);
std::string strip_trailing_newline(std::string s); std::string strip_trailing_newline(std::string s);
std::string trim(std::string haystack, const char &needle); std::string trim(std::string haystack, char needle);
std::string ltrim(std::string haystack, const char &needle); std::string ltrim(std::string haystack, char needle);
std::string rtrim(std::string haystack, const char &needle); std::string rtrim(std::string haystack, char needle);
std::string join(const std::vector<std::string> &strs, std::string delim); std::string join(std::vector<std::string> strs, std::string delim);
std::vector<std::string> split(std::string s, const char &delim); std::vector<std::string> split(std::string s, char delim);
std::vector<std::string> &split_into(std::string s, const char &delim, std::vector<std::string> &elems); std::vector<std::string> &split_into(std::string s, char delim, std::vector<std::string> &elems);
std::size_t find_nth(std::string haystack, std::size_t pos, std::string needle, std::size_t nth); std::size_t find_nth(std::string haystack, std::size_t pos, std::string needle, std::size_t nth);
} }

16
src/utils/string.cpp
View File

@ -37,11 +37,11 @@ namespace string
return boost::replace_all_copy(haystack, needle, replacement); return boost::replace_all_copy(haystack, needle, replacement);
} }
std::string squeeze(std::string haystack, const char &needle) { std::string squeeze(std::string haystack, char needle) {
return replace_all(haystack, {needle, needle}, {needle}); return replace_all(haystack, {needle, needle}, {needle});
} }
// std::string strip(std::string haystack, const char &needle) // std::string strip(std::string haystack, char needle)
// { // {
// std::string str(haystack); // std::string str(haystack);
// std::string::size_type pos; // std::string::size_type pos;
@ -58,11 +58,11 @@ namespace string
return str; return str;
} }
std::string trim(std::string haystack, const char &needle) { std::string trim(std::string haystack, char needle) {
return rtrim(ltrim(haystack, needle), needle); return rtrim(ltrim(haystack, needle), needle);
} }
std::string ltrim(std::string haystack, const char &needle) std::string ltrim(std::string haystack, char needle)
{ {
std::string str(haystack); std::string str(haystack);
while (str[0] == needle) while (str[0] == needle)
@ -70,7 +70,7 @@ namespace string
return str; return str;
} }
std::string rtrim(std::string haystack, const char &needle) std::string rtrim(std::string haystack, char needle)
{ {
std::string str(haystack); std::string str(haystack);
while (str[str.length()-1] == needle) while (str[str.length()-1] == needle)
@ -78,7 +78,7 @@ namespace string
return str; return str;
} }
std::string join(const std::vector<std::string> &strs, std::string delim) std::string join(std::vector<std::string> strs, std::string delim)
{ {
std::string str; std::string str;
for (auto &s : strs) for (auto &s : strs)
@ -86,13 +86,13 @@ namespace string
return str; return str;
} }
std::vector<std::string> split(std::string s, const char &delim) std::vector<std::string> split(std::string s, char delim)
{ {
std::vector<std::string> vec; std::vector<std::string> vec;
return split_into(s, delim, vec); return split_into(s, delim, vec);
} }
std::vector<std::string> &split_into(std::string s, const char &delim, std::vector<std::string> &container) std::vector<std::string> &split_into(std::string s, char delim, std::vector<std::string> &container)
{ {
std::string str; std::string str;
std::stringstream buffer(s); std::stringstream buffer(s);