Browse Source

Rename KWallet to TDEWallet

tags/r14.0.0
Timothy Pearson 5 years ago
parent
commit
a637b08775

+ 1
- 1
kmail/aboutdata.cpp View File

@@ -179,7 +179,7 @@ namespace KMail {
179 179
     { "Christoph Kl\303\274nter", 0, 0, 0 }, // fix for bug:88216 (drag&drop from KAddressBook to the To: field)
180 180
     { "Martin Koller", 0, 0, 0 }, // optional columns in the message list
181 181
     { "Tobias K\303\266nig", 0, 0, 0 }, // edit recent addresses, store email<->OpenPGP key association in address book
182
-    { "Volker Krause", 0, 0, 0 }, // implemented KWallet support, fixed multiple bugs
182
+    { "Volker Krause", 0, 0, 0 }, // implemented TDEWallet support, fixed multiple bugs
183 183
     { "Francois Kritzinger", 0, 0, 0 }, // fix bug in configuration dialog
184 184
     { "Danny Kukawka", 0, 0, 0 }, // DCOP enhancements for better message importing
185 185
     { "Roger Larsson", 0, 0, 0 }, // add name of checked account to status bar message

+ 4
- 4
kmail/accountdialog.cpp View File

@@ -626,9 +626,9 @@ void AccountDialog::makePopAccountPage()
626 626
     new TQCheckBox( i18n("Sto&re POP password"), page1 );
627 627
   TQWhatsThis::add( mPop.storePasswordCheck,
628 628
                    i18n("Check this option to have KMail store "
629
-                   "the password.\nIf KWallet is available "
629
+                   "the password.\nIf TDEWallet is available "
630 630
                    "the password will be stored there which is considered "
631
-                   "safe.\nHowever, if KWallet is not available, "
631
+                   "safe.\nHowever, if TDEWallet is not available, "
632 632
                    "the password will be stored in KMail's configuration "
633 633
                    "file. The password is stored in an "
634 634
                    "obfuscated format, but should not be "
@@ -960,9 +960,9 @@ void AccountDialog::makeImapAccountPage( bool connected )
960 960
     new TQCheckBox( i18n("Sto&re IMAP password"), page1 );
961 961
   TQWhatsThis::add( mImap.storePasswordCheck,
962 962
                    i18n("Check this option to have KMail store "
963
-                   "the password.\nIf KWallet is available "
963
+                   "the password.\nIf TDEWallet is available "
964 964
                    "the password will be stored there which is considered "
965
-                   "safe.\nHowever, if KWallet is not available, "
965
+                   "safe.\nHowever, if TDEWallet is not available, "
966 966
                    "the password will be stored in KMail's configuration "
967 967
                    "file. The password is stored in an "
968 968
                    "obfuscated format, but should not be "

+ 1
- 1
kmail/kmkernel.cpp View File

@@ -70,7 +70,7 @@ using KMail::FolderIface;
70 70
 #include <kdebug.h>
71 71
 #include <tdeio/netaccess.h>
72 72
 #include <tdewallet.h>
73
-using KWallet::Wallet;
73
+using TDEWallet::Wallet;
74 74
 #include "actionscheduler.h"
75 75
 
76 76
 #include <qutf7codec.h>

+ 3
- 3
kmail/kmkernel.h View File

@@ -24,7 +24,7 @@
24 24
 namespace TDEIO {
25 25
   class Job;
26 26
 }
27
-namespace KWallet {
27
+namespace TDEWallet {
28 28
   class Wallet;
29 29
 }
30 30
 
@@ -396,7 +396,7 @@ public:
396 396
   void messageCountChanged();
397 397
 
398 398
   /** Open KDE wallet and set it to kmail folder */
399
-  KWallet::Wallet *wallet();
399
+  TDEWallet::Wallet *wallet();
400 400
 
401 401
   /** Get first mainwidget */
402 402
   KMMainWidget *getKMMainWidget();
@@ -516,7 +516,7 @@ private:
516 516
   KPIM::ThreadWeaver::Weaver *the_weaver;
517 517
   KPIM::ThreadWeaver::WeaverThreadLogger *the_weaverLogger;
518 518
 
519
-  KWallet::Wallet *mWallet;
519
+  TDEWallet::Wallet *mWallet;
520 520
 
521 521
   // variables used by dcopAddMessage()
522 522
   TQStringList mAddMessageMsgIds;

+ 6
- 6
kmail/kmtransport.cpp View File

@@ -39,7 +39,7 @@
39 39
 #include <kseparator.h>
40 40
 #include <kdebug.h>
41 41
 #include <tdewallet.h>
42
-using KWallet::Wallet;
42
+using TDEWallet::Wallet;
43 43
 #include <kprotocolinfo.h>
44 44
 
45 45
 #include "kmkernel.h"
@@ -138,15 +138,15 @@ void KMTransportInfo::writeConfig(int id)
138 138
     }
139 139
     // wallet not available, ask the user if we should use the config file instead
140 140
     if ( !passwdStored && ( mStorePasswdInConfig ||  KMessageBox::warningYesNo( 0,
141
-         i18n("KWallet is not available. It is strongly recommended to use "
142
-              "KWallet for managing your passwords.\n"
141
+         i18n("TDEWallet is not available. It is strongly recommended to use "
142
+              "TDEWallet for managing your passwords.\n"
143 143
               "However, KMail can store the password in its configuration "
144 144
               "file instead. The password is stored in an obfuscated format, "
145 145
               "but should not be considered secure from decryption efforts "
146 146
               "if access to the configuration file is obtained.\n"
147 147
               "Do you want to store the password for account '%1' in the "
148 148
               "configuration file?").arg( name ),
149
-         i18n("KWallet Not Available"),
149
+         i18n("TDEWallet Not Available"),
150 150
          KGuiItem( i18n("Store Password") ),
151 151
          KGuiItem( i18n("Do Not Store Password") ) )
152 152
          == KMessageBox::Yes ) ) {
@@ -457,9 +457,9 @@ void KMTransportDialog::makeSmtpPage()
457 457
     new TQCheckBox( i18n("&Store SMTP password"), page1 );
458 458
   TQWhatsThis::add(mSmtp.storePasswordCheck,
459 459
                   i18n("Check this option to have KMail store "
460
-                  "the password.\nIf KWallet is available "
460
+                  "the password.\nIf TDEWallet is available "
461 461
                   "the password will be stored there which is considered "
462
-                  "safe.\nHowever, if KWallet is not available, "
462
+                  "safe.\nHowever, if TDEWallet is not available, "
463 463
                   "the password will be stored in KMail's configuration "
464 464
                   "file. The password is stored in an "
465 465
                   "obfuscated format, but should not be "

+ 5
- 5
kmail/networkaccount.cpp View File

@@ -39,7 +39,7 @@
39 39
 #include <kdebug.h>
40 40
 #include <tdewallet.h>
41 41
 using TDEIO::MetaData;
42
-using KWallet::Wallet;
42
+using TDEWallet::Wallet;
43 43
 
44 44
 #include <climits>
45 45
 
@@ -162,7 +162,7 @@ namespace KMail {
162 162
 
163 163
       if ( !encpasswd.isEmpty() ) {
164 164
         setPasswd( decryptStr( encpasswd ), true );
165
-        // migrate to KWallet if available
165
+        // migrate to TDEWallet if available
166 166
         if ( Wallet::isEnabled() ) {
167 167
           config.deleteEntry( "pass" );
168 168
           config.deleteEntry( "passwd" );
@@ -217,15 +217,15 @@ namespace KMail {
217 217
       // if wallet is not available, write to config file, since the account
218 218
       // manager deletes this group, we need to write it always
219 219
       if ( !passwdStored && ( mStorePasswdInConfig || KMessageBox::warningYesNo( 0,
220
-           i18n("KWallet is not available. It is strongly recommended to use "
221
-                "KWallet for managing your passwords.\n"
220
+           i18n("TDEWallet is not available. It is strongly recommended to use "
221
+                "TDEWallet for managing your passwords.\n"
222 222
                 "However, KMail can store the password in its configuration "
223 223
                 "file instead. The password is stored in an obfuscated format, "
224 224
                 "but should not be considered secure from decryption efforts "
225 225
                 "if access to the configuration file is obtained.\n"
226 226
                 "Do you want to store the password for account '%1' in the "
227 227
                 "configuration file?").arg( name() ),
228
-           i18n("KWallet Not Available"),
228
+           i18n("TDEWallet Not Available"),
229 229
            KGuiItem( i18n("Store Password") ),
230 230
            KGuiItem( i18n("Do Not Store Password") ) )
231 231
            == KMessageBox::Yes ) ) {

+ 2
- 2
knode/knaccountmanager.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include "knaccountmanager.h"
32 32
 #include "knfoldermanager.h"
33 33
 
34
-KWallet::Wallet* KNAccountManager::mWallet = 0;
34
+TDEWallet::Wallet* KNAccountManager::mWallet = 0;
35 35
 bool KNAccountManager::mWalletOpenFailed = false;
36 36
 
37 37
 KNAccountManager::KNAccountManager(KNGroupManager *gm, TQObject * parent, const char * name)
@@ -252,7 +252,7 @@ void KNAccountManager::loadPasswords()
252 252
 }
253 253
 
254 254
 
255
-KWallet::Wallet* KNAccountManager::wallet()
255
+TDEWallet::Wallet* KNAccountManager::wallet()
256 256
 {
257 257
   if ( mWallet && mWallet->isOpen() )
258 258
     return mWallet;

+ 3
- 3
knode/knaccountmanager.h View File

@@ -18,7 +18,7 @@
18 18
 #include <tqglobal.h>
19 19
 #include <tqvaluelist.h>
20 20
 
21
-namespace KWallet {
21
+namespace TDEWallet {
22 22
   class Wallet;
23 23
 }
24 24
 
@@ -61,7 +61,7 @@ class KNAccountManager : public TQObject
61 61
     void loadPasswordsAsync();
62 62
 
63 63
     /** Returns a pointer to an open wallet if available, 0 otherwise */
64
-    static KWallet::Wallet* wallet();
64
+    static TDEWallet::Wallet* wallet();
65 65
 
66 66
   protected:
67 67
     void loadAccounts();
@@ -85,7 +85,7 @@ class KNAccountManager : public TQObject
85 85
 
86 86
   private:
87 87
     TQValueList<KNNntpAccount*> mAccounts;
88
-    static KWallet::Wallet *mWallet;
88
+    static TDEWallet::Wallet *mWallet;
89 89
     static bool mWalletOpenFailed;
90 90
     bool mAsyncOpening;
91 91
 

+ 1
- 1
knode/knnetaccess.cpp View File

@@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job)
102 102
   if ( !job->account()->readyForLogin() ) {
103 103
     mWalletQueue.append( job );
104 104
     knGlobals.accountManager()->loadPasswordsAsync();
105
-    job->setStatus( i18n( "Waiting for KWallet..." ) );
105
+    job->setStatus( i18n( "Waiting for TDEWallet..." ) );
106 106
     return;
107 107
   }
108 108
 

+ 6
- 6
knode/knserverinfo.cpp View File

@@ -18,7 +18,7 @@
18 18
 #include <tdelocale.h>
19 19
 #include <kdebug.h>
20 20
 #include <tdewallet.h>
21
-using namespace KWallet;
21
+using namespace TDEWallet;
22 22
 
23 23
 #include "knglobals.h"
24 24
 #include "knserverinfo.h"
@@ -67,7 +67,7 @@ void KNServerInfo::readConf(TDEConfig *conf)
67 67
   u_ser=conf->readEntry("user");
68 68
   p_ass = KNHelper::decryptStr(conf->readEntry("pass"));
69 69
 
70
-  // migration to KWallet
70
+  // migration to TDEWallet
71 71
   if (Wallet::isEnabled() && !p_ass.isEmpty()) {
72 72
     conf->deleteEntry( "pass" );
73 73
     p_assDirty = true;
@@ -104,15 +104,15 @@ void KNServerInfo::saveConf(TDEConfig *conf)
104 104
     Wallet *wallet = KNAccountManager::wallet();
105 105
     if (!wallet || wallet->writePassword(TQString::number(i_d), p_ass)) {
106 106
       if ( KMessageBox::warningYesNo( 0,
107
-            i18n("KWallet is not available. It is strongly recommended to use "
108
-                "KWallet for managing your passwords.\n"
107
+            i18n("TDEWallet is not available. It is strongly recommended to use "
108
+                "TDEWallet for managing your passwords.\n"
109 109
                 "However, KNode can store the password in its configuration "
110 110
                 "file instead. The password is stored in an obfuscated format, "
111 111
                 "but should not be considered secure from decryption efforts "
112 112
                 "if access to the configuration file is obtained.\n"
113 113
                 "Do you want to store the password for server '%1' in the "
114 114
                 "configuration file?").arg( server() ),
115
-            i18n("KWallet Not Available"),
115
+            i18n("TDEWallet Not Available"),
116 116
             KGuiItem( i18n("Store Password") ),
117 117
             KGuiItem( i18n("Do Not Store Password") ) )
118 118
             == KMessageBox::Yes ) {
@@ -182,7 +182,7 @@ void KNServerInfo::readPassword()
182 182
     return;
183 183
 
184 184
   // finally try to open the wallet and read the password
185
-  KWallet::Wallet *wallet = KNAccountManager::wallet();
185
+  TDEWallet::Wallet *wallet = KNAccountManager::wallet();
186 186
   if ( wallet )
187 187
     wallet->readPassword( TQString::number(i_d), p_ass );
188 188
 }

+ 3
- 3
knode/knserverinfo.h View File

@@ -18,10 +18,10 @@
18 18
 #include <tqstring.h>
19 19
 
20 20
 class TDEConfig;
21
-namespace KWallet {
21
+namespace TDEWallet {
22 22
   class Wallet;
23 23
 }
24
-using KWallet::Wallet;
24
+using TDEWallet::Wallet;
25 25
 
26 26
 class KNServerInfo {
27 27
 
@@ -63,7 +63,7 @@ class KNServerInfo {
63 63
 
64 64
     bool operator==(const KNServerInfo &s);
65 65
 
66
-    /** Loads the password from KWallet, used for on-demand password loading */
66
+    /** Loads the password from TDEWallet, used for on-demand password loading */
67 67
     void readPassword();
68 68
 
69 69
   protected:

+ 1
- 1
korn/kmail_proto.h View File

@@ -64,7 +64,7 @@ public:
64 64
 	 * it calculates how the configuration whould have looked in KOrn.
65 65
 	 *
66 66
 	 * @param config The configuration group to read the kmailname from.
67
-	 * @param password The password fetched out of the configuration or KWallet.
67
+	 * @param password The password fetched out of the configuration or TDEWallet.
68 68
 	 * @return A mapping containing the configuration if success, and empty mapping otherwise.
69 69
 	 */
70 70
         virtual TQMap< TQString, TQString > * createConfig( TDEConfigGroup* config, const TQString& password ) const;

+ 1
- 1
korn/korncfg.ui View File

@@ -52,7 +52,7 @@
52 52
                             <cstring>chUseWallet</cstring>
53 53
                         </property>
54 54
                         <property name="text">
55
-                            <string>Use &amp;KWallet if possible</string>
55
+                            <string>Use &amp;TDEWallet if possible</string>
56 56
                         </property>
57 57
                         <property name="checked">
58 58
                             <bool>true</bool>

+ 1
- 1
korn/korncfgimpl.cpp View File

@@ -220,7 +220,7 @@ void KornCfgImpl::writeConfig()
220 220
 	if( rbDocked->isChecked() )
221 221
 		_config->writeEntry( "layout", "Docked" );
222 222
 
223
-	//Default is 'false' here, because if no option is set, KWallet isn't used.
223
+	//Default is 'false' here, because if no option is set, TDEWallet isn't used.
224 224
 	if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() )
225 225
 		//Configuration box changed => setting over configuration
226 226
 		rewritePasswords();

+ 2
- 2
korn/password.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <tqstring.h>
27 27
 #include <tqstringlist.h>
28 28
 
29
-KWallet::Wallet* KOrnPassword::m_wallet = 0;
29
+TDEWallet::Wallet* KOrnPassword::m_wallet = 0;
30 30
 bool KOrnPassword::m_openFailed = false;
31 31
 bool KOrnPassword::m_useWallet = false; //Not default true until moving works
32 32
 
@@ -178,7 +178,7 @@ void KOrnPassword::open()
178 178
 		return; //Not open, and can't be opened
179 179
 
180 180
 	delete m_wallet; m_wallet = 0;
181
-	m_wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0 );
181
+	m_wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0 );
182 182
 	
183 183
 	if( !m_wallet )
184 184
 		m_openFailed = true;

+ 11
- 11
korn/password.h View File

@@ -21,13 +21,13 @@
21 21
 #define KORNPASSWORD_H
22 22
 
23 23
 class TDEConfigBase;
24
-namespace KWallet { class Wallet; }
24
+namespace TDEWallet { class Wallet; }
25 25
 
26 26
 class TQString;
27 27
 
28 28
 /**
29 29
  * This class can be used to store and retrieve passwords.
30
- * It uses KWallet if possible, and the configuartion files otherwise.
30
+ * It uses TDEWallet if possible, and the configuartion files otherwise.
31 31
  */
32 32
 class KOrnPassword
33 33
 {
@@ -46,15 +46,15 @@ public:
46 46
 	 *
47 47
 	 * @param box The boxnumber of the account
48 48
 	 * @param account The accountnumber of the account
49
-	 * @param fallbackConfig The configuration file if KWallet cannot be used.
49
+	 * @param fallbackConfig The configuration file if TDEWallet cannot be used.
50 50
 	 * @return The password, or TQString() if it failes.
51 51
 	 */
52 52
 	static TQString readKOrnPassword( int box, int account, const TDEConfigBase& fallbackConfig );
53 53
 	/**
54
-	 * This function gets a password with is puts in KWallet by KMail
54
+	 * This function gets a password with is puts in TDEWallet by KMail
55 55
 	 *
56 56
 	 * @param accountnr The id of the KMail account
57
-	 * @param fallbackConfig The configuration used if KWallet isn't available.
57
+	 * @param fallbackConfig The configuration used if TDEWallet isn't available.
58 58
 	 * @return The password, TQStirng::null if it failes.
59 59
 	 */
60 60
 	static TQString readKMailPassword( int accountnr, const TDEConfigBase& fallbackConfig );
@@ -64,22 +64,22 @@ public:
64 64
 	 *
65 65
 	 * @param box The boxnumber of the account.
66 66
 	 * @param account The accountnumber of the account.
67
-	 * @param fallbackConfig The configuration file if KWallet isn't available.
67
+	 * @param fallbackConfig The configuration file if TDEWallet isn't available.
68 68
 	 * @param password The password to be stored.
69 69
 	 */
70 70
 	static void writeKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig, const TQString& password );
71 71
 
72 72
 	/**
73
-	 * This function deletes a password from both KWallet and the configuration file
73
+	 * This function deletes a password from both TDEWallet and the configuration file
74 74
 	 *
75 75
 	 * @param box The boxnumber of the account.
76 76
 	 * @param account The accountnumber of the account.
77
-	 * @param fallbackConfig The configuration file if KWallet isn't available.
77
+	 * @param fallbackConfig The configuration file if TDEWallet isn't available.
78 78
 	 */
79 79
 	static void deleteKOrnPassword( int box, int account, TDEConfigBase& fallbackConfig );
80 80
 
81 81
 	/**
82
-	 * This function deletes a password from KWallet 
82
+	 * This function deletes a password from TDEWallet 
83 83
 	 *
84 84
 	 * @param box The boxnumber of the account.
85 85
 	 * @param account The accountnumber of the account.
@@ -143,7 +143,7 @@ public:
143 143
 	static void rewritePassword( int box, int account, TDEConfigBase &config, bool newUseWalletValue );
144 144
 	
145 145
 	/**
146
-	 * If set to true, this class will try to use KWallet,
146
+	 * If set to true, this class will try to use TDEWallet,
147 147
 	 * if false, it will not.
148 148
 	 *
149 149
 	 * The default value is true.
@@ -159,7 +159,7 @@ private:
159 159
 	
160 160
 	static TQString KMailDecrypt( const TQString& enc );
161 161
 	
162
-	static KWallet::Wallet *m_wallet;
162
+	static TDEWallet::Wallet *m_wallet;
163 163
 	static bool m_openFailed;
164 164
 	static bool m_useWallet;
165 165
 };

+ 1
- 1
tderesources/caldav/preferences.cpp View File

@@ -26,7 +26,7 @@
26 26
  ========================================================================*/
27 27
 
28 28
 using namespace KCal;
29
-using namespace KWallet;
29
+using namespace TDEWallet;
30 30
 
31 31
 /*=========================================================================
32 32
 | CONSTANTS

+ 3
- 3
tderesources/caldav/preferences.h View File

@@ -33,7 +33,7 @@ namespace KCal {
33 33
 /**
34 34
  * This class provides access to ResourceCalDav preferences.
35 35
  * It inherits auto-generated CalDavPrefsSkel class to add password-handling code.
36
- * KWallet is used for storing passwords.
36
+ * TDEWallet is used for storing passwords.
37 37
  * It also adds code to allow multiple CalDAV resources to store settings in the same
38 38
  * config file.
39 39
  */
@@ -109,7 +109,7 @@ protected:
109 109
     /**
110 110
      * Returns the wallet or NULL, if the wallet can't be obtained.
111 111
      */
112
-    KWallet::Wallet* getWallet();
112
+    TDEWallet::Wallet* getWallet();
113 113
 
114 114
     /**
115 115
      * Tries to set a working folder for the wallet. If the wallet is not configured yet, does nothing.
@@ -150,7 +150,7 @@ private:
150 150
     static const TQString WALLET_FOLDER;
151 151
     static const TQString WALLET_PWD_SUFFIX;
152 152
 
153
-    KWallet::Wallet* mWallet;
153
+    TDEWallet::Wallet* mWallet;
154 154
     bool mNoWallet;
155 155
 
156 156
     TQString mPrefix;

+ 1
- 1
tderesources/carddav/preferences.cpp View File

@@ -25,7 +25,7 @@
25 25
  ========================================================================*/
26 26
 
27 27
 using namespace TDEABC;
28
-using namespace KWallet;
28
+using namespace TDEWallet;
29 29
 
30 30
 /*=========================================================================
31 31
 | CONSTANTS

+ 3
- 3
tderesources/carddav/preferences.h View File

@@ -32,7 +32,7 @@ namespace TDEABC {
32 32
 /**
33 33
  * This class provides access to ResourceCardDav preferences.
34 34
  * It inherits auto-generated CardDavPrefsSkel class to add password-handling code.
35
- * KWallet is used for storing passwords.
35
+ * TDEWallet is used for storing passwords.
36 36
  * It also adds code to allow multiple CardDAV resources to store settings in the same
37 37
  * config file.
38 38
  */
@@ -100,7 +100,7 @@ protected:
100 100
     /**
101 101
      * Returns the wallet or NULL, if the wallet can't be obtained.
102 102
      */
103
-    KWallet::Wallet* getWallet();
103
+    TDEWallet::Wallet* getWallet();
104 104
 
105 105
     /**
106 106
      * Tries to set a working folder for the wallet. If the wallet is not configured yet, does nothing.
@@ -141,7 +141,7 @@ private:
141 141
     static const TQString WALLET_FOLDER;
142 142
     static const TQString WALLET_PWD_SUFFIX;
143 143
 
144
-    KWallet::Wallet* mWallet;
144
+    TDEWallet::Wallet* mWallet;
145 145
     bool mNoWallet;
146 146
 
147 147
     TQString mPrefix;

+ 3
- 3
tderesources/scalix/scalixadmin/passwordpage.cpp View File

@@ -162,13 +162,13 @@ void PasswordPage::finished( TDEIO::Job* job )
162 162
     // Save only if the user choose it before
163 163
     bool storePassword = group.readBoolEntry( "store-passwd", false );
164 164
     if ( storePassword ) {
165
-      // First try to store in KWallet
166
-      if ( KWallet::Wallet::isEnabled() ) {
165
+      // First try to store in TDEWallet
166
+      if ( TDEWallet::Wallet::isEnabled() ) {
167 167
         WId window = 0;
168 168
         if ( tqApp->activeWindow() )
169 169
           window = tqApp->activeWindow()->winId();
170 170
 
171
-        KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), window );
171
+        TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), window );
172 172
         if ( wallet ) {
173 173
           if ( !wallet->hasFolder( "kmail" ) )
174 174
             wallet->createFolder( "kmail" );

+ 1
- 1
wizards/kmailchanges.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <kdebug.h>
32 32
 #include <kstringhandler.h>
33 33
 #include <tdewallet.h>
34
-using namespace KWallet;
34
+using namespace TDEWallet;
35 35
 
36 36
 static const char* s_folderContentsType[] = {
37 37
   I18N_NOOP( "Calendar" ),

+ 2
- 2
wizards/kmailchanges.h View File

@@ -25,7 +25,7 @@
25 25
 #include <tdeconfigpropagator.h>
26 26
 #include <tdeconfig.h>
27 27
 
28
-namespace KWallet {
28
+namespace TDEWallet {
29 29
   class Wallet;
30 30
 }
31 31
 
@@ -107,7 +107,7 @@ class CreateImapAccount : public TDEConfigPropagator::Change
107 107
     CustomWriter *mCustomWriter;
108 108
 
109 109
   private:
110
-    static KWallet::Wallet *mWallet;
110
+    static TDEWallet::Wallet *mWallet;
111 111
 };
112 112
 
113 113
 class CreateDisconnectedImapAccount : public CreateImapAccount

+ 1
- 1
wizards/scalixwizard.cpp View File

@@ -409,7 +409,7 @@ ScalixWizard::ScalixWizard() : TDEConfigWizard( new ScalixPropagator )
409 409
 
410 410
   mSavePasswordCheck = new TQCheckBox( i18n("Save password"), page );
411 411
   topLayout->addMultiCellWidget( mSavePasswordCheck, 5, 5, 0, 1 );
412
-  TQWhatsThis::add( mSavePasswordCheck, i18n( "Shall the password be saved in KWallet?." ) );
412
+  TQWhatsThis::add( mSavePasswordCheck, i18n( "Shall the password be saved in TDEWallet?." ) );
413 413
 
414 414
   label = new TQLabel( i18n( "Use Secure Connection:" ), page );
415 415
   topLayout->addWidget( label, 6, 0 );

Loading…
Cancel
Save