Rename KWallet to TDEWallet.

12 files changed, 27 insertions, 27 deletions

diff --git a/kshowmail/configelem.cpp b/kshowmail/configelem.cpp
index 43b11b5..cf4463a 100644
--- a/kshowmail/configelem.cpp
+++ b/kshowmail/configelem.cpp
@@ -312,7 +312,7 @@ bool ConfigElem::assertPassword( bool force )
       else
         config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
 
-      if( PasswordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+      if( PasswordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
         TDEWalletAccess::savePassword( getAccountName(), m_url.pass() );
 
       config->sync();
@@ -1211,7 +1211,7 @@ void ConfigElem::printSetup( ) const
   {
     case CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE    : kdDebug() << "Password Storage: don't save" << endl; break;
     case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE    : kdDebug() << "Password Storage: save in file" << endl; break;
-    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : kdDebug() << "Password Storage: use TDEWallet" << endl; break;
+    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET : kdDebug() << "Password Storage: use TDEWallet" << endl; break;
     default                                         : kdDebug() << "Password Storage: invalid value" << endl;
 
   }
@@ -1225,7 +1225,7 @@ void ConfigElem::setPasswordStorage( int storage )
 {
   if( storage == CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE ||
       storage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE ||
-      storage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+      storage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
 
     PasswordStorage = storage;
 
diff --git a/kshowmail/configelem.h b/kshowmail/configelem.h
index 62cdca4..75a1240 100644
--- a/kshowmail/configelem.h
+++ b/kshowmail/configelem.h
@@ -279,14 +279,14 @@ class ConfigElem : public TQObject {
    /**
     * Sets the password storage type.
     * The Constants are defined in constants.h
-    * @param storage type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET
+    * @param storage type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET
     */
    void setPasswordStorage( int storage );
 
    /**
     * Returns the password storage type.
     * The Constants are defined in constants.h.
-    * @return type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET
+    * @return type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET
     */
    int getPasswordStorage() const;
 
@@ -481,7 +481,7 @@ class ConfigElem : public TQObject {
 
     /**
      * Type of password storage.
-     * valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET
+     * valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET
      * The Constants are defined in constants.h
      * @see saveOptions()
      * @see setPasswordStorage()
diff --git a/kshowmail/configlist.cpp b/kshowmail/configlist.cpp
index 58bb90a..50bb22e 100644
--- a/kshowmail/configlist.cpp
+++ b/kshowmail/configlist.cpp
@@ -886,8 +886,8 @@ void ConfigList::refreshSetup( TDEListView* view )
         acc->setPassword( Encryption::decrypt( config->readEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, DEFAULT_ACCOUNT_PASSWORD ) ) );
         break;
 
-      case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET:
-        acc->setPasswordStorage( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
+      case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET:
+        acc->setPasswordStorage( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET );
         acc->setPassword( TDEWalletAccess::getPassword( *it ) );
         break;
 
diff --git a/kshowmail/constants.h b/kshowmail/constants.h
index b36a36f..33d4850 100644
--- a/kshowmail/constants.h
+++ b/kshowmail/constants.h
@@ -249,7 +249,7 @@ namespace Constants
 
   #define CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE     1
   #define CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE     2
-  #define CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET  3
+  #define CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET  3
   #define CONFIG_VALUE_ACCOUNT_SECTRANSFER_NONE       1
   #define CONFIG_VALUE_ACCOUNT_SECTRANSFER_SSL        2
   #define CONFIG_VALUE_ACCOUNT_SECTRANSFER_TLS        3
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.cpp b/kshowmail/kcmconfigs/accountsetupdialog.cpp
index 9e48369..19cfe0d 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.cpp
+++ b/kshowmail/kcmconfigs/accountsetupdialog.cpp
@@ -91,7 +91,7 @@ AccountSetupDialog::AccountSetupDialog( TQWidget* parent, TDEListView* view, Acc
   TQRadioButton* btnPasswordSaveTDEWallet = new TQRadioButton( i18n( "Use TDEWallet" ), gboxPassword, "btnPasswordSaveTDEWallet" );
   grpPasswordStorage->insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
   grpPasswordStorage->insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
-  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
+  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
   TQToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
   TQToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
   TQToolTip::add( btnPasswordSaveTDEWallet, i18n( "Use TDEWallet to save the password. Maybe you have to type in the TDEWallet master password at first server connect." ) );
@@ -269,7 +269,7 @@ void AccountSetupDialog::slotOk( )
     case ID_BUTTON_PASSWORD_SAVE_FILE    : account->setPasswordStorageType( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE );
                                            account->setPassword( pass );
                                            break;
-    case ID_BUTTON_PASSWORD_SAVE_KWALLET : account->setPasswordStorageType( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
+    case ID_BUTTON_PASSWORD_SAVE_TDEWALLET : account->setPasswordStorageType( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET );
                                            account->setPassword( pass );
                                            break;
     default                              : account->setPasswordStorageType( -1 );
@@ -311,7 +311,7 @@ void AccountSetupDialog::fillDialog( )
   txtUser->setText( account->getUser() );
 
   int type = account->getPasswordStorageType();
-  if( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  if( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     type = DEFAULT_ACCOUNT_PASSWORD_STORAGE;
 
   switch( type )
@@ -324,7 +324,7 @@ void AccountSetupDialog::fillDialog( )
                                                       txtPassword->setEnabled( true );
                                                       txtPassword->setText( account->getPassword() );
                                                       break;
-    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : grpPasswordStorage->setButton( ID_BUTTON_PASSWORD_SAVE_KWALLET );
+    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET : grpPasswordStorage->setButton( ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
                                                       txtPassword->setEnabled( true );
                                                       txtPassword->setText( account->getPassword() );
                                                       break;
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.h b/kshowmail/kcmconfigs/accountsetupdialog.h
index 257e549..61e92e1 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.h
+++ b/kshowmail/kcmconfigs/accountsetupdialog.h
@@ -39,7 +39,7 @@
 //radio button IDs
 #define ID_BUTTON_PASSWORD_DONT_SAVE 1
 #define ID_BUTTON_PASSWORD_SAVE_FILE 2
-#define ID_BUTTON_PASSWORD_SAVE_KWALLET 3
+#define ID_BUTTON_PASSWORD_SAVE_TDEWALLET 3
 #define ID_BUTTON_SECLOGIN_NONE 1
 #define ID_BUTTON_SECLOGIN_APOP 2
 #define ID_BUTTON_SECLOGIN_SASL 3
diff --git a/kshowmail/kcmconfigs/accountsetupitem.cpp b/kshowmail/kcmconfigs/accountsetupitem.cpp
index 6ca8ad4..e073cf0 100644
--- a/kshowmail/kcmconfigs/accountsetupitem.cpp
+++ b/kshowmail/kcmconfigs/accountsetupitem.cpp
@@ -116,7 +116,7 @@ TQString AccountSetupItem::getPassword( ) const
 
 void AccountSetupItem::setPasswordStorageType( int type )
 {
-  if( type == CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE || type == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE || type == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  if( type == CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE || type == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE || type == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     _passwordStorage = type;
   else
     _passwordStorage = DEFAULT_ACCOUNT_PASSWORD_STORAGE;
@@ -160,7 +160,7 @@ void AccountSetupItem::save() const
     config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
 
   //save password in TDEWallet if desired
-  if( getPasswordStorageType() == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  if( getPasswordStorageType() == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     TDEWalletAccess::savePassword( getAccountName(), getPassword() );
 
   config->writeEntry( CONFIG_ENTRY_ACCOUNT_ACTIVE, getActive() );
@@ -180,7 +180,7 @@ void AccountSetupItem::load( )
 
   if( _passwordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE )
     _password = decrypt( config->readEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, DEFAULT_ACCOUNT_PASSWORD ) );
-  else if( _passwordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  else if( _passwordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     _password = TDEWalletAccess::getPassword( getAccountName() );
   else
     _password = TQString::null;
diff --git a/kshowmail/kcmconfigs/accountsetupitem.h b/kshowmail/kcmconfigs/accountsetupitem.h
index f011646..98b1f18 100644
--- a/kshowmail/kcmconfigs/accountsetupitem.h
+++ b/kshowmail/kcmconfigs/accountsetupitem.h
@@ -126,7 +126,7 @@ class AccountSetupItem : public TDEListViewItem
     /**
      * Sets the password storage type.
      * See constants.h for valid values
-     * @param type password storage type (CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE or CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET)
+     * @param type password storage type (CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE or CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET)
      */
     void setPasswordStorageType( int type );
 
diff --git a/kshowmail/kcmconfigs/tdewalletaccess.h b/kshowmail/kcmconfigs/tdewalletaccess.h
index 3bc68d8..6699408 100644
--- a/kshowmail/kcmconfigs/tdewalletaccess.h
+++ b/kshowmail/kcmconfigs/tdewalletaccess.h
@@ -6,8 +6,8 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#ifndef KWALLETACCESS_H
-#define KWALLETACCESS_H
+#ifndef TDEWALLETACCESS_H
+#define TDEWALLETACCESS_H
 
 //TQt headers
 #include <ntqstring.h>
diff --git a/kshowmail/serverdialog.cpp b/kshowmail/serverdialog.cpp
index 3c0c7d9..4c051ad 100644
--- a/kshowmail/serverdialog.cpp
+++ b/kshowmail/serverdialog.cpp
@@ -97,7 +97,7 @@ ServerDialog::ServerDialog( TQWidget* parent, ConfigElem* item )
   TQRadioButton* btnPasswordSaveTDEWallet = new TQRadioButton( i18n( "Use TDEWallet" ), gboxPassword, "btnPasswordSaveTDEWallet" );
   grpPasswordStorage->insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
   grpPasswordStorage->insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
-  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
+  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
   TQToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
   TQToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
   TQToolTip::add( btnPasswordSaveTDEWallet, i18n( "Use TDEWallet to save the password. Maybe you have to type in the TDEWallet master password at first server connect." ) );
@@ -237,7 +237,7 @@ void ServerDialog::slotOk( )
     case ID_BUTTON_PASSWORD_SAVE_FILE    : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE );
                                            config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, crypt( url ) );
                                            break;
-    case ID_BUTTON_PASSWORD_SAVE_KWALLET : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
+    case ID_BUTTON_PASSWORD_SAVE_TDEWALLET : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET );
                                            config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
                                            TDEWalletAccess::savePassword( txtAccount->text(), pass );
                                            break;
@@ -297,7 +297,7 @@ void ServerDialog::fillDialog( )
   txtUser->setText( account->getUser() );
 
   int type = account->getPasswordStorage();
-  if( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  if( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     type = DEFAULT_ACCOUNT_PASSWORD_STORAGE;
 
   switch( type )
@@ -310,7 +310,7 @@ void ServerDialog::fillDialog( )
                                                       txtPassword->setEnabled( true );
                                                       txtPassword->setText( account->getPassword() );
                                                       break;
-    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : grpPasswordStorage->setButton( ID_BUTTON_PASSWORD_SAVE_KWALLET );
+    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET : grpPasswordStorage->setButton( ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
                                                       txtPassword->setEnabled( true );
                                                       txtPassword->setText( account->getPassword() );
                                                       break;
diff --git a/kshowmail/serverdialog.h b/kshowmail/serverdialog.h
index fd3dca2..8db7fff 100644
--- a/kshowmail/serverdialog.h
+++ b/kshowmail/serverdialog.h
@@ -47,7 +47,7 @@
 //radio button IDs
 #define ID_BUTTON_PASSWORD_DONT_SAVE 1
 #define ID_BUTTON_PASSWORD_SAVE_FILE 2
-#define ID_BUTTON_PASSWORD_SAVE_KWALLET 3
+#define ID_BUTTON_PASSWORD_SAVE_TDEWALLET 3
 #define ID_BUTTON_SECLOGIN_NONE 1
 #define ID_BUTTON_SECLOGIN_APOP 2
 #define ID_BUTTON_SECLOGIN_SASL 3
diff --git a/kshowmail/tdewalletaccess.h b/kshowmail/tdewalletaccess.h
index 3bc68d8..6699408 100644
--- a/kshowmail/tdewalletaccess.h
+++ b/kshowmail/tdewalletaccess.h
@@ -6,8 +6,8 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#ifndef KWALLETACCESS_H
-#define KWALLETACCESS_H
+#ifndef TDEWALLETACCESS_H
+#define TDEWALLETACCESS_H
 
 //TQt headers
 #include <ntqstring.h>