summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-06-28 18:10:57 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-06-28 18:13:23 +0200
commit5e7b4208af67228e8dae4bfb4f08d4dd69107102 (patch)
tree98ac9ad53ffc8200736988c932369203c9f74fb8
parentb51af279c4be77dd401b0ba910a34d9977b2453f (diff)
downloadcodeine-5e7b4208af67228e8dae4bfb4f08d4dd69107102.tar.gz
codeine-5e7b4208af67228e8dae4bfb4f08d4dd69107102.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>
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/app/captureFrame.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ddfb4f..cb9c06d 100644
--- a/CMakeLists.txt
+++ b/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" )
diff --git a/src/app/captureFrame.cpp b/src/app/captureFrame.cpp
index 3be0e9f..1ef8a4f 100644
--- a/src/app/captureFrame.cpp
+++ b/src/app/captureFrame.cpp
@@ -107,7 +107,7 @@ public:
return;
const TQString type = dialog.currentFilter().remove( 0, 2 ).upper();
- if( m_frame.save( fileName, type ) )
+ if( m_frame.save( fileName, type.utf8() ) )
message( i18n("%1 saved successfully").arg( fileName ) );
else
message( i18n("Sorry, could not save %1").arg( fileName ) );