From c860865bcded3d7b8a316f3933396e5fd93c7d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 13 May 2019 19:23:17 +0200 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 +- kdpkg-install/install.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4e675a..55a17e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,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/kdpkg-install/install.cpp b/kdpkg-install/install.cpp index 95420a3..3c78386 100644 --- a/kdpkg-install/install.cpp +++ b/kdpkg-install/install.cpp @@ -163,7 +163,7 @@ void install::page3() titleTextLabel->setText( ""+i18n( "Resynchronize Package Index")+"" ); closePushButton->hide(); - TQStrList run; run.append( m_kdePrefix + "/share/kdpkg/sh/kdpkg-sh" ); + TQStrList run; run.append( m_kdePrefix.local8Bit() + "/share/kdpkg/sh/kdpkg-sh" ); run.append( "update" ); TQWidget *consoleWidget = new console(this, run ); @@ -186,11 +186,11 @@ void install::page4() if( !removePkg ) removePkg = "none"; - TQStrList run; run.append( m_kdePrefix + "/share/kdpkg/sh/kdpkg-sh" ); + TQStrList run; run.append( m_kdePrefix.local8Bit() + "/share/kdpkg/sh/kdpkg-sh" ); run.append( "install" ); - run.append( path ); - run.append( installPkg ); - run.append( removePkg ); + run.append( path.local8Bit() ); + run.append( installPkg.local8Bit() ); + run.append( removePkg.local8Bit() ); TQWidget *consoleWidget = new console(this, run ); widgetStack->addWidget(consoleWidget, 5);