summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-04-12 02:30:13 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-04-12 09:22:20 +0200
commit0d2238b5a78bc1aa5440b0ce63f83249aafc40c2 (patch)
tree05a43d362cff263b3f307774ba9bf6eca6187910 /src
parent903ee205e515f879deacfe7e08c157528d6a14b5 (diff)
downloadkasablanca-0d2238b5a78bc1aa5440b0ce63f83249aafc40c2.tar.gz
kasablanca-0d2238b5a78bc1aa5440b0ce63f83249aafc40c2.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>
Diffstat (limited to 'src')
-rw-r--r--src/ftpthread.cpp2
-rw-r--r--src/kasablanca.cpp6
2 files changed, 4 insertions, 4 deletions
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");