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/2/head
Slávek Banko 3 years ago committed by gregory guy
parent 2fe98299ba
commit c9792a21ad
No known key found for this signature in database
GPG Key ID: 2CC84A1CC6823AF8

@ -59,7 +59,7 @@ include( ConfigureChecks.cmake )
###### global compiler settings ###### 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_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )

@ -668,7 +668,7 @@ void save_preferences(bool mode) {
filename += "qalculate-tde.cfg"; filename += "qalculate-tde.cfg";
file = fopen(filename.c_str(), "w+"); file = fopen(filename.c_str(), "w+");
if(file == NULL) { if(file == NULL) {
fprintf(stderr, i18n("Couldn't write preferences to\n%s"), filename.c_str()); fprintf(stderr, i18n("Couldn't write preferences to\n%s").local8Bit(), filename.c_str());
return; return;
} }
fprintf(file, "\n[General]\n"); fprintf(file, "\n[General]\n");

@ -152,7 +152,7 @@ void QalculateExportCSVDialog::slotOk() {
} }
if(!CALCULATOR->exportCSV(*matrix_struct, str.ascii(), delimiter)) { if(!CALCULATOR->exportCSV(*matrix_struct, str.ascii(), delimiter)) {
TQString error_str; TQString error_str;
error_str.sprintf(i18n("Could not export to file \n%s"), str.ascii()); error_str.sprintf(i18n("Could not export to file \n%s").utf8(), str.ascii());
KMessageBox::error(this, error_str); KMessageBox::error(this, error_str);
reject(); reject();
} }

@ -366,7 +366,7 @@ void QalculateFunctionsDialog::functionSelected() {
str += "<br>"; str += "<br>";
if(f->subtype() == SUBTYPE_DATA_SET) { if(f->subtype() == SUBTYPE_DATA_SET) {
str += "<br>"; str += "<br>";
str2.sprintf(i18n("Retrieves data from the %s data set for a given object and property. If \"info\" is typed as property, a dialog window will pop up with all properties of the object."), f->title().c_str()); str2.sprintf(i18n("Retrieves data from the %s data set for a given object and property. If \"info\" is typed as property, a dialog window will pop up with all properties of the object.").utf8(), f->title().c_str());
str2.replace("<", "&lt;"); str2.replace("<", "&lt;");
str2.replace(">", "&gt;"); str2.replace(">", "&gt;");
str += str2; str += str2;

@ -146,7 +146,7 @@ TQString linkInfo(const MathStructure *m, TQWidget *w, bool full_length = false)
str += "<br>"; str += "<br>";
str += "<br>"; str += "<br>";
TQString str2; TQString str2;
str2.sprintf(i18n("Retrieves data from the %s data set for a given object and property. If \"info\" is typed as property, a dialog window will pop up with all properties of the object."), f->title().c_str()); str2.sprintf(i18n("Retrieves data from the %s data set for a given object and property. If \"info\" is typed as property, a dialog window will pop up with all properties of the object.").utf8(), f->title().c_str());
str2.replace("<", "&lt;"); str2.replace("<", "&lt;");
str2.replace(">", "&gt;"); str2.replace(">", "&gt;");
str += str2; str += str2;

Loading…
Cancel
Save