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/displaycertdialog.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/displaycertdialog.cpp')
| -rw-r--r-- | src/displaycertdialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/displaycertdialog.cpp b/src/displaycertdialog.cpp index 57e06c5..d1eefd8 100644 --- a/src/displaycertdialog.cpp +++ b/src/displaycertdialog.cpp @@ -23,8 +23,8 @@ #include <tqstringlist.h> #include <iostream> -DisplayCertDialog::DisplayCertDialog(TQWidget *parent, const char* caption, KVpncConfig *GlobalConfig) - : KDialogBase ( parent, i18n ( "Certificate data" ).ascii(), true, caption, +DisplayCertDialog::DisplayCertDialog(TQWidget *parent, const TQString& caption, KVpncConfig *GlobalConfig) + : KDialogBase ( parent, i18n ( "Certificate data" ).utf8(), true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { main = new DisplayCertDialogBase ( this ); @@ -41,7 +41,7 @@ DisplayCertDialog::~DisplayCertDialog() void DisplayCertDialog::parseCertData() { - std::cout << "certdatalist" << CertDataList.join (" ") << std::endl; + std::cout << "certdatalist" << CertDataList.join (" ").local8Bit() << std::endl; for ( TQStringList::Iterator it = CertDataList.begin(); it != CertDataList.end(); ++it ) { if (GlobalConfig->KvpncDebugLevel > 2) GlobalConfig->appendLogEntry("[cert data]: "+*it,GlobalConfig->debug); |