1 files changed, 17 insertions, 17 deletions

diff --git a/src/modules/UserDBBackendMysql/UserDBBackendMysql.h b/src/modules/UserDBBackendMysql/UserDBBackendMysql.h
index 959e133..9351ca1 100644
--- a/src/modules/UserDBBackendMysql/UserDBBackendMysql.h
+++ b/src/modules/UserDBBackendMysql/UserDBBackendMysql.h
@@ -29,7 +29,7 @@
 #include <mysql/mysql.h>
 
 #include <boost/thread/mutex.hpp>
-#include <boost/variant.hpp>
+#include <boost/variant/variant.hpp>
 
 namespace Mad {
 namespace Modules {
@@ -37,14 +37,14 @@ namespace UserDBBackendMysql {
 
 class UserDBBackendMysql : public Common::UserDBBackend, private Core::Configurable, private boost::noncopyable {
   private:
-    typedef std::map<std::string, boost::variant<std::string, unsigned long> > ArgumentMap;
+    typedef std::map<Core::String, boost::variant<Core::String, unsigned long> > ArgumentMap;
 
     class Result;
-    Result query(const std::string &query, const ArgumentMap &args = ArgumentMap()) throw(Core::Exception);
+    Result query(const Core::String &query, const ArgumentMap &args = ArgumentMap()) throw(Core::Exception);
 
     class Result {
       private:
-        friend Result UserDBBackendMysql::query(const std::string &query, const ArgumentMap &args) throw(Core::Exception);
+        friend Result UserDBBackendMysql::query(const Core::String &query, const ArgumentMap &args) throw(Core::Exception);
 
         boost::shared_ptr<MYSQL_RES> result;
 
@@ -84,21 +84,21 @@ class UserDBBackendMysql : public Common::UserDBBackend, private Core::Configura
         }
     };
 
-    static const std::string name;
+    static const Core::String name;
 
     Common::Application *application;
 
-    std::string host, username, passwd, db, unixSocket;
+    Core::String host, username, passwd, db, unixSocket;
     uint16_t port;
 
-    std::string queryListUsers, queryListGroups;
-    std::string queryListUserGroups, queryListGroupUsers;
-    std::string queryUserById, queryUserByName;
-    std::string queryGroupById, queryGroupByName;
-    std::string queryUserGroupTable;
-    std::string queryAddUser, queryUpdateUser, queryDeleteUser;
-    std::string queryAddGroup, queryUpdateGroup, queryDeleteGroup;
-    std::string queryAddUserToGroup, queryDeleteUserFromGroup;
+    Core::String queryListUsers, queryListGroups;
+    Core::String queryListUserGroups, queryListGroupUsers;
+    Core::String queryUserById, queryUserByName;
+    Core::String queryGroupById, queryGroupByName;
+    Core::String queryUserGroupTable;
+    Core::String queryAddUser, queryUpdateUser, queryDeleteUser;
+    Core::String queryAddGroup, queryUpdateGroup, queryDeleteGroup;
+    Core::String queryAddUserToGroup, queryDeleteUserFromGroup;
 
     MYSQL *mysql;
 
@@ -112,12 +112,12 @@ class UserDBBackendMysql : public Common::UserDBBackend, private Core::Configura
 
     virtual boost::shared_ptr<const std::map<unsigned long, Common::UserInfo> > getUserList(boost::posix_time::ptime *timestamp) throw(Core::Exception);
     virtual boost::shared_ptr<const Common::UserInfo> getUserInfo(unsigned long uid, boost::posix_time::ptime *timestamp) throw(Core::Exception);
-    virtual boost::shared_ptr<const Common::UserInfo> getUserInfoByName(const std::string &name, boost::posix_time::ptime *timestamp) throw(Core::Exception);
+    virtual boost::shared_ptr<const Common::UserInfo> getUserInfoByName(const Core::String &name, boost::posix_time::ptime *timestamp) throw(Core::Exception);
     virtual boost::shared_ptr<const std::set<unsigned long> > getUserGroupList(unsigned long uid, boost::posix_time::ptime *timestamp) throw(Core::Exception);
 
     virtual boost::shared_ptr<const std::map<unsigned long, Common::GroupInfo> > getGroupList(boost::posix_time::ptime *timestamp) throw(Core::Exception);
     virtual boost::shared_ptr<const Common::GroupInfo> getGroupInfo(unsigned long gid, boost::posix_time::ptime *timestamp) throw(Core::Exception);
-    virtual boost::shared_ptr<const Common::GroupInfo> getGroupInfoByName(const std::string &name, boost::posix_time::ptime *timestamp) throw(Core::Exception);
+    virtual boost::shared_ptr<const Common::GroupInfo> getGroupInfoByName(const Core::String &name, boost::posix_time::ptime *timestamp) throw(Core::Exception);
     virtual boost::shared_ptr<const std::set<unsigned long> > getGroupUserList(unsigned long gid, boost::posix_time::ptime *timestamp) throw(Core::Exception);
 
     virtual boost::shared_ptr<const std::multimap<unsigned long, unsigned long> > getFullUserGroupList(boost::posix_time::ptime *timestamp) throw(Core::Exception);
@@ -147,7 +147,7 @@ class UserDBBackendMysql : public Common::UserDBBackend, private Core::Configura
       }
     }
 
-    virtual const std::string& getName() {
+    virtual const Core::String& getName() {
       return name;
     }
 };