From 998c76a01a81629bb9701d75b3248d86bde68bad Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Wed, 19 Dec 2018 15:54:42 +0100 Subject: Added controlled conversions to char* instead of automatic ascii conversions. The definition of -UTQT_NO_ASCII_CAST is no longer needed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit cbcf7d45291c2efe12c1de29fbf1ec11163536e4) --- src/mainwidget.cpp | 4 ++-- src/options.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp index 7c29c3c..3f081b6 100644 --- a/src/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -105,7 +105,7 @@ MainWidget::~MainWidget() { } void MainWidget::fileOpen() { - KFileDialog d(TQString(),KImageIO::pattern(),this,i18n("Select an image"),true); + KFileDialog d(TQString(),KImageIO::pattern(),this,i18n("Select an image").utf8(),true); d.exec(); if(d.result()==TQDialog::Accepted) @@ -162,7 +162,7 @@ void MainWidget::fileSave() { ofstream out(m_outputFilename.local8Bit()); if(!in || !out) { - emit signalChangeStatusbar(i18n(i18n("Error while saving file"))); + emit signalChangeStatusbar(i18n("Error while saving file")); return; } emit signalChangeStatusbar(i18n("Saving %1...").arg(m_outputFilename)); diff --git a/src/options.cpp b/src/options.cpp index 6945c11..e59c764 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -81,7 +81,7 @@ void Options::defaultOptions(){ void Options::debug() { for(map::iterator i=options.begin(); i!=options.end(); i++) - cout << (*i).first << "=" << (*i).second << endl; + cout << (*i).first.local8Bit() << "=" << (*i).second.local8Bit() << endl; } -- cgit v1.2.3