diff options
Diffstat (limited to 'korn')
| -rw-r--r-- | korn/kmail_proto.h | 2 | ||||
| -rw-r--r-- | korn/korncfg.ui | 2 | ||||
| -rw-r--r-- | korn/korncfgimpl.cpp | 2 | ||||
| -rw-r--r-- | korn/password.cpp | 4 | ||||
| -rw-r--r-- | korn/password.h | 22 |
5 files changed, 16 insertions, 16 deletions
diff --git a/korn/kmail_proto.h b/korn/kmail_proto.h index c2026baf1..0025596b7 100644 --- a/korn/kmail_proto.h +++ b/korn/kmail_proto.h @@ -64,7 +64,7 @@ public: * it calculates how the configuration whould have looked in KOrn. * * @param config The configuration group to read the kmailname from. - * @param password The password fetched out of the configuration or KWallet. + * @param password The password fetched out of the configuration or TDEWallet. * @return A mapping containing the configuration if success, and empty mapping otherwise. */ virtual TQMap< TQString, TQString > * createConfig( TDEConfigGroup* config, const TQString& password ) const; diff --git a/korn/korncfg.ui b/korn/korncfg.ui index f99da3d4a..e3bed0839 100644 --- a/korn/korncfg.ui +++ b/korn/korncfg.ui @@ -52,7 +52,7 @@ <cstring>chUseWallet</cstring> </property> <property name="text"> - <string>Use &KWallet if possible</string> + <string>Use &TDEWallet if possible</string> </property> <property name="checked"> <bool>true</bool> diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index c6e8d171d..c4fa1359d 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -220,7 +220,7 @@ void KornCfgImpl::writeConfig() if( rbDocked->isChecked() ) _config->writeEntry( "layout", "Docked" ); - //Default is 'false' here, because if no option is set, KWallet isn't used. + //Default is 'false' here, because if no option is set, TDEWallet isn't used. if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() ) //Configuration box changed => setting over configuration rewritePasswords(); diff --git a/korn/password.cpp b/korn/password.cpp index f93183193..ca6139b4f 100644 --- a/korn/password.cpp +++ b/korn/password.cpp @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tqstringlist.h> -KWallet::Wallet* KOrnPassword::m_wallet = 0; +TDEWallet::Wallet* KOrnPassword::m_wallet = 0; bool KOrnPassword::m_openFailed = false; bool KOrnPassword::m_useWallet = false; //Not default true until moving works @@ -178,7 +178,7 @@ void KOrnPassword::open() return; //Not open, and can't be opened delete m_wallet; m_wallet = 0; - m_wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0 ); + m_wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0 ); if( !m_wallet ) m_openFailed = true; diff --git a/korn/password.h b/korn/password.h index a2df7f990..27a944a92 100644 --- a/korn/password.h +++ b/korn/password.h @@ -21,13 +21,13 @@ #define KORNPASSWORD_H class TDEConfigBase; -namespace KWallet { class Wallet; } +namespace TDEWallet { class Wallet; } class TQString; /** * This class can be used to store and retrieve passwords. - * It uses KWallet if possible, and the configuartion files otherwise. + * It uses TDEWallet if possible, and the configuartion files otherwise. */ class KOrnPassword { @@ -46,15 +46,15 @@ public: * * @param box The boxnumber of the account * @param account The accountnumber of the account - * @param fallbackConfig The configuration file if KWallet cannot be used. + * @param fallbackConfig The configuration file if TDEWallet cannot be used. * @return The password, or TQString() if it failes. */ static TQString readKOrnPassword( int box, int account, const TDEConfigBase& fallbackConfig ); /** - * This function gets a password with is puts in KWallet by KMail + * This function gets a password with is puts in TDEWallet by KMail * * @param accountnr The id of the KMail account - * @param fallbackConfig The configuration used if KWallet isn't available. + * @param fallbackConfig The configuration used if TDEWallet isn't available. * @return The password, TQStirng::null if it failes. */ static TQString readKMailPassword( int accountnr, const TDEConfigBase& fallbackConfig ); @@ -64,22 +64,22 @@ public: * * @param box The boxnumber of the account. * @param account The accountnumber of the account. - * @param fallbackConfig The configuration file if KWallet isn't available. + * @param fallbackConfig The configuration file if TDEWallet isn't available. * @param password The password to be stored. */ static void writeKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig, const TQString& password ); /** - * This function deletes a password from both KWallet and the configuration file + * This function deletes a password from both TDEWallet and the configuration file * * @param box The boxnumber of the account. * @param account The accountnumber of the account. - * @param fallbackConfig The configuration file if KWallet isn't available. + * @param fallbackConfig The configuration file if TDEWallet isn't available. */ static void deleteKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig ); /** - * This function deletes a password from KWallet + * This function deletes a password from TDEWallet * * @param box The boxnumber of the account. * @param account The accountnumber of the account. @@ -143,7 +143,7 @@ public: static void rewritePassword( int box, int account, TDEConfigBase &config, bool newUseWalletValue ); /** - * If set to true, this class will try to use KWallet, + * If set to true, this class will try to use TDEWallet, * if false, it will not. * * The default value is true. @@ -159,7 +159,7 @@ private: static TQString KMailDecrypt( const TQString& enc ); - static KWallet::Wallet *m_wallet; + static TDEWallet::Wallet *m_wallet; static bool m_openFailed; static bool m_useWallet; }; |