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/Core/ConfigManager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/Core/ConfigManager.cpp') diff --git a/src/Core/ConfigManager.cpp b/src/Core/ConfigManager.cpp index d79ce32..fdbc93f 100644 --- a/src/Core/ConfigManager.cpp +++ b/src/Core/ConfigManager.cpp @@ -48,7 +48,7 @@ void ConfigManager::handleConfigEntry(const ConfigEntry &entry) { } if(!handled) - application->logf(Logger::LOG_WARNING, "Invalid config option '%s'.", entry[entry.getSize()-1].getKey().extract().c_str()); + application->logf(Logger::LOG_WARNING, "Invalid config option '%s'.", entry[entry.getSize()-1].getKey().toLocale().c_str()); } bool ConfigManager::loadFile(const std::string &filename) { @@ -66,9 +66,7 @@ bool ConfigManager::loadFile(const std::string &filename) { while(!(file.eof() && line.isEmpty() && input.isEmpty())) { while(input.isEmpty() && !file.eof()) { - std::string tmp; - std::getline(file, tmp); - input = tmp.c_str(); + input = String::getline(file); } if(input.isEmpty()) -- cgit v1.2.3