diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1bfe08..d6c1985 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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" )
diff --git a/domino/domino.cpp b/domino/domino.cpp
index 85a076e..2fc0231 100644
--- a/domino/domino.cpp
+++ b/domino/domino.cpp
@@ -6510,7 +6510,7 @@ void DominoStyle::drawComplexControl(ComplexControl control,
 					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";
 					TQPixmap* arrow;
 					TQColor color = tb->palette().active().buttonText();
diff --git a/dominoConfig/dominoconf.cpp b/dominoConfig/dominoconf.cpp
index 6aed86b..8d249eb 100644
--- a/dominoConfig/dominoconf.cpp
+++ b/dominoConfig/dominoconf.cpp
@@ -3786,7 +3786,7 @@ void DominoStyleConfig::slotLoad() {
 	SchemeEntry * entry;
 	TQString fName;
 	for (entry = schemeList->first(); entry; entry = schemeList->next()) {
-		if(!strcmp(entry->getSchemeName(), sName)) {
+		if (entry->getSchemeName() == sName) {
 			fName = entry->getFileName();
 			break;
 		}
@@ -3839,7 +3839,7 @@ void DominoStyleConfig::slotDelete() {
 	SchemeEntry * entry;
 	TQString fName;
 	for (entry = schemeList->first(); entry; entry = schemeList->next()) {
-		if(!strcmp(entry->getSchemeName(), sName)) {
+		if (entry->getSchemeName() == sName) {
 			fName = entry->getFileName();
 			schemeList->remove(entry);
 			break;
@@ -3888,7 +3888,7 @@ void DominoStyleConfig::slotDelPerm(TQListViewItem* li) {
 	TQString selected = li->text(0);
 
 	for ( entry = schemeList->first(); entry; entry = schemeList->next() ) {
-		if(!strcmp(entry->getSchemeName(), selected)) {
+		if (entry->getSchemeName() == selected) {
 			deleteButton->setEnabled(entry->isDeletable());
 			return;
 		}