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 c860865bcd)

CMakeLists.txt

@@ -59,7 +59,7 @@ include( ConfigureChecks.cmake )
 
 ###### global compiler settings
 
-add_definitions( -DHAVE_CONFIG_H -UQT_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" )

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);