diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-04-12 02:30:13 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-04-12 12:57:00 +0200 |
| commit | 8acdd39befd1ffe7441502020196069a0d71b0f4 (patch) | |
| tree | b6d4533570def7cb4833086be35fd8de25b672d4 | |
| parent | 5db7d87e79382572079dd1d122feba6cfe7135f6 (diff) | |
| download | kasablanca-8acdd39befd1ffe7441502020196069a0d71b0f4.tar.gz kasablanca-8acdd39befd1ffe7441502020196069a0d71b0f4.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>
(cherry picked from commit 0d2238b5a78bc1aa5440b0ce63f83249aafc40c2)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/ftpthread.cpp | 2 | ||||
| -rw-r--r-- | src/kasablanca.cpp | 6 |
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"); |