Rename KWallet to TDEWallet.

19 files changed, 43 insertions, 43 deletions

diff --git a/doc/html/classConfigElem.html b/doc/html/classConfigElem.html
index 3d0c760..d9994a1 100644
--- a/doc/html/classConfigElem.html
+++ b/doc/html/classConfigElem.html
@@ -926,7 +926,7 @@ Returns the user name. <dl class="return" compact><dt><b>Returns:</b></dt><dd>th
 <p>
 Sets the password storage type. The <a class="el" href="namespaceConstants.html">Constants</a> are defined in <a class="el" href="constants_8h.html">constants.h</a> <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>storage</em>&nbsp;</td><td>type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>storage</em>&nbsp;</td><td>type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET </td></tr>
   </table>
 </dl>
 
@@ -948,7 +948,7 @@ Sets the password storage type. The <a class="el" href="namespaceConstants.html"
 <div class="memdoc">
 
 <p>
-Returns the password storage type. The <a class="el" href="namespaceConstants.html">Constants</a> are defined in <a class="el" href="constants_8h.html">constants.h</a>. <dl class="return" compact><dt><b>Returns:</b></dt><dd>type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET </dd></dl>
+Returns the password storage type. The <a class="el" href="namespaceConstants.html">Constants</a> are defined in <a class="el" href="constants_8h.html">constants.h</a>. <dl class="return" compact><dt><b>Returns:</b></dt><dd>type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET </dd></dl>
 
 </div>
 </div><p>
@@ -2473,7 +2473,7 @@ State of the account.
 <div class="memdoc">
 
 <p>
-Type of password storage. valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET The <a class="el" href="namespaceConstants.html">Constants</a> are defined in <a class="el" href="constants_8h.html">constants.h</a> <dl class="see" compact><dt><b>See also:</b></dt><dd><a class="el" href="classConfigElem.html#bda433f60b1eed0d4b8d207707d5005c">saveOptions()</a> <p>
+Type of password storage. valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET The <a class="el" href="namespaceConstants.html">Constants</a> are defined in <a class="el" href="constants_8h.html">constants.h</a> <dl class="see" compact><dt><b>See also:</b></dt><dd><a class="el" href="classConfigElem.html#bda433f60b1eed0d4b8d207707d5005c">saveOptions()</a> <p>
 <a class="el" href="classConfigElem.html#58f9d269bd389c52718d78d7615c4431">setPasswordStorage()</a> </dd></dl>
 
 </div>
diff --git a/doc/html/configelem_8cpp-source.html b/doc/html/configelem_8cpp-source.html
index ef516d8..72ef9a0 100644
--- a/doc/html/configelem_8cpp-source.html
+++ b/doc/html/configelem_8cpp-source.html
@@ -322,7 +322,7 @@
 <a name="l00305"></a>00305       <span class="keywordflow">else</span>
 <a name="l00306"></a>00306         config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
 <a name="l00307"></a>00307 
-<a name="l00308"></a>00308       <span class="keywordflow">if</span>( <a class="code" href="classConfigElem.html#1ad409223125a43d257cd7666c8c7284">PasswordStorage</a> == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+<a name="l00308"></a>00308       <span class="keywordflow">if</span>( <a class="code" href="classConfigElem.html#1ad409223125a43d257cd7666c8c7284">PasswordStorage</a> == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
 <a name="l00309"></a>00309         <a class="code" href="namespaceTDEWalletAccess.html#0687cd1465352be5b3572cdfd2411219">TDEWalletAccess::savePassword</a>( <a class="code" href="classConfigElem.html#760e18ad688d55cd76bfeeb4958df769">getAccountName</a>(), <a class="code" href="classConfigElem.html#c9d1c50d2a2ac6c4fa9261f0d77729a9">m_url</a>.pass() );
 <a name="l00310"></a>00310 
 <a name="l00311"></a>00311       config-&gt;sync();
@@ -1175,7 +1175,7 @@
 <a name="l01158"></a>01158   {
 <a name="l01159"></a>01159     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE    : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: don't save"</span> &lt;&lt; endl; <span class="keywordflow">break</span>;
 <a name="l01160"></a>01160     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE    : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: save in file"</span> &lt;&lt; endl; <span class="keywordflow">break</span>;
-<a name="l01161"></a>01161     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: use TDEWallet"</span> &lt;&lt; endl; <span class="keywordflow">break</span>;
+<a name="l01161"></a>01161     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: use TDEWallet"</span> &lt;&lt; endl; <span class="keywordflow">break</span>;
 <a name="l01162"></a>01162     <span class="keywordflow">default</span>                                         : kdDebug() &lt;&lt; <span class="stringliteral">"Password Storage: invalid value"</span> &lt;&lt; endl;
 <a name="l01163"></a>01163 
 <a name="l01164"></a>01164   }
@@ -1189,7 +1189,7 @@
 <a name="l01172"></a>01172 {
 <a name="l01173"></a>01173   <span class="keywordflow">if</span>( storage == CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE ||
 <a name="l01174"></a>01174       storage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE ||
-<a name="l01175"></a>01175       storage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+<a name="l01175"></a>01175       storage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
 <a name="l01176"></a>01176 
 <a name="l01177"></a>01177     <a class="code" href="classConfigElem.html#1ad409223125a43d257cd7666c8c7284">PasswordStorage</a> = storage;
 <a name="l01178"></a>01178 
diff --git a/doc/html/configlist_8cpp-source.html b/doc/html/configlist_8cpp-source.html
index c074acd..d6ace1d 100644
--- a/doc/html/configlist_8cpp-source.html
+++ b/doc/html/configlist_8cpp-source.html
@@ -870,8 +870,8 @@
 <a name="l00853"></a>00853         acc-&gt;<a class="code" href="classConfigElem.html#6edf15369f3e906a04dff0b92f5b3c2d">setPassword</a>( <a class="code" href="namespaceEncryption.html#df6ae41daa3eebed6cc7a74a37936981">Encryption::decrypt</a>( <a class="code" href="classConfigList.html#4bed3e796400897fbffd3eb19e4ff296">config</a>-&gt;readEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, DEFAULT_ACCOUNT_PASSWORD ) ) );
 <a name="l00854"></a>00854         <span class="keywordflow">break</span>;
 <a name="l00855"></a>00855 
-<a name="l00856"></a>00856       <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET:
-<a name="l00857"></a>00857         acc-&gt;<a class="code" href="classConfigElem.html#58f9d269bd389c52718d78d7615c4431">setPasswordStorage</a>( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
+<a name="l00856"></a>00856       <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET:
+<a name="l00857"></a>00857         acc-&gt;<a class="code" href="classConfigElem.html#58f9d269bd389c52718d78d7615c4431">setPasswordStorage</a>( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET );
 <a name="l00858"></a>00858         acc-&gt;<a class="code" href="classConfigElem.html#6edf15369f3e906a04dff0b92f5b3c2d">setPassword</a>( <a class="code" href="namespaceTDEWalletAccess.html#2ce179e4ef9e2a06990252aca555b2fa">TDEWalletAccess::getPassword</a>( *it ) );
 <a name="l00859"></a>00859         <span class="keywordflow">break</span>;
 <a name="l00860"></a>00860 
diff --git a/doc/html/constants_8h-source.html b/doc/html/constants_8h-source.html
index 712369f..fcb3823 100644
--- a/doc/html/constants_8h-source.html
+++ b/doc/html/constants_8h-source.html
@@ -250,7 +250,7 @@
 <a name="l00249"></a>00249 <span class="preprocessor"></span>
 <a name="l00250"></a><a class="code" href="constants_8h.html#f16ef9af8fec6d5ed486b17820d6b9af">00250</a> <span class="preprocessor">  #define CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE     1</span>
 <a name="l00251"></a><a class="code" href="constants_8h.html#ee48acb672fa99a5522570686e40ef4c">00251</a> <span class="preprocessor"></span><span class="preprocessor">  #define CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE     2</span>
-<a name="l00252"></a><a class="code" href="constants_8h.html#157cbe3a986bfe2f41c6e3b536cfe69e">00252</a> <span class="preprocessor"></span><span class="preprocessor">  #define CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET  3</span>
+<a name="l00252"></a><a class="code" href="constants_8h.html#157cbe3a986bfe2f41c6e3b536cfe69e">00252</a> <span class="preprocessor"></span><span class="preprocessor">  #define CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET  3</span>
 <a name="l00253"></a><a class="code" href="constants_8h.html#acbef0d7ea1ec00dbd8fd0a9eed544f7">00253</a> <span class="preprocessor"></span><span class="preprocessor">  #define CONFIG_VALUE_ACCOUNT_SECTRANSFER_NONE       1</span>
 <a name="l00254"></a><a class="code" href="constants_8h.html#772b70735fcf84d1dd22266ddd5c53c9">00254</a> <span class="preprocessor"></span><span class="preprocessor">  #define CONFIG_VALUE_ACCOUNT_SECTRANSFER_SSL        2</span>
 <a name="l00255"></a><a class="code" href="constants_8h.html#052422c4bf668ca3c9adb5beb7f76f95">00255</a> <span class="preprocessor"></span><span class="preprocessor">  #define CONFIG_VALUE_ACCOUNT_SECTRANSFER_TLS        3</span>
diff --git a/doc/html/files.html b/doc/html/files.html
index dd458e9..604643f 100644
--- a/doc/html/files.html
+++ b/doc/html/files.html
@@ -104,8 +104,8 @@
   <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="filtersetupdialog_8h.html">filtersetupdialog.h</a> <a href="filtersetupdialog_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="filtersetupitem_8cpp.html">filtersetupitem.cpp</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="filtersetupitem_8h.html">filtersetupitem.h</a> <a href="filtersetupitem_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="kcmconfigs_2kwalletaccess_8cpp.html">tdewalletaccess.cpp</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="kcmconfigs_2kwalletaccess_8h.html">tdewalletaccess.h</a> <a href="kcmconfigs_2kwalletaccess_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="kcmconfigs_2tdewalletaccess_8cpp.html">tdewalletaccess.cpp</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="kcmconfigs_2tdewalletaccess_8h.html">tdewalletaccess.h</a> <a href="kcmconfigs_2tdewalletaccess_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="mailboxwizard_8cpp.html">mailboxwizard.cpp</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="mailboxwizard_8h.html">mailboxwizard.h</a> <a href="mailboxwizard_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">Daten/Documents/programmieren/kshowmail/kshowmail/kshowmail/kcmconfigs/<a class="el" href="mailboxwizardlistitem_8cpp.html">mailboxwizardlistitem.cpp</a></td><td class="indexvalue"></td></tr>
diff --git a/doc/html/serverdialog_8cpp-source.html b/doc/html/serverdialog_8cpp-source.html
index 5c23848..25ece68 100644
--- a/doc/html/serverdialog_8cpp-source.html
+++ b/doc/html/serverdialog_8cpp-source.html
@@ -105,7 +105,7 @@
 <a name="l00088"></a>00088   TQRadioButton* btnPasswordSaveTDEWallet = <span class="keyword">new</span> TQRadioButton( i18n( <span class="stringliteral">"Use TDEWallet"</span> ), gboxPassword, <span class="stringliteral">"btnPasswordSaveTDEWallet"</span> );
 <a name="l00089"></a>00089   <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
 <a name="l00090"></a>00090   <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
-<a name="l00091"></a>00091   <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
+<a name="l00091"></a>00091   <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
 <a name="l00092"></a>00092   TQToolTip::add( btnPasswordDontSave, i18n( <span class="stringliteral">"Don't save password. KShowmail will ask you for it at first server connect."</span> ) );
 <a name="l00093"></a>00093   TQToolTip::add( btnPasswordSaveFile, i18n( <span class="stringliteral">"Save password in the configuration file. Not recommended, because the password is just lightly encrypted"</span> ) );
 <a name="l00094"></a>00094   TQToolTip::add( btnPasswordSaveTDEWallet, i18n( <span class="stringliteral">"Use TDEWallet to save the password. Maybe you have to type in the TDEWallet master password at first server connect."</span> ) );
@@ -214,7 +214,7 @@
 <a name="l00197"></a>00197     <span class="keywordflow">case</span> ID_BUTTON_PASSWORD_SAVE_FILE    : config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE );
 <a name="l00198"></a>00198                                            config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, <a class="code" href="namespaceEncryption.html#83f630d4dba4cf3a5f6b03a25e43f6c8">crypt</a>( url ) );
 <a name="l00199"></a>00199                                            <span class="keywordflow">break</span>;
-<a name="l00200"></a>00200     <span class="keywordflow">case</span> ID_BUTTON_PASSWORD_SAVE_KWALLET : config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
+<a name="l00200"></a>00200     <span class="keywordflow">case</span> ID_BUTTON_PASSWORD_SAVE_TDEWALLET : config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET );
 <a name="l00201"></a>00201                                            config-&gt;writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
 <a name="l00202"></a>00202                                            <a class="code" href="namespaceTDEWalletAccess.html#0687cd1465352be5b3572cdfd2411219">TDEWalletAccess::savePassword</a>( <a class="code" href="classServerDialog.html#690681b24cfd21ebdc4d5543bee5b4a3">txtAccount</a>-&gt;text(), pass );
 <a name="l00203"></a>00203                                            <span class="keywordflow">break</span>;
@@ -247,7 +247,7 @@
 <a name="l00230"></a>00230   <a class="code" href="classServerDialog.html#0df9d91a225a5426d198286987f5b1b2">txtUser</a>-&gt;setText( <a class="code" href="classServerDialog.html#c361b2cc2165a11e38e83cea29e39185">account</a>-&gt;<a class="code" href="classConfigElem.html#19f5621cac8e71c1088995bcef75596a">getUser</a>() );
 <a name="l00231"></a>00231 
 <a name="l00232"></a>00232   <span class="keywordtype">int</span> type = <a class="code" href="classServerDialog.html#c361b2cc2165a11e38e83cea29e39185">account</a>-&gt;<a class="code" href="classConfigElem.html#34bc68f7bbdc296d18460f303f479450">getPasswordStorage</a>();
-<a name="l00233"></a>00233   <span class="keywordflow">if</span>( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE &amp;&amp; type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE &amp;&amp; type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+<a name="l00233"></a>00233   <span class="keywordflow">if</span>( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE &amp;&amp; type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE &amp;&amp; type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
 <a name="l00234"></a>00234     type = DEFAULT_ACCOUNT_PASSWORD_STORAGE;
 <a name="l00235"></a>00235 
 <a name="l00236"></a>00236   <span class="keywordflow">switch</span>( type )
@@ -260,7 +260,7 @@
 <a name="l00243"></a>00243                                                       <a class="code" href="classServerDialog.html#8630fd27107213fd88fbaf0db02793d6">txtPassword</a>-&gt;setEnabled( <span class="keyword">true</span> );
 <a name="l00244"></a>00244                                                       <a class="code" href="classServerDialog.html#8630fd27107213fd88fbaf0db02793d6">txtPassword</a>-&gt;setText( <a class="code" href="classServerDialog.html#c361b2cc2165a11e38e83cea29e39185">account</a>-&gt;<a class="code" href="classConfigElem.html#7ea9a96f400284acce0999639659c461">getPassword</a>() );
 <a name="l00245"></a>00245                                                       <span class="keywordflow">break</span>;
-<a name="l00246"></a>00246     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;setButton( ID_BUTTON_PASSWORD_SAVE_KWALLET );
+<a name="l00246"></a>00246     <span class="keywordflow">case</span> CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET : <a class="code" href="classServerDialog.html#63a7dda4a3c7da5a4b7979dcd13f96ce">grpPasswordStorage</a>-&gt;setButton( ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
 <a name="l00247"></a>00247                                                       <a class="code" href="classServerDialog.html#8630fd27107213fd88fbaf0db02793d6">txtPassword</a>-&gt;setEnabled( <span class="keyword">true</span> );
 <a name="l00248"></a>00248                                                       <a class="code" href="classServerDialog.html#8630fd27107213fd88fbaf0db02793d6">txtPassword</a>-&gt;setText( <a class="code" href="classServerDialog.html#c361b2cc2165a11e38e83cea29e39185">account</a>-&gt;<a class="code" href="classConfigElem.html#7ea9a96f400284acce0999639659c461">getPassword</a>() );
 <a name="l00249"></a>00249                                                       <span class="keywordflow">break</span>;
diff --git a/doc/html/serverdialog_8h-source.html b/doc/html/serverdialog_8h-source.html
index f9e46c5..ff819e4 100644
--- a/doc/html/serverdialog_8h-source.html
+++ b/doc/html/serverdialog_8h-source.html
@@ -69,7 +69,7 @@
 <a name="l00047"></a>00047 <span class="comment">//radio button IDs</span>
 <a name="l00048"></a><a class="code" href="serverdialog_8h.html#be096056a674c86942df35ae88683434">00048</a> <span class="preprocessor">#define ID_BUTTON_PASSWORD_DONT_SAVE 1</span>
 <a name="l00049"></a><a class="code" href="serverdialog_8h.html#9638724c33aa14f0d538a7e4423e470b">00049</a> <span class="preprocessor"></span><span class="preprocessor">#define ID_BUTTON_PASSWORD_SAVE_FILE 2</span>
-<a name="l00050"></a><a class="code" href="serverdialog_8h.html#77714157b4c78706e8a5bb4baf36692e">00050</a> <span class="preprocessor"></span><span class="preprocessor">#define ID_BUTTON_PASSWORD_SAVE_KWALLET 3</span>
+<a name="l00050"></a><a class="code" href="serverdialog_8h.html#77714157b4c78706e8a5bb4baf36692e">00050</a> <span class="preprocessor"></span><span class="preprocessor">#define ID_BUTTON_PASSWORD_SAVE_TDEWALLET 3</span>
 <a name="l00051"></a><a class="code" href="serverdialog_8h.html#f019b2688ba98eabbe519528e08e8a3f">00051</a> <span class="preprocessor"></span><span class="preprocessor">#define ID_BUTTON_SECLOGIN_NONE 1</span>
 <a name="l00052"></a><a class="code" href="serverdialog_8h.html#d06081dbbddcd8906f776cb51a1b86d7">00052</a> <span class="preprocessor"></span><span class="preprocessor">#define ID_BUTTON_SECLOGIN_APOP 2</span>
 <a name="l00053"></a><a class="code" href="serverdialog_8h.html#e10ffb05e2e9354fe339b6bee90335e7">00053</a> <span class="preprocessor"></span><span class="preprocessor">#define ID_BUTTON_SECLOGIN_SASL 3</span>
diff --git a/kshowmail/configelem.cpp b/kshowmail/configelem.cpp
index 43b11b5..cf4463a 100644
--- a/kshowmail/configelem.cpp
+++ b/kshowmail/configelem.cpp
@@ -312,7 +312,7 @@ bool ConfigElem::assertPassword( bool force )
       else
         config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
 
-      if( PasswordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+      if( PasswordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
         TDEWalletAccess::savePassword( getAccountName(), m_url.pass() );
 
       config->sync();
@@ -1211,7 +1211,7 @@ void ConfigElem::printSetup( ) const
   {
     case CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE    : kdDebug() << "Password Storage: don't save" << endl; break;
     case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE    : kdDebug() << "Password Storage: save in file" << endl; break;
-    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : kdDebug() << "Password Storage: use TDEWallet" << endl; break;
+    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET : kdDebug() << "Password Storage: use TDEWallet" << endl; break;
     default                                         : kdDebug() << "Password Storage: invalid value" << endl;
 
   }
@@ -1225,7 +1225,7 @@ void ConfigElem::setPasswordStorage( int storage )
 {
   if( storage == CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE ||
       storage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE ||
-      storage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+      storage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
 
     PasswordStorage = storage;
 
diff --git a/kshowmail/configelem.h b/kshowmail/configelem.h
index 62cdca4..75a1240 100644
--- a/kshowmail/configelem.h
+++ b/kshowmail/configelem.h
@@ -279,14 +279,14 @@ class ConfigElem : public TQObject {
    /**
     * Sets the password storage type.
     * The Constants are defined in constants.h
-    * @param storage type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET
+    * @param storage type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET
     */
    void setPasswordStorage( int storage );
 
    /**
     * Returns the password storage type.
     * The Constants are defined in constants.h.
-    * @return type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET
+    * @return type of password storage; valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET
     */
    int getPasswordStorage() const;
 
@@ -481,7 +481,7 @@ class ConfigElem : public TQObject {
 
     /**
      * Type of password storage.
-     * valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET
+     * valid values are: CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET
      * The Constants are defined in constants.h
      * @see saveOptions()
      * @see setPasswordStorage()
diff --git a/kshowmail/configlist.cpp b/kshowmail/configlist.cpp
index 58bb90a..50bb22e 100644
--- a/kshowmail/configlist.cpp
+++ b/kshowmail/configlist.cpp
@@ -886,8 +886,8 @@ void ConfigList::refreshSetup( TDEListView* view )
         acc->setPassword( Encryption::decrypt( config->readEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, DEFAULT_ACCOUNT_PASSWORD ) ) );
         break;
 
-      case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET:
-        acc->setPasswordStorage( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
+      case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET:
+        acc->setPasswordStorage( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET );
         acc->setPassword( TDEWalletAccess::getPassword( *it ) );
         break;
 
diff --git a/kshowmail/constants.h b/kshowmail/constants.h
index b36a36f..33d4850 100644
--- a/kshowmail/constants.h
+++ b/kshowmail/constants.h
@@ -249,7 +249,7 @@ namespace Constants
 
   #define CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE     1
   #define CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE     2
-  #define CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET  3
+  #define CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET  3
   #define CONFIG_VALUE_ACCOUNT_SECTRANSFER_NONE       1
   #define CONFIG_VALUE_ACCOUNT_SECTRANSFER_SSL        2
   #define CONFIG_VALUE_ACCOUNT_SECTRANSFER_TLS        3
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.cpp b/kshowmail/kcmconfigs/accountsetupdialog.cpp
index 9e48369..19cfe0d 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.cpp
+++ b/kshowmail/kcmconfigs/accountsetupdialog.cpp
@@ -91,7 +91,7 @@ AccountSetupDialog::AccountSetupDialog( TQWidget* parent, TDEListView* view, Acc
   TQRadioButton* btnPasswordSaveTDEWallet = new TQRadioButton( i18n( "Use TDEWallet" ), gboxPassword, "btnPasswordSaveTDEWallet" );
   grpPasswordStorage->insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
   grpPasswordStorage->insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
-  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
+  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
   TQToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
   TQToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
   TQToolTip::add( btnPasswordSaveTDEWallet, i18n( "Use TDEWallet to save the password. Maybe you have to type in the TDEWallet master password at first server connect." ) );
@@ -269,7 +269,7 @@ void AccountSetupDialog::slotOk( )
     case ID_BUTTON_PASSWORD_SAVE_FILE    : account->setPasswordStorageType( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE );
                                            account->setPassword( pass );
                                            break;
-    case ID_BUTTON_PASSWORD_SAVE_KWALLET : account->setPasswordStorageType( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
+    case ID_BUTTON_PASSWORD_SAVE_TDEWALLET : account->setPasswordStorageType( CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET );
                                            account->setPassword( pass );
                                            break;
     default                              : account->setPasswordStorageType( -1 );
@@ -311,7 +311,7 @@ void AccountSetupDialog::fillDialog( )
   txtUser->setText( account->getUser() );
 
   int type = account->getPasswordStorageType();
-  if( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  if( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     type = DEFAULT_ACCOUNT_PASSWORD_STORAGE;
 
   switch( type )
@@ -324,7 +324,7 @@ void AccountSetupDialog::fillDialog( )
                                                       txtPassword->setEnabled( true );
                                                       txtPassword->setText( account->getPassword() );
                                                       break;
-    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : grpPasswordStorage->setButton( ID_BUTTON_PASSWORD_SAVE_KWALLET );
+    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET : grpPasswordStorage->setButton( ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
                                                       txtPassword->setEnabled( true );
                                                       txtPassword->setText( account->getPassword() );
                                                       break;
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.h b/kshowmail/kcmconfigs/accountsetupdialog.h
index 257e549..61e92e1 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.h
+++ b/kshowmail/kcmconfigs/accountsetupdialog.h
@@ -39,7 +39,7 @@
 //radio button IDs
 #define ID_BUTTON_PASSWORD_DONT_SAVE 1
 #define ID_BUTTON_PASSWORD_SAVE_FILE 2
-#define ID_BUTTON_PASSWORD_SAVE_KWALLET 3
+#define ID_BUTTON_PASSWORD_SAVE_TDEWALLET 3
 #define ID_BUTTON_SECLOGIN_NONE 1
 #define ID_BUTTON_SECLOGIN_APOP 2
 #define ID_BUTTON_SECLOGIN_SASL 3
diff --git a/kshowmail/kcmconfigs/accountsetupitem.cpp b/kshowmail/kcmconfigs/accountsetupitem.cpp
index 6ca8ad4..e073cf0 100644
--- a/kshowmail/kcmconfigs/accountsetupitem.cpp
+++ b/kshowmail/kcmconfigs/accountsetupitem.cpp
@@ -116,7 +116,7 @@ TQString AccountSetupItem::getPassword( ) const
 
 void AccountSetupItem::setPasswordStorageType( int type )
 {
-  if( type == CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE || type == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE || type == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  if( type == CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE || type == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE || type == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     _passwordStorage = type;
   else
     _passwordStorage = DEFAULT_ACCOUNT_PASSWORD_STORAGE;
@@ -160,7 +160,7 @@ void AccountSetupItem::save() const
     config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
 
   //save password in TDEWallet if desired
-  if( getPasswordStorageType() == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  if( getPasswordStorageType() == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     TDEWalletAccess::savePassword( getAccountName(), getPassword() );
 
   config->writeEntry( CONFIG_ENTRY_ACCOUNT_ACTIVE, getActive() );
@@ -180,7 +180,7 @@ void AccountSetupItem::load( )
 
   if( _passwordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE )
     _password = decrypt( config->readEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, DEFAULT_ACCOUNT_PASSWORD ) );
-  else if( _passwordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  else if( _passwordStorage == CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     _password = TDEWalletAccess::getPassword( getAccountName() );
   else
     _password = TQString::null;
diff --git a/kshowmail/kcmconfigs/accountsetupitem.h b/kshowmail/kcmconfigs/accountsetupitem.h
index f011646..98b1f18 100644
--- a/kshowmail/kcmconfigs/accountsetupitem.h
+++ b/kshowmail/kcmconfigs/accountsetupitem.h
@@ -126,7 +126,7 @@ class AccountSetupItem : public TDEListViewItem
     /**
      * Sets the password storage type.
      * See constants.h for valid values
-     * @param type password storage type (CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE or CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET)
+     * @param type password storage type (CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE or CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET)
      */
     void setPasswordStorageType( int type );
 
diff --git a/kshowmail/kcmconfigs/tdewalletaccess.h b/kshowmail/kcmconfigs/tdewalletaccess.h
index 3bc68d8..6699408 100644
--- a/kshowmail/kcmconfigs/tdewalletaccess.h
+++ b/kshowmail/kcmconfigs/tdewalletaccess.h
@@ -6,8 +6,8 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#ifndef KWALLETACCESS_H
-#define KWALLETACCESS_H
+#ifndef TDEWALLETACCESS_H
+#define TDEWALLETACCESS_H
 
 //TQt headers
 #include <ntqstring.h>
diff --git a/kshowmail/serverdialog.cpp b/kshowmail/serverdialog.cpp
index 3c0c7d9..4c051ad 100644
--- a/kshowmail/serverdialog.cpp
+++ b/kshowmail/serverdialog.cpp
@@ -97,7 +97,7 @@ ServerDialog::ServerDialog( TQWidget* parent, ConfigElem* item )
   TQRadioButton* btnPasswordSaveTDEWallet = new TQRadioButton( i18n( "Use TDEWallet" ), gboxPassword, "btnPasswordSaveTDEWallet" );
   grpPasswordStorage->insert( btnPasswordDontSave, ID_BUTTON_PASSWORD_DONT_SAVE );
   grpPasswordStorage->insert( btnPasswordSaveFile, ID_BUTTON_PASSWORD_SAVE_FILE );
-  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_KWALLET );
+  grpPasswordStorage->insert( btnPasswordSaveTDEWallet, ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
   TQToolTip::add( btnPasswordDontSave, i18n( "Don't save password. KShowmail will ask you for it at first server connect." ) );
   TQToolTip::add( btnPasswordSaveFile, i18n( "Save password in the configuration file. Not recommended, because the password is just lightly encrypted" ) );
   TQToolTip::add( btnPasswordSaveTDEWallet, i18n( "Use TDEWallet to save the password. Maybe you have to type in the TDEWallet master password at first server connect." ) );
@@ -237,7 +237,7 @@ void ServerDialog::slotOk( )
     case ID_BUTTON_PASSWORD_SAVE_FILE    : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE );
                                            config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, crypt( url ) );
                                            break;
-    case ID_BUTTON_PASSWORD_SAVE_KWALLET : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET );
+    case ID_BUTTON_PASSWORD_SAVE_TDEWALLET : config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD_STORAGE, CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET );
                                            config->writeEntry( CONFIG_ENTRY_ACCOUNT_PASSWORD, TQString::null );
                                            TDEWalletAccess::savePassword( txtAccount->text(), pass );
                                            break;
@@ -297,7 +297,7 @@ void ServerDialog::fillDialog( )
   txtUser->setText( account->getUser() );
 
   int type = account->getPasswordStorage();
-  if( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET )
+  if( type != CONFIG_VALUE_ACCOUNT_PASSWORD_DONT_SAVE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_FILE && type != CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET )
     type = DEFAULT_ACCOUNT_PASSWORD_STORAGE;
 
   switch( type )
@@ -310,7 +310,7 @@ void ServerDialog::fillDialog( )
                                                       txtPassword->setEnabled( true );
                                                       txtPassword->setText( account->getPassword() );
                                                       break;
-    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_KWALLET : grpPasswordStorage->setButton( ID_BUTTON_PASSWORD_SAVE_KWALLET );
+    case CONFIG_VALUE_ACCOUNT_PASSWORD_SAVE_TDEWALLET : grpPasswordStorage->setButton( ID_BUTTON_PASSWORD_SAVE_TDEWALLET );
                                                       txtPassword->setEnabled( true );
                                                       txtPassword->setText( account->getPassword() );
                                                       break;
diff --git a/kshowmail/serverdialog.h b/kshowmail/serverdialog.h
index fd3dca2..8db7fff 100644
--- a/kshowmail/serverdialog.h
+++ b/kshowmail/serverdialog.h
@@ -47,7 +47,7 @@
 //radio button IDs
 #define ID_BUTTON_PASSWORD_DONT_SAVE 1
 #define ID_BUTTON_PASSWORD_SAVE_FILE 2
-#define ID_BUTTON_PASSWORD_SAVE_KWALLET 3
+#define ID_BUTTON_PASSWORD_SAVE_TDEWALLET 3
 #define ID_BUTTON_SECLOGIN_NONE 1
 #define ID_BUTTON_SECLOGIN_APOP 2
 #define ID_BUTTON_SECLOGIN_SASL 3
diff --git a/kshowmail/tdewalletaccess.h b/kshowmail/tdewalletaccess.h
index 3bc68d8..6699408 100644
--- a/kshowmail/tdewalletaccess.h
+++ b/kshowmail/tdewalletaccess.h
@@ -6,8 +6,8 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#ifndef KWALLETACCESS_H
-#define KWALLETACCESS_H
+#ifndef TDEWALLETACCESS_H
+#define TDEWALLETACCESS_H
 
 //TQt headers
 #include <ntqstring.h>