From cbcf7d45291c2efe12c1de29fbf1ec11163536e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 19 Dec 2018 15:54:42 +0100 Subject: [PATCH] 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 --- CMakeLists.txt | 2 +- src/mainwidget.cpp | 4 ++-- src/options.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98d3e15..ed7a871 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST ) +add_definitions( -DHAVE_CONFIG_H ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) 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; }