Remove unnecessary std:: qualifiers

[libs/core.git] / source / strings / utils.cpp

diff --git a/source/strings/utils.cpp b/source/strings/utils.cpp
index a67eb15b1f4b2b738fecc1b40bc60e7e9e3a97f3..1b4cad080dee85950740b58de822484be2c2214e 100644 (file)
--- a/source/strings/utils.cpp
+++ b/source/strings/utils.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <list>
 #include <stdexcept>
+#include <cctype>
 #include "utils.h"
 
 using namespace std;
@@ -39,7 +40,7 @@ vector<string> do_split(const string &str, const string &sep, int max_split)
        return result;
 }
 
-bool check_str(const std::string &str, int (*pred)(int))
+bool check_str(const string &str, int (*pred)(int))
 {
        for(string::const_iterator i=str.begin(); i!=str.end(); ++i)
                if(!pred(*i))
@@ -129,7 +130,21 @@ string strip(const string &s)
        return result;
 }
 
-string c_unescape(const std::string &str)
+string &append(string &str, const string &sep, const string &other)
+{
+       if(!str.empty() && !other.empty())
+               str += sep;
+       str += other;
+       return str;
+}
+
+string join(const string &str1, const string &sep, const string &str2)
+{
+       string result = str1;
+       return append(result, sep, str2);
+}
+
+string c_unescape(const string &str)
 {
        bool escape = false;
        unsigned numeric_type = 0;