Fix FTBFS

15 files changed, 40 insertions, 40 deletions

diff --git a/Helperstuff/BuildService/debian.changelog b/Helperstuff/BuildService/debian.changelog
index 8d18bdb..40ba985 100644
--- a/Helperstuff/BuildService/debian.changelog
+++ b/Helperstuff/BuildService/debian.changelog
@@ -14,7 +14,7 @@ tdesvn (0.14.5-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control
-    - Don't conflict with kde4 versions of tdesdk-kio-plugins. Closes: #483260
+    - Don't conflict with kde4 versions of tdesdk-tdeio-plugins. Closes: #483260
     - Bump Standards-Version to 3.8.0. No further changes.
   * debian/watch
     - Update watch file to match the new download location.
@@ -306,7 +306,7 @@ tdesvn (0.7.1-1) unstable; urgency=low
   * Tightened build dependency on libsvn0-dev as tdesvn now requires subversion
     1.2 or higher.
   * Split up package into core application tdesvn and KIO plugin package
-    tdesvn-kio-plugins.
+    tdesvn-tdeio-plugins.
   * Updated menu icon.
   * Use Debian libtool and regenerate the autotools files. Closes: #343952
     + Add build dependencies to automake1.9, autoconf and libtool.
diff --git a/Helperstuff/BuildService/debian.control b/Helperstuff/BuildService/debian.control
index efded04..cc66426 100644
--- a/Helperstuff/BuildService/debian.control
+++ b/Helperstuff/BuildService/debian.control
@@ -28,7 +28,7 @@ Description: Qt wrapper library for subversion (development files)
 Package: tdesvn
 Section: devel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-kio-plugins (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins (= ${binary:Version})
 Recommends: kompare, graphviz
 Suggests: khelpcenter, kdiff3
 Description: subversion client with tight KDE integration
@@ -39,12 +39,12 @@ Description: subversion client with tight KDE integration
  a tight integration into KDE and can be embedded into other KDE 
  applications like konqueror via the KDE component technology KParts.
 
-Package: tdesvn-kio-plugins
+Package: tdesvn-tdeio-plugins
 Section: devel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: tdesdk-misc (<< 4:3.5.0-1), tdesdk-kio-plugins (<< 4:4.0.0)
-Replaces: tdesdk-kio-plugins (<< 4:4.0.0)
+Conflicts: tdesdk-misc (<< 4:3.5.0-1), tdesdk-tdeio-plugins (<< 4:4.0.0)
+Replaces: tdesdk-tdeio-plugins (<< 4:4.0.0)
 Description: subversion I/O slaves for KDE
  This packages includes KIO slaves for svn, svn+file, svn+http, 
  svn+https, svn+ssh. This allows you to access subversion repositories 
diff --git a/Helperstuff/BuildService/tdesvn.dsc.in b/Helperstuff/BuildService/tdesvn.dsc.in
index f3f2ab6..2d4b8c8 100644
--- a/Helperstuff/BuildService/tdesvn.dsc.in
+++ b/Helperstuff/BuildService/tdesvn.dsc.in
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: tdesvn
-Binary: libsvnqt4, libsvnqt-dev, tdesvn, tdesvn-kio-plugins
+Binary: libsvnqt4, libsvnqt-dev, tdesvn, tdesvn-tdeio-plugins
 Architecture: any
 Version: @VERSION@-1
 Maintainer: Rajko Albrecht <ral@alwins-world.de>
diff --git a/Helperstuff/BuildService/tdesvn.spec.in b/Helperstuff/BuildService/tdesvn.spec.in
index 871d860..60ffeaf 100644
--- a/Helperstuff/BuildService/tdesvn.spec.in
+++ b/Helperstuff/BuildService/tdesvn.spec.in
@@ -51,7 +51,7 @@ via a KIO protocol, too.
 %package tdeiosvn
 Requires: tdesvn = %{version}
 Group:    Development/Tools
-Summary:  A kde-kio integration for subversion based on tdesvn
+Summary:  A kde-tdeio integration for subversion based on tdesvn
 
 %description tdeiosvn
 KIO integration (TDEIO::svn) based on tdesvn alternative protocol name.
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index e33077d..08332f2 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -375,7 +375,7 @@ Deleting items is always recursive. Eg., when you delete a folder all subitems w
 <sect1 id="working-with-repositories">
 <title>Working on repositories</title>
 <para>
-Simple repository browsing may done within &konqi; &krus; or similar filebrowsers: Open a URL with protocol described in <xref linkend="tdesvn-features" xreflabel="Features" /> (the variants starting with &quot;k&quot;) and them will display the content. So simple operations like copy, move and delete may work. When appending a query &quot;?rev=&lt;xxx&gt;&quot; the listing comes from a specific revision. Format of revision-query is described in <xref linkend="revision-syntax" />, some more information about TDEIO::ksvn are in <xref linkend="tdesvn-kio" />
+Simple repository browsing may done within &konqi; &krus; or similar filebrowsers: Open a URL with protocol described in <xref linkend="tdesvn-features" xreflabel="Features" /> (the variants starting with &quot;k&quot;) and them will display the content. So simple operations like copy, move and delete may work. When appending a query &quot;?rev=&lt;xxx&gt;&quot; the listing comes from a specific revision. Format of revision-query is described in <xref linkend="revision-syntax" />, some more information about TDEIO::ksvn are in <xref linkend="tdesvn-tdeio" />
 </para>
 <para>
 All work except &quot;Copy&quot; may only done when browsing at revision HEAD.
@@ -783,9 +783,9 @@ you may store you ssh-key-password for your current session so no further enteri
 </sect1>
 </chapter>
 
-<chapter id="tdesvn-kio">
+<chapter id="tdesvn-tdeio">
 <title>Konqueror, KIO, &kappname;</title>
-<sect1 id="tdesvn-kio-desc">
+<sect1 id="tdesvn-tdeio-desc">
 <title>Description</title>
 <para>
 As of version 0.7.0 of &kappname; it comes with some modules integrating some commands directly into konqueror menus.
@@ -800,7 +800,7 @@ As of version 0.7.0 of &kappname; it comes with some modules integrating some co
 <listitem><para>ksvn+ssh</para></listitem>
 <listitem><para>ksvn</para></listitem>
 </itemizedlist>
-The same maybe for &quot;svn+...&quot; but as from kde 3.4, tdesdk has it own small svn-kio called &quot;svn+http&quot;etc. So packages are organized that way - or should that &quot;svn+...&quot; comes as an extra package so it may installed if tdesdk hasn't installed it.
+The same maybe for &quot;svn+...&quot; but as from kde 3.4, tdesdk has it own small svn-tdeio called &quot;svn+http&quot;etc. So packages are organized that way - or should that &quot;svn+...&quot; comes as an extra package so it may installed if tdesdk hasn't installed it.
 </para>
 <para>
 These protocols are designed only for repositories, not for working copies. E.g. &quot;ksvn+file:///&lt;path&gt;&quot; must point to the beginning of a repository different to the application itself or KPart.
@@ -844,7 +844,7 @@ Let kdiff3 print all differences between two revisions. Note! Using this within
 </para>
 </sect2>
 </sect1>
-<sect1 id="kio-svn-special">
+<sect1 id="tdeio-svn-special">
 <title>Programmers information about TDEIO::ksvn</title>
 <para>
 <note><para>You may skip this if not interested in KIO programming.</para></note>
@@ -854,7 +854,7 @@ so, for instance, tdevelop may use it if tdesdk isn't installed but uses tdesvn:
 <sect2>
 <title>Commandlist</title>
 <para>
-<table id="kio-svn-special-commands">
+<table id="tdeio-svn-special-commands">
 <title>Command overview for TDEIO::ksvn::special</title>
 <tgroup cols="4">
 
@@ -1002,7 +1002,7 @@ Use this with care - this may produce a lot of data.
 Return values may given via metadata, see apidoc for details.
 </para>
 <para>
-<table id="kio-ksvn-metadata">
+<table id="tdeio-ksvn-metadata">
 <title>Content of metadata</title>
 <tgroup cols="2">
 
@@ -1606,7 +1606,7 @@ Target name, eg., the origin name. For kdiff3 (as an example) this would be name
 </sect3>
 </sect2>
 </sect1>
-<sect1 id="kio-cmdline-settings">
+<sect1 id="tdeio-cmdline-settings">
 <title>KIO &#047; commandline</title>
 <para>
 <variablelist>
@@ -1645,7 +1645,7 @@ tdesvn action menu for konqueror but only copy/move/mkdir/delete made with konqu
 <varlistentry>
 <term>Standard message</term>
 <listitem><para>
-The message tdesvn-kio should set on operations from within konqueror when the flag above is set. Default is &quot;Revision made with tdesvn KIO.&quot;
+The message tdesvn-tdeio should set on operations from within konqueror when the flag above is set. Default is &quot;Revision made with tdesvn KIO.&quot;
 </para></listitem>
 </varlistentry>
 
diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
index 128ea66..7a52e35 100644
--- a/doc/nl/index.docbook
+++ b/doc/nl/index.docbook
@@ -371,7 +371,7 @@ Items verwijderen is altijd recursief. B.V.,wanneer een map verwijderd wordt, da
 <sect1 id="working-with-repositories">
 <title>Werken met repositories</title>
 <para>
-Eenvoudig bladeren door de repository kan gedaan worden met &konqi; &krus; of vergelijkbare bestandsbeheerders: Open een URL met een protocool zoals beschreven in <xref linkend="tdesvn-features" xreflabel="Features" /> (Alle varianten die starten met &quot;k&quot;) en zij zullen de inhoud tonen. Hierdoor kunnen eenvoudige opdrachten zoals kopieren, verplaatsen en verwijderen uitgevoerd worden. Wanneer het volgende filter &quot;?rev=&lt;xxx&gt;&quot; wordt ingesteld, zijn alleen de gegevens van een specifiek revisie te zien. De syntax van een revisie-filter wordt beschreven in <xref linkend="revision-syntax" />, lees meer over TDEIO::ksvn in <xref linkend="tdesvn-kio" />
+Eenvoudig bladeren door de repository kan gedaan worden met &konqi; &krus; of vergelijkbare bestandsbeheerders: Open een URL met een protocool zoals beschreven in <xref linkend="tdesvn-features" xreflabel="Features" /> (Alle varianten die starten met &quot;k&quot;) en zij zullen de inhoud tonen. Hierdoor kunnen eenvoudige opdrachten zoals kopieren, verplaatsen en verwijderen uitgevoerd worden. Wanneer het volgende filter &quot;?rev=&lt;xxx&gt;&quot; wordt ingesteld, zijn alleen de gegevens van een specifiek revisie te zien. De syntax van een revisie-filter wordt beschreven in <xref linkend="revision-syntax" />, lees meer over TDEIO::ksvn in <xref linkend="tdesvn-tdeio" />
 </para>
 <para>
 Alle opdrachten behalve &quot;Kopieren&quot; kunnen alleen uitgevoerd worden in de revisie HEAD.
@@ -695,9 +695,9 @@ Dit item - als het een map is - een item daarin heeft conflicten met (die opgelo
 -->
 </chapter>
 
-<chapter id="tdesvn-kio">
+<chapter id="tdesvn-tdeio">
 <title>Konqueror, KIO, &kappname;</title>
-<sect1 id="tdesvn-kio-desc">
+<sect1 id="tdesvn-tdeio-desc">
 <title>Omschrijving</title>
 <para>
 Vanaf versie 0.7.0 van &kappname; , zijn er enkele modules die enkele commando's direct in de menu's van konqueror integreren.
@@ -712,7 +712,7 @@ Vanaf versie 0.7.0 van &kappname; , zijn er enkele modules die enkele commando's
 <listitem><para>ksvn+ssh</para></listitem>
 <listitem><para>ksvn</para></listitem>
 </itemizedlist>
-Dit geldt mischien ook voor &quot;svn+...&quot; maar vanaf kde 3.4, heeft tdesdk zijn eigen kleine svn-kio genaamd &quot;svn+http&quot;enz. Deze pakketten zijn zo georganiseerd - of zouden dat moeten zijn - dat &quot;svn+...&quot; als een extra pakket komt zodat het geïnstalleerd kan worden als kdesk het niet geïnstalleerd heeft.
+Dit geldt mischien ook voor &quot;svn+...&quot; maar vanaf kde 3.4, heeft tdesdk zijn eigen kleine svn-tdeio genaamd &quot;svn+http&quot;enz. Deze pakketten zijn zo georganiseerd - of zouden dat moeten zijn - dat &quot;svn+...&quot; als een extra pakket komt zodat het geïnstalleerd kan worden als kdesk het niet geïnstalleerd heeft.
 </para>
 <para>
 Deze protocools zijn alleen ontworpen voor repositories, niet voor werkkopieën. B.v. &quot;ksvn+file:///&lt;pad&gt;&quot; moet naar een ander startpunt wijzen dan het programma zelf of Kpart. Werkkopieën kunnen bekeken worden met konqueror.
@@ -754,7 +754,7 @@ Laat kdiff3 alle verschillen tussen twee revisie's tonen. Letop! Gebruik hiervan
 </para>
 </sect2>
 </sect1>
-<sect1 id="kio-svn-special">
+<sect1 id="tdeio-svn-special">
 <title>Informatie over TDEIO::ksvn voor programmeurs</title>
 <para>
 <note><para>U kunt dit gedeelte overslaan indien U niet geïnterreseerd bent in KIO-programmeren.</para></note>
@@ -764,7 +764,7 @@ dus, bijvoorbeeld, tdevelop kan het gebruiken als kdesk niet is geïnstalleerd i
 <sect2>
 <title>Overzicht met commando's</title>
 <para>
-<table id="kio-svn-special-commands">
+<table id="tdeio-svn-special-commands">
 <title>Commando overzicht voor TDEIO::ksvn::special</title>
 <tgroup cols="4">
 
@@ -911,7 +911,7 @@ Gebruik dit voorzichtig - dit kan veel data produceren.
 Return waarden mogen gegeven worden via metadata, lees apidoc voor de details.
 </para>
 <para>
-<table id="kio-ksvn-metadata">
+<table id="tdeio-ksvn-metadata">
 <title>Inhoud van metadata</title>
 <tgroup cols="2">
 
@@ -1460,7 +1460,7 @@ Vervang door doel.
 </sect3>
 </sect2>
 </sect1>
-<sect1 id="kio-cmdline-settings">
+<sect1 id="tdeio-cmdline-settings">
 <title>KIO &#047; commandoregel</title>
 <para>
 <variablelist>
@@ -1497,7 +1497,7 @@ Wanneer dit is ingeschakeld, zal de KIO-implementatie van &kappname; niet vragen
 <varlistentry>
 <term>Standaard berichten</term>
 <listitem><para>
-Het bericht dat tdesvn-kio zou moeten geven bij bewerkingen vanuit konqueror wanneer bovenstaande vlag is gezet. Standaard is &quot;Revision made with tdesvn KIO.&quot;
+Het bericht dat tdesvn-tdeio zou moeten geven bij bewerkingen vanuit konqueror wanneer bovenstaande vlag is gezet. Standaard is &quot;Revision made with tdesvn KIO.&quot;
 </para></listitem>
 </varlistentry>
 
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 6af7c8f..2625951 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -1988,12 +1988,12 @@ void tdesvnfilelist::slotDelete()
 
     TQValueList<svn::Path> items;
     TQStringList displist;
-    KURL::List kioList;
+    KURL::List tdeioList;
     while ((cur=liter.current())!=0){
         ++liter;
         if (!cur->isRealVersioned()) {
             KURL _uri; _uri.setPath(cur->fullName());
-            kioList.append(_uri);
+            tdeioList.append(_uri);
         } else {
             items.push_back(cur->fullName());
         }
@@ -2003,8 +2003,8 @@ void tdesvnfilelist::slotDelete()
     if (answer!=KMessageBox::Yes) {
         return;
     }
-    if (kioList.count()>0) {
-        TDEIO::Job*aJob = TDEIO::del(kioList);
+    if (tdeioList.count()>0) {
+        TDEIO::Job*aJob = TDEIO::del(tdeioList);
         connect(aJob,TQT_SIGNAL(result (TDEIO::Job *)),this,TQT_SLOT(slotDeleteFinished(TDEIO::Job*)));
         dispDummy();
     }
diff --git a/src/tdeiosvn/kiobytestream.cpp b/src/tdeiosvn/tdeiobytestream.cpp
index 81c6fc8..fe3c3a9 100644
--- a/src/tdeiosvn/kiobytestream.cpp
+++ b/src/tdeiosvn/tdeiobytestream.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
-#include "kiobytestream.h"
+#include "tdeiobytestream.h"
 
 KioByteStream::KioByteStream(StreamWrittenCb*aCb,const TQString&filename)
     : svn::stream::SvnStream(false,true,0L),
diff --git a/src/tdeiosvn/kiobytestream.h b/src/tdeiosvn/tdeiobytestream.h
index 48addfe..48addfe 100644
--- a/src/tdeiosvn/kiobytestream.h
+++ b/src/tdeiosvn/tdeiobytestream.h
diff --git a/src/tdeiosvn/kiolistener.cpp b/src/tdeiosvn/tdeiolistener.cpp
index f4cd940..d8d3210 100644
--- a/src/tdeiosvn/kiolistener.cpp
+++ b/src/tdeiosvn/tdeiolistener.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
-#include "kiolistener.h"
+#include "tdeiolistener.h"
 #include "tdeiosvn.h"
 
 #include <kdebug.h>
@@ -98,12 +98,12 @@ bool KioListener::contextGetLogMessage (TQString & msg,const svn::CommitItemList
     }
     msg = lt[0];
 #else
-    msg = "Made with a kio::svn client";
+    msg = "Made with a tdeio::svn client";
 #endif
     return true;
 }
 
-/*! the content of that method is taken from the notify in kio::svn in KDE SDK */
+/*! the content of that method is taken from the notify in tdeio::svn in KDE SDK */
 /* this moment we don't use it full 'cause not all is made via KIO */
 void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action,svn_node_kind_t kind ,const char * mime_type ,svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state,svn_revnum_t revision)
 {
diff --git a/src/tdeiosvn/kiolistener.h b/src/tdeiosvn/tdeiolistener.h
index f836b65..f836b65 100644
--- a/src/tdeiosvn/kiolistener.h
+++ b/src/tdeiosvn/tdeiolistener.h
diff --git a/src/tdeiosvn/tdeiosvn.cpp b/src/tdeiosvn/tdeiosvn.cpp
index fe17ab1..1365dd2 100644
--- a/src/tdeiosvn/tdeiosvn.cpp
+++ b/src/tdeiosvn/tdeiosvn.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "tdesvn-config.h"
 #include "tdeiosvn.h"
-#include "kiolistener.h"
+#include "tdeiolistener.h"
 
 #include "svnqttypes.hpp"
 #include "dirent.hpp"
@@ -147,7 +147,7 @@ tdeio_svnProtocol::tdeio_svnProtocol(const TQCString &pool_socket, const TQCStri
 
 tdeio_svnProtocol::~tdeio_svnProtocol()
 {
-    kdDebug()<<"Delete kio protocol"<<endl;
+    kdDebug()<<"Delete tdeio protocol"<<endl;
     delete m_pData;
 }
 
diff --git a/src/tdeiosvn/tdeiosvn.h b/src/tdeiosvn/tdeiosvn.h
index eca379a..b63936c 100644
--- a/src/tdeiosvn/tdeiosvn.h
+++ b/src/tdeiosvn/tdeiosvn.h
@@ -20,7 +20,7 @@
 #ifndef KIOSVN_H
 #define KIOSVN_H
 
-#include "kiobytestream.h"
+#include "tdeiobytestream.h"
 
 #include <tqstring.h>
 #include <tqcstring.h>
@@ -64,7 +64,7 @@ public:
     virtual void wc_delete(const KURL::List&);
     virtual void special(const TQByteArray& data);
     virtual void wc_resolve(const KURL&,bool);
-    /* looked on kio::svn from tdesdk */
+    /* looked on tdeio::svn from tdesdk */
     enum KSVN_METHOD {
         /* KURL repository, KURL target, int revnumber, TQString revkind */
         SVN_CHECKOUT = 1,
diff --git a/tdesvn.spec b/tdesvn.spec
index 1ac1d56..15e9f04 100644
--- a/tdesvn.spec
+++ b/tdesvn.spec
@@ -24,7 +24,7 @@ via a KIO protocol, too.
 %package tdeiosvn
 Requires: tdesvn = %{version}
 Group:    Development/Tools
-Summary:  A kde-kio integration for subversion based on tdesvn
+Summary:  A kde-tdeio integration for subversion based on tdesvn
 
 %description tdeiosvn
 KIO integration (TDEIO::svn) based on tdesvn alternative protocol name.
diff --git a/tdesvn.spec.in b/tdesvn.spec.in
index a51fa10..9b729ba 100644
--- a/tdesvn.spec.in
+++ b/tdesvn.spec.in
@@ -24,7 +24,7 @@ via a KIO protocol, too.
 %package tdeiosvn
 Requires: tdesvn = %{version}
 Group:    Development/Tools
-Summary:  A kde-kio integration for subversion based on tdesvn
+Summary:  A kde-tdeio integration for subversion based on tdesvn
 
 %description tdeiosvn
 KIO integration (TDEIO::svn) based on tdesvn alternative protocol name.