Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 11 insertions, 1 deletions

diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh
index 75fa69e..7bc8f80 100644
--- a/src/FbTk/StringUtil.hh
+++ b/src/FbTk/StringUtil.hh
@@ -30,6 +30,16 @@ namespace FbTk {
 
 namespace StringUtil {
 
+/// \@{
+/// @param in - input string, might be 0xab or 0123
+/// @param out - result if extraction was ok
+/// @return 1 - ok, result stored in 'out'
+int extractNumber(const std::string& in, unsigned int& out);
+int extractNumber(const std::string& in, int& out);
+/// \@}
+
+/// creates a number to a string
+std::string number2String(int num);
 
 /// Similar to `strstr' but this function ignores the case of both strings
 const char *strcasestr(const char *str, const char *ptn);
@@ -84,7 +94,7 @@ static void stringTokensBetween(Container &container, const std::string &in,
     while (true) {
         err = getStringBetween(token, in.c_str() + pos, first, last, ok_chars,
                                allow_nesting);
-        if (err == 0)
+        if (err <= 0)
             break;
         container.push_back(token);
         pos += err;