diff options
| author | Slávek Banko <[email protected]> | 2018-12-16 05:16:48 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2018-12-16 11:28:29 +0100 |
| commit | 6284823847949bb94a9974bc49befb14d9513b47 (patch) | |
| tree | c0edff6a7f82c84531fdf8ed1b89fe3eab336e56 /src/kvpnc.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 <[email protected]>
(cherry picked from commit e543ebc9363bb746a042577f314240af305e07b5)
Diffstat (limited to 'src/kvpnc.cpp')
| -rw-r--r-- | src/kvpnc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index 84d1541..21bf2b9 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -20000,7 +20000,7 @@ void KVpnc::setGuiStatus ( int status ) ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString); - TQString TypeString2 = " [" + i18n("%1" , PrettyTypeString) + TQString("]"); + TQString TypeString2 = " [" + PrettyTypeString + TQString("]"); LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(TQString(TQDateTime::currentDateTime().toString(Qt::TextDate)) + TypeString2); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan) @@ -22881,7 +22881,7 @@ void KVpnc::doQuickConnect ( int id ) if ( itemtext != GlobalConfig->currentProfile->getName() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Switching to %1" , TQString ( itemtext ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n("Switching to %1").arg(itemtext), GlobalConfig->debug ); bool profileInList = false; for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ ) { |