Use Unicode-aware String class instead of std::string

1 files changed, 4 insertions, 4 deletions

diff --git a/src/Client/PasswordReader.cpp b/src/Client/PasswordReader.cpp
index d5c4fe8..8d549f5 100644
--- a/src/Client/PasswordReader.cpp
+++ b/src/Client/PasswordReader.cpp
@@ -32,7 +32,7 @@
 namespace Mad {
 namespace Client {
 
-std::string PasswordReader::readPassword(const std::string &prompt) {
+Core::String PasswordReader::readPassword(const Core::String &prompt) {
   std::string password;
 
 #ifdef _WIN32
@@ -41,7 +41,7 @@ std::string PasswordReader::readPassword(const std::string &prompt) {
   GetConsoleMode(handle, &mode);
   SetConsoleMode(handle, mode & ~(ENABLE_ECHO_INPUT));
   
-  std::cout << prompt << std::flush;
+  std::cout << prompt.extract() << std::flush;
   std::getline(std::cin, password);
   std::cout << std::endl;
 
@@ -56,14 +56,14 @@ std::string PasswordReader::readPassword(const std::string &prompt) {
   termnew.c_lflag &= ~ECHO;
   tcsetattr(STDIN_FILENO, TCSAFLUSH, &termnew);
 
-  std::cout << prompt << std::flush;
+  std::cout << prompt.extract() << std::flush;
   std::getline(std::cin, password);
   std::cout << std::endl;
 
   tcsetattr(STDIN_FILENO, TCSAFLUSH, &termold);
 #endif
 
-  return password;
+  return password.c_str();
 }
 
 }