summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-05-13 19:23:17 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-05-13 19:23:17 +0200
commitc860865bcded3d7b8a316f3933396e5fd93c7d51 (patch)
tree7cc7e6ea2c54fa6afa5b7acc3b3f4b08ef82e262
parent26f73f5100c4917f50f593f55fc96776055d2b39 (diff)
downloadkdpkg-c860865b.tar.gz
kdpkg-c860865b.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>
-rw-r--r--CMakeLists.txt2
-rw-r--r--kdpkg-install/install.cpp10
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( "<b>"+i18n( "Resynchronize Package Index")+"</b>" );
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);