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 2 years ago
parent 0c5e20bde1
commit 591c8f8d77
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

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

@ -819,7 +819,7 @@ ColourDesired Platform::ChromeHighlight()
const char *Platform::DefaultFont() const char *Platform::DefaultFont()
{ {
return TQApplication::font().family(); return TQApplication::font().family().utf8();
} }
int Platform::DefaultFontSize() int Platform::DefaultFontSize()

@ -406,7 +406,7 @@ void QextScintillaLexerPython::setIndentationWarning(IndentationWarning warn)
// Set the "tab.timmy.whinge.level" property. // Set the "tab.timmy.whinge.level" property.
void QextScintillaLexerPython::setTabWhingeProp() void QextScintillaLexerPython::setTabWhingeProp()
{ {
emit propertyChanged("tab.timmy.whinge.level",TQString::number(indent_warn)); emit propertyChanged("tab.timmy.whinge.level",TQString::number(indent_warn).latin1());
} }
#include "qextscintillalexerpython.moc" #include "qextscintillalexerpython.moc"

Loading…
Cancel
Save