Branch: master

1eaefc42 2014-06-05 04:12:21 Michele Calgaro
Fixed "comparison with string literal results" warnings.
This resolves bug 1649.
M kshowmail/kcmconfigs/accountsetupdialog.cpp
M kshowmail/kcmconfigs/configlog.cpp
M kshowmail/serverdialog.cpp
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.cpp b/kshowmail/kcmconfigs/accountsetupdialog.cpp
index 19cfe0d..be1ce1a 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.cpp
+++ b/kshowmail/kcmconfigs/accountsetupdialog.cpp
@@ -256,7 +256,7 @@
   //will return an empty string. If the user has typed in a new password, KPasswordEdit::password()
   //will return the correct password
   TQString pass;
-  if( txtPassword->password() == "" || txtPassword->password() == TQString::null )
+  if( txtPassword->password() == TQString("") || txtPassword->password() == TQString::null )
     pass = txtPassword->text();
   else
     pass = txtPassword->password();
diff --git a/kshowmail/kcmconfigs/configlog.cpp b/kshowmail/kcmconfigs/configlog.cpp
index 673a6ed..4f28464 100644
--- a/kshowmail/kcmconfigs/configlog.cpp
+++ b/kshowmail/kcmconfigs/configlog.cpp
@@ -121,7 +121,7 @@
   else if( config->readEntry( CONFIG_ENTRY_LOG_REMOVE_DELETED_MAILS, DEFAULT_LOG_REMOVE_DELETED_MAILS ) == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
     grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
   else
-    if( DEFAULT_LOG_REMOVE_DELETED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )
+    if (!strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT))
       grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
     else
       grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
@@ -131,7 +131,7 @@
   else if( config->readEntry( CONFIG_ENTRY_LOG_REMOVE_MOVED_MAILS, DEFAULT_LOG_REMOVE_MOVED_MAILS ) == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
   else
-    if( DEFAULT_LOG_REMOVE_MOVED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )
+    if (!strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT))
       grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
   else
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
@@ -155,16 +155,16 @@
   else
     chkLogMovedMails->setChecked( false );
 
-  if( DEFAULT_LOG_REMOVE_DELETED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )
+  if (!strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT))
     grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
-  else if( DEFAULT_LOG_REMOVE_DELETED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
+  else if (!strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS))
     grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
   else
     grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
 
-  if( DEFAULT_LOG_REMOVE_MOVED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )
+  if (!strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT))
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
-  else if( DEFAULT_LOG_REMOVE_MOVED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
+  else if (!strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS))
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
   else
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
diff --git a/kshowmail/serverdialog.cpp b/kshowmail/serverdialog.cpp
index 4c051ad..17b6496 100644
--- a/kshowmail/serverdialog.cpp
+++ b/kshowmail/serverdialog.cpp
@@ -217,7 +217,7 @@
   //will return an empty string. If the user has typed in a new password, KPasswordEdit::password()
   //will return the correct password
   TQString pass;
-  if( txtPassword->password() == "" || txtPassword->password() == TQString::null )
+  if( txtPassword->password() == TQString("") || txtPassword->password() == TQString::null )
     pass = txtPassword->text();
   else
     pass = txtPassword->password();