Rename KWallet to TDEWallet

5 files changed, 15 insertions, 15 deletions

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: