M src/ClientPattern.cc → src/ClientPattern.cc

@@ -24,8 +24,8 @@ // $Id$
 
 #include "ClientPattern.hh"
 #include "RegExp.hh"
-#include "StringUtil.hh"
 #include "WinClient.hh"
+#include "FbTk/StringUtil.hh"
 #include "FbTk/App.hh"
 
 // use GNU extensions

M src/CommandParser.cc → src/CommandParser.cc

@@ -23,22 +23,14 @@ 
 // $Id$
 
 #include "CommandParser.hh"
-
-#include "StringUtil.hh"
+#include "FbTk/StringUtil.hh"
 
 #include <vector>
-using namespace std;
-
-namespace {
-
-string::size_type removeFirstWhitespace(std::string &str) {
-    string::size_type first_pos = str.find_first_not_of(" \t");
-    if (first_pos != string::npos)
-        str.erase(0, first_pos);
-    return first_pos;
-}
 
-}; // end anonymous namespace
+using std::string;
+using std::vector;
+using FbTk::StringUtil::removeFirstWhitespace;
+using FbTk::StringUtil::toLower;
 
 CommandFactory::CommandFactory() {
 
@@ -49,7 +41,7 @@ // remove all associations with this factory
     CommandParser::instance().removeAssociation(*this);
 }
 
-void CommandFactory::addCommand(const std::string &command_name) {
+void CommandFactory::addCommand(const string &command_name) {
     CommandParser::instance().associateCommand(command_name, *this);
 }
 
@@ -58,7 +50,7 @@ static CommandParser singleton;
     return singleton;
 }
 
-FbTk::Command *CommandParser::parseLine(const std::string &line) {
+FbTk::Command *CommandParser::parseLine(const string &line) {
 
     // parse arguments and command
     string command = line;
@@ -74,7 +66,7 @@ }
 
     // now we have parsed command and arguments
 
-    command = FbTk::StringUtil::toLower(command);
+    command = toLower(command);
 
     // we didn't find any matching command in default commands,
     // so we search in the command creators modules for a 
@@ -100,7 +92,7 @@ }
 
 void CommandParser::removeAssociation(CommandFactory &factory) {
     // commands that are associated with the factory
-    std::vector<std::string> commands; 
+    vector<string> commands; 
     // find associations
     CommandFactoryMap::iterator factory_it = m_commandfactorys.begin();
     const CommandFactoryMap::iterator factory_it_end = m_commandfactorys.end();

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

@@ -1,5 +1,5 @@ 
 // StringUtil.hh for fluxbox 
-// Copyright (c) 2001 - 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
+// Copyright (c) 2001 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),

M src/Keys.cc → src/Keys.cc

@@ -1,5 +1,5 @@ 
 // Keys.cc for Fluxbox - an X11 Window manager
-// Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
+// Copyright (c) 2001 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),