From a7a285eb61dd83afc892bc1d64ffe14b9f1426a3 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 27 Sep 2009 23:51:34 +0200 Subject: Completely migrate to Unicode String class --- src/Common/UserManager.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Common/UserManager.cpp') diff --git a/src/Common/UserManager.cpp b/src/Common/UserManager.cpp index 5fb5d15..90a0435 100644 --- a/src/Common/UserManager.cpp +++ b/src/Common/UserManager.cpp @@ -41,9 +41,9 @@ bool UserManager::handleConfigEntry(const Core::ConfigEntry &entry, bool /*handl if(entry[1].getKey().matches("MinUid")) { if(entry[2].isEmpty()) { char *endptr; - unsigned long val = std::strtoul(entry[1][0].extract().c_str(), &endptr, 10); + unsigned long val = std::strtoul(entry[1][0].toString().c_str(), &endptr, 10); if(entry[1][0].isEmpty() || *endptr) { - application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: MinUid '%s'", entry[1][0].extract().c_str()); + application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: MinUid '%s'", entry[1][0].toLocale().c_str()); } else { minUid = val; @@ -53,9 +53,9 @@ bool UserManager::handleConfigEntry(const Core::ConfigEntry &entry, bool /*handl else if(entry[1].getKey().matches("MaxUid")) { if(entry[2].isEmpty()) { char *endptr; - unsigned long val = std::strtoul(entry[1][0].extract().c_str(), &endptr, 10); + unsigned long val = std::strtoul(entry[1][0].toString().c_str(), &endptr, 10); if(entry[1][0].isEmpty() || *endptr) { - application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: MaxUid '%s'", entry[1][0].extract().c_str()); + application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: MaxUid '%s'", entry[1][0].toLocale().c_str()); } else { maxUid = val; @@ -65,9 +65,9 @@ bool UserManager::handleConfigEntry(const Core::ConfigEntry &entry, bool /*handl else if(entry[1].getKey().matches("MinGid")) { if(entry[2].isEmpty()) { char *endptr; - unsigned long val = std::strtoul(entry[1][0].extract().c_str(), &endptr, 10); + unsigned long val = std::strtoul(entry[1][0].toString().c_str(), &endptr, 10); if(entry[1][0].isEmpty() || *endptr) { - application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: MinGid '%s'", entry[1][0].extract().c_str()); + application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: MinGid '%s'", entry[1][0].toLocale().c_str()); } else { minGid = val; @@ -77,9 +77,9 @@ bool UserManager::handleConfigEntry(const Core::ConfigEntry &entry, bool /*handl else if(entry[1].getKey().matches("MaxGid")) { if(entry[2].isEmpty()) { char *endptr; - unsigned long val = std::strtoul(entry[1][0].extract().c_str(), &endptr, 10); + unsigned long val = std::strtoul(entry[1][0].toString().c_str(), &endptr, 10); if(entry[1][0].isEmpty() || *endptr) { - application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: MaxGid '%s'", entry[1][0].extract().c_str()); + application->logf(Core::Logger::LOG_WARNING, "UserBackendHome: Invalid configuration: MaxGid '%s'", entry[1][0].toLocale().c_str()); } else { maxGid = val; -- cgit v1.2.3