Added controlled conversions to char* instead of automatic ascii conversions.

The definition of -UTQT_NO_ASCII_CAST is no longer needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/torclient.cpp b/src/torclient.cpp
index 27c9477..c3efc5a 100644
--- a/src/torclient.cpp
+++ b/src/torclient.cpp
@@ -378,7 +378,7 @@ void TorClient::authenticate()
         if (TorkConfig::generateRandomPassword()){
             crypto_seed_rng();
             sendToServer(TQString("setconf HashedControlPassword=16:%2")
-                         .arg(hashPassword(crypto_rand_string(16))));
+                         .arg(hashPassword(crypto_rand_string(16).latin1())));
         }
     }
 
@@ -839,7 +839,7 @@ void TorClient::parseServer(const TQString &info)
 
         if (gi){
             int country_id = 0;
-            country_id = GeoIP_id_by_name(gi, ip);
+            country_id = GeoIP_id_by_name(gi, ip.latin1());
             cc = GeoIP_country_name[country_id];
             GeoIP_delete(gi);
         }else
@@ -1258,7 +1258,7 @@ bool TorClient::noSpecialProcessing(const TDEConfigSkeletonItem* it)
             crypto_seed_rng();
             sendToServer(TQString("setconf %1=16:%2")
                          .arg((*it).name())
-                         .arg(hashPassword(crypto_rand_string(16))));
+                         .arg(hashPassword(crypto_rand_string(16).latin1())));
             return false; 
         }
         return true;