From b40ba0cf91603b695f1f2380cbd39966a458f22f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Sun, 27 Sep 2009 19:58:24 +0200
Subject: Use Unicode-aware String class instead of std::string

---
 .../AuthBackendChallengeResponse.cpp                         |  8 ++++----
 .../AuthBackendChallengeResponse.h                           | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/modules/AuthBackendChallengeResponse')

diff --git a/src/modules/AuthBackendChallengeResponse/AuthBackendChallengeResponse.cpp b/src/modules/AuthBackendChallengeResponse/AuthBackendChallengeResponse.cpp
index fc6bd47..0785b7d 100644
--- a/src/modules/AuthBackendChallengeResponse/AuthBackendChallengeResponse.cpp
+++ b/src/modules/AuthBackendChallengeResponse/AuthBackendChallengeResponse.cpp
@@ -27,7 +27,7 @@ namespace Mad {
 namespace Modules {
 namespace AuthBackendChallengeResponse {
 
-const std::string AuthBackendChallengeResponse::methodName = "Challenge-Response";
+const Core::String AuthBackendChallengeResponse::methodName = "Challenge-Response";
 
 AuthBackendChallengeResponse::AuthContextChallengeResponse::AuthContextChallengeResponse(AuthBackendChallengeResponse *backend) : authenticated(false) {
   challenge.reserve(32);
@@ -38,13 +38,13 @@ AuthBackendChallengeResponse::AuthContextChallengeResponse::AuthContextChallenge
     challenge.push_back(backend->randomGenerator());
 }
 
-boost::shared_ptr<Common::AuthContext> AuthBackendChallengeResponse::authenticate(boost::shared_ptr<Common::AuthProvider> provider, const std::string &subMethod,
-    const std::string &user, const std::vector<boost::uint8_t> &data, std::vector<boost::uint8_t> &response,
+boost::shared_ptr<Common::AuthContext> AuthBackendChallengeResponse::authenticate(boost::shared_ptr<Common::AuthProvider> provider, const Core::String &subMethod,
+    const Core::String &user, const std::vector<boost::uint8_t> &data, std::vector<boost::uint8_t> &response,
     boost::shared_ptr<Common::AuthContext> context) throw(Core::Exception) {
   if(context && dynamic_cast<AuthContextChallengeResponse*>(context.get()) == 0)
     throw(Core::Exception(Core::Exception::INVALID_INPUT));
 
-  std::vector<std::string> allowedMethods = getSubMethods(provider);
+  std::vector<Core::String> allowedMethods = getSubMethods(provider);
   if(std::find(allowedMethods.begin(), allowedMethods.end(), subMethod) == allowedMethods.end())
     throw(Core::Exception(Core::Exception::INVALID_INPUT));
 
diff --git a/src/modules/AuthBackendChallengeResponse/AuthBackendChallengeResponse.h b/src/modules/AuthBackendChallengeResponse/AuthBackendChallengeResponse.h
index dc1b60a..0d69eba 100644
--- a/src/modules/AuthBackendChallengeResponse/AuthBackendChallengeResponse.h
+++ b/src/modules/AuthBackendChallengeResponse/AuthBackendChallengeResponse.h
@@ -56,7 +56,7 @@ class MAD_MODULE_EXPORT AuthBackendChallengeResponse : public Common::AuthBacken
         }
     };
 
-    static const std::string methodName;
+    static const Core::String methodName;
 
     Common::Application *application;
 
@@ -68,19 +68,19 @@ class MAD_MODULE_EXPORT AuthBackendChallengeResponse : public Common::AuthBacken
 
 
   protected:
-    virtual const std::string& getMethodName() const {
+    virtual const Core::String& getMethodName() const {
       return methodName;
     }
 
-    virtual std::vector<std::string> getSubMethods(boost::shared_ptr<Common::AuthProvider> provider) const {
-      std::vector<std::string> ret;
+    virtual std::vector<Core::String> getSubMethods(boost::shared_ptr<Common::AuthProvider> provider) const {
+      std::vector<Core::String> ret;
       ret.push_back(provider->getHashes().front());
 
       return ret;
     }
 
-    virtual boost::shared_ptr<Common::AuthContext> authenticate(boost::shared_ptr<Common::AuthProvider> provider, const std::string &subMethod,
-        const std::string &user, const std::vector<boost::uint8_t> &data, std::vector<boost::uint8_t> &response,
+    virtual boost::shared_ptr<Common::AuthContext> authenticate(boost::shared_ptr<Common::AuthProvider> provider, const Core::String &subMethod,
+        const Core::String &user, const std::vector<boost::uint8_t> &data, std::vector<boost::uint8_t> &response,
         boost::shared_ptr<Common::AuthContext> context) throw(Core::Exception);
 
   public:
-- 
cgit v1.2.3