Rename KWallet to TDEWallet

6 files changed, 20 insertions, 20 deletions

diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index 6e80f20de..ef18bb17a 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -179,7 +179,7 @@ namespace KMail {
     { "Christoph Kl\303\274nter", 0, 0, 0 }, // fix for bug:88216 (drag&drop from KAddressBook to the To: field)
     { "Martin Koller", 0, 0, 0 }, // optional columns in the message list
     { "Tobias K\303\266nig", 0, 0, 0 }, // edit recent addresses, store email<->OpenPGP key association in address book
-    { "Volker Krause", 0, 0, 0 }, // implemented KWallet support, fixed multiple bugs
+    { "Volker Krause", 0, 0, 0 }, // implemented TDEWallet support, fixed multiple bugs
     { "Francois Kritzinger", 0, 0, 0 }, // fix bug in configuration dialog
     { "Danny Kukawka", 0, 0, 0 }, // DCOP enhancements for better message importing
     { "Roger Larsson", 0, 0, 0 }, // add name of checked account to status bar message
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 0898c36b6..ab1da8e47 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -626,9 +626,9 @@ void AccountDialog::makePopAccountPage()
     new TQCheckBox( i18n("Sto&re POP password"), page1 );
   TQWhatsThis::add( mPop.storePasswordCheck,
                    i18n("Check this option to have KMail store "
-                   "the password.\nIf KWallet is available "
+                   "the password.\nIf TDEWallet is available "
                    "the password will be stored there which is considered "
-                   "safe.\nHowever, if KWallet is not available, "
+                   "safe.\nHowever, if TDEWallet is not available, "
                    "the password will be stored in KMail's configuration "
                    "file. The password is stored in an "
                    "obfuscated format, but should not be "
@@ -960,9 +960,9 @@ void AccountDialog::makeImapAccountPage( bool connected )
     new TQCheckBox( i18n("Sto&re IMAP password"), page1 );
   TQWhatsThis::add( mImap.storePasswordCheck,
                    i18n("Check this option to have KMail store "
-                   "the password.\nIf KWallet is available "
+                   "the password.\nIf TDEWallet is available "
                    "the password will be stored there which is considered "
-                   "safe.\nHowever, if KWallet is not available, "
+                   "safe.\nHowever, if TDEWallet is not available, "
                    "the password will be stored in KMail's configuration "
                    "file. The password is stored in an "
                    "obfuscated format, but should not be "
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 056eaa4ae..df0ab2d5b 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -70,7 +70,7 @@ using KMail::FolderIface;
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 #include <tdewallet.h>
-using KWallet::Wallet;
+using TDEWallet::Wallet;
 #include "actionscheduler.h"
 
 #include <qutf7codec.h>
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 0a3c4a9e7..993c8a0e9 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -24,7 +24,7 @@
 namespace TDEIO {
   class Job;
 }
-namespace KWallet {
+namespace TDEWallet {
   class Wallet;
 }
 
@@ -396,7 +396,7 @@ public:
   void messageCountChanged();
 
   /** Open KDE wallet and set it to kmail folder */
-  KWallet::Wallet *wallet();
+  TDEWallet::Wallet *wallet();
 
   /** Get first mainwidget */
   KMMainWidget *getKMMainWidget();
@@ -516,7 +516,7 @@ private:
   KPIM::ThreadWeaver::Weaver *the_weaver;
   KPIM::ThreadWeaver::WeaverThreadLogger *the_weaverLogger;
 
-  KWallet::Wallet *mWallet;
+  TDEWallet::Wallet *mWallet;
 
   // variables used by dcopAddMessage()
   TQStringList mAddMessageMsgIds;
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index e14bd7728..4f991f944 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -39,7 +39,7 @@
 #include <kseparator.h>
 #include <kdebug.h>
 #include <tdewallet.h>
-using KWallet::Wallet;
+using TDEWallet::Wallet;
 #include <kprotocolinfo.h>
 
 #include "kmkernel.h"
@@ -138,15 +138,15 @@ void KMTransportInfo::writeConfig(int id)
     }
     // wallet not available, ask the user if we should use the config file instead
     if ( !passwdStored && ( mStorePasswdInConfig ||  KMessageBox::warningYesNo( 0,
-         i18n("KWallet is not available. It is strongly recommended to use "
-              "KWallet for managing your passwords.\n"
+         i18n("TDEWallet is not available. It is strongly recommended to use "
+              "TDEWallet for managing your passwords.\n"
               "However, KMail can store the password in its configuration "
               "file instead. The password is stored in an obfuscated format, "
               "but should not be considered secure from decryption efforts "
               "if access to the configuration file is obtained.\n"
               "Do you want to store the password for account '%1' in the "
               "configuration file?").arg( name ),
-         i18n("KWallet Not Available"),
+         i18n("TDEWallet Not Available"),
          KGuiItem( i18n("Store Password") ),
          KGuiItem( i18n("Do Not Store Password") ) )
          == KMessageBox::Yes ) ) {
@@ -457,9 +457,9 @@ void KMTransportDialog::makeSmtpPage()
     new TQCheckBox( i18n("&Store SMTP password"), page1 );
   TQWhatsThis::add(mSmtp.storePasswordCheck,
                   i18n("Check this option to have KMail store "
-                  "the password.\nIf KWallet is available "
+                  "the password.\nIf TDEWallet is available "
                   "the password will be stored there which is considered "
-                  "safe.\nHowever, if KWallet is not available, "
+                  "safe.\nHowever, if TDEWallet is not available, "
                   "the password will be stored in KMail's configuration "
                   "file. The password is stored in an "
                   "obfuscated format, but should not be "
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 5e4f5b5e9..7f4c53b32 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <tdewallet.h>
 using TDEIO::MetaData;
-using KWallet::Wallet;
+using TDEWallet::Wallet;
 
 #include <climits>
 
@@ -162,7 +162,7 @@ namespace KMail {
 
       if ( !encpasswd.isEmpty() ) {
         setPasswd( decryptStr( encpasswd ), true );
-        // migrate to KWallet if available
+        // migrate to TDEWallet if available
         if ( Wallet::isEnabled() ) {
           config.deleteEntry( "pass" );
           config.deleteEntry( "passwd" );
@@ -217,15 +217,15 @@ namespace KMail {
       // if wallet is not available, write to config file, since the account
       // manager deletes this group, we need to write it always
       if ( !passwdStored && ( mStorePasswdInConfig || KMessageBox::warningYesNo( 0,
-           i18n("KWallet is not available. It is strongly recommended to use "
-                "KWallet for managing your passwords.\n"
+           i18n("TDEWallet is not available. It is strongly recommended to use "
+                "TDEWallet for managing your passwords.\n"
                 "However, KMail can store the password in its configuration "
                 "file instead. The password is stored in an obfuscated format, "
                 "but should not be considered secure from decryption efforts "
                 "if access to the configuration file is obtained.\n"
                 "Do you want to store the password for account '%1' in the "
                 "configuration file?").arg( name() ),
-           i18n("KWallet Not Available"),
+           i18n("TDEWallet Not Available"),
            KGuiItem( i18n("Store Password") ),
            KGuiItem( i18n("Do Not Store Password") ) )
            == KMessageBox::Yes ) ) {