code simplification / deduplication

* parse the string only once for a bunch of chars to check instead of
  starting over again and again from the beginning, created a helper
  function to do this (FbTk::StringUtil::findCharFromAlphabetAfterTrigger)

* put same code into a function (setClockModeLabel())

* use much simpler code to switch between 12h and 24h mode and replace
  the fmt-switches

1 files changed, 12 insertions, 0 deletions

diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh
index 7bc8f80..a16e709 100644
--- a/src/FbTk/StringUtil.hh
+++ b/src/FbTk/StringUtil.hh
@@ -50,6 +50,18 @@ std::string expandFilename(const std::string &filename);
 /// @return extension of filename (ex: filename.txt will return txt)
 std::string findExtension(const std::string &filename);
 
+/// is the char after a 'trigger' part of an alphabet?
+/// @param in - string to analyze
+/// @param trigger - check for char after trigger
+/// @param alphabet - contains chars to search for
+/// @param len_alphabet - length of alphabet
+/// @param found - position of found char in alphabet (optional)
+/// @return position of trigger if found
+/// @return std::string::npos if nothing found
+std::string::size_type findCharFromAlphabetAfterTrigger(const std::string& in, 
+    char trigger,
+    const char alphabet[], size_t len_alphabet, size_t* found);
+
 /// @return copy of original with find_string replaced with "replace"
 std::string replaceString(const std::string &original, 
                           const char *find_string,