diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-03-07 20:24:08 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-03-12 00:35:39 +0100 |
| commit | 369d8455ac39aa9f5328b855bd5f456e3f384a63 (patch) | |
| tree | ea0e74835bcc4c1ca9245316ffebf9a439828dd3 /klinkstatus/src | |
| parent | eea71ca9ecdfbd4682054a86cc9bbf954af94693 (diff) | |
| download | tdewebdev-369d8455ac39aa9f5328b855bd5f456e3f384a63.tar.gz tdewebdev-369d8455ac39aa9f5328b855bd5f456e3f384a63.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 70defe5e6d9498c5c6011eee50c4dc506abebd61)
Diffstat (limited to 'klinkstatus/src')
| -rw-r--r-- | klinkstatus/src/engine/linkchecker.cpp | 2 | ||||
| -rw-r--r-- | klinkstatus/src/global.cpp | 2 | ||||
| -rw-r--r-- | klinkstatus/src/ui/tabwidgetsession.cpp | 2 | ||||
| -rw-r--r-- | klinkstatus/src/ui/treeview.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 134b9582..82572997 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -277,7 +277,7 @@ void LinkChecker::slotData(TDEIO::Job* /*job*/, const TQByteArray& data) TQTextCodec* codec = 0; if(has_defined_charset_) - codec = TQTextCodec::codecForName(document_charset_); + codec = TQTextCodec::codecForName(document_charset_.latin1()); if(!codec) codec = TQTextCodec::codecForName("iso8859-1"); // default diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index 4fa6d88f..b5ac9619 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -111,7 +111,7 @@ TQCString Global::quantaDCOPAppId() { ps_list[i] = ps_list[i].stripWhiteSpace (); if(self()->dcop_client_->isApplicationRegistered("quanta-" + ps_list[i].local8Bit())) - app_id = "quanta-" + ps_list[i]; + app_id = "quanta-" + ps_list[i].utf8(); } } diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 015ce4cf..9f27d344 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -149,7 +149,7 @@ void TabWidgetSession::closeSession() SessionWidget* TabWidgetSession::newSessionWidget() { SessionWidget* session_widget = new SessionWidget(KLSConfig::maxConnectionsNumber(), - KLSConfig::timeOut(), this, TQString("session_widget-" + count())); + KLSConfig::timeOut(), this, TQString("session_widget-" + count()).utf8()); TQStringList columns; diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index c14a0824..52e7883b 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -72,7 +72,7 @@ void TreeView::setColumns(TQStringList const& columns) // resetColumns is called automatically for(uint i = 0; i != columns.size(); ++i) { - addColumn(i18n(columns[i])); + addColumn(i18n(columns[i].utf8())); setColumnWidthMode(i, TQListView::Manual); } |