summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/ftpthread.cpp2
-rw-r--r--src/kasablanca.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af8ec47..4517e05 100644
--- a/CMakeLists.txt
+++ b/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" )
diff --git a/src/ftpthread.cpp b/src/ftpthread.cpp
index f171918..c51ae20 100644
--- a/src/ftpthread.cpp
+++ b/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);
diff --git a/src/kasablanca.cpp b/src/kasablanca.cpp
index 500330e..687c7f6 100644
--- a/src/kasablanca.cpp
+++ b/src/kasablanca.cpp
@@ -278,9 +278,9 @@ void Kasablanca::optionsPreferences()
dialog->setHelp("globalhelp");
- KasablancaGeneralPreferencesDialog *general = new KasablancaGeneralPreferencesDialog(0, i18n("General"));
- KasablancaColorsPreferencesDialog *colors = new KasablancaColorsPreferencesDialog(0, i18n("Colors"));
- KasablancaUserInterfacePreferencesDialog *ui = new KasablancaUserInterfacePreferencesDialog(0, i18n("User Interface"));
+ KasablancaGeneralPreferencesDialog *general = new KasablancaGeneralPreferencesDialog(0, i18n("General").utf8());
+ KasablancaColorsPreferencesDialog *colors = new KasablancaColorsPreferencesDialog(0, i18n("Colors").utf8());
+ 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");