diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-12-16 05:16:48 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-12-16 11:28:29 +0100 |
| commit | 6284823847949bb94a9974bc49befb14d9513b47 (patch) | |
| tree | c0edff6a7f82c84531fdf8ed1b89fe3eab336e56 /src/utils.cpp | |
| parent | edd94929b6f5cec0621460553c6d5c704cc13691 (diff) | |
| download | kvpnc-6284823847949bb94a9974bc49befb14d9513b47.tar.gz kvpnc-6284823847949bb94a9974bc49befb14d9513b47.zip | |
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>
(cherry picked from commit e543ebc9363bb746a042577f314240af305e07b5)
Diffstat (limited to 'src/utils.cpp')
| -rw-r--r-- | src/utils.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/utils.cpp b/src/utils.cpp index 4409ac3..a132f03 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -1471,7 +1471,7 @@ void Utils::readStdOutRetriveIpsecAlgos() TQString Algo = msg.stripWhiteSpace().section(":",1,1).section(",",1,1).section("=",1,1); TQString MinKeySize = msg.stripWhiteSpace().section(":",1,1).section(",",3,3).section("=",1,1); TQString MaxKeySize = msg.stripWhiteSpace().section(":",1,1).section(",",4,4).section("=",1,1); - std::cout << "IKE encryption algo found: \"" << Algo << "\", Min: " << MinKeySize << ", Max: " << MaxKeySize << std::endl; + std::cout << "IKE encryption algo found: \"" << Algo.local8Bit() << "\", Min: " << MinKeySize.local8Bit() << ", Max: " << MaxKeySize.local8Bit() << std::endl; // TQStringList AlgoOptList = TQStringList::split("-",AlgoOpt); // for (TQStringList::Iterator it = AlgoOptList.begin(); it != AlgoOptList.end(); ++it) // { @@ -1896,12 +1896,12 @@ int Utils::dottedIpv4Netmask2NetmaskBytes(TQString dottedIpv4Netmask) TQString block2 = dec2bin(part2); TQString block3 = dec2bin(part3); - std::cout << "block0: " << block0 << std::endl; - std::cout << "block1: " << block1 << std::endl; - std::cout << "block2: " << block2 << std::endl; - std::cout << "block3: " << block3 << std::endl; + std::cout << "block0: " << block0.local8Bit() << std::endl; + std::cout << "block1: " << block1.local8Bit() << std::endl; + std::cout << "block2: " << block2.local8Bit() << std::endl; + std::cout << "block3: " << block3.local8Bit() << std::endl; block = block0 + block1 +block2 + block3; - std::cout << "block: " << block.ascii() << std::endl; + std::cout << "block: " << block.local8Bit() << std::endl; for (int i=0; i< 31;i++) { |