diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2013-08-31 12:45:11 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-08-31 12:45:11 -0500 |
commit | 471786e5395d05095f7e7259370421358d551f35 (patch) | |
tree | 8d8895ed02042eea1d021031d660f8c1b5673e9b /kshowmail/kcmconfigs | |
parent | 61db68d9b80c95fb61be92f048b8cc83c74bc078 (diff) | |
download | kshowmail-471786e5395d05095f7e7259370421358d551f35.tar.gz kshowmail-471786e5395d05095f7e7259370421358d551f35.zip |
Rename KWallet to TDEWallet.
Diffstat (limited to 'kshowmail/kcmconfigs')
-rw-r--r-- | kshowmail/kcmconfigs/accountsetupdialog.cpp | 8 | ||||
-rw-r--r-- | kshowmail/kcmconfigs/accountsetupdialog.h | 2 | ||||
-rw-r--r-- | kshowmail/kcmconfigs/accountsetupitem.cpp | 6 | ||||
-rw-r--r-- | kshowmail/kcmconfigs/accountsetupitem.h | 2 | ||||
-rw-r--r-- | kshowmail/kcmconfigs/tdewalletaccess.h | 4 |
5 files changed, 11 insertions, 11 deletions
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> |