From a7a285eb61dd83afc892bc1d64ffe14b9f1426a3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Sun, 27 Sep 2009 23:51:34 +0200
Subject: Completely migrate to Unicode String class

---
 src/Client/UserCommands.cpp | 108 ++++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

(limited to 'src/Client/UserCommands.cpp')

diff --git a/src/Client/UserCommands.cpp b/src/Client/UserCommands.cpp
index 5e55534..fe5343c 100644
--- a/src/Client/UserCommands.cpp
+++ b/src/Client/UserCommands.cpp
@@ -107,7 +107,7 @@ void UserCommands::userInfoCommand(CommandParser *commandParser, const std::vect
 
   try {
     char *endptr;
-    unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+    unsigned long uid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
 
     boost::shared_ptr<const Common::UserInfo> userInfo;
 
@@ -160,19 +160,19 @@ void UserCommands::listGroupsCommand(CommandParser *commandParser, const std::ve
 
 void UserCommands::groupInfoCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() == 1) {
-    std::cerr << args[0].extract() << ": No group id given." << std::endl;
+    std::cerr << args[0] << ": No group id given." << std::endl;
     commandParser->printUsage("group_info");
     return;
   }
   if(args.size() > 2) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("group_info");
     return;
   }
 
   try {
     char *endptr;
-    unsigned long gid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+    unsigned long gid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
 
     boost::shared_ptr<const Common::GroupInfo> groupInfo;
 
@@ -182,7 +182,7 @@ void UserCommands::groupInfoCommand(CommandParser *commandParser, const std::vec
     else
       groupInfo = commandParser->application->getUserManager()->getGroupInfo(gid);
 
-    std::cout << "  Group name: " << groupInfo->getName().extract() << " (" << groupInfo->getGid() << ")" << std::endl << std::endl;
+    std::cout << "  Group name: " << groupInfo->getName() << " (" << groupInfo->getGid() << ")" << std::endl << std::endl;
 
     boost::shared_ptr<const std::set<unsigned long> > users = commandParser->application->getUserManager()->getGroupUserList(groupInfo->getGid());
 
@@ -191,7 +191,7 @@ void UserCommands::groupInfoCommand(CommandParser *commandParser, const std::vec
 
 
       for(std::set<unsigned long>::const_iterator user = users->begin(); user != users->end(); ++user)
-        std::cout << "    " << getUserName(commandParser, *user, true).extract() << std::endl;
+        std::cout << "    " << getUserName(commandParser, *user, true) << std::endl;
 
       std::cout << std::endl;
     }
@@ -203,27 +203,27 @@ void UserCommands::groupInfoCommand(CommandParser *commandParser, const std::vec
 
 void UserCommands::addUserCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 5) {
-    std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
+    std::cerr << args[0] << ": Too few arguments." << std::endl;
     commandParser->printUsage("add_user");
     return;
   }
   if(args.size() > 5) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("add_user");
     return;
   }
 
   char *endptr;
-  unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+  unsigned long uid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
   if(args[1].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse user id." << std::endl;
     commandParser->printUsage("add_user");
     return;
   }
 
-  unsigned long gid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+  unsigned long gid = std::strtoul(args[2].toString().c_str(), &endptr, 10);
   if(args[2].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse group id." << std::endl;
     commandParser->printUsage("add_user");
     return;
   }
@@ -244,34 +244,34 @@ void UserCommands::addUserCommand(CommandParser *commandParser, const std::vecto
 
 void UserCommands::updateUserCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 6) {
-    std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
+    std::cerr << args[0] << ": Too few arguments." << std::endl;
     commandParser->printUsage("update_user");
     return;
   }
   if(args.size() > 6) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("update_user");
     return;
   }
 
   char *endptr;
-  unsigned long origUid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+  unsigned long origUid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
   if(args[1].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse the old user id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse the old user id." << std::endl;
     commandParser->printUsage("update_user");
     return;
   }
 
-  unsigned long uid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+  unsigned long uid = std::strtoul(args[2].toString().c_str(), &endptr, 10);
   if(args[2].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse the new user id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse the new user id." << std::endl;
     commandParser->printUsage("update_user");
     return;
   }
 
-  unsigned long gid = std::strtoul(args[3].extract().c_str(), &endptr, 10);
+  unsigned long gid = std::strtoul(args[3].toString().c_str(), &endptr, 10);
   if(args[3].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse group id." << std::endl;
     commandParser->printUsage("update_user");
     return;
   }
@@ -292,20 +292,20 @@ void UserCommands::updateUserCommand(CommandParser *commandParser, const std::ve
 
 void UserCommands::deleteUserCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 2) {
-    std::cerr << args[0].extract() << ": No user id given." << std::endl;
+    std::cerr << args[0] << ": No user id given." << std::endl;
     commandParser->printUsage("delete_user");
     return;
   }
   if(args.size() > 2) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("delete_user");
     return;
   }
 
   char *endptr;
-  unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+  unsigned long uid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
   if(args[1].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse user id." << std::endl;
     commandParser->printUsage("delete_user");
     return;
   }
@@ -322,20 +322,20 @@ void UserCommands::deleteUserCommand(CommandParser *commandParser, const std::ve
 
 void UserCommands::addGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 3) {
-    std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
+    std::cerr << args[0] << ": Too few arguments." << std::endl;
     commandParser->printUsage("add_group");
     return;
   }
   if(args.size() > 3) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("add_group");
     return;
   }
 
   char *endptr;
-  unsigned long gid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+  unsigned long gid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
   if(args[2].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse group id." << std::endl;
     commandParser->printUsage("add_group");
     return;
   }
@@ -352,27 +352,27 @@ void UserCommands::addGroupCommand(CommandParser *commandParser, const std::vect
 
 void UserCommands::updateGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 4) {
-    std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
+    std::cerr << args[0] << ": Too few arguments." << std::endl;
     commandParser->printUsage("update_group");
     return;
   }
   if(args.size() > 4) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("update_group");
     return;
   }
 
   char *endptr;
-  unsigned long origGid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+  unsigned long origGid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
   if(args[1].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse the old group id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse the old group id." << std::endl;
     commandParser->printUsage("update_group");
     return;
   }
 
-  unsigned long gid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+  unsigned long gid = std::strtoul(args[2].toString().c_str(), &endptr, 10);
   if(args[2].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse the new group id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse the new group id." << std::endl;
     commandParser->printUsage("update_group");
     return;
   }
@@ -389,20 +389,20 @@ void UserCommands::updateGroupCommand(CommandParser *commandParser, const std::v
 
 void UserCommands::deleteGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 2) {
-    std::cerr << args[0].extract() << ": No group id given." << std::endl;
+    std::cerr << args[0] << ": No group id given." << std::endl;
     commandParser->printUsage("delete_group");
     return;
   }
   if(args.size() > 2) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("delete_group");
     return;
   }
 
   char *endptr;
-  unsigned long gid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+  unsigned long gid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
   if(args[1].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse group id." << std::endl;
     commandParser->printUsage("delete_group");
     return;
   }
@@ -419,27 +419,27 @@ void UserCommands::deleteGroupCommand(CommandParser *commandParser, const std::v
 
 void UserCommands::addUserToGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 3) {
-    std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
+    std::cerr << args[0] << ": Too few arguments." << std::endl;
     commandParser->printUsage("add_user_to_group");
     return;
   }
   if(args.size() > 3) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("add_user_to_group");
     return;
   }
 
   char *endptr;
-  unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+  unsigned long uid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
   if(args[1].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse user id." << std::endl;
     commandParser->printUsage("add_user_to_group");
     return;
   }
 
-  unsigned long gid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+  unsigned long gid = std::strtoul(args[2].toString().c_str(), &endptr, 10);
   if(args[2].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse group id." << std::endl;
     commandParser->printUsage("add_user_to_group");
     return;
   }
@@ -456,27 +456,27 @@ void UserCommands::addUserToGroupCommand(CommandParser *commandParser, const std
 
 void UserCommands::deleteUserFromGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 3) {
-    std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
+    std::cerr << args[0] << ": Too few arguments." << std::endl;
     commandParser->printUsage("delete_user_from_group");
     return;
   }
   if(args.size() > 3) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("delete_user_from_group");
     return;
   }
 
   char *endptr;
-  unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+  unsigned long uid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
   if(args[1].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse user id." << std::endl;
     commandParser->printUsage("delete_user_from_group");
     return;
   }
 
-  unsigned long gid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+  unsigned long gid = std::strtoul(args[2].toString().c_str(), &endptr, 10);
   if(args[2].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse group id." << std::endl;
     commandParser->printUsage("delete_user_from_group");
     return;
   }
@@ -493,20 +493,20 @@ void UserCommands::deleteUserFromGroupCommand(CommandParser *commandParser, cons
 
 void UserCommands::setPasswordCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 2) {
-    std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
+    std::cerr << args[0] << ": Too few arguments." << std::endl;
     commandParser->printUsage("set_password");
     return;
   }
   if(args.size() > 2) {
-    std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
+    std::cerr << args[0] << ": Too many arguments." << std::endl;
     commandParser->printUsage("set_password");
     return;
   }
 
   char *endptr;
-  unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+  unsigned long uid = std::strtoul(args[1].toString().c_str(), &endptr, 10);
   if(args[1].isEmpty() || *endptr != '\0') {
-    std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
+    std::cerr << args[0] << ": Unable to parse user id." << std::endl;
     commandParser->printUsage("set_password");
     return;
   }
-- 
cgit v1.2.3