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>

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

src/ftpthread.cpp

@@ -753,7 +753,7 @@ void FtpThread::Transfer_Fxp_thread()
 	tqWarning("bla_thread: %d", alt);
 	
 	if (resume) tqWarning("WARNING: fxp resume isn't supported. overwriting file instead");
-	result == ftplib::Fxp(mp_ftp, dstftp->Ftp(), src, dst, ftplib::image, method);
+	result == ftplib::Fxp(mp_ftp, dstftp->Ftp(), src.utf8(), dst.utf8(), ftplib::image, method);
 	
 	FxpReportResult(result);
 	dstftp->FxpReportResult(result);

src/kasablanca.cpp

@@ -278,9 +278,9 @@ void Kasablanca::optionsPreferences()
 
 	dialog->setHelp("globalhelp");
 
-	KasablancaGeneralPreferencesDialog *general = new KasablancaGeneralPreferencesDialog(0, i18n("General"));
+	KasablancaGeneralPreferencesDialog *general = new KasablancaGeneralPreferencesDialog(0, i18n("General").utf8());
-	KasablancaColorsPreferencesDialog *colors = new KasablancaColorsPreferencesDialog(0, i18n("Colors"));
+	KasablancaColorsPreferencesDialog *colors = new KasablancaColorsPreferencesDialog(0, i18n("Colors").utf8());
-	KasablancaUserInterfacePreferencesDialog *ui = new KasablancaUserInterfacePreferencesDialog(0, i18n("User Interface"));
+	KasablancaUserInterfacePreferencesDialog *ui = new KasablancaUserInterfacePreferencesDialog(0, i18n("User Interface").utf8());
 	dialog->addPage(general, i18n("General"), "kasablanca");
 	dialog->addPage(colors, i18n("Colors"), "colors");
 	dialog->addPage(ui, i18n("User Interface"), "winprops");