Rename KWallet to TDEWallet

24 files changed, 66 insertions, 66 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 ) ) {
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 7eac9000d..6016519f4 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -31,7 +31,7 @@
 #include "knaccountmanager.h"
 #include "knfoldermanager.h"
 
-KWallet::Wallet* KNAccountManager::mWallet = 0;
+TDEWallet::Wallet* KNAccountManager::mWallet = 0;
 bool KNAccountManager::mWalletOpenFailed = false;
 
 KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * parent, const char * name)
@@ -252,7 +252,7 @@ void KNAccountManager::loadPasswords()
 }
 
 
-KWallet::Wallet* KNAccountManager::wallet()
+TDEWallet::Wallet* KNAccountManager::wallet()
 {
   if ( mWallet && mWallet->isOpen() )
     return mWallet;
diff --git a/knode/knaccountmanager.h b/knode/knaccountmanager.h
index 8ee01497c..56e994c6b 100644
--- a/knode/knaccountmanager.h
+++ b/knode/knaccountmanager.h
@@ -18,7 +18,7 @@
 #include <tqglobal.h>
 #include <tqvaluelist.h>
 
-namespace KWallet {
+namespace TDEWallet {
   class Wallet;
 }
 
@@ -61,7 +61,7 @@ class KNAccountManager : public TQObject
     void loadPasswordsAsync();
 
     /** Returns a pointer to an open wallet if available, 0 otherwise */
-    static KWallet::Wallet* wallet();
+    static TDEWallet::Wallet* wallet();
 
   protected:
     void loadAccounts();
@@ -85,7 +85,7 @@ class KNAccountManager : public TQObject
 
   private:
     TQValueList<KNNntpAccount*> mAccounts;
-    static KWallet::Wallet *mWallet;
+    static TDEWallet::Wallet *mWallet;
     static bool mWalletOpenFailed;
     bool mAsyncOpening;
 
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 747f6d4cf..57488f717 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job)
   if ( !job->account()->readyForLogin() ) {
     mWalletQueue.append( job );
     knGlobals.accountManager()->loadPasswordsAsync();
-    job->setStatus( i18n( "Waiting for KWallet..." ) );
+    job->setStatus( i18n( "Waiting for TDEWallet..." ) );
     return;
   }
 
diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp
index 3d4e4ded3..2c7949419 100644
--- a/knode/knserverinfo.cpp
+++ b/knode/knserverinfo.cpp
@@ -18,7 +18,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdewallet.h>
-using namespace KWallet;
+using namespace TDEWallet;
 
 #include "knglobals.h"
 #include "knserverinfo.h"
@@ -67,7 +67,7 @@ void KNServerInfo::readConf(TDEConfig *conf)
   u_ser=conf->readEntry("user");
   p_ass = KNHelper::decryptStr(conf->readEntry("pass"));
 
-  // migration to KWallet
+  // migration to TDEWallet
   if (Wallet::isEnabled() && !p_ass.isEmpty()) {
     conf->deleteEntry( "pass" );
     p_assDirty = true;
@@ -104,15 +104,15 @@ void KNServerInfo::saveConf(TDEConfig *conf)
     Wallet *wallet = KNAccountManager::wallet();
     if (!wallet || wallet->writePassword(TQString::number(i_d), p_ass)) {
       if ( 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, KNode 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 server '%1' in the "
                 "configuration file?").arg( server() ),
-            i18n("KWallet Not Available"),
+            i18n("TDEWallet Not Available"),
             KGuiItem( i18n("Store Password") ),
             KGuiItem( i18n("Do Not Store Password") ) )
             == KMessageBox::Yes ) {
@@ -182,7 +182,7 @@ void KNServerInfo::readPassword()
     return;
 
   // finally try to open the wallet and read the password
-  KWallet::Wallet *wallet = KNAccountManager::wallet();
+  TDEWallet::Wallet *wallet = KNAccountManager::wallet();
   if ( wallet )
     wallet->readPassword( TQString::number(i_d), p_ass );
 }
diff --git a/knode/knserverinfo.h b/knode/knserverinfo.h
index ba5dcf4d7..19991d4e8 100644
--- a/knode/knserverinfo.h
+++ b/knode/knserverinfo.h
@@ -18,10 +18,10 @@
 #include <tqstring.h>
 
 class TDEConfig;
-namespace KWallet {
+namespace TDEWallet {
   class Wallet;
 }
-using KWallet::Wallet;
+using TDEWallet::Wallet;
 
 class KNServerInfo {
 
@@ -63,7 +63,7 @@ class KNServerInfo {
 
     bool operator==(const KNServerInfo &s);
 
-    /** Loads the password from KWallet, used for on-demand password loading */
+    /** Loads the password from TDEWallet, used for on-demand password loading */
     void readPassword();
 
   protected:
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 &amp;KWallet if possible</string>
+                            <string>Use &amp;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;
 };
diff --git a/tderesources/caldav/preferences.cpp b/tderesources/caldav/preferences.cpp
index 5286d0220..a4be7cc13 100644
--- a/tderesources/caldav/preferences.cpp
+++ b/tderesources/caldav/preferences.cpp
@@ -26,7 +26,7 @@
  ========================================================================*/
 
 using namespace KCal;
-using namespace KWallet;
+using namespace TDEWallet;
 
 /*=========================================================================
 | CONSTANTS
diff --git a/tderesources/caldav/preferences.h b/tderesources/caldav/preferences.h
index 0c4532cf9..d54d7d4e3 100644
--- a/tderesources/caldav/preferences.h
+++ b/tderesources/caldav/preferences.h
@@ -33,7 +33,7 @@ namespace KCal {
 /**
  * This class provides access to ResourceCalDav preferences.
  * It inherits auto-generated CalDavPrefsSkel class to add password-handling code.
- * KWallet is used for storing passwords.
+ * TDEWallet is used for storing passwords.
  * It also adds code to allow multiple CalDAV resources to store settings in the same
  * config file.
  */
@@ -109,7 +109,7 @@ protected:
     /**
      * Returns the wallet or NULL, if the wallet can't be obtained.
      */
-    KWallet::Wallet* getWallet();
+    TDEWallet::Wallet* getWallet();
 
     /**
      * Tries to set a working folder for the wallet. If the wallet is not configured yet, does nothing.
@@ -150,7 +150,7 @@ private:
     static const TQString WALLET_FOLDER;
     static const TQString WALLET_PWD_SUFFIX;
 
-    KWallet::Wallet* mWallet;
+    TDEWallet::Wallet* mWallet;
     bool mNoWallet;
 
     TQString mPrefix;
diff --git a/tderesources/carddav/preferences.cpp b/tderesources/carddav/preferences.cpp
index 30a4bbf4a..a37931741 100644
--- a/tderesources/carddav/preferences.cpp
+++ b/tderesources/carddav/preferences.cpp
@@ -25,7 +25,7 @@
  ========================================================================*/
 
 using namespace TDEABC;
-using namespace KWallet;
+using namespace TDEWallet;
 
 /*=========================================================================
 | CONSTANTS
diff --git a/tderesources/carddav/preferences.h b/tderesources/carddav/preferences.h
index 123751d19..6ff80ef3d 100644
--- a/tderesources/carddav/preferences.h
+++ b/tderesources/carddav/preferences.h
@@ -32,7 +32,7 @@ namespace TDEABC {
 /**
  * This class provides access to ResourceCardDav preferences.
  * It inherits auto-generated CardDavPrefsSkel class to add password-handling code.
- * KWallet is used for storing passwords.
+ * TDEWallet is used for storing passwords.
  * It also adds code to allow multiple CardDAV resources to store settings in the same
  * config file.
  */
@@ -100,7 +100,7 @@ protected:
     /**
      * Returns the wallet or NULL, if the wallet can't be obtained.
      */
-    KWallet::Wallet* getWallet();
+    TDEWallet::Wallet* getWallet();
 
     /**
      * Tries to set a working folder for the wallet. If the wallet is not configured yet, does nothing.
@@ -141,7 +141,7 @@ private:
     static const TQString WALLET_FOLDER;
     static const TQString WALLET_PWD_SUFFIX;
 
-    KWallet::Wallet* mWallet;
+    TDEWallet::Wallet* mWallet;
     bool mNoWallet;
 
     TQString mPrefix;
diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp
index 4a13b700f..38262725f 100644
--- a/tderesources/scalix/scalixadmin/passwordpage.cpp
+++ b/tderesources/scalix/scalixadmin/passwordpage.cpp
@@ -162,13 +162,13 @@ void PasswordPage::finished( TDEIO::Job* job )
     // Save only if the user choose it before
     bool storePassword = group.readBoolEntry( "store-passwd", false );
     if ( storePassword ) {
-      // First try to store in KWallet
-      if ( KWallet::Wallet::isEnabled() ) {
+      // First try to store in TDEWallet
+      if ( TDEWallet::Wallet::isEnabled() ) {
         WId window = 0;
         if ( tqApp->activeWindow() )
           window = tqApp->activeWindow()->winId();
 
-        KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), window );
+        TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), window );
         if ( wallet ) {
           if ( !wallet->hasFolder( "kmail" ) )
             wallet->createFolder( "kmail" );
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 968a30b2a..cc6bb5655 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kstringhandler.h>
 #include <tdewallet.h>
-using namespace KWallet;
+using namespace TDEWallet;
 
 static const char* s_folderContentsType[] = {
   I18N_NOOP( "Calendar" ),
diff --git a/wizards/kmailchanges.h b/wizards/kmailchanges.h
index 3fc412a1d..b098b08dc 100644
--- a/wizards/kmailchanges.h
+++ b/wizards/kmailchanges.h
@@ -25,7 +25,7 @@
 #include <tdeconfigpropagator.h>
 #include <tdeconfig.h>
 
-namespace KWallet {
+namespace TDEWallet {
   class Wallet;
 }
 
@@ -107,7 +107,7 @@ class CreateImapAccount : public TDEConfigPropagator::Change
     CustomWriter *mCustomWriter;
 
   private:
-    static KWallet::Wallet *mWallet;
+    static TDEWallet::Wallet *mWallet;
 };
 
 class CreateDisconnectedImapAccount : public CreateImapAccount
diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index cb89e298c..3aa5634c0 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -409,7 +409,7 @@ ScalixWizard::ScalixWizard() : TDEConfigWizard( new ScalixPropagator )
 
   mSavePasswordCheck = new TQCheckBox( i18n("Save password"), page );
   topLayout->addMultiCellWidget( mSavePasswordCheck, 5, 5, 0, 1 );
-  TQWhatsThis::add( mSavePasswordCheck, i18n( "Shall the password be saved in KWallet?." ) );
+  TQWhatsThis::add( mSavePasswordCheck, i18n( "Shall the password be saved in TDEWallet?." ) );
 
   label = new TQLabel( i18n( "Use Secure Connection:" ), page );
   topLayout->addWidget( label, 6, 0 );