From 92940571f3113a27673b6e79dba26e745079ff90 Mon Sep 17 00:00:00 2001 From: Mathias Gumz Date: Thu, 5 Feb 2015 21:35:02 +0100 Subject: Cleanup; Remove unused function --- src/FbTk/StringUtil.hh | 6 ------ src/FbTk/Timer.cc | 2 +- src/Resources.cc | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh index 930e0b5..bc17158 100644 --- a/src/FbTk/StringUtil.hh +++ b/src/FbTk/StringUtil.hh @@ -94,12 +94,6 @@ std::string::size_type removeTrailingWhitespace(std::string &str); /// splits input at first non-leading whitespace and returns both parts void getFirstWord(const std::string &in, std::string &first, std::string &rest); -template -void fromString(const char *in, T &out) { - FbTk_istringstream iss(in); - iss >> out; -} - template static void stringTokensBetween(Container &container, const std::string &in, std::string &rest, char first, char last, diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc index 61875f7..05d938b 100644 --- a/src/FbTk/Timer.cc +++ b/src/FbTk/Timer.cc @@ -239,7 +239,7 @@ Command *DelayedCmd::parse(const std::string &command, return 0; uint64_t delay = 200; - StringUtil::fromString(args.c_str() + err, delay); + StringUtil::extractNumber(args.c_str() + err, delay); return new DelayedCmd(cmd, delay); } diff --git a/src/Resources.cc b/src/Resources.cc index affaf19..aacff60 100644 --- a/src/Resources.cc +++ b/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 ------ //----------------------------------------------------------------- -- cgit v0.11.2