Additional k => tde renaming and fixes

8 files changed, 25 insertions, 25 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index a4f5aa5..77e0341 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KDED, $lib_kded)
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-ltdeabc")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_KFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/admin b/admin
-Subproject b4d585c643d92787bfa17b935ce00b09960ee36
+Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46
diff --git a/doc/html/classConfigElem.html b/doc/html/classConfigElem.html
index d9994a1..caf3a02 100644
--- a/doc/html/classConfigElem.html
+++ b/doc/html/classConfigElem.html
@@ -1485,7 +1485,7 @@ Commits the downloading of mail bodies. Starts a pop3 job that will do the commi
 <div class="memdoc">
 
 <p>
-Creates a POP3 transfer job (<a class="el" href="namespaceKIO.html">KIO</a> Job), which will be stored in pop3Job. <dl compact><dt><b>Parameters:</b></dt><dd>
+Creates a POP3 transfer job (<a class="el" href="namespaceKIO.html">TDEIO</a> Job), which will be stored in pop3Job. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>path</em>&nbsp;</td><td>command and parameters of the job as URL path </td></tr>
   </table>
@@ -1529,7 +1529,7 @@ Returns the timeout time in seconds which is stored in the general configuration
 <div class="memdoc">
 
 <p>
-First step of the refresh cycle. Gets the UIDs of the available mails from the server. It starts a <a class="el" href="namespaceKIO.html">KIO</a> job to get the UIDs. The UIDs will be stored in receivedUIDs by <a class="el" href="classConfigElem.html#11db8a853a253b81a16ecd199c441911">slotReceiveUID()</a>. When the job is ready, it will invoke <a class="el" href="classConfigElem.html#5ba4833fd4b897bb21fa31dff2cf5750">slotUIDsReceived()</a>. 
+First step of the refresh cycle. Gets the UIDs of the available mails from the server. It starts a <a class="el" href="namespaceKIO.html">TDEIO</a> job to get the UIDs. The UIDs will be stored in receivedUIDs by <a class="el" href="classConfigElem.html#11db8a853a253b81a16ecd199c441911">slotReceiveUID()</a>. When the job is ready, it will invoke <a class="el" href="classConfigElem.html#5ba4833fd4b897bb21fa31dff2cf5750">slotUIDsReceived()</a>. 
 </div>
 </div><p>
 <a class="anchor" name="ab836ffc3b068d052ea3486f8cdac74d"></a><!-- doxytag: member="ConfigElem::getSizes" ref="ab836ffc3b068d052ea3486f8cdac74d" args="()" -->
@@ -1548,7 +1548,7 @@ First step of the refresh cycle. Gets the UIDs of the available mails from the s
 <div class="memdoc">
 
 <p>
-Second step of the refresh cycle. Gets the sizes of the available mails from the server. It starts a <a class="el" href="namespaceKIO.html">KIO</a> job to get these. The Sizes will be temporarily stored in receivedSizes by <a class="el" href="classConfigElem.html#b3e0a075b84fed2a1e156de17cdefbad">slotReceiveSize()</a>. When the job is ready, it will invoke <a class="el" href="classConfigElem.html#685be03ba48ad2e1cfb9a0cc04a81559">slotSizesReceived()</a>. 
+Second step of the refresh cycle. Gets the sizes of the available mails from the server. It starts a <a class="el" href="namespaceKIO.html">TDEIO</a> job to get these. The Sizes will be temporarily stored in receivedSizes by <a class="el" href="classConfigElem.html#b3e0a075b84fed2a1e156de17cdefbad">slotReceiveSize()</a>. When the job is ready, it will invoke <a class="el" href="classConfigElem.html#685be03ba48ad2e1cfb9a0cc04a81559">slotSizesReceived()</a>. 
 </div>
 </div><p>
 <a class="anchor" name="f7202b10df7e27303315d754b25b6d6c"></a><!-- doxytag: member="ConfigElem::getHeaders" ref="f7202b10df7e27303315d754b25b6d6c" args="()" -->
diff --git a/doc/html/configelem_8cpp-source.html b/doc/html/configelem_8cpp-source.html
index 72ef9a0..1ae135e 100644
--- a/doc/html/configelem_8cpp-source.html
+++ b/doc/html/configelem_8cpp-source.html
@@ -434,7 +434,7 @@
 <a name="l00417"></a>00417   <a class="code" href="classConfigElem.html#c9d1c50d2a2ac6c4fa9261f0d77729a9">m_url</a>.setPath( path );
 <a name="l00418"></a>00418 
 <a name="l00419"></a>00419   <span class="comment">//print debug message</span>
-<a name="l00420"></a>00420   kdDebug() &lt;&lt; <span class="stringliteral">"ConfigElem::startKIOJob: start KIO job on URL "</span> &lt;&lt; <a class="code" href="classConfigElem.html#c9d1c50d2a2ac6c4fa9261f0d77729a9">m_url</a>.url() &lt;&lt; endl;
+<a name="l00420"></a>00420   kdDebug() &lt;&lt; <span class="stringliteral">"ConfigElem::startKIOJob: start TDEIO job on URL "</span> &lt;&lt; <a class="code" href="classConfigElem.html#c9d1c50d2a2ac6c4fa9261f0d77729a9">m_url</a>.url() &lt;&lt; endl;
 <a name="l00421"></a>00421 
 <a name="l00422"></a>00422   <span class="comment">//start the job and get handle to it</span>
 <a name="l00423"></a>00423   <a class="code" href="classConfigElem.html#abccdbb4bf0f8c3ba6ac726c27f454fc">pop3Job</a> = TDEIO::get( <a class="code" href="classConfigElem.html#c9d1c50d2a2ac6c4fa9261f0d77729a9">m_url</a>, <span class="keyword">false</span>, <span class="keyword">false</span> );
@@ -853,7 +853,7 @@
 <a name="l00836"></a>00836   <span class="comment">//set account state to idle</span>
 <a name="l00837"></a>00837   <a class="code" href="classConfigElem.html#47a700c6d8d856f35bdcd4e01910a4ca">state</a> = <a class="code" href="namespaceTypes.html#57c868019acd102e855ff50f6043c1b6a15826a259a1b9518c05738511bca3c7">AccountIdle</a>;
 <a name="l00838"></a>00838 
-<a name="l00839"></a>00839   <span class="comment">//we don't need an error message, because the KIO job has shown one</span>
+<a name="l00839"></a>00839   <span class="comment">//we don't need an error message, because the TDEIO job has shown one</span>
 <a name="l00840"></a>00840 }
 <a name="l00841"></a>00841 
 <a name="l00842"></a><a class="code" href="classConfigElem.html#6470facb8041787fc48707ece1dfc364">00842</a> <span class="keywordtype">void</span> <a class="code" href="classConfigElem.html#6470facb8041787fc48707ece1dfc364">ConfigElem::slotFinalizeRefresh</a>( TDEIO::Job* )
diff --git a/doc/html/namespaces.html b/doc/html/namespaces.html
index 91351c3..f12b8a2 100644
--- a/doc/html/namespaces.html
+++ b/doc/html/namespaces.html
@@ -22,7 +22,7 @@
   <tr><td class="indexkey"><a class="el" href="namespaceCodecs.html">Codecs</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="namespaceConstants.html">Constants</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="namespaceEncryption.html">Encryption</a></td><td class="indexvalue">Provides functions to crypt and decrypt a password </td></tr>
-  <tr><td class="indexkey"><a class="el" href="namespaceKIO.html">KIO</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="namespaceKIO.html">TDEIO</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="namespaceTDEWalletAccess.html">TDEWalletAccess</a></td><td class="indexvalue">Provides routines to save and read passwords using TDEWallet </td></tr>
   <tr><td class="indexkey"><a class="el" href="namespacestd.html">std</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="namespaceTypes.html">Types</a></td><td class="indexvalue"></td></tr>
diff --git a/kshowmail/Makefile.am b/kshowmail/Makefile.am
index 6c55fe5..c1b99ac 100644
--- a/kshowmail/Makefile.am
+++ b/kshowmail/Makefile.am
@@ -10,8 +10,8 @@ kshowmail_SOURCES = AlertDlg.ui alertdialog.cpp configelem.cpp configlist.cpp \
 	senderlistfilter.cpp serverdialog.cpp showheaderdialog.cpp showlistviewitem.cpp \
 	showmaildialog.cpp showrecord.cpp showrecordelem.cpp uniqueapp.cpp filterlogview.cpp \
 	filterlogviewdeleteditem.cpp filterlogviewmoveditem.cpp
-kshowmail_LDADD = $(LIB_KUTILS) -lmimelib $(LIB_KFILE) $(LIB_TDEUI) \
-	$(LIB_TDECORE) $(LIB_KIO) $(LIB_QT) $(LIBSOCKET) -ltdewalletclient -lDCOP
+kshowmail_LDADD = $(LIB_TDEUTILS) -lmimelib $(LIB_KFILE) $(LIB_TDEUI) \
+	$(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT) $(LIBSOCKET) -ltdewalletclient -lDCOP
 
 
 EXTRA_DIST = main.cpp kshowmail.cpp kshowmail.h kshowmaildoc.cpp kshowmaildoc.h commandentry.cpp commandentry.h kshowmailview.cpp kshowmailview.h OptionDlg.ui OptionDlg.h optiondialog.cpp optiondialog.h ServerDlg.ui serverdialog.cpp serverdialog.h EditDlg.ui editdialog.cpp editdialog.h commanddialog.cpp commanddialog.h CommandDlg.ui commandlist.cpp commandlist.h CommandEntryDlg.ui commandentrydialog.cpp commandentrydialog.h configelem.cpp configelem.h kshowmaildock.cpp kshowmaildock.h configlist.cpp configlist.h AlertDlg.ui alertdialog.cpp alertdialog.h uniqueapp.cpp uniqueapp.h showrecordelem.cpp showrecordelem.h showrecord.cpp showrecord.h kshowmail.desktop decodeRFC2047.h decodeRFC2047.cpp showlistviewitem.cpp showlistviewitem.h kfeedback.cpp kfeedback.h kshowmailfeedback.cpp filter.cpp filter.h filterelem.cpp filterelem.h filterdialog.cpp filterdialog.h FilterDlg.ui FilterEntryDlg.ui filterentrydialog.cpp filterentrydialog.h filterlist.cpp filterlist.h logger.cpp logger.h
diff --git a/kshowmail/configelem.cpp b/kshowmail/configelem.cpp
index cf4463a..2b6a8e5 100644
--- a/kshowmail/configelem.cpp
+++ b/kshowmail/configelem.cpp
@@ -462,7 +462,7 @@ void ConfigElem::startKIOJob( const TQString & path )
   m_url.setPath( path );
 
   //print debug message
-  kdDebug() << "ConfigElem::startKIOJob: start KIO job on URL " << m_url.url() << endl;
+  kdDebug() << "ConfigElem::startKIOJob: start TDEIO job on URL " << m_url.url() << endl;
 
   //start the job and get handle to it
   pop3Job = TDEIO::get( m_url, false, false );
@@ -893,7 +893,7 @@ void ConfigElem::cancelRefresh()
   //set account state to idle
   state = AccountIdle;
 
-  //we don't need an error message, because the KIO job has shown one
+  //we don't need an error message, because the TDEIO job has shown one
 }
 
 void ConfigElem::slotFinalizeRefresh( TDEIO::Job* )
diff --git a/kshowmail/configelem.h b/kshowmail/configelem.h
index 75a1240..c81bca2 100644
--- a/kshowmail/configelem.h
+++ b/kshowmail/configelem.h
@@ -707,7 +707,7 @@ class ConfigElem : public TQObject {
     void commitDownloading();
 
     /**
-     * Creates a POP3 transfer job (KIO Job), which will be stored in pop3Job.
+     * Creates a POP3 transfer job (TDEIO Job), which will be stored in pop3Job.
      * @param path command and parameters of the job as URL path
      */
     void startKIOJob( const TQString& path );
@@ -726,7 +726,7 @@ class ConfigElem : public TQObject {
     /**
      * First step of the refresh cycle.
      * Gets the UIDs of the available mails from the server.
-     * It starts a KIO job to get the UIDs. The UIDs will be stored
+     * It starts a TDEIO job to get the UIDs. The UIDs will be stored
      * in receivedUIDs by slotReceiveUID().
      * When the job is ready, it will invoke slotUIDsReceived().
      */
@@ -735,7 +735,7 @@ class ConfigElem : public TQObject {
     /**
      * Second step of the refresh cycle.
      * Gets the sizes of the available mails from the server.
-     * It starts a KIO job to get these. The Sizes will be temporarily
+     * It starts a TDEIO job to get these. The Sizes will be temporarily
      * stored in receivedSizes by slotReceiveSize().
      * When the job is ready, it will invoke slotSizesReceived().
      */