Completely migrate to Unicode String class

1 files changed, 6 insertions, 6 deletions

diff --git a/src/modules/UserDBBackendMysql/UserDBBackendMysql.cpp b/src/modules/UserDBBackendMysql/UserDBBackendMysql.cpp
index 46f9d12..1d213a8 100644
--- a/src/modules/UserDBBackendMysql/UserDBBackendMysql.cpp
+++ b/src/modules/UserDBBackendMysql/UserDBBackendMysql.cpp
@@ -68,7 +68,7 @@ bool UserDBBackendMysql::handleConfigEntry(const Core::ConfigEntry &entry, bool
       char *endptr;
       long val;
 
-      val = strtol(entry[2][0].extract().c_str(), &endptr, 10);
+      val = strtol(entry[2][0].toString().c_str(), &endptr, 10);
 
       if(endptr != 0 || val < 0 || val > 65535)
         application->log(Core::Logger::LOG_WARNING, "UserDBBackendMysql: Invalid port");
@@ -166,8 +166,8 @@ void UserDBBackendMysql::configFinished() {
 
   boost::lock_guard<boost::mutex> lock(mutex);
   mysql = mysql_init(0);
-  mysql_real_connect(mysql, host.extract().c_str(), username.extract().c_str(), passwd.extract().c_str(),
-      db.extract().c_str(), port, unixSocket.isEmpty() ? 0 : unixSocket.extract().c_str(), 0);
+  mysql_real_connect(mysql, host.toLocale().c_str(), username.toLocale().c_str(), passwd.toLocale().c_str(),
+      db.toLocale().c_str(), port, unixSocket.isEmpty() ? 0 : unixSocket.toLocale().c_str(), 0);
 }
 
 
@@ -175,7 +175,7 @@ UserDBBackendMysql::Result UserDBBackendMysql::query(const Core::String &query,
   if(!mysql || mysql_ping(mysql))
     throw Core::Exception(Core::Exception::NOT_AVAILABLE);
 
-  std::string queryStr = query.extract();
+  std::string queryStr = query.toLocale();
 
   if(args.empty()) {
     mysql_real_query(mysql, queryStr.c_str(), queryStr.length());
@@ -185,7 +185,7 @@ UserDBBackendMysql::Result UserDBBackendMysql::query(const Core::String &query,
       std::string argStr;
 
       try {
-        argStr = boost::get<Core::String>(arg->second).extract();
+        argStr = boost::get<Core::String>(arg->second).toLocale();
       }
       catch(...) {
         std::ostringstream stream;
@@ -196,7 +196,7 @@ UserDBBackendMysql::Result UserDBBackendMysql::query(const Core::String &query,
       boost::scoped_array<char> escaped(new char[argStr.length()*2+1]);
       mysql_real_escape_string(mysql, escaped.get(), argStr.c_str(), argStr.length());
 
-      queryStr = boost::regex_replace(queryStr, boost::regex("\\{" + arg->first.extract() + "\\}"), "\"" + std::string(escaped.get()) + "\"", boost::match_default);
+      queryStr = boost::regex_replace(queryStr, boost::regex("\\{" + arg->first.toLocale() + "\\}"), "\"" + std::string(escaped.get()) + "\"", boost::match_default);
     }
 
     mysql_real_query(mysql, queryStr.c_str(), queryStr.length());