M src/FbTk/StringUtil.hh → src/FbTk/StringUtil.hh

@@ -94,12 +94,6 @@ 
 /// splits input at first non-leading whitespace and returns both parts
 void getFirstWord(const std::string &in, std::string &first, std::string &rest);
 
-template <typename T>
-void fromString(const char *in, T &out) {
-    FbTk_istringstream iss(in);
-    iss >> out;
-}
-
 template <typename Container>
 static void stringTokensBetween(Container &container, const std::string &in,
         std::string &rest, char first, char last,

M src/FbTk/Timer.cc → src/FbTk/Timer.cc

@@ -239,7 +239,7 @@ if (cmd == 0)
         return 0;
 
     uint64_t delay = 200;
-    StringUtil::fromString<uint64_t>(args.c_str() + err, delay);
+    StringUtil::extractNumber(args.c_str() + err, delay);
 
     return new DelayedCmd(cmd, delay);
 }

M src/Resources.cc → src/Resources.cc

@@ -35,8 +35,6 @@ 
 using std::string;
 using std::vector;
 
-using namespace FbTk;
-
 //-----------------------------------------------------------------
 //---- accessors for int, bool, and some enums with Resource ------
 //-----------------------------------------------------------------