1 files changed, 9 insertions, 10 deletions
diff --git a/src/Client/CommandParser.h b/src/Client/CommandParser.h
index c4a0f79..87262d7 100644
--- a/src/Client/CommandParser.h
+++ b/src/Client/CommandParser.h
@@ -29,7 +29,6 @@
 #include <boost/smart_ptr.hpp>
 
 #include <map>
-#include <string>
 #include <vector>
 
 namespace Mad {
@@ -57,7 +56,7 @@ class MAD_CLIENT_EXPORT CommandParser {
       const char* desc;
       const char* longdesc;
 
-      boost::function2<void, CommandParser*, const std::vector<std::string> > function;
+      boost::function2<void, CommandParser*, const std::vector<Core::String> > function;
     };
 
     static const Command commands[];
@@ -68,14 +67,14 @@ class MAD_CLIENT_EXPORT CommandParser {
 
     bool disconnect;
 
-    static const Command* findCommand(const std::string& command);
+    static const Command* findCommand(const Core::String& command);
 
-    static void printUsage(const std::string& command);
-    std::map<std::string, Common::HostInfo> parseHostList(const std::vector<std::string> &args, bool mustBeActive = false);
+    static void printUsage(const Core::String& command);
+    std::map<Core::String, Common::HostInfo> parseHostList(const std::vector<Core::String> &args, bool mustBeActive = false);
 
-    void helpCommand(const std::vector<std::string> &args);
-    void listHostsCommand(const std::vector<std::string> &args);
-    void exitCommand(const std::vector<std::string> &args);
+    void helpCommand(const std::vector<Core::String> &args);
+    void listHostsCommand(const std::vector<Core::String> &args);
+    void exitCommand(const std::vector<Core::String> &args);
 
   public:
     CommandParser(Application *application0, Common::Connection *connection0);
@@ -84,10 +83,10 @@ class MAD_CLIENT_EXPORT CommandParser {
       return connection;
     }
 
-    bool parse(const std::string &cmd);
+    bool parse(const Core::String &cmd);
 
     void requestDisconnect() {
-      exitCommand(std::vector<std::string>());
+      exitCommand(std::vector<Core::String>());
     }
 
     bool willDisconnect() const {