Rename KWallet to TDEWallet

5 files changed, 11 insertions, 11 deletions

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" );