Removed unnecessary automatic conversions to char*.

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 4 years ago
parent fabe2f7244
commit bb945af0ac
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

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

@ -6510,7 +6510,7 @@ void DominoStyle::drawComplexControl(ComplexControl control,
painter.drawLine(fr.x()+4, fr.height(), fr.width()-4, fr.height()); painter.drawLine(fr.x()+4, fr.height(), fr.width()-4, fr.height());
} }
if(tb->popup() && (!tb->iconSet().isNull() || tb->text() || tb->pixmap())) { if(tb->popup() && (!tb->iconSet().isNull() || !tb->text().isEmpty() || tb->pixmap())) {
TQString isEnabled = enabled ? "1" : "0"; TQString isEnabled = enabled ? "1" : "0";
TQPixmap* arrow; TQPixmap* arrow;
TQColor color = tb->palette().active().buttonText(); TQColor color = tb->palette().active().buttonText();

@ -3786,7 +3786,7 @@ void DominoStyleConfig::slotLoad() {
SchemeEntry * entry; SchemeEntry * entry;
TQString fName; TQString fName;
for (entry = schemeList->first(); entry; entry = schemeList->next()) { for (entry = schemeList->first(); entry; entry = schemeList->next()) {
if(!strcmp(entry->getSchemeName(), sName)) { if (entry->getSchemeName() == sName) {
fName = entry->getFileName(); fName = entry->getFileName();
break; break;
} }
@ -3839,7 +3839,7 @@ void DominoStyleConfig::slotDelete() {
SchemeEntry * entry; SchemeEntry * entry;
TQString fName; TQString fName;
for (entry = schemeList->first(); entry; entry = schemeList->next()) { for (entry = schemeList->first(); entry; entry = schemeList->next()) {
if(!strcmp(entry->getSchemeName(), sName)) { if (entry->getSchemeName() == sName) {
fName = entry->getFileName(); fName = entry->getFileName();
schemeList->remove(entry); schemeList->remove(entry);
break; break;
@ -3888,7 +3888,7 @@ void DominoStyleConfig::slotDelPerm(TQListViewItem* li) {
TQString selected = li->text(0); TQString selected = li->text(0);
for ( entry = schemeList->first(); entry; entry = schemeList->next() ) { for ( entry = schemeList->first(); entry; entry = schemeList->next() ) {
if(!strcmp(entry->getSchemeName(), selected)) { if (entry->getSchemeName() == selected) {
deleteButton->setEnabled(entry->isDeletable()); deleteButton->setEnabled(entry->isDeletable());
return; return;
} }

Loading…
Cancel
Save