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>
pull/1/head
Slávek Banko 5 years ago
parent 500e1425cf
commit cbcf7d4529
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -58,7 +58,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" )

@ -105,7 +105,7 @@ MainWidget::~MainWidget() {
}
void MainWidget::fileOpen() {
KFileDialog d(TQString(),KImageIO::pattern(),this,i18n("Select an image"),true);
KFileDialog d(TQString(),KImageIO::pattern(),this,i18n("Select an image").utf8(),true);
d.exec();
if(d.result()==TQDialog::Accepted)
@ -162,7 +162,7 @@ void MainWidget::fileSave() {
ofstream out(m_outputFilename.local8Bit());
if(!in || !out)
{
emit signalChangeStatusbar(i18n(i18n("Error while saving file")));
emit signalChangeStatusbar(i18n("Error while saving file"));
return;
}
emit signalChangeStatusbar(i18n("Saving %1...").arg(m_outputFilename));

@ -81,7 +81,7 @@ void Options::defaultOptions(){
void Options::debug() {
for(map<TQString,TQString>::iterator i=options.begin(); i!=options.end(); i++)
cout << (*i).first << "=" << (*i).second << endl;
cout << (*i).first.local8Bit() << "=" << (*i).second.local8Bit() << endl;
}

Loading…
Cancel
Save