summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--applnk/compat/socks.desktop2
-rw-r--r--doc/faq/intro.docbook2
-rw-r--r--doc/glossary/index.docbook4
-rw-r--r--doc/glossary/tdeprintingglossary.docbook2
-rw-r--r--doc/kcontrol/tdehtml/index.docbook4
-rw-r--r--doc/tdeioslave/index.docbook156
-rw-r--r--doc/tdeioslave/mac.docbook2
-rw-r--r--doc/userguide/base-tde-applications.docbook4
-rw-r--r--doc/userguide/extragear-applications.docbook2
-rw-r--r--doc/userguide/tde-for-admins.docbook6
-rw-r--r--doc/userguide/tde-office.docbook4
-rw-r--r--doc/userguide/under-the-hood.docbook2
-rw-r--r--drkonqi/Makefile.am4
-rw-r--r--kappfinder/Makefile.am6
-rw-r--r--kate/ChangeLog6
-rw-r--r--kate/app/Makefile.am2
-rw-r--r--kate/interfaces/Makefile.am2
-rw-r--r--kate/utils/Makefile.am2
-rw-r--r--kcminit/Makefile.am4
-rw-r--r--kcontrol/Makefile.am2
-rw-r--r--kcontrol/access/Makefile.am2
-rw-r--r--kcontrol/accessibility/Makefile.am2
-rw-r--r--kcontrol/arts/Makefile.am2
-rw-r--r--kcontrol/clock/Makefile.am2
-rw-r--r--kcontrol/colors/Makefile.am2
-rw-r--r--kcontrol/componentchooser/Makefile.am2
-rw-r--r--kcontrol/crypto/Makefile.am2
-rw-r--r--kcontrol/css/Makefile.am2
-rw-r--r--kcontrol/display/Makefile.am2
-rw-r--r--kcontrol/displayconfig/Makefile.am2
-rw-r--r--kcontrol/dnssd/Makefile.am2
-rw-r--r--kcontrol/ebrowsing/Makefile.am2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/Makefile.am4
-rw-r--r--kcontrol/ebrowsing/plugins/localdomain/Makefile.am2
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/Makefile.am2
-rw-r--r--kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h4
-rw-r--r--kcontrol/energy/Makefile.am2
-rw-r--r--kcontrol/filetypes/Makefile.am6
-rw-r--r--kcontrol/iccconfig/Makefile.am2
-rw-r--r--kcontrol/icons/Makefile.am2
-rw-r--r--kcontrol/input/Makefile.am2
-rw-r--r--kcontrol/input/xcursor/themepage.cpp2
-rw-r--r--kcontrol/ioslaveinfo/Makefile.am2
-rw-r--r--kcontrol/ioslaveinfo/ioslaveinfo.desktop2
-rw-r--r--kcontrol/kcontrol/Makefile.am2
-rw-r--r--kcontrol/kded/Makefile.am2
-rw-r--r--kcontrol/keys/tdeaccelaction.h6
-rw-r--r--kcontrol/kicker/Makefile.am2
-rw-r--r--kcontrol/knotify/Makefile.am2
-rw-r--r--kcontrol/konq/Makefile.am2
-rw-r--r--kcontrol/konqhtml/javaopts.cpp4
-rw-r--r--kcontrol/konsole/Makefile.am2
-rw-r--r--kcontrol/kthememanager/Makefile.am2
-rw-r--r--kcontrol/locale/Makefile.am2
-rw-r--r--kcontrol/nics/Makefile.am2
-rw-r--r--kcontrol/randr/Makefile.am2
-rw-r--r--kcontrol/samba/Makefile.am2
-rw-r--r--kcontrol/screensaver/Makefile.am2
-rw-r--r--kcontrol/smartcard/Makefile.am2
-rw-r--r--kcontrol/style/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp6
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp2
-rw-r--r--kcontrol/tdefontinst/lib/FcEngine.cpp4
-rw-r--r--kcontrol/tdefontinst/lib/KfiConstants.h8
-rw-r--r--kcontrol/tdefontinst/lib/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp2
-rw-r--r--kcontrol/tdefontinst/tdefile-plugin/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/tdefontinst/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/tdeio/KioFonts.cpp82
-rw-r--r--kcontrol/tdefontinst/tdeio/KioFonts.h4
-rw-r--r--kcontrol/tdefontinst/tdeio/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/thumbnail/Makefile.am2
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewPart.cpp20
-rw-r--r--kcontrol/tdefontinst/viewpart/Makefile.am6
-rw-r--r--kcontrol/tdeio/Makefile.am2
-rw-r--r--kcontrol/tdeio/lanbrowser.desktop4
-rw-r--r--kcontrol/tdm/Makefile.am2
-rw-r--r--kdcop/Makefile.am2
-rw-r--r--kdebugdialog/tdelistdebugdialog.h4
-rw-r--r--kdesktop/Makefile.am4
-rw-r--r--kdesktop/kwebdesktop/Makefile.am2
-rw-r--r--kdesktop/lock/Makefile.am4
-rw-r--r--kdialog/Makefile.am4
-rw-r--r--kdialog/tdelistboxdialog.h4
-rw-r--r--kfind/Makefile.am6
-rw-r--r--kfind/kfinddlg.cpp2
-rw-r--r--kfind/kquery.h2
-rw-r--r--khelpcenter/DESIGN4
-rw-r--r--khelpcenter/Makefile.am6
-rw-r--r--khelpcenter/htmlsearch/Makefile.am6
-rw-r--r--khotkeys/shared/Makefile.am2
-rw-r--r--kicker/applets/launcher/Makefile.am4
-rw-r--r--kicker/applets/lockout/Makefile.am2
-rw-r--r--kicker/applets/media/Makefile.am2
-rw-r--r--kicker/applets/run/Makefile.am2
-rw-r--r--kicker/applets/swallow/Makefile.am2
-rw-r--r--kicker/applets/systemtray/Makefile.am2
-rw-r--r--kicker/applets/trash/Makefile.am2
-rw-r--r--kicker/extensions/kasbar/Makefile.am2
-rw-r--r--kicker/extensions/sidebar/Makefile.am2
-rw-r--r--kicker/extensions/taskbar/Makefile.am2
-rw-r--r--kicker/kicker/Makefile.am2
-rw-r--r--kicker/kicker/plugins/Makefile.am2
-rw-r--r--kicker/libkicker/Makefile.am2
-rw-r--r--kicker/libkicker/kickerSettings.kcfg2
-rw-r--r--kicker/menuext/konq-profiles/Makefile.am2
-rw-r--r--kicker/menuext/konsole/Makefile.am2
-rw-r--r--kicker/menuext/recentdocs/Makefile.am2
-rw-r--r--kicker/menuext/system/Makefile.am2
-rw-r--r--kicker/menuext/tdeprint/Makefile.am2
-rw-r--r--kicker/proxy/Makefile.am2
-rw-r--r--kicker/taskbar/Makefile.am2
-rw-r--r--klipper/Makefile.am2
-rw-r--r--kmenuedit/Makefile.am2
-rw-r--r--kmenuedit/basictab.cpp7
-rw-r--r--knetattach/Makefile.am4
-rw-r--r--konqueror/Makefile.am2
-rw-r--r--konqueror/client/Makefile.am2
-rw-r--r--konqueror/iconview/konq_iconview.cc2
-rw-r--r--konqueror/keditbookmarks/Makefile.am4
-rw-r--r--konqueror/keditbookmarks/commands.cpp2
-rw-r--r--konqueror/keditbookmarks/updater.cpp2
-rw-r--r--konqueror/konq_run.cc2
-rw-r--r--konqueror/listview/konq_listviewwidget.cc2
-rw-r--r--konqueror/listview/konq_listviewwidget.h2
-rw-r--r--konqueror/preloader/Makefile.am2
-rw-r--r--konqueror/profile_kde_devel.desktop2
-rw-r--r--konqueror/sidebar/Makefile.am4
-rw-r--r--konqueror/sidebar/test/Makefile.am2
-rw-r--r--konqueror/sidebar/web_module/Makefile.am2
-rw-r--r--konsole/konsole/Makefile.am6
-rw-r--r--kpager/Makefile.am2
-rw-r--r--kpersonalizer/Makefile.am4
-rw-r--r--kreadconfig/Makefile.am2
-rw-r--r--ksmserver/Makefile.am2
-rw-r--r--ksplashml/Makefile.am4
-rw-r--r--ksplashml/kcmksplash/Makefile.am2
-rw-r--r--ksplashml/themeengine/default/Makefile.am2
-rw-r--r--ksplashml/themeengine/redmond/Makefile.am2
-rw-r--r--ksplashml/themeengine/simple/Makefile.am2
-rw-r--r--ksplashml/themeengine/standard/Makefile.am2
-rw-r--r--ksplashml/themeengine/unified/Makefile.am2
-rw-r--r--kstart/Makefile.am2
-rw-r--r--ksysguard/gui/Makefile.am6
-rw-r--r--ksysguard/gui/SensorDisplayLib/Makefile.am2
-rw-r--r--ksystraycmd/Makefile.am2
-rw-r--r--ktip/Makefile.am2
-rw-r--r--ktip/tips2
-rw-r--r--kxkb/Makefile.am2
-rw-r--r--libkonq/Makefile.am2
-rw-r--r--libkonq/favicons/Makefile.am2
-rw-r--r--libkonq/konq_undo.cc2
-rw-r--r--nsplugins/Makefile.am2
-rw-r--r--nsplugins/test/Makefile.am2
-rw-r--r--nsplugins/viewer/Makefile.am2
-rw-r--r--nsplugins/viewer/nsplugin.cpp4
-rw-r--r--tdeioslave/about/Makefile.am4
-rw-r--r--tdeioslave/cgi/Makefile.am2
-rw-r--r--tdeioslave/cgi/cgi.h4
-rw-r--r--tdeioslave/cgi/kcmcgi/Makefile.am2
-rw-r--r--tdeioslave/cgi/kcmcgi/kcmcgi.cpp4
-rw-r--r--tdeioslave/cgi/kcmcgi/kcmcgi.desktop242
-rw-r--r--tdeioslave/filter/Makefile.am2
-rw-r--r--tdeioslave/finger/Makefile.am2
-rw-r--r--tdeioslave/fish/Makefile.am4
-rw-r--r--tdeioslave/fish/fish.protocol10
-rw-r--r--tdeioslave/fish/nxfish.protocol6
-rw-r--r--tdeioslave/floppy/Makefile.am2
-rw-r--r--tdeioslave/floppy/tdeio_floppy.h4
-rw-r--r--tdeioslave/home/Makefile.am4
-rw-r--r--tdeioslave/home/kdedmodule/Makefile.am2
-rw-r--r--tdeioslave/home/tdeio_home.h4
-rw-r--r--tdeioslave/info/Makefile.am2
-rw-r--r--tdeioslave/ldap/Makefile.am4
-rw-r--r--tdeioslave/mac/Makefile.am2
-rw-r--r--tdeioslave/mac/mac.protocol8
-rw-r--r--tdeioslave/man/Makefile.am12
-rw-r--r--tdeioslave/man/man2html.cpp4
-rw-r--r--tdeioslave/media/Makefile.am4
-rw-r--r--tdeioslave/media/mediamanager/Makefile.am2
-rw-r--r--tdeioslave/media/medianotifier/Makefile.am2
-rw-r--r--tdeioslave/media/medianotifier/medianotifier.cpp2
-rw-r--r--tdeioslave/media/mounthelper/Makefile.am4
-rw-r--r--tdeioslave/media/mounthelper/tdeio_media_mounthelper.h4
-rw-r--r--tdeioslave/media/propsdlgplugin/Makefile.am2
-rw-r--r--tdeioslave/media/tdecmodule/Makefile.am2
-rw-r--r--tdeioslave/media/tdefile-plugin/Makefile.am2
-rw-r--r--tdeioslave/media/tdeio_media.h4
-rw-r--r--tdeioslave/nfs/Makefile.am2
-rw-r--r--tdeioslave/nfs/tdeio_nfs.h4
-rw-r--r--tdeioslave/nntp/Makefile.am2
-rw-r--r--tdeioslave/pop3/Makefile.am2
-rw-r--r--tdeioslave/remote/Makefile.am4
-rw-r--r--tdeioslave/remote/kdedmodule/Makefile.am2
-rw-r--r--tdeioslave/remote/tdeio_remote.h4
-rw-r--r--tdeioslave/settings/Makefile.am2
-rw-r--r--tdeioslave/sftp/Makefile.am6
-rw-r--r--tdeioslave/sftp/sftp.protocol6
-rw-r--r--tdeioslave/sftp/tdeio_sftp.cpp264
-rw-r--r--tdeioslave/sftp/tdeio_sftp.h2
-rw-r--r--tdeioslave/smb/tdeio_smb.cpp2
-rw-r--r--tdeioslave/smb/tdeio_smb.h8
-rw-r--r--tdeioslave/smb/tdeio_smb_auth.cpp20
-rw-r--r--tdeioslave/smb/tdeio_smb_browse.cpp36
-rw-r--r--tdeioslave/smb/tdeio_smb_dir.cpp38
-rw-r--r--tdeioslave/smb/tdeio_smb_file.cpp34
-rw-r--r--tdeioslave/smb/tdeio_smb_internal.cpp2
-rw-r--r--tdeioslave/smb/tdeio_smb_internal.h4
-rw-r--r--tdeioslave/smb/tdeio_smb_mount.cpp10
-rw-r--r--tdeioslave/smtp/Makefile.am2
-rw-r--r--tdeioslave/smtp/TODO2
-rw-r--r--tdeioslave/smtp/compliance.txt2
-rw-r--r--tdeioslave/smtp/response.h2
-rw-r--r--tdeioslave/smtp/transactionstate.h2
-rw-r--r--tdeioslave/system/Makefile.am4
-rw-r--r--tdeioslave/system/kdedmodule/Makefile.am2
-rw-r--r--tdeioslave/system/tdeio_system.h4
-rw-r--r--tdeioslave/tar/Makefile.am6
-rw-r--r--tdeioslave/tar/tar.h2
-rw-r--r--tdeioslave/thumbnail/Makefile.am8
-rw-r--r--tdeioslave/trash/Makefile.am8
-rw-r--r--tdeioslave/trash/tdefile-plugin/Makefile.am2
-rw-r--r--tdeioslave/trash/tdeio_trash.h4
-rw-r--r--tdeioslave/trash/trashimpl.cpp8
-rw-r--r--tdeioslave/trash/trashimpl.h2
-rw-r--r--tdepasswd/Makefile.am4
-rw-r--r--tdeprint/slave/Makefile.am2
-rw-r--r--tdeprint/slave/tdeio_print.cpp44
-rw-r--r--tdeprint/slave/tdeio_print.h8
-rw-r--r--tdeprint/tdeprint_part/Makefile.am2
-rw-r--r--tdeprint/tdeprintfax/Makefile.am4
-rw-r--r--tdescreensaver/Makefile.am2
-rw-r--r--tdesu/tdesu/Makefile.am4
-rw-r--r--tdm/README2
-rw-r--r--tdm/kfrontend/Makefile.am6
-rw-r--r--tqt3integration/module/Makefile.am2
-rw-r--r--twin/clients/keramik/Makefile.am2
-rw-r--r--twin/clients/kwmtheme/cli_installer/Makefile.am2
-rw-r--r--twin/killer/Makefile.am2
-rw-r--r--twin/tools/Makefile.am2
242 files changed, 821 insertions, 816 deletions
diff --git a/applnk/compat/socks.desktop b/applnk/compat/socks.desktop
index 9b4a0219..f559e313 100644
--- a/applnk/compat/socks.desktop
+++ b/applnk/compat/socks.desktop
@@ -19,5 +19,5 @@ Type=Application
Icon=proxy
Exec=tdecmshell proxy
X-TDE-ModuleType=Library
-X-TDE-Library=kio
+X-TDE-Library=tdeio
X-TDE-FactoryName=proxy
diff --git a/doc/faq/intro.docbook b/doc/faq/intro.docbook
index f2b00a2d..ab19b717 100644
--- a/doc/faq/intro.docbook
+++ b/doc/faq/intro.docbook
@@ -162,7 +162,7 @@ Trinity developers want to maintain a "traditional" desktop environment.</para>
<itemizedlist>
<listitem>
-<para>Desktop search through the locate:/ kio-slave and Beagle</para>
+<para>Desktop search through the locate:/ tdeio-slave and Beagle</para>
</listitem>
<listitem>
diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook
index b06708a1..a6071879 100644
--- a/doc/glossary/index.docbook
+++ b/doc/glossary/index.docbook
@@ -24,8 +24,8 @@
<glossseealso otherterm="gloss-kde">&tde;</glossseealso>
</glossdef>
</glossentry>
- <glossentry id="gloss-kio">
- <glossterm><acronym>KIO</acronym></glossterm>
+ <glossentry id="gloss-tdeio">
+ <glossterm><acronym>TDEIO</acronym></glossterm>
<glossdef><para>The &tde; Input/Output system which makes use of so-called
<quote><acronym>IO</acronym> Slaves</quote>.</para>
<glossseealso otherterm="gloss-ioslave"><acronym>IO</acronym>
diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/glossary/tdeprintingglossary.docbook
index 731c26b5..ae688bc3 100644
--- a/doc/glossary/tdeprintingglossary.docbook
+++ b/doc/glossary/tdeprintingglossary.docbook
@@ -1128,7 +1128,7 @@ now.
</glossentry>
<glossentry id="gloss-printtdeioslave">
- <glossterm>print:/ KIO Slave</glossterm>
+ <glossterm>print:/ TDEIO Slave</glossterm>
<glossdef><para>You can use a syntax of "print:/..." to get quick access
to TDEPrint resources. Typing "print:/manager" as a Konqueror URL
address gives administrative access to TDEPrint. Konqueror uses &tde;'s
diff --git a/doc/kcontrol/tdehtml/index.docbook b/doc/kcontrol/tdehtml/index.docbook
index b8df2459..9f706188 100644
--- a/doc/kcontrol/tdehtml/index.docbook
+++ b/doc/kcontrol/tdehtml/index.docbook
@@ -225,8 +225,8 @@ which &Java; applications can read and write text. While most &Java;
applications will not require such a console, it could be helpful in
diagnosing problems with &Java; applications.</para>
-<para><guilabel>Use KIO</guilabel> will cause the
-<acronym>JVM</acronym>to use &tde;'s own <acronym>KIO</acronym>
+<para><guilabel>Use TDEIO</guilabel> will cause the
+<acronym>JVM</acronym>to use &tde;'s own <acronym>TDEIO</acronym>
transports for network connections.</para>
<para><guilabel>Use security
diff --git a/doc/tdeioslave/index.docbook b/doc/tdeioslave/index.docbook
index 8a9672a5..6558dba6 100644
--- a/doc/tdeioslave/index.docbook
+++ b/doc/tdeioslave/index.docbook
@@ -1,45 +1,45 @@
<?xml version="1.0" ?>
<!DOCTYPE part PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
-<!ENTITY kio-bzip SYSTEM "bzip.docbook">
-<!ENTITY kio-bzip2 SYSTEM "bzip2.docbook">
-<!ENTITY kio-cgi SYSTEM "cgi.docbook">
-<!ENTITY kio-data SYSTEM "data.docbook">
-<!ENTITY kio-file SYSTEM "file.docbook">
-<!ENTITY kio-finger SYSTEM "finger.docbook">
-<!ENTITY kio-fish SYSTEM "fish.docbook">
-<!ENTITY kio-floppy SYSTEM "floppy.docbook">
-<!ENTITY kio-ftp SYSTEM "ftp.docbook">
-<!ENTITY kio-gopher SYSTEM "gopher.docbook">
-<!ENTITY kio-gzip SYSTEM "gzip.docbook">
-<!ENTITY kio-help SYSTEM "help.docbook">
-<!ENTITY kio-http SYSTEM "http.docbook">
-<!ENTITY kio-https SYSTEM "https.docbook">
-<!ENTITY kio-imap SYSTEM "imap.docbook">
-<!ENTITY kio-imaps SYSTEM "imaps.docbook">
-<!ENTITY kio-info SYSTEM "info.docbook">
-<!ENTITY kio-lan SYSTEM "lan.docbook">
-<!ENTITY kio-ldap SYSTEM "ldap.docbook">
-<!ENTITY kio-mailto SYSTEM "mailto.docbook">
-<!ENTITY kio-mac SYSTEM "mac.docbook">
-<!ENTITY kio-man SYSTEM "man.docbook">
-<!ENTITY kio-mrml SYSTEM "mrml.docbook"> <!-- post release, put this in the right module -->
-<!ENTITY kio-news SYSTEM "news.docbook">
-<!ENTITY kio-nfs SYSTEM "nfs.docbook">
-<!ENTITY kio-nntp SYSTEM "nntp.docbook">
-<!ENTITY kio-pop3 SYSTEM "pop3.docbook">
-<!ENTITY kio-pop3s SYSTEM "pop3s.docbook">
-<!ENTITY kio-print SYSTEM "print.docbook">
-<!ENTITY kio-rlan SYSTEM "rlan.docbook">
-<!ENTITY kio-rlogin SYSTEM "rlogin.docbook">
-<!ENTITY kio-sftp SYSTEM "sftp.docbook">
-<!ENTITY kio-smb SYSTEM "smb.docbook">
-<!ENTITY kio-smtp SYSTEM "smtp.docbook">
-<!ENTITY kio-tar SYSTEM "tar.docbook">
-<!ENTITY kio-telnet SYSTEM "telnet.docbook">
-<!ENTITY kio-thumbnail SYSTEM "thumbnail.docbook">
-<!ENTITY kio-webdav SYSTEM "webdav.docbook">
-<!ENTITY kio-webdavs SYSTEM "webdavs.docbook">
+<!ENTITY tdeio-bzip SYSTEM "bzip.docbook">
+<!ENTITY tdeio-bzip2 SYSTEM "bzip2.docbook">
+<!ENTITY tdeio-cgi SYSTEM "cgi.docbook">
+<!ENTITY tdeio-data SYSTEM "data.docbook">
+<!ENTITY tdeio-file SYSTEM "file.docbook">
+<!ENTITY tdeio-finger SYSTEM "finger.docbook">
+<!ENTITY tdeio-fish SYSTEM "fish.docbook">
+<!ENTITY tdeio-floppy SYSTEM "floppy.docbook">
+<!ENTITY tdeio-ftp SYSTEM "ftp.docbook">
+<!ENTITY tdeio-gopher SYSTEM "gopher.docbook">
+<!ENTITY tdeio-gzip SYSTEM "gzip.docbook">
+<!ENTITY tdeio-help SYSTEM "help.docbook">
+<!ENTITY tdeio-http SYSTEM "http.docbook">
+<!ENTITY tdeio-https SYSTEM "https.docbook">
+<!ENTITY tdeio-imap SYSTEM "imap.docbook">
+<!ENTITY tdeio-imaps SYSTEM "imaps.docbook">
+<!ENTITY tdeio-info SYSTEM "info.docbook">
+<!ENTITY tdeio-lan SYSTEM "lan.docbook">
+<!ENTITY tdeio-ldap SYSTEM "ldap.docbook">
+<!ENTITY tdeio-mailto SYSTEM "mailto.docbook">
+<!ENTITY tdeio-mac SYSTEM "mac.docbook">
+<!ENTITY tdeio-man SYSTEM "man.docbook">
+<!ENTITY tdeio-mrml SYSTEM "mrml.docbook"> <!-- post release, put this in the right module -->
+<!ENTITY tdeio-news SYSTEM "news.docbook">
+<!ENTITY tdeio-nfs SYSTEM "nfs.docbook">
+<!ENTITY tdeio-nntp SYSTEM "nntp.docbook">
+<!ENTITY tdeio-pop3 SYSTEM "pop3.docbook">
+<!ENTITY tdeio-pop3s SYSTEM "pop3s.docbook">
+<!ENTITY tdeio-print SYSTEM "print.docbook">
+<!ENTITY tdeio-rlan SYSTEM "rlan.docbook">
+<!ENTITY tdeio-rlogin SYSTEM "rlogin.docbook">
+<!ENTITY tdeio-sftp SYSTEM "sftp.docbook">
+<!ENTITY tdeio-smb SYSTEM "smb.docbook">
+<!ENTITY tdeio-smtp SYSTEM "smtp.docbook">
+<!ENTITY tdeio-tar SYSTEM "tar.docbook">
+<!ENTITY tdeio-telnet SYSTEM "telnet.docbook">
+<!ENTITY tdeio-thumbnail SYSTEM "thumbnail.docbook">
+<!ENTITY tdeio-webdav SYSTEM "webdav.docbook">
+<!ENTITY tdeio-webdavs SYSTEM "webdavs.docbook">
<!ENTITY tdeprint "<application>TDEPrint</application>">
<!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
<!ENTITY Ferdinand.Gassauer.mail '<email>f.gassauer@aon.at</email>'>
@@ -49,45 +49,45 @@
<part lang="&language;">
<title>IO-Slaves</title>
-&kio-bzip;
-&kio-bzip2;
-&kio-cgi;
-&kio-data;
-&kio-file;
-&kio-finger;
-&kio-fish;
-&kio-floppy;
-&kio-ftp;
-&kio-gopher;
-&kio-gzip;
-&kio-help;
-&kio-http;
-&kio-https;
-&kio-imap;
-&kio-imaps;
-&kio-info;
-&kio-lan;
-&kio-ldap;
-&kio-mailto;
-&kio-mac;
-&kio-man;
-&kio-mrml;
-&kio-news;
-&kio-nfs;
-&kio-nntp;
-&kio-pop3;
-&kio-pop3s;
-&kio-print;
-&kio-rlan;
-&kio-rlogin;
-&kio-sftp;
-&kio-smb;
-&kio-smtp;
-&kio-tar;
-&kio-telnet;
-&kio-thumbnail;
-&kio-webdav;
-&kio-webdavs;
+&tdeio-bzip;
+&tdeio-bzip2;
+&tdeio-cgi;
+&tdeio-data;
+&tdeio-file;
+&tdeio-finger;
+&tdeio-fish;
+&tdeio-floppy;
+&tdeio-ftp;
+&tdeio-gopher;
+&tdeio-gzip;
+&tdeio-help;
+&tdeio-http;
+&tdeio-https;
+&tdeio-imap;
+&tdeio-imaps;
+&tdeio-info;
+&tdeio-lan;
+&tdeio-ldap;
+&tdeio-mailto;
+&tdeio-mac;
+&tdeio-man;
+&tdeio-mrml;
+&tdeio-news;
+&tdeio-nfs;
+&tdeio-nntp;
+&tdeio-pop3;
+&tdeio-pop3s;
+&tdeio-print;
+&tdeio-rlan;
+&tdeio-rlogin;
+&tdeio-sftp;
+&tdeio-smb;
+&tdeio-smtp;
+&tdeio-tar;
+&tdeio-telnet;
+&tdeio-thumbnail;
+&tdeio-webdav;
+&tdeio-webdavs;
</part>
diff --git a/doc/tdeioslave/mac.docbook b/doc/tdeioslave/mac.docbook
index a0ea6d69..5c9f2a79 100644
--- a/doc/tdeioslave/mac.docbook
+++ b/doc/tdeioslave/mac.docbook
@@ -15,7 +15,7 @@ tools</ulink>, so you will need these installed for it to work.</para>
<para>Enter <userinput>mac:/</userinput> into &konqueror; and you
should see the contents of your &MacOS; partition. If you have not
-used kio-mac before, you will probably get an error message saying you
+used tdeio-mac before, you will probably get an error message saying you
have not specified the right partition. Enter something like
<userinput>mac:/<option>?dev=/dev/hda2</option></userinput> to specify
the partition (if you don't know which partition &MacOS; is on, you
diff --git a/doc/userguide/base-tde-applications.docbook b/doc/userguide/base-tde-applications.docbook
index 9696aeac..2a5ef53c 100644
--- a/doc/userguide/base-tde-applications.docbook
+++ b/doc/userguide/base-tde-applications.docbook
@@ -23,7 +23,7 @@
<variablelist>
<varlistentry>
<term>&konqueror;</term>
- <listitem><para>&tde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &tde; technology, from KIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of displaying various image files as well as documents.</para>
+ <listitem><para>&tde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &tde; technology, from TDEIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of displaying various image files as well as documents.</para>
<itemizedlist>
<listitem><para>Website: <ulink url="http://konqueror.org">http://konqueror.org</ulink></para></listitem>
@@ -122,7 +122,7 @@
<itemizedlist>
<title>Related Information</title>
<listitem><para><ulink url="http://kde-apps.org">http://kde-apps.org</ulink> -- mdash; The largest directory of third-party &tde; applications.</para></listitem>
- <listitem><para>As you may have noticed, a wealth of information is accessible from the respective handbooks themselves, which can be accessed either by using the help KIO slave in &konqueror; (that is, type <userinput>help:/<replaceable>application</replaceable></userinput> in the Location toolbar), or by selecting it in the &khelpcenter;.</para></listitem>
+ <listitem><para>As you may have noticed, a wealth of information is accessible from the respective handbooks themselves, which can be accessed either by using the help TDEIO slave in &konqueror; (that is, type <userinput>help:/<replaceable>application</replaceable></userinput> in the Location toolbar), or by selecting it in the &khelpcenter;.</para></listitem>
<listitem><para>You can also likely find out quite a bit of information from the &tde; website, itself, at <ulink url="http://kde.org">http://kde.org</ulink>.</para></listitem>
</itemizedlist>
diff --git a/doc/userguide/extragear-applications.docbook b/doc/userguide/extragear-applications.docbook
index 86ede999..5d0d2671 100644
--- a/doc/userguide/extragear-applications.docbook
+++ b/doc/userguide/extragear-applications.docbook
@@ -70,7 +70,7 @@
<varlistentry>
<term><application>Gwenview</application></term>
- <listitem><para>Another advanced image viewer which can load and save all image formats supported by &tde;, as well as being able to display the <application>GIMP</application> (*.<acronym>xcf</acronym>) image filetype. <application>Gwenview</application> can perform a few graphical manipulations (rotate, mirroring) and has full support for KIO slaves (allowing you to use it via &FTP;). Other features also include file management operations, such as copy, paste, move and delete.</para>
+ <listitem><para>Another advanced image viewer which can load and save all image formats supported by &tde;, as well as being able to display the <application>GIMP</application> (*.<acronym>xcf</acronym>) image filetype. <application>Gwenview</application> can perform a few graphical manipulations (rotate, mirroring) and has full support for TDEIO slaves (allowing you to use it via &FTP;). Other features also include file management operations, such as copy, paste, move and delete.</para>
<itemizedlist>
<listitem><para>Website: <ulink url="http://gwenview.sourceforge.net/">http://gwenview.sourceforge.net/</ulink></para></listitem>
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook
index aca6bb7d..41599e4a 100644
--- a/doc/userguide/tde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@@ -1188,10 +1188,10 @@ on a multi-head system.</para>
<varlistentry><term>$<envar>TDE_FORK_SLAVES</envar></term>
<listitem><para>Set this variable to spawn
-<acronym>KIO</acronym>-slaves directly from the application process
-itself. By default <acronym>KIO</acronym>-slaves are spawned using
+<acronym>TDEIO</acronym>-slaves directly from the application process
+itself. By default <acronym>TDEIO</acronym>-slaves are spawned using
<command>tdelauncher</command>/<command>tdeinit</command>. This option is
-useful if the <acronym>KIO</acronym>-slave should run in the same
+useful if the <acronym>TDEIO</acronym>-slave should run in the same
environment as the application. This can be the case with
<application>Clearcase</application>.</para>
</listitem>
diff --git a/doc/userguide/tde-office.docbook b/doc/userguide/tde-office.docbook
index 28e089b3..f8df1336 100644
--- a/doc/userguide/tde-office.docbook
+++ b/doc/userguide/tde-office.docbook
@@ -49,7 +49,7 @@ the &tde; desktop. This section was written with version 1.4 of
&koffice; is a highly integrated office suite that builds directly on the
TDE technology. This has many advantages in terms of integration, features,
performance, familiar look and feel and so on. All technologies like &DCOP;,
-KIO, KParts are directly available.
+TDEIO, KParts are directly available.
</para>
<para>
In particular the KParts technology is extended for the &koffice;
@@ -289,7 +289,7 @@ actually use the OASIS OpenDocument file format.
<para>Each Koffice component comes with its own manual.
These manuals offer all the latest information about the
various components &koffice; has to offer and should be
-read to learn more about &koffice;. The application manuals can be accessed by using the documentation KIO Slave in &konqueror; (that is, typing <userinput>help:/<replaceable>application</replaceable></userinput> into the Location toolbar) or by selecting the respective handbook from the &khelpcenter;. The website is
+read to learn more about &koffice;. The application manuals can be accessed by using the documentation TDEIO Slave in &konqueror; (that is, typing <userinput>help:/<replaceable>application</replaceable></userinput> into the Location toolbar) or by selecting the respective handbook from the &khelpcenter;. The website is
also a good place to find out more; it is at <ulink url="http://www.koffice.org">http://www.koffice.org</ulink>.</para>
</sect1>
diff --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook
index 050fae8a..62ab1a5e 100644
--- a/doc/userguide/under-the-hood.docbook
+++ b/doc/userguide/under-the-hood.docbook
@@ -401,7 +401,7 @@ select/deselect --> in order to enable or disable debugging output for
that part of &tde;.</para>
<para>The list of debugging areas is sorted numerically, not alphabetically,
-so kio (127) comes before artskde (400). The numbers go up to 200000 or so,
+so tdeio (127) comes before artskde (400). The numbers go up to 200000 or so,
but there are really only 400 areas. You don't have to scroll through the
entire list to find the area you need, though. There is a line edit <!--
text-entry ? --> box at the top of the dialog where you can enter a part of
diff --git a/drkonqi/Makefile.am b/drkonqi/Makefile.am
index cd56bce2..a2d43c35 100644
--- a/drkonqi/Makefile.am
+++ b/drkonqi/Makefile.am
@@ -11,8 +11,8 @@ EXTRA_DIST = LICENSE
bin_PROGRAMS = drkonqi crashtest
# Libraries:
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-LDADD = $(LIB_TDEUI) $(LIB_KIO)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+LDADD = $(LIB_TDEUI) $(LIB_TDEIO)
# toplevel.cpp must be last in row due to X-headers being included. (--enable-final)
# Did I mention already that X header files really suck?
diff --git a/kappfinder/Makefile.am b/kappfinder/Makefile.am
index fb79b8f5..07a6a742 100644
--- a/kappfinder/Makefile.am
+++ b/kappfinder/Makefile.am
@@ -2,13 +2,13 @@ SUBDIRS = apps
bin_PROGRAMS = kappfinder
kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp
-kappfinder_LDADD = $(LIB_TDEUI) $(LIB_KIO)
-kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kappfinder_LDADD = $(LIB_TDEUI) $(LIB_TDEIO)
+kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
noinst_PROGRAMS = kappfinder_install
kappfinder_install_SOURCES = main_install.cpp common.cpp
kappfinder_install_LDADD = $(LIB_TDEUI)
-kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
INCLUDES = $(all_includes)
METASOURCES = AUTO
diff --git a/kate/ChangeLog b/kate/ChangeLog
index f971110c..533f15e8 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -109,16 +109,16 @@
* myself back again ;)
* now kate is clean (only qt3), no backports ;)
-2001-08-24 christian@tdevelop.org
+2001-08-24 christian@kdevelop.org
* reimplement the commenting of selections on some languages
-2001-08-19 christian@tdevelop.org
+2001-08-19 christian@kdevelop.org
* added back Sather highlighting support
* improved Eiffel language syntax highlighting support
* added Eiffel language comment directive in eiffel.xml
* added Ada language comment directive in ada.xml
-2001-08-15 christian@tdevelop.org
+2001-08-15 christian@kdevelop.org
* committed Eiffel language syntax highlighting support
2001-08-08 rokrau@yahoo.com
diff --git a/kate/app/Makefile.am b/kate/app/Makefile.am
index 957df959..de225863 100644
--- a/kate/app/Makefile.am
+++ b/kate/app/Makefile.am
@@ -12,7 +12,7 @@ libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugin
kateexternaltools.cpp katesavemodifieddialog.cpp kateviewspacecontainer.cpp \
katemwmodonhddialog.cpp katesession.cpp katemdi.cpp katetabwidget.cpp
-libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la $(LIB_KUTILS) ../utils/libkateutils.la
+libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la $(LIB_TDEUTILS) ../utils/libkateutils.la
libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index 96bef52d..57901370 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -6,7 +6,7 @@ libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentman
pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp
libkateinterfacesprivate_la_LIBADD = -lkatepartinterfaces
-libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h
kateincludedir = $(includedir)/kate
diff --git a/kate/utils/Makefile.am b/kate/utils/Makefile.am
index 1fcf3352..a1703863 100644
--- a/kate/utils/Makefile.am
+++ b/kate/utils/Makefile.am
@@ -8,7 +8,7 @@ libkateutils_la_SOURCES = dockviewbase.cpp messageview.cpp listboxview.cpp
libkateutils_la_LDFLAGS = $(all_libraries) -no-undefined
-libkateutils_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)
+libkateutils_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
libkateutils_la_METASOURCES = AUTO
diff --git a/kcminit/Makefile.am b/kcminit/Makefile.am
index 07f4d694..16480744 100644
--- a/kcminit/Makefile.am
+++ b/kcminit/Makefile.am
@@ -22,11 +22,11 @@ bin_PROGRAMS=
lib_LTLIBRARIES=
kcminit_la_SOURCES = main.cpp main.skel
-kcminit_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS)
+kcminit_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS)
kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version
kcminit_startup_la_SOURCES = main.cpp main.skel
-kcminit_startup_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS)
+kcminit_startup_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS)
kcminit_startup_la_LDFLAGS = $(all_libraries) -module -avoid-version
AM_CPPFLAGS = $(all_includes)
diff --git a/kcontrol/Makefile.am b/kcontrol/Makefile.am
index 30f03338..6871483f 100644
--- a/kcontrol/Makefile.am
+++ b/kcontrol/Makefile.am
@@ -33,7 +33,7 @@ endif
# 'colors' and 'fonts' should come after 'krdb'
SUBDIRS = bell background dnssd filetypes samba krdb input info ioslaveinfo tdm\
- kicker locale launch keys kio konq style kded \
+ kicker locale launch keys tdeio konq style kded \
konqhtml ebrowsing arts kcontrol knotify\
clock pics $(ACCESS_SUBDIR) colors energy fonts css \
icons screensaver taskbar crypto privacy smserver \
diff --git a/kcontrol/access/Makefile.am b/kcontrol/access/Makefile.am
index 6ea38b8b..792c33fb 100644
--- a/kcontrol/access/Makefile.am
+++ b/kcontrol/access/Makefile.am
@@ -13,7 +13,7 @@ kaccess_la_LIBADD = $(LIB_TDEUI)
kcm_access_la_SOURCES = kcmaccess.cpp
kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_access_la_LIBADD = $(LIB_KIO)
+kcm_access_la_LIBADD = $(LIB_TDEIO)
noinst_HEADERS = kcmaccess.h
diff --git a/kcontrol/accessibility/Makefile.am b/kcontrol/accessibility/Makefile.am
index 67eb8957..7a0da941 100644
--- a/kcontrol/accessibility/Makefile.am
+++ b/kcontrol/accessibility/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_accessibility.la
kcm_accessibility_la_SOURCES = accessibility.cpp accessibilityconfigwidget.ui
kcm_accessibility_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_accessibility_la_LIBADD = $(LIB_KIO)
+kcm_accessibility_la_LIBADD = $(LIB_TDEIO)
noinst_HEADERS = accessibility.h
diff --git a/kcontrol/arts/Makefile.am b/kcontrol/arts/Makefile.am
index 3959f310..9d0e7000 100644
--- a/kcontrol/arts/Makefile.am
+++ b/kcontrol/arts/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_arts.la
kcm_arts_la_SOURCES = arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
kcm_arts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -ltdemid
+kcm_arts_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) -ltdemid
AM_CPPFLAGS = -I$(kde_includes)/arts $(all_includes)
diff --git a/kcontrol/clock/Makefile.am b/kcontrol/clock/Makefile.am
index 0348e587..0572d26d 100644
--- a/kcontrol/clock/Makefile.am
+++ b/kcontrol/clock/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_clock.la
kcm_clock_la_SOURCES = dtime.cpp tzone.cpp main.cpp
kcm_clock_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_clock_la_LIBADD = $(LIB_KIO)
+kcm_clock_la_LIBADD = $(LIB_TDEIO)
AM_CPPFLAGS = $(all_includes)
diff --git a/kcontrol/colors/Makefile.am b/kcontrol/colors/Makefile.am
index c5d813d6..f21102ee 100644
--- a/kcontrol/colors/Makefile.am
+++ b/kcontrol/colors/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_colors.la
kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp
kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
-kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
+kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
METASOURCES = colorscm.moc widgetcanvas.moc
noinst_HEADERS = colorscm.h widgetcanvas.h
diff --git a/kcontrol/componentchooser/Makefile.am b/kcontrol/componentchooser/Makefile.am
index 6abd5f41..3280ace2 100644
--- a/kcontrol/componentchooser/Makefile.am
+++ b/kcontrol/componentchooser/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kcm_componentchooser.la
kcm_componentchooser_la_SOURCES = componentchooser_ui.ui componentconfig_ui.ui emailclientconfig_ui.ui terminalemulatorconfig_ui.ui browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp
kcm_componentchooser_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_componentchooser_la_LIBADD = $(LIB_KIO)
+kcm_componentchooser_la_LIBADD = $(LIB_TDEIO)
xdg_apps_DATA = componentchooser.desktop
diff --git a/kcontrol/crypto/Makefile.am b/kcontrol/crypto/Makefile.am
index 84ef0a0c..a2b600f4 100644
--- a/kcontrol/crypto/Makefile.am
+++ b/kcontrol/crypto/Makefile.am
@@ -6,7 +6,7 @@ kcm_crypto_la_SOURCES = crypto.cpp certexport.cpp kdatetimedlg.cpp
AM_CXXFLAGS = $(CXXFLAGS) -DLIBDIR=$(libdir)
kcm_crypto_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined
-kcm_crypto_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSSL)
+kcm_crypto_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIBSSL)
METASOURCES = AUTO
diff --git a/kcontrol/css/Makefile.am b/kcontrol/css/Makefile.am
index 10d2f3d4..95c093fd 100644
--- a/kcontrol/css/Makefile.am
+++ b/kcontrol/css/Makefile.am
@@ -6,7 +6,7 @@ templatedir = $(kde_datadir)/kcmcss
kde_module_LTLIBRARIES = kcm_css.la
kcm_css_la_SOURCES = template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui
kcm_css_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_css_la_LIBADD = -ltdeui $(LIB_KIO)
+kcm_css_la_LIBADD = -ltdeui $(LIB_TDEIO)
METASOURCES = AUTO
diff --git a/kcontrol/display/Makefile.am b/kcontrol/display/Makefile.am
index 442639b3..00a10de0 100644
--- a/kcontrol/display/Makefile.am
+++ b/kcontrol/display/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_display.la
kcm_display_la_SOURCES = display.cpp
kcm_display_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_display_la_LIBADD = $(LIB_KUTILS)
+kcm_display_la_LIBADD = $(LIB_TDEUTILS)
AM_CPPFLAGS = $(all_includes)
METASOURCES = AUTO
diff --git a/kcontrol/displayconfig/Makefile.am b/kcontrol/displayconfig/Makefile.am
index a2c2607e..cdeb29ea 100644
--- a/kcontrol/displayconfig/Makefile.am
+++ b/kcontrol/displayconfig/Makefile.am
@@ -5,7 +5,7 @@ kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displaycon
kcm_displayconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined
-kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
+kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIB_XRANDR)
METASOURCES = AUTO
diff --git a/kcontrol/dnssd/Makefile.am b/kcontrol/dnssd/Makefile.am
index da4ffdb5..79c1698c 100644
--- a/kcontrol/dnssd/Makefile.am
+++ b/kcontrol/dnssd/Makefile.am
@@ -5,7 +5,7 @@ kcm_tdednssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
kcm_tdednssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
xdg_apps_DATA = kcm_tdednssd.desktop
-kcm_tdednssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
+kcm_tdednssd_la_LIBADD = $(LIB_TDEDNSSD) $(LIB_TDEUI)
messages: rc.cpp
$(EXTRACTRC) *.ui *.rc >> rc.cpp
diff --git a/kcontrol/ebrowsing/Makefile.am b/kcontrol/ebrowsing/Makefile.am
index 87587fd4..7f59498b 100644
--- a/kcontrol/ebrowsing/Makefile.am
+++ b/kcontrol/ebrowsing/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kcm_kurifilt.la
kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp
kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
+kcm_kurifilt_la_LIBADD = $(LIB_TDESYCOCA)
# Don't link this lib to the plugins. They are dlopened and linking to them
# results in crashes when closing tdecmshell.
# plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libtdeshorturifilter.la
diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am
index 4cdb46d4..6482d7a3 100644
--- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am
+++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am
@@ -9,10 +9,10 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkuriikwsfilter.la libkurisearchfilter.la
libkuriikwsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
+libkuriikwsfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
libkurisearchfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
+libkurisearchfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
libkuriikwsfilter_la_SOURCES = kuriikwsfiltereng.cpp kuriikwsfilter.skel \
kuriikwsfilter.cpp searchprovider.cpp
diff --git a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am
index 362aacbf..e9713b8e 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am
+++ b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII
kde_module_LTLIBRARIES = liblocaldomainurifilter.la
liblocaldomainurifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE)
+liblocaldomainurifilter_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE)
liblocaldomainurifilter_la_SOURCES = localdomainurifilter.cpp localdomainurifilter.skel
diff --git a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
index fccf0ef6..c9ad8e08 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
+++ b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII
kde_module_LTLIBRARIES = libtdeshorturifilter.la
libtdeshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libtdeshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
+libtdeshorturifilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
libtdeshorturifilter_la_SOURCES = tdeshorturifilter.cpp tdeshorturifilter.skel
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
index db3f1480..1d48e7c2 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
@@ -20,8 +20,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef _KSHORTURIFILTER_H_
-#define _KSHORTURIFILTER_H_
+#ifndef _TDESHORTURIFILTER_H_
+#define _TDESHORTURIFILTER_H_
#include <dcopobject.h>
#include <kgenericfactory.h>
diff --git a/kcontrol/energy/Makefile.am b/kcontrol/energy/Makefile.am
index e7a9b24b..7d42e5af 100644
--- a/kcontrol/energy/Makefile.am
+++ b/kcontrol/energy/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_energy.la
kcm_energy_la_SOURCES = energy.cpp
kcm_energy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_KIO)
+kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_TDEIO)
METASOURCES = energy.moc
noinst_HEADERS = energy.h
diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am
index 31a1d60a..d69f552f 100644
--- a/kcontrol/filetypes/Makefile.am
+++ b/kcontrol/filetypes/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = $(all_includes)
-kcm_filetypes_la_LIBADD = libfiletypes.la $(LIB_KIO)
+kcm_filetypes_la_LIBADD = libfiletypes.la $(LIB_TDEIO)
kcm_filetypes_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
METASOURCES = AUTO
@@ -20,8 +20,8 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
kserviceselectdlg.cpp
keditfiletype_SOURCES = keditfiletype.cpp
-keditfiletype_LDADD = libfiletypes.la $(LIB_KIO)
-keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+keditfiletype_LDADD = libfiletypes.la $(LIB_TDEIO)
+keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
messages:
$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot
diff --git a/kcontrol/iccconfig/Makefile.am b/kcontrol/iccconfig/Makefile.am
index 098e5aae..1462fd42 100644
--- a/kcontrol/iccconfig/Makefile.am
+++ b/kcontrol/iccconfig/Makefile.am
@@ -5,7 +5,7 @@ kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel
kcm_iccconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined
-kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
+kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIB_XRANDR)
METASOURCES = AUTO
diff --git a/kcontrol/icons/Makefile.am b/kcontrol/icons/Makefile.am
index 6de8b72c..87fd4f0d 100644
--- a/kcontrol/icons/Makefile.am
+++ b/kcontrol/icons/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_icons.la
kcm_icons_la_SOURCES = iconthemes.cpp icons.cpp main.cpp
kcm_icons_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kcm_icons_la_LIBADD = $(LIB_KIO)
+kcm_icons_la_LIBADD = $(LIB_TDEIO)
METASOURCES = AUTO
diff --git a/kcontrol/input/Makefile.am b/kcontrol/input/Makefile.am
index 840029c2..ec7a4ad8 100644
--- a/kcontrol/input/Makefile.am
+++ b/kcontrol/input/Makefile.am
@@ -22,7 +22,7 @@ kde_module_LTLIBRARIES = kcm_input.la
kcm_input_la_SOURCES = mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp logitechmouse_base.ui
kcm_input_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_input_la_LIBADD = $(THEMEPAGE_LIB) $(XTESTLIB) $(LIB_KIO) $(LIB_XCURSOR) $(USB_LIBS)
+kcm_input_la_LIBADD = $(THEMEPAGE_LIB) $(XTESTLIB) $(LIB_TDEIO) $(LIB_XCURSOR) $(USB_LIBS)
METASOURCES = AUTO
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index d84d470b..cdffbd1b 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -269,7 +269,7 @@ void ThemePage::removeClicked()
// theme with the same name, we shouldn't remove the theme from the list if it's
// still available elsewhere. This could be solved by calling insertThemes() here,
// but since TDEIO::del() is an asynchronos operation, the theme we're deleting will
- // be readded to the list again before KIO has removed it.
+ // be readded to the list again before TDEIO has removed it.
}
diff --git a/kcontrol/ioslaveinfo/Makefile.am b/kcontrol/ioslaveinfo/Makefile.am
index 75def7ba..598f193f 100644
--- a/kcontrol/ioslaveinfo/Makefile.am
+++ b/kcontrol/ioslaveinfo/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_ioslaveinfo.la
kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp
kcm_ioslaveinfo_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_KIO)
+kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_TDEIO)
AM_CPPFLAGS= $(all_includes)
diff --git a/kcontrol/ioslaveinfo/ioslaveinfo.desktop b/kcontrol/ioslaveinfo/ioslaveinfo.desktop
index 451ded7f..f545071e 100644
--- a/kcontrol/ioslaveinfo/ioslaveinfo.desktop
+++ b/kcontrol/ioslaveinfo/ioslaveinfo.desktop
@@ -97,7 +97,7 @@ Keywords[es]=Protocolo,Slaves de E/S,Slaves,Red,Información,Tiempo de expiraci
Keywords[et]=protokoll,IO moodulid,moodulid,võrk,info,taimaut,aegumine
Keywords[eu]=Protocol,IO morroiak,Morroiak,Sarea,Informazioa,Denbora-muga
Keywords[fa]=قرارداد، IO slaves، Slaves، شبکه، اطلاعات، اتمام وقت
-Keywords[fi]=Protokolla,Yhteyskäytäntö,KIO,KIO-palvelu,Verkko,Aikavalvonta,aikakatkaisu
+Keywords[fi]=Protokolla,Yhteyskäytäntö,TDEIO,TDEIO-palvelu,Verkko,Aikavalvonta,aikakatkaisu
Keywords[fr]=protocole,modules,entrées/sorties,réseau,informations,délai
Keywords[fy]=protocol,IO slaves,slaves,network,ynformaasje,timeout,netwurk,tiidslimyt
Keywords[gl]=Protocolo,escravos IO,Escravos,Rede,Información,Tempo de agarda,Timeout
diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am
index 9de9b6f1..9ae27d42 100644
--- a/kcontrol/kcontrol/Makefile.am
+++ b/kcontrol/kcontrol/Makefile.am
@@ -32,7 +32,7 @@ kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \
moduleIface.cpp moduleIface.skel global.cpp modules.cpp \
proxywidget.cpp kcrootonly.cpp searchwidget.cpp
-kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_TDEHTML)
+kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIB_TDEHTML)
kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
rccontroldir = $(kde_datadir)/kcontrol
diff --git a/kcontrol/kded/Makefile.am b/kcontrol/kded/Makefile.am
index af2d5414..e631b727 100644
--- a/kcontrol/kded/Makefile.am
+++ b/kcontrol/kded/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_kded.la
kcm_kded_la_SOURCES = kcmkded.cpp
kcm_kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kded_la_LIBADD = $(LIB_KIO)
+kcm_kded_la_LIBADD = $(LIB_TDEIO)
AM_CPPFLAGS= $(all_includes)
diff --git a/kcontrol/keys/tdeaccelaction.h b/kcontrol/keys/tdeaccelaction.h
index 5cc6ca02..f95a5015 100644
--- a/kcontrol/keys/tdeaccelaction.h
+++ b/kcontrol/keys/tdeaccelaction.h
@@ -20,8 +20,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KACCELACTION_H
-#define _KACCELACTION_H
+#ifndef _TDEACCELACTION_H
+#define _TDEACCELACTION_H
#include <tqmap.h>
#include <tqptrvector.h>
@@ -202,4 +202,4 @@ class TDEAccelActions
friend class TDEAccelBase;
};
-#endif // _KACCELACTION_H
+#endif // _TDEACCELACTION_H
diff --git a/kcontrol/kicker/Makefile.am b/kcontrol/kicker/Makefile.am
index 2fa9a2ad..78d01073 100644
--- a/kcontrol/kicker/Makefile.am
+++ b/kcontrol/kicker/Makefile.am
@@ -7,7 +7,7 @@ kcm_kicker_la_SOURCES = positiontab.ui hidingtab.ui lookandfeeltab.ui menutab.ui
positionconfig.cpp hidingconfig.cpp menuconfig.cpp lookandfeelconfig.cpp
kcm_kicker_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kicker_la_LIBADD = $(top_builddir)/kicker/libkicker/libkickermain.la ../background/libbgnd.la $(LIB_KIO) $(LIB_KUTILS)
+kcm_kicker_la_LIBADD = $(top_builddir)/kicker/libkicker/libkickermain.la ../background/libbgnd.la $(LIB_TDEIO) $(LIB_TDEUTILS)
AM_CPPFLAGS = -I$(top_srcdir)/kicker/kicker/core -I$(top_srcdir)/kicker/libkicker \
-I$(top_builddir)/kicker/libkicker -I$(srcdir)/../background $(all_includes)
diff --git a/kcontrol/knotify/Makefile.am b/kcontrol/knotify/Makefile.am
index 1fc878b6..ffe9e052 100644
--- a/kcontrol/knotify/Makefile.am
+++ b/kcontrol/knotify/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_knotify.la
kcm_knotify_la_SOURCES = knotify.cpp playersettings.ui
kcm_knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_knotify_la_LIBADD = $(LIB_KIO)
+kcm_knotify_la_LIBADD = $(LIB_TDEIO)
AM_CPPFLAGS = $(all_includes)
METASOURCES = AUTO
diff --git a/kcontrol/konq/Makefile.am b/kcontrol/konq/Makefile.am
index 2dddd942..a42ac90d 100644
--- a/kcontrol/konq/Makefile.am
+++ b/kcontrol/konq/Makefile.am
@@ -11,7 +11,7 @@ kcm_konq_la_SOURCES = behaviour.cpp desktop.cpp rootopts.cpp \
desktopbehavior.ui
kcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KUTILS)
+kcm_konq_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEUTILS)
kcm_konq_la_DATA = overlapping.png onlyone.png
kcm_konq_ladir = $(kde_datadir)/kcontrol/pics
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index e2191059..6a702559 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -86,7 +86,7 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
grid->addWidget( javaSecurityManagerCB, 0, 0 );
connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
- useKioCB = new TQCheckBox( i18n("Use &KIO"), checkboxes );
+ useKioCB = new TQCheckBox( i18n("Use &TDEIO"), checkboxes );
grid->addWidget( useKioCB, 0, 1 );
connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
@@ -158,7 +158,7 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
"policytool utility to give code downloaded from certain sites more "
"permissions." ) );
- TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use KIO for network transport ") );
+ TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use TDEIO for network transport ") );
TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in "
"your path, simply leave it as 'java'. If you need to use a different jre, "
diff --git a/kcontrol/konsole/Makefile.am b/kcontrol/konsole/Makefile.am
index 91be65e2..f45149ed 100644
--- a/kcontrol/konsole/Makefile.am
+++ b/kcontrol/konsole/Makefile.am
@@ -4,7 +4,7 @@ kcm_konsole_la_SOURCES = schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp \
schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui
kcm_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_konsole_la_LIBADD = -ltdeui $(LIB_KIO)
+kcm_konsole_la_LIBADD = -ltdeui $(LIB_TDEIO)
AM_CPPFLAGS = $(all_includes)
METASOURCES = AUTO
diff --git a/kcontrol/kthememanager/Makefile.am b/kcontrol/kthememanager/Makefile.am
index be71094c..cbc241dd 100644
--- a/kcontrol/kthememanager/Makefile.am
+++ b/kcontrol/kthememanager/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_kthememanager.la
kcm_kthememanager_la_SOURCES = kthemedlg.ui newthemewidget.ui knewthemedlg.cpp ktheme.cpp kthememanager.cpp
-kcm_kthememanager_la_LIBADD = $(LIB_KIO)
+kcm_kthememanager_la_LIBADD = $(LIB_TDEIO)
kcm_kthememanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
noinst_HEADERS = kthememanager.h ktheme.h knewthemedlg.h kthemedlg.ui.h
diff --git a/kcontrol/locale/Makefile.am b/kcontrol/locale/Makefile.am
index 6872f143..0eaa24ae 100644
--- a/kcontrol/locale/Makefile.am
+++ b/kcontrol/locale/Makefile.am
@@ -10,7 +10,7 @@ METASOURCES = AUTO
noinst_HEADERS = toplevel.h kcmlocale.h klocalesample.h localenum.h localemon.h localetime.h localeother.h
kcm_locale_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kcm_locale_la_LIBADD = $(LIB_KIO)
+kcm_locale_la_LIBADD = $(LIB_TDEIO)
# Note: newer glibc (e.g. zonetab version 1.31 (cvs revision 1.22) have more/other data than older ones (e.g. zonetab version 1.28)
diff --git a/kcontrol/nics/Makefile.am b/kcontrol/nics/Makefile.am
index 6bcf9208..7e1cd0ee 100644
--- a/kcontrol/nics/Makefile.am
+++ b/kcontrol/nics/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_nic.la
kcm_nic_la_SOURCES = nic.cpp
kcm_nic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_nic_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSOCKET)
+kcm_nic_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIBSOCKET)
AM_CPPFLAGS= $(all_includes)
diff --git a/kcontrol/randr/Makefile.am b/kcontrol/randr/Makefile.am
index 7a5357c6..cb28fd1c 100644
--- a/kcontrol/randr/Makefile.am
+++ b/kcontrol/randr/Makefile.am
@@ -30,7 +30,7 @@ bin_PROGRAMS = tderandrtray
tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp
tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr
-tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_KUTILS) $(LIB_XRANDR)
+tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_TDEUTILS) $(LIB_XRANDR)
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tderandr.pot
diff --git a/kcontrol/samba/Makefile.am b/kcontrol/samba/Makefile.am
index 42c3f661..4eabf0d8 100644
--- a/kcontrol/samba/Makefile.am
+++ b/kcontrol/samba/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_samba.la
kcm_samba_la_SOURCES = main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp kcmsambastatistics.cpp
kcm_samba_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_samba_la_LIBADD = $(LIB_KIO)
+kcm_samba_la_LIBADD = $(LIB_TDEIO)
AM_CPPFLAGS = $(all_includes)
diff --git a/kcontrol/screensaver/Makefile.am b/kcontrol/screensaver/Makefile.am
index 995b2962..cf79d11b 100644
--- a/kcontrol/screensaver/Makefile.am
+++ b/kcontrol/screensaver/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_screensaver.la
kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp \
saverconfig.cpp advanceddialog.cpp kswidget.cpp
kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB) $(GLLIB)
+kcm_screensaver_la_LIBADD = $(LIB_TDESYCOCA) $(DPMSLIB) $(GLLIB)
METASOURCES = AUTO
noinst_HEADERS = scrnsave.h
diff --git a/kcontrol/smartcard/Makefile.am b/kcontrol/smartcard/Makefile.am
index ee2546c6..61d49dfb 100644
--- a/kcontrol/smartcard/Makefile.am
+++ b/kcontrol/smartcard/Makefile.am
@@ -5,7 +5,7 @@ kcm_smartcard_la_SOURCES = smartcard.cpp smartcardbase.ui nosmartcardbase.ui sma
kcm_smartcard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_KIO)
+kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_TDEIO)
METASOURCES = AUTO
diff --git a/kcontrol/style/Makefile.am b/kcontrol/style/Makefile.am
index 27f38de7..6029c770 100644
--- a/kcontrol/style/Makefile.am
+++ b/kcontrol/style/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_style.la
kcm_style_la_SOURCES = kcmstyle.cpp stylepreview.ui menupreview.cpp styleconfdialog.cpp
kcm_style_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
-kcm_style_la_LIBADD = $(LIB_KIO) ../krdb/libkrdb.la
+kcm_style_la_LIBADD = $(LIB_TDEIO) ../krdb/libkrdb.la
METASOURCES = AUTO
noinst_HEADERS = kcmstyle.h stylepreview.h menupreview.h
diff --git a/kcontrol/tdefontinst/Makefile.am b/kcontrol/tdefontinst/Makefile.am
index f81ef525..2cea3e76 100644
--- a/kcontrol/tdefontinst/Makefile.am
+++ b/kcontrol/tdefontinst/Makefile.am
@@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail
FONTINST_VP_SUBDIR=viewpart
endif
-SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst kio
+SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst tdeio
EXTRA_DIST = TODO
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index 9f939324..cbe8eed5 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -146,7 +146,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
TQString previousPath=itsConfig.readEntry(CFG_PATH);
- itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER),
+ itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER),
fontsFrame);
itsDirOp->setViewConfig(&itsConfig, "ListView Settings");
itsDirOp->setMinimumSize(TQSize(96, 64));
@@ -439,7 +439,7 @@ void CKCmFontInst::removeFonts()
{
KURL url((*it)->url());
- url.setQuery(KFI_KIO_NO_CLEAR);
+ url.setQuery(KFI_TDEIO_NO_CLEAR);
files.append((*it)->text());
urls.append(url);
}
@@ -596,7 +596,7 @@ void CKCmFontInst::delResult(TDEIO::Job *job)
stream << KFI::SPECIAL_RESCAN;
- TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
+ TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this);
jobResult(job);
}
diff --git a/kcontrol/tdefontinst/kcmfontinst/Makefile.am b/kcontrol/tdefontinst/kcmfontinst/Makefile.am
index b6e65809..3c6d2194 100644
--- a/kcontrol/tdefontinst/kcmfontinst/Makefile.am
+++ b/kcontrol/tdefontinst/kcmfontinst/Makefile.am
@@ -4,7 +4,7 @@ FONTINST_PRINT_LIB=../viewpart/libtdefontinstprint.la
endif
kde_module_LTLIBRARIES = kcm_fontinst.la
-kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la
+kcm_fontinst_la_LIBADD = $(LIB_TDEIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la
METASOURCES = AUTO
kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
diff --git a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
index 4840b721..8ac0d9bc 100644
--- a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
@@ -90,7 +90,7 @@ void CSettingsDialog::slotOk()
stream << KFI::SPECIAL_RECONFIG;
- TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
+ TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this);
}
hide();
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index ab89689d..1956a34a 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -909,7 +909,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
// fonts:/System/times.ttf
// file:/home/wibble/hmm.ttf
//
- if(KFI_KIO_FONTS_PROTOCOL==url.protocol())
+ if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol())
{
TDEIO::UDSEntry udsEntry;
TQString name;
@@ -948,7 +948,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
TQTextStream stream(&file);
thumbUrl=stream.readLine();
- isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
+ isThumbnailUrl=0==thumbUrl.find(KFI_TDEIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
file.close();
}
diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h
index 5e863353..06688c6d 100644
--- a/kcontrol/tdefontinst/lib/KfiConstants.h
+++ b/kcontrol/tdefontinst/lib/KfiConstants.h
@@ -6,10 +6,10 @@
#define KFI_CATALOGUE "tdefontinst"
// io-slave
-#define KFI_KIO_FONTS_PROTOCOL "fonts"
-#define KFI_KIO_FONTS_USER I18N_NOOP("Personal")
-#define KFI_KIO_FONTS_SYS I18N_NOOP("System")
-#define KFI_KIO_NO_CLEAR "?noclear"
+#define KFI_TDEIO_FONTS_PROTOCOL "fonts"
+#define KFI_TDEIO_FONTS_USER I18N_NOOP("Personal")
+#define KFI_TDEIO_FONTS_SYS I18N_NOOP("System")
+#define KFI_TDEIO_NO_CLEAR "?noclear"
// Config
#define KFI_UI_CFG_FILE KFI_CATALOGUE"uirc"
diff --git a/kcontrol/tdefontinst/lib/Makefile.am b/kcontrol/tdefontinst/lib/Makefile.am
index a0ecdfbb..dca66c63 100644
--- a/kcontrol/tdefontinst/lib/Makefile.am
+++ b/kcontrol/tdefontinst/lib/Makefile.am
@@ -9,6 +9,6 @@ Misc.h \
FcEngine.h \
KfiConstants.h
-libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
+libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_TDEIO) $(LIBXFT_LIB)
libtdefontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
diff --git a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
index 6cbeb5b3..0456c1d3 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
+++ b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
@@ -320,7 +320,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
slantAll;
KURL url(info.url());
TQString fName;
- bool fontsProt = KFI_KIO_FONTS_PROTOCOL == url.protocol(),
+ bool fontsProt = KFI_TDEIO_FONTS_PROTOCOL == url.protocol(),
fileProt = "file" == url.protocol(),
downloaded = false,
status = false;
diff --git a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
index a7f82921..04ff8706 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
+++ b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_font.la
tdefile_font_la_SOURCES = KFileFont.cpp
tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
-tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la
+tdefile_font_la_LIBADD = $(LIB_TDEIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la
kdelnkdir = $(kde_servicesdir)
kde_services_DATA = tdefile_font.desktop
diff --git a/kcontrol/tdefontinst/tdefontinst/Makefile.am b/kcontrol/tdefontinst/tdefontinst/Makefile.am
index a8b782b8..ae4733ff 100644
--- a/kcontrol/tdefontinst/tdefontinst/Makefile.am
+++ b/kcontrol/tdefontinst/tdefontinst/Makefile.am
@@ -11,6 +11,6 @@ FontEngine.h \
Fontmap.h \
XConfig.h
-tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libtdefontinst.la
+tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_TDEIO) ../lib/libtdefontinst.la
tdefontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
index 949b0d4c..54de7bdc 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
@@ -104,13 +104,13 @@ int kdemain(int argc, char **argv)
{
if (argc != 4)
{
- fprintf(stderr, "Usage: tdeio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
+ fprintf(stderr, "Usage: tdeio_" KFI_TDEIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
exit(-1);
}
TDELocale::setMainCatalogue(KFI_CATALOGUE);
- TDEInstance instance("tdeio_" KFI_KIO_FONTS_PROTOCOL);
+ TDEInstance instance("tdeio_" KFI_TDEIO_FONTS_PROTOCOL);
KFI::CKioFonts slave(argv[2], argv[3]);
slave.dispatchLoop();
@@ -123,12 +123,12 @@ namespace KFI
inline bool isSysFolder(const TQString &sect)
{
- return i18n(KFI_KIO_FONTS_SYS)==sect || KFI_KIO_FONTS_SYS==sect;
+ return i18n(KFI_TDEIO_FONTS_SYS)==sect || KFI_TDEIO_FONTS_SYS==sect;
}
inline bool isUserFolder(const TQString &sect)
{
- return i18n(KFI_KIO_FONTS_USER)==sect || KFI_KIO_FONTS_USER==sect;
+ return i18n(KFI_TDEIO_FONTS_USER)==sect || KFI_TDEIO_FONTS_USER==sect;
}
static TQString removeMultipleExtension(const KURL &url)
@@ -289,10 +289,10 @@ static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, c
addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, sys
- ? KFI_KIO_FONTS_PROTOCOL"/system-folder"
- : KFI_KIO_FONTS_PROTOCOL"/folder");
+ ? KFI_TDEIO_FONTS_PROTOCOL"/system-folder"
+ : KFI_TDEIO_FONTS_PROTOCOL"/folder");
addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
- TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
+ TQString url(KFI_TDEIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
return true;
}
else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet!
@@ -303,7 +303,7 @@ static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, c
addAtom(entry, TDEIO::UDS_ACCESS, 0744);
addAtom(entry, TDEIO::UDS_USER, 0, "root");
addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
- addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder");
+ addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_TDEIO_FONTS_PROTOCOL"/system-folder");
addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
return true;
@@ -393,11 +393,11 @@ static bool createFontUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, TQV
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
- TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
+ TQString url(KFI_TDEIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
if(!Misc::root())
{
- url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
+ url+=sys ? i18n(KFI_TDEIO_FONTS_SYS) : i18n(KFI_TDEIO_FONTS_USER);
url+=TQString::fromLatin1("/");
}
if(multiple)
@@ -706,7 +706,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
}
CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
- : TDEIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
+ : TDEIO::SlaveBase(KFI_TDEIO_FONTS_PROTOCOL, pool, app),
itsRoot(Misc::root()),
itsUsingFcFpe(false),
itsUsingXfsFpe(false),
@@ -855,9 +855,9 @@ void CKioFonts::listDir(const KURL &url)
{
size=2;
totalSize(size);
- createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
+ createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
listEntry(entry, false);
- createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_SYS].location, true);
+ createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_SYS), itsFolders[FOLDER_SYS].location, true);
listEntry(entry, false);
}
@@ -896,13 +896,13 @@ void CKioFonts::stat(const KURL &url)
err=!createStatEntry(entry, url, FOLDER_SYS);
else
if(isUserFolder(pathList[0]))
- err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
+ err=!createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
else if(isSysFolder(pathList[0]))
- err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
+ err=!createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
else
{
error(TDEIO::ERR_SLAVE_DEFINED,
- i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
+ i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
break;
@@ -1098,7 +1098,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if(passwd.isEmpty())
{
- error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
}
@@ -1150,7 +1150,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
}
else
{
- error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
}
@@ -1165,7 +1165,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
}
else
{
- error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_USER)));
return;
}
}
@@ -1317,7 +1317,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
return;
}
- bool fromFonts=KFI_KIO_FONTS_PROTOCOL==src.protocol();
+ bool fromFonts=KFI_TDEIO_FONTS_PROTOCOL==src.protocol();
if((!fromFonts || updateFontList()) // CPD: dont update font list upon a copy from file - is too slow. Just stat on filename!
&& checkUrl(src) && checkAllowed(src))
@@ -1390,7 +1390,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
}
else
{
- error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
}
@@ -1595,7 +1595,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
}
else
{
- error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
}
@@ -1619,7 +1619,7 @@ void CKioFonts::del(const KURL &url, bool)
TQValueList<FcPattern *>::Iterator it,
end=entries->end();
CDirList modifiedDirs;
- bool clearList=KFI_KIO_NO_CLEAR!=url.query();
+ bool clearList=KFI_TDEIO_NO_CLEAR!=url.query();
if(nonRootSys(url))
{
@@ -1656,7 +1656,7 @@ void CKioFonts::del(const KURL &url, bool)
if(doRootCmd(cmd))
modified(FOLDER_SYS, clearList, modifiedDirs);
else
- error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+ error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
}
else
{
@@ -1905,7 +1905,7 @@ TQString CKioFonts::getRootPasswd(bool askPasswd)
int attempts=0;
TQString errorMsg;
- authInfo.url=KURL(KFI_KIO_FONTS_PROTOCOL ":///");
+ authInfo.url=KURL(KFI_TDEIO_FONTS_PROTOCOL ":///");
authInfo.username=SYS_USER;
authInfo.keepPassword=true;
@@ -1964,19 +1964,19 @@ bool CKioFonts::confirmUrl(KURL &url)
"case the font will only be usable by you), or \"%2\" ("
"the font will be usable by all users - but you will "
"need to know the administrator's password)?")
- .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)),
- i18n("Where to Install"), i18n(KFI_KIO_FONTS_USER),
- i18n(KFI_KIO_FONTS_SYS));
+ .arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)),
+ i18n("Where to Install"), i18n(KFI_TDEIO_FONTS_USER),
+ i18n(KFI_TDEIO_FONTS_SYS));
if(changeToSystem)
{
itsLastDest=DEST_SYS;
- url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+url.fileName());
+ url.setPath(TQChar('/')+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')+url.fileName());
}
else
{
itsLastDest=DEST_USER;
- url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+url.fileName());
+ url.setPath(TQChar('/')+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')+url.fileName());
}
KFI_DBUG << "Changed URL to:" << url.path() << endl;
@@ -2150,7 +2150,7 @@ bool CKioFonts::checkFile(const TQString &file)
bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files)
{
- if(KFI_KIO_FONTS_PROTOCOL==src.protocol())
+ if(KFI_TDEIO_FONTS_PROTOCOL==src.protocol())
{
TQValueList<FcPattern *> *entries=getEntries(src);
@@ -2275,7 +2275,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map,
// (such as there would be for a TTC font), then ask the user for confirmation of the action.
bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFolder folder, EOp op)
{
- if(KFI_KIO_FONTS_PROTOCOL!=url.protocol())
+ if(KFI_TDEIO_FONTS_PROTOCOL!=url.protocol())
return true;
TQStringList::ConstIterator it,
@@ -2330,7 +2330,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol
bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patterns, EFolder folder, EOp op)
{
- if(KFI_KIO_FONTS_PROTOCOL!=url.protocol())
+ if(KFI_TDEIO_FONTS_PROTOCOL!=url.protocol())
return true;
TQStringList files;
@@ -2349,7 +2349,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patte
bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
{
- if(KFI_KIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path())))
+ if(KFI_TDEIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path())))
{
TQString sect(getSect(u.path()));
@@ -2369,7 +2369,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
if(!isSysFolder(sect) && !isUserFolder(sect))
{
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
- .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
+ .arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)));
return false;
}
}
@@ -2379,17 +2379,17 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
bool CKioFonts::checkAllowed(const KURL &u)
{
- if (KFI_KIO_FONTS_PROTOCOL==u.protocol())
+ if (KFI_TDEIO_FONTS_PROTOCOL==u.protocol())
{
TQString ds(Misc::dirSyntax(u.path()));
- if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) ||
- ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) ||
- ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
- ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
+ if(ds==TQString(TQChar('/')+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')) ||
+ ds==TQString(TQChar('/')+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')) ||
+ ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_TDEIO_FONTS_USER)+TQChar('/')) ||
+ ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_TDEIO_FONTS_SYS)+TQChar('/')))
{
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
- .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
+ .arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS))); \
return false;
}
}
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.h b/kcontrol/tdefontinst/tdeio/KioFonts.h
index 4f3c465d..52516fe6 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.h
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.h
@@ -1,5 +1,5 @@
-#ifndef __KIO_FONTS_H__
-#define __KIO_FONTS_H__
+#ifndef __TDEIO_FONTS_H__
+#define __TDEIO_FONTS_H__
////////////////////////////////////////////////////////////////////////////////
//
diff --git a/kcontrol/tdefontinst/tdeio/Makefile.am b/kcontrol/tdefontinst/tdeio/Makefile.am
index bde65435..f5c48c9a 100644
--- a/kcontrol/tdefontinst/tdeio/Makefile.am
+++ b/kcontrol/tdefontinst/tdeio/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdeio_fonts.la
tdeio_fonts_la_SOURCES = \
KioFonts.cpp
-tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libtdefontinst.la
+tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_TDEIO) -ltdesu ../lib/libtdefontinst.la
tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
diff --git a/kcontrol/tdefontinst/thumbnail/Makefile.am b/kcontrol/tdefontinst/thumbnail/Makefile.am
index d9005a33..7eaacbf2 100644
--- a/kcontrol/tdefontinst/thumbnail/Makefile.am
+++ b/kcontrol/tdefontinst/thumbnail/Makefile.am
@@ -1,7 +1,7 @@
kde_module_LTLIBRARIES = fontthumbnail.la
fontthumbnail_la_SOURCES = FontThumbnail.cpp
-fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libtdefontinst.la
+fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_TDEIO) ../lib/libtdefontinst.la
fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
METASOURCES = AUTO
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index 2f289649..e31510ad 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -59,7 +59,7 @@ static KURL getDest(const KURL &url, bool system)
{
return KURL(KFI::Misc::root()
? TQString("fonts:/") + url.fileName()
- : TQString("fonts:/") + TQString(system ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER))
+ : TQString("fonts:/") + TQString(system ? i18n(KFI_TDEIO_FONTS_SYS) : i18n(KFI_TDEIO_FONTS_USER))
+ TQChar('/') + url.fileName());
}
@@ -122,7 +122,7 @@ bool CFontViewPart::openURL(const KURL &url)
if (!url.isValid() || !closeURL())
return false;
- if(KFI_KIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile())
+ if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile())
{
m_url=url;
emit started(0);
@@ -150,7 +150,7 @@ bool CFontViewPart::openFile()
void CFontViewPart::timeout()
{
bool showFs=false,
- isFonts=KFI_KIO_FONTS_PROTOCOL==m_url.protocol();
+ isFonts=KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol();
itsShowInstallButton=false;
@@ -169,12 +169,12 @@ void CFontViewPart::timeout()
}
else
{
- destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
+ destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
if(TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
itsShowInstallButton=false;
else
{
- destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
+ destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
}
@@ -198,7 +198,7 @@ void CFontViewPart::previewStatus(bool st)
itsInstallButton->setShown(st && itsShowInstallButton);
itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown());
itsChangeTextAction->setEnabled(st);
- itsPrintAction->setEnabled(st && KFI_KIO_FONTS_PROTOCOL==m_url.protocol());
+ itsPrintAction->setEnabled(st && KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol());
}
void CFontViewPart::install()
@@ -211,10 +211,10 @@ void CFontViewPart::install()
"password)")
.arg(itsPreview->engine().getName(m_url))
.arg(m_url.fileName())
- .arg(i18n(KFI_KIO_FONTS_USER))
- .arg(i18n(KFI_KIO_FONTS_SYS)),
- i18n("Install"), i18n(KFI_KIO_FONTS_USER),
- i18n(KFI_KIO_FONTS_SYS));
+ .arg(i18n(KFI_TDEIO_FONTS_USER))
+ .arg(i18n(KFI_TDEIO_FONTS_SYS)),
+ i18n("Install"), i18n(KFI_TDEIO_FONTS_USER),
+ i18n(KFI_TDEIO_FONTS_SYS));
if(KMessageBox::Cancel!=resp)
{
diff --git a/kcontrol/tdefontinst/viewpart/Makefile.am b/kcontrol/tdefontinst/viewpart/Makefile.am
index 22403916..c088942d 100644
--- a/kcontrol/tdefontinst/viewpart/Makefile.am
+++ b/kcontrol/tdefontinst/viewpart/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = libtdefontviewpart.la
libtdefontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
libtdefontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libtdefontviewpart_la_LIBADD = $(LIB_KPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la
+libtdefontviewpart_la_LIBADD = $(LIB_TDEPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la
noinst_HEADERS = FontViewPart.h FontViewPartFactory.h FontPreview.h FontViewerApp.h KfiPrint.h
@@ -16,8 +16,8 @@ kde_services_DATA = tdefontviewpart.desktop
AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
METASOURCES = AUTO
-tdefontview_LDADD = $(LIB_KPARTS)
-tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdefontview_LDADD = $(LIB_TDEPARTS)
+tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
bin_PROGRAMS = tdefontview
xdg_apps_DATA = tdefontview.desktop
diff --git a/kcontrol/tdeio/Makefile.am b/kcontrol/tdeio/Makefile.am
index 8252bc48..3bebf748 100644
--- a/kcontrol/tdeio/Makefile.am
+++ b/kcontrol/tdeio/Makefile.am
@@ -17,7 +17,7 @@ kcm_tdeio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \
manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui
kcm_tdeio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kcm_tdeio_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS)
+kcm_tdeio_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS)
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcmtdeio.pot
diff --git a/kcontrol/tdeio/lanbrowser.desktop b/kcontrol/tdeio/lanbrowser.desktop
index 87901589..4c1e16d6 100644
--- a/kcontrol/tdeio/lanbrowser.desktop
+++ b/kcontrol/tdeio/lanbrowser.desktop
@@ -104,10 +104,10 @@ Comment[de]=Einrichtung von LISa, resLISa und Ein-/Ausgabemodulen
Comment[el]=Ρύθμιση του lisa, reslisa και των ioslaves
Comment[eo]=Agordo de Lisa, Reslisa kaj la Enel-sklavoj
Comment[es]=Configuración de lisa, reslisa y los ioslaves
-Comment[et]=Lisa, reslisa ja KIO moodulite seadistamine
+Comment[et]=Lisa, reslisa ja TDEIO moodulite seadistamine
Comment[eu]=Konfiguratu lisa, reslisa eta ioslave-ak
Comment[fa]=برپایی lisa، reslisa و ioslaves
-Comment[fi]=Lisan, Reslisan ja KIO-palveluiden asetukset
+Comment[fi]=Lisan, Reslisan ja TDEIO-palveluiden asetukset
Comment[fr]=Configuration de LISa, ResLISa et des modules d'entrées-sorties
Comment[fy]=Lisa, reslisa en de ioslaves ynstelle
Comment[ga]=Socraigh lisa, reslisa agus ioslaves
diff --git a/kcontrol/tdm/Makefile.am b/kcontrol/tdm/Makefile.am
index e6193d7d..ae0e6a99 100644
--- a/kcontrol/tdm/Makefile.am
+++ b/kcontrol/tdm/Makefile.am
@@ -5,7 +5,7 @@ kcm_tdm_la_SOURCES = background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.cpp \
tdm-users.cpp tdm-conv.cpp main.cpp kbackedcombobox.cpp
kcm_tdm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined
-kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) $(LIB_KNEWSTUFF)
+kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_TDEIO) $(LIB_KNEWSTUFF)
AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \
-I$(top_srcdir)/kcontrol/background \
diff --git a/kdcop/Makefile.am b/kdcop/Makefile.am
index 38190652..25c33f65 100644
--- a/kdcop/Makefile.am
+++ b/kdcop/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kdcop
kdcop_SOURCES = kdcop.cpp kdcopwindow.cpp kdcoplistview.cpp kdcopview.ui
-kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) -lDCOP $(LIB_QT)
+kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) -lDCOP $(LIB_QT)
noinst_HEADERS = kdcopwindow.h
METASOURCES = AUTO
diff --git a/kdebugdialog/tdelistdebugdialog.h b/kdebugdialog/tdelistdebugdialog.h
index 07fa0bc9..d0da5c10 100644
--- a/kdebugdialog/tdelistdebugdialog.h
+++ b/kdebugdialog/tdelistdebugdialog.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KLISTDEBUGDIALOG__H
-#define KLISTDEBUGDIALOG__H
+#ifndef TDELISTDEBUGDIALOG__H
+#define TDELISTDEBUGDIALOG__H
#include "kabstractdebugdialog.h"
#include <tqcheckbox.h>
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index 959018af..539db39f 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -2,7 +2,7 @@
INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/tdmlib $(all_includes)
kdesktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kdesktop_la_LIBADD = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/tdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR)
+kdesktop_la_LIBADD = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/tdmlib/libdmctl.la $(LIB_XSS) $(LIB_TDEUTILS) $(LIB_XCURSOR)
SUBDIRS = . lock pics patterns programs init kwebdesktop
@@ -39,7 +39,7 @@ kcheckrunning_LDADD = $(LIB_X11) $(LIB_QT)
kxdglauncher_SOURCES = kxdglauncher.cpp
kxdglauncher_LDFLAGS = $(all_libraries)
-kxdglauncher_LDADD = $(LIB_KUTILS)
+kxdglauncher_LDADD = $(LIB_TDEUTILS)
METASOURCES = AUTO
diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am
index 3ee91b6d..0d627675 100644
--- a/kdesktop/kwebdesktop/Makefile.am
+++ b/kdesktop/kwebdesktop/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = kwebdesktop
METASOURCES = AUTO
kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc
-kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index 60a1531f..7713707e 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -1,8 +1,8 @@
## Makefile.am of tdebase/kdesktop/lock
INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/tdmlib $(GLINC) $(all_includes)
-kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
+kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_TDEIO) $(LIB_XF86MISC) $(GLLIB)
####### Files
diff --git a/kdialog/Makefile.am b/kdialog/Makefile.am
index be19a45b..05f22af3 100644
--- a/kdialog/Makefile.am
+++ b/kdialog/Makefile.am
@@ -4,8 +4,8 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kdialog
kdialog_SOURCES = kdialog.cpp widgets.cpp tdelistboxdialog.cpp progressdialog.cpp progressdialogiface.skel
-kdialog_LDADD = $(LIB_KIO)
-kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kdialog_LDADD = $(LIB_TDEIO)
+kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO
diff --git a/kdialog/tdelistboxdialog.h b/kdialog/tdelistboxdialog.h
index 37d77f14..a93e7d00 100644
--- a/kdialog/tdelistboxdialog.h
+++ b/kdialog/tdelistboxdialog.h
@@ -18,8 +18,8 @@
//
-#ifndef _KLISTBOXDIALOG_H_
-#define _KLISTBOXDIALOG_H_
+#ifndef _TDELISTBOXDIALOG_H_
+#define _TDELISTBOXDIALOG_H_
#include <kdialogbase.h>
diff --git a/kfind/Makefile.am b/kfind/Makefile.am
index fed64f02..96b03308 100644
--- a/kfind/Makefile.am
+++ b/kfind/Makefile.am
@@ -14,7 +14,7 @@ kde_module_LTLIBRARIES = libkfindpart.la
libkfindpart_la_SOURCES = kfindpart.cpp
libkfindpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkfindpart_la_LIBADD = libkfind_common.la $(LIB_KPARTS) $(top_builddir)/libkonq/libkonq.la
+libkfindpart_la_LIBADD = libkfind_common.la $(LIB_TDEPARTS) $(top_builddir)/libkonq/libkonq.la
noinst_HEADERS = kftabdlg.h kfind.h version.h kquery.h kdatecombo.h
@@ -30,7 +30,7 @@ messages:
bin_PROGRAMS = kfind
kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp
-kfind_LDADD = libkfind_common.la $(LIB_KPARTS)
+kfind_LDADD = libkfind_common.la $(LIB_TDEPARTS)
# the library search path.
-kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index 76fa6301..efae231d 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -189,7 +189,7 @@ void KfindDlg::slotResult(int errorCode)
}
else
{
- kdDebug()<<"KIO error code: "<<errorCode<<endl;
+ kdDebug()<<"TDEIO error code: "<<errorCode<<endl;
setStatusMsg(i18n("Error."));
};
diff --git a/kfind/kquery.h b/kfind/kquery.h
index 3388daba..8f12e782 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -49,7 +49,7 @@ class KQuery : public TQObject
/* List of files found using slocate */
void slotListEntries(TQStringList);
protected slots:
- /* List of files found using KIO */
+ /* List of files found using TDEIO */
void slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &);
void slotResult(TDEIO::Job *);
void slotCanceled(TDEIO::Job *);
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN
index c5c961ae..68d762a5 100644
--- a/khelpcenter/DESIGN
+++ b/khelpcenter/DESIGN
@@ -219,7 +219,7 @@ regexp' or 'Search case sensitive'.
# We could show them in a listview on the Search tab, each found search engine
# being represented by a checkable listview item. So, we just let the user
# enter a term, replace the \{@} placeholder in the URIs specified in the
-# selected .desktop files with that term, send out a request via KIO and show
+# selected .desktop files with that term, send out a request via TDEIO and show
# the results in our TDEHTMLPart (after all KHC::View is a TDEHTMLPart already). A
# problem with this: How to display the multiple HTML pages returned by the
# selected search engines? Using a QSplitter to split multiple TDEHTMLParts?
@@ -237,7 +237,7 @@ regexp' or 'Search case sensitive'.
# In additionl there could be a X-KHelpCenter-XSLT key which defines which .xslt
# stylesheet to use for that particular search engine. We then query that search
# engine by replacing the placeholder in the URI with whatever the user entered
-# and hand it to KIO. All the HTML returned by the various search engines gets
+# and hand it to TDEIO. All the HTML returned by the various search engines gets
# then transformed into a custom, intermediate, XML dialect, using the XSLT
# stylesheets define in the .desktop files. Using that intermediate step we
# can nicely drop duplicate hits, for example, or create a list of hits in the
diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am
index d00e2436..e9e3ac01 100644
--- a/khelpcenter/Makefile.am
+++ b/khelpcenter/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
bin_PROGRAMS = khc_indexbuilder
lib_LTLIBRARIES =
-khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
khc_indexbuilder_LDADD = $(LIB_TDECORE)
khc_indexbuilder_SOURCES = khc_indexbuilder.cpp
@@ -27,14 +27,14 @@ khelpcenter_la_SOURCES = navigator.cpp \
#kcm_helpcenter_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version \
# $(all_libraries) -no-undefined
-#kcm_helpcenter_la_LIBADD = $(LIB_KIO)
+#kcm_helpcenter_la_LIBADD = $(LIB_TDEIO)
#kcm_helpcenter_la_SOURCES = kcmhelpcenter.cpp docmetainfo.cpp \
# docentrytraverser.cpp docentry.cpp htmlsearch.cpp \
# htmlsearchconfig.cpp
EXTRA_PROGRAMS = testmetainfo
-testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testmetainfo_LDADD = $(LIB_TDECORE) docentry.lo docmetainfo.lo \
docentrytraverser.lo htmlsearch.lo
testmetainfo_SOURCES = testmetainfo.cpp
diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am
index 132be449..d4d00fb5 100644
--- a/khelpcenter/htmlsearch/Makefile.am
+++ b/khelpcenter/htmlsearch/Makefile.am
@@ -11,11 +11,11 @@ lib_LTLIBRARIES = libhtmlsearch.la libkcm_htmlsearch.la
libhtmlsearch_la_SOURCES = htmlsearch.cpp progressdialog.cpp
libhtmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-libhtmlsearch_la_LIBADD = $(LIB_KIO)
+libhtmlsearch_la_LIBADD = $(LIB_TDEIO)
libkcm_htmlsearch_la_SOURCES = kcmhtmlsearch.cpp klangcombo.cpp ktagcombobox.cpp
libkcm_htmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-libkcm_htmlsearch_la_LIBADD = $(LIB_KIO)
+libkcm_htmlsearch_la_LIBADD = $(LIB_TDEIO)
noinst_HEADERS = kcmhtmlsearch.h htmlsearch.h
@@ -27,7 +27,7 @@ wrapperdir = $(kde_datadir)/khelpcenter/
wrapper_SCRIPTS = meinproc_wrapper
tdehtmlindex_SOURCES = index.cpp
-tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdehtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI)
xpm_DATA = unchecked.xpm checked.xpm
diff --git a/khotkeys/shared/Makefile.am b/khotkeys/shared/Makefile.am
index 4e20f608..f318e935 100644
--- a/khotkeys/shared/Makefile.am
+++ b/khotkeys/shared/Makefile.am
@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libkhotkeys_shared.la
libkhotkeys_shared_la_SOURCES = action_data.cpp khotkeysglobal.cpp triggers.cpp windows.cpp \
settings.cpp actions.cpp input.cpp conditions.cpp khlistview.cpp khlistbox.cpp \
gestures.cpp voices.cpp voicesignature.cpp sound.cpp soundrecorder.cpp
-libkhotkeys_shared_la_LIBADD = $(LIB_KIO) $(XTESTLIB) -lXext -lX11 $(X_PRE_LIBS)
+libkhotkeys_shared_la_LIBADD = $(LIB_TDEIO) $(XTESTLIB) -lXext -lX11 $(X_PRE_LIBS)
libkhotkeys_shared_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -version-info 1:0:0 -no-undefined
INCLUDES = $(all_includes)
diff --git a/kicker/applets/launcher/Makefile.am b/kicker/applets/launcher/Makefile.am
index a0384df4..2ec80e11 100644
--- a/kicker/applets/launcher/Makefile.am
+++ b/kicker/applets/launcher/Makefile.am
@@ -15,8 +15,8 @@ EXTRA_DIST = $(lnk_DATA)
launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined
launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kicker/buttons/libkicker_buttons.la \
- ../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_KIO) \
- $(LIB_KSYCOCA) $(LIB_TDEUI) $(LIB_KUTILS)
+ ../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_TDEIO) \
+ $(LIB_TDESYCOCA) $(LIB_TDEUI) $(LIB_TDEUTILS)
kde_kcfg_DATA = launcherapplet.kcfg
diff --git a/kicker/applets/lockout/Makefile.am b/kicker/applets/lockout/Makefile.am
index f9772adf..7f0c11ac 100644
--- a/kicker/applets/lockout/Makefile.am
+++ b/kicker/applets/lockout/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = lockout_panelapplet.la
lockout_panelapplet_la_SOURCES = lockout.cpp
lockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KSYCOCA)
+lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDESYCOCA)
noinst_HEADERS = lockout.h
diff --git a/kicker/applets/media/Makefile.am b/kicker/applets/media/Makefile.am
index f7d5dbee..b7b71762 100644
--- a/kicker/applets/media/Makefile.am
+++ b/kicker/applets/media/Makefile.am
@@ -13,7 +13,7 @@ lnk_DATA = mediaapplet.desktop
EXTRA_DIST = $(lnk_DATA)
media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS)
+media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEUTILS)
messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/mediaapplet.pot
diff --git a/kicker/applets/run/Makefile.am b/kicker/applets/run/Makefile.am
index a14c2353..70885a6a 100644
--- a/kicker/applets/run/Makefile.am
+++ b/kicker/applets/run/Makefile.am
@@ -13,7 +13,7 @@ lnk_DATA = runapplet.desktop
EXTRA_DIST = $(lnk_DATA)
run_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-run_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
+run_panelapplet_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/krunapplet.pot
diff --git a/kicker/applets/swallow/Makefile.am b/kicker/applets/swallow/Makefile.am
index 78d70c2d..ba4d1b91 100644
--- a/kicker/applets/swallow/Makefile.am
+++ b/kicker/applets/swallow/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = swallow_panelapplet.la
swallow_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
+swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
swallow_panelapplet_la_SOURCES = swallow.cpp prefwidgetbase.ui prefwidget.cpp
diff --git a/kicker/applets/systemtray/Makefile.am b/kicker/applets/systemtray/Makefile.am
index 3ba76ca5..96fba41d 100644
--- a/kicker/applets/systemtray/Makefile.am
+++ b/kicker/applets/systemtray/Makefile.am
@@ -14,7 +14,7 @@ lnk_DATA = systemtrayapplet.desktop
EXTRA_DIST = $(lnk_DATA)
systemtray_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO)
+systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_TDEIO)
messages:
diff --git a/kicker/applets/trash/Makefile.am b/kicker/applets/trash/Makefile.am
index 2da7fec6..602462a3 100644
--- a/kicker/applets/trash/Makefile.am
+++ b/kicker/applets/trash/Makefile.am
@@ -14,7 +14,7 @@ lnk_DATA = trashapplet.desktop
EXTRA_DIST = $(lnk_DATA)
trash_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-trash_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la ../../../libkonq/libkonq.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS)
+trash_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la ../../../libkonq/libkonq.la $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEUTILS)
messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/trashapplet.pot
diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am
index e186aad1..a0d79970 100644
--- a/kicker/extensions/kasbar/Makefile.am
+++ b/kicker/extensions/kasbar/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = $(lnk_DATA)
bin_PROGRAMS = kasbar
kasbar_SOURCES = kasbarapp.cpp
-kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kasbar_LDADD = libkasbar.la \
$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
diff --git a/kicker/extensions/sidebar/Makefile.am b/kicker/extensions/sidebar/Makefile.am
index 0da0a705..9d0b75ee 100644
--- a/kicker/extensions/sidebar/Makefile.am
+++ b/kicker/extensions/sidebar/Makefile.am
@@ -6,7 +6,7 @@ sidebar_panelextension_la_SOURCES = sidebarextension.cpp
sidebar_panelextension_la_METASOURCES = AUTO
sidebar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-sidebar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_KPARTS) ../../../libkonq/libkonq.la
+sidebar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../libkonq/libkonq.la
lnkdir = $(kde_datadir)/kicker/extensions
diff --git a/kicker/extensions/taskbar/Makefile.am b/kicker/extensions/taskbar/Makefile.am
index d4752e32..72dbcee7 100644
--- a/kicker/extensions/taskbar/Makefile.am
+++ b/kicker/extensions/taskbar/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = taskbar_panelextension.la
taskbar_panelextension_la_SOURCES = taskbarextension.cpp taskbarextension.skel
taskbar_panelextension_la_METASOURCES = AUTO
taskbar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-taskbar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_KPARTS) \
+taskbar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPARTS) \
../../libkicker/libkickermain.la \
../../taskmanager/libtaskmanager.la \
../../taskbar/libtaskbar.la
diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am
index 7f3d0b27..b3026b5e 100644
--- a/kicker/kicker/Makefile.am
+++ b/kicker/kicker/Makefile.am
@@ -10,7 +10,7 @@ tdeinit_LTLIBRARIES = kicker.la
CLEANFILES = dummy.cpp
kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \
- ui/libkicker_ui.la ../libkicker/libkickermain.la $(LIB_KIO) $(LIB_KUTILS) $(LIB_TDEABC)
+ ui/libkicker_ui.la ../libkicker/libkickermain.la $(LIB_TDEIO) $(LIB_TDEUTILS) $(LIB_TDEABC)
kicker_la_SOURCES = dummy.cpp
kicker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/kicker/kicker/plugins/Makefile.am b/kicker/kicker/plugins/Makefile.am
index bab1011f..38a5b611 100644
--- a/kicker/kicker/plugins/Makefile.am
+++ b/kicker/kicker/plugins/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kickoffsearch_beagle.la
kickoffsearch_beagle_la_SOURCES = kickoff-beagle-plugin.cpp beaglesearch.cpp
# Libs needed by the plugin
-kickoffsearch_beagle_la_LIBADD = $(LIB_KPARTS) ../interfaces/libkickoffsearch_interfaces.la \
+kickoffsearch_beagle_la_LIBADD = $(LIB_TDEPARTS) ../interfaces/libkickoffsearch_interfaces.la \
$(LIBBEAGLE_LIBADD) $(GLIB_LIBADD)
# LD flags for the plugin
diff --git a/kicker/libkicker/Makefile.am b/kicker/libkicker/Makefile.am
index 5ec65be4..fb917c67 100644
--- a/kicker/libkicker/Makefile.am
+++ b/kicker/libkicker/Makefile.am
@@ -11,7 +11,7 @@ libkickermain_la_SOURCES = appletinfo.cpp global.cpp kickertip.cpp \
libkickermain_la_METASOURCES = AUTO
libkickermain_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
-libkickermain_la_LIBADD = $(LIB_KIO)
+libkickermain_la_LIBADD = $(LIB_TDEIO)
kde_kcfg_DATA = kickerSettings.kcfg
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index 4a84885d..0b022a30 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -153,7 +153,7 @@
</entry>
<entry name="KickoffSearchAddressBook" type="Bool" >
- <label>When this option is enabled, kabc is utilized to search for addresses. This may start KMail.</label>
+ <label>When this option is enabled, tdeabc is utilized to search for addresses. This may start KMail.</label>
<default>false</default>
</entry>
diff --git a/kicker/menuext/konq-profiles/Makefile.am b/kicker/menuext/konq-profiles/Makefile.am
index a5b95da3..14d706c7 100644
--- a/kicker/menuext/konq-profiles/Makefile.am
+++ b/kicker/menuext/konq-profiles/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_konqueror.la
kickermenu_konqueror_la_SOURCES = konqy_menu.cpp
kickermenu_konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_konqueror_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
+kickermenu_konqueror_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
kickermenu_konqueror_la_METASOURCES = AUTO
diff --git a/kicker/menuext/konsole/Makefile.am b/kicker/menuext/konsole/Makefile.am
index 5abdf5a2..951b5ba2 100644
--- a/kicker/menuext/konsole/Makefile.am
+++ b/kicker/menuext/konsole/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_konsole.la
kickermenu_konsole_la_SOURCES = konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp
kickermenu_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
+kickermenu_konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
kickermenu_konsole_la_METASOURCES = AUTO
diff --git a/kicker/menuext/recentdocs/Makefile.am b/kicker/menuext/recentdocs/Makefile.am
index 7bd91542..5dd79e24 100644
--- a/kicker/menuext/recentdocs/Makefile.am
+++ b/kicker/menuext/recentdocs/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_recentdocs.la
kickermenu_recentdocs_la_SOURCES = recentdocsmenu.cpp
kickermenu_recentdocs_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kickermenu_recentdocs_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
+kickermenu_recentdocs_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
kickermenu_recentdocs_la_METASOURCES = AUTO
diff --git a/kicker/menuext/system/Makefile.am b/kicker/menuext/system/Makefile.am
index a629970b..29855827 100644
--- a/kicker/menuext/system/Makefile.am
+++ b/kicker/menuext/system/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_systemmenu.la
kickermenu_systemmenu_la_SOURCES = systemmenu.cpp
kickermenu_systemmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kickermenu_systemmenu_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kicker/libkicker/libkickermain.la
+kickermenu_systemmenu_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/kicker/libkicker/libkickermain.la
kickermenu_systemmenu_la_METASOURCES = AUTO
diff --git a/kicker/menuext/tdeprint/Makefile.am b/kicker/menuext/tdeprint/Makefile.am
index cd103201..4486ff6f 100644
--- a/kicker/menuext/tdeprint/Makefile.am
+++ b/kicker/menuext/tdeprint/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_tdeprint.la
kickermenu_tdeprint_la_SOURCES = print_mnu.cpp
kickermenu_tdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_tdeprint_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) -ltdeprint
+kickermenu_tdeprint_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) -ltdeprint
kickermenu_tdeprint_la_METASOURCES = AUTO
diff --git a/kicker/proxy/Makefile.am b/kicker/proxy/Makefile.am
index 4dacc51f..0ed35216 100644
--- a/kicker/proxy/Makefile.am
+++ b/kicker/proxy/Makefile.am
@@ -17,7 +17,7 @@ extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
extensiondebugger_SOURCES = extensiondebugger.cpp
extensiondebugger_LDADD = ../libkicker/libkickermain.la
-extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
messages:
$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot
diff --git a/kicker/taskbar/Makefile.am b/kicker/taskbar/Makefile.am
index 6cf4b9e9..e1495dbc 100644
--- a/kicker/taskbar/Makefile.am
+++ b/kicker/taskbar/Makefile.am
@@ -9,7 +9,7 @@ libtaskbar_la_SOURCES = taskbarsettings.kcfgc taskcontainer.cpp taskbar.cpp \
libtaskbar_la_METASOURCES = AUTO
libtaskbar_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) -no-undefined
-libtaskbar_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) ../libkicker/libkickermain.la ../taskmanager/libtaskmanager.la
+libtaskbar_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) ../libkicker/libkickermain.la ../taskmanager/libtaskmanager.la
messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/libtaskbar.pot
diff --git a/klipper/Makefile.am b/klipper/Makefile.am
index 83292c93..24f7bca7 100644
--- a/klipper/Makefile.am
+++ b/klipper/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = klipper_panelapplet.la
CLEANFILES = dummy.cpp
-libklipper_common_la_LIBADD = $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_XFIXES)
+libklipper_common_la_LIBADD = $(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_XFIXES)
libklipper_common_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \
toplevel.skel clipboardpoll.cpp history.cpp historyitem.cpp historystringitem.cpp klipperpopup.cpp popupproxy.cpp \
historyimageitem.cpp historyurlitem.cpp
diff --git a/kmenuedit/Makefile.am b/kmenuedit/Makefile.am
index 7f54096c..d385186e 100644
--- a/kmenuedit/Makefile.am
+++ b/kmenuedit/Makefile.am
@@ -11,7 +11,7 @@ CLEANFILES = dummy.cpp
libkmenueditcommon_la_SOURCES = basictab.cpp treeview.cpp kmenuedit.cpp \
khotkeys.cpp menufile.cpp menuinfo.cpp
-libkmenueditcommon_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
+libkmenueditcommon_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
libkmenueditcommon_la_LDFLAGS = $(all_libraries) -module -avoid-version
kmenuedit_la_SOURCES = main.cpp
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 5ecb9366..32dba3f3 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -366,7 +366,12 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo)
_pathEdit->lineEdit()->setText(df->readPath());
_termOptEdit->setText(df->readEntry("TerminalOptions"));
- _uidEdit->setText(df->readEntry("X-TDE-Username"));
+ if( df->hasKey( "X-TDE-Username" )) {
+ _uidEdit->setText(df->readEntry("X-TDE-Username"));
+ }
+ else {
+ _uidEdit->setText(df->readEntry("X-KDE-Username"));
+ }
if( df->hasKey( "StartupNotify" ))
_launchCB->setChecked(df->readBoolEntry("StartupNotify", true));
diff --git a/knetattach/Makefile.am b/knetattach/Makefile.am
index f6eecd6d..966c91e2 100644
--- a/knetattach/Makefile.am
+++ b/knetattach/Makefile.am
@@ -2,8 +2,8 @@ INCLUDES= $(all_includes)
bin_PROGRAMS = knetattach
knetattach_SOURCES = knetattach.ui main.cpp
-knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-knetattach_LDADD = $(LIB_KIO)
+knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+knetattach_LDADD = $(LIB_TDEIO)
METASOURCES = AUTO
xdg_apps_DATA = knetattach.desktop
KDE_ICON = AUTO
diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am
index aa9e0d7a..e84ddffc 100644
--- a/konqueror/Makefile.am
+++ b/konqueror/Makefile.am
@@ -49,7 +49,7 @@ noinst_HEADERS = KonqMainWindowIface.h KonqViewIface.h delayedinitializer.h \
konq_view.h konq_viewmgr.h konq_extensionmanager.h version.h
konqueror_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lconnectionmanager -lnetworkstatus
-konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) $(LIB_KUTILS) -lconnectionmanager -lnetworkstatus
+konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) $(LIB_TDEUTILS) -lconnectionmanager -lnetworkstatus
# Hmm, this experiment of a static konq failed, don't trust it...
# (but feel free to fix it :)
diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am
index 059bfa8e..feef3b72 100644
--- a/konqueror/client/Makefile.am
+++ b/konqueror/client/Makefile.am
@@ -6,7 +6,7 @@ tdeinit_LTLIBRARIES = kfmclient.la
INCLUDES= -I.. $(all_includes)
kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kfmclient_la_LIBADD = $(LIB_KIO)
+kfmclient_la_LIBADD = $(LIB_TDEIO)
kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
noinst_HEADERS = kfmclient.h
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index eadd0efc..6e6a6fb4 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -1051,7 +1051,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
void KonqKfmIconView::slotDeleteItem( KFileItem * _fileitem )
{
// new in 3.5.5
-#ifdef KPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
+#ifdef TDEPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
KFileItemList list;
list.append( _fileitem );
emit m_extension->itemsRemoved( list );
diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am
index 681e1ab1..a062b868 100644
--- a/konqueror/keditbookmarks/Makefile.am
+++ b/konqueror/keditbookmarks/Makefile.am
@@ -7,8 +7,8 @@ lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = keditbookmarks.la
kbookmarkmerger_SOURCES = kbookmarkmerger.cpp
-kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kbookmarkmerger_LDADD = $(LIB_KIO)
+kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kbookmarkmerger_LDADD = $(LIB_TDEIO)
dcop_DCOPIDLNG = true
keditbookmarks_la_SOURCES = main.cpp listview.cpp toplevel.cpp actionsimpl.cpp commands.cpp importers.cpp dcop.skel dcop.cpp bookmarkiterator.cpp \
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index 4cfb95a7..f69c01ca 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -333,7 +333,7 @@ TQString NodeEditCommand::setNodeText(KBookmark bk, const TQStringList &nodehier
}
void NodeEditCommand::execute() {
- // DUPLICATED HEAVILY FROM KIO/BOOKMARKS
+ // DUPLICATED HEAVILY FROM TDEIO/BOOKMARKS
KBookmark bk = CurrentMgr::bookmarkAt(m_address);
Q_ASSERT(!bk.isNull());
m_oldText = setNodeText(bk, TQStringList() << m_nodename, m_newText);
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 08210222..b3b0e2ef 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -147,7 +147,7 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url
// kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting TDEIO::get() " << url << endl;
-// the use of KIO rather than directly using TDEHTML is to allow silently abort on error
+// the use of TDEIO rather than directly using TDEHTML is to allow silently abort on error
TDEIO::Job *job = TDEIO::get(m_url, false, false);
job->addMetaData( TQString("cookies"), TQString("none") );
diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cc
index 64bb3203..8c2a9132 100644
--- a/konqueror/konq_run.cc
+++ b/konqueror/konq_run.cc
@@ -59,7 +59,7 @@ void KonqRun::foundMimeType( const TQString & _type )
{
//kdDebug(1202) << "KonqRun::foundMimeType " << _type << " m_req=" << m_req.debug() << endl;
- TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again
+ TQString mimeType = _type; // this ref comes from the job, we lose it when using TDEIO again
m_bFoundMimeType = true;
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 8f86fa0f..d07edcbd 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -1282,7 +1282,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
void KonqBaseListViewWidget::slotDeleteItem( KFileItem * _fileitem )
{
// new in 3.5.5
-#ifdef KPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
+#ifdef TDEPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
KFileItemList list;
list.append( _fileitem );
emit m_pBrowserView->extension()->itemsRemoved( list );
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 5c9cade4..2157b664 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -235,7 +235,7 @@ protected:
// IMO there is really no need for an advanced data structure
//we have a fixed number of members,
//it consumes less memory and access should be faster (Alex)
- // This might not be the case for ever... we should introduce custom fields in kio (David)
+ // This might not be the case for ever... we should introduce custom fields in tdeio (David)
TQValueVector<ColumnInfo> confColumns;
KonqBaseListViewItem *m_dragOverItem;
diff --git a/konqueror/preloader/Makefile.am b/konqueror/preloader/Makefile.am
index f7c6ffb9..efe0413b 100644
--- a/konqueror/preloader/Makefile.am
+++ b/konqueror/preloader/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kded_konqy_preloader.la
INCLUDES= -I.. $(all_includes)
kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel
kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_KSYCOCA) $(LIB_TDECORE)
+kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_TDESYCOCA) $(LIB_TDECORE)
METASOURCES = AUTO
diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop
index 6c30b886..b4662866 100644
--- a/konqueror/profile_kde_devel.desktop
+++ b/konqueror/profile_kde_devel.desktop
@@ -79,7 +79,7 @@ ViewT0_PassiveMode=false
ViewT0_ServiceName=tdehtml
ViewT0_ServiceType=text/html
ViewT0_ToggleView=false
-ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/kdelibs/html/main.html
+ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/tdelibs/html/main.html
ViewT1_LinkedView=false
ViewT1_LockedLocation=false
ViewT1_PassiveMode=false
diff --git a/konqueror/sidebar/Makefile.am b/konqueror/sidebar/Makefile.am
index 1cfc7f6a..6f4695dc 100644
--- a/konqueror/sidebar/Makefile.am
+++ b/konqueror/sidebar/Makefile.am
@@ -22,11 +22,11 @@ kde_module_LTLIBRARIES = konq_sidebar.la
# the Part's source, library search path, and link libraries
konq_sidebar_la_SOURCES = konqsidebar.cpp sidebar_widget.cpp
konq_sidebar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konq_sidebar_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) ../../libkonq/libkonq.la ./libkonqsidebarplugin.la $(LIB_KUTILS)
+konq_sidebar_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEIO) ../../libkonq/libkonq.la ./libkonqsidebarplugin.la $(LIB_TDEUTILS)
libkonqsidebarplugin_la_SOURCES=konqsidebarplugin.cpp
libkonqsidebarplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) -no-undefined
-libkonqsidebarplugin_la_LIBADD = $(LIB_KPARTS)
+libkonqsidebarplugin_la_LIBADD = $(LIB_TDEPARTS)
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
diff --git a/konqueror/sidebar/test/Makefile.am b/konqueror/sidebar/test/Makefile.am
index ebaeff29..570b60c8 100644
--- a/konqueror/sidebar/test/Makefile.am
+++ b/konqueror/sidebar/test/Makefile.am
@@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = konq_sidebartest.la
# the Part's source, library search path, and link libraries
konq_sidebartest_la_SOURCES = konqsidebartest.cpp
konq_sidebartest_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konq_sidebartest_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) ../libkonqsidebarplugin.la
+konq_sidebartest_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEIO) ../libkonqsidebarplugin.la
# this is where the part's XML-GUI resource file goes
partrcdir = $(kde_datadir)/konqsidebartng/entries
diff --git a/konqueror/sidebar/web_module/Makefile.am b/konqueror/sidebar/web_module/Makefile.am
index a55213aa..55672f13 100644
--- a/konqueror/sidebar/web_module/Makefile.am
+++ b/konqueror/sidebar/web_module/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
konqsidebar_web_la_SOURCES = web_module.cpp
konqsidebar_web_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-konqsidebar_web_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la
+konqsidebar_web_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la
#plugindir=$(kde_datadir)/konqsidebartng/entries
#plugin_DATA=websidebar.desktop
diff --git a/konsole/konsole/Makefile.am b/konsole/konsole/Makefile.am
index 4f9a03d5..70b1b0ba 100644
--- a/konsole/konsole/Makefile.am
+++ b/konsole/konsole/Makefile.am
@@ -25,7 +25,7 @@ libkonsolepart_la_SOURCES = TEPty.cpp BlockArray.cpp konsole_part.cpp \
sessioniface.skel
libkonsolepart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkonsolepart_la_LIBADD = $(XTESTLIB) $(LIB_KPARTS)
+libkonsolepart_la_LIBADD = $(XTESTLIB) $(LIB_TDEPARTS)
fontembedder_SOURCES = fontembedder.cpp
fontembedder_LDFLAGS = $(all_libraries)
@@ -42,11 +42,11 @@ konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp se
konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp \
zmodem_dialog.cpp printsettings.cpp
konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
-konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIBUTIL) $(XTESTLIB) $(LIB_XRENDER)
+konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) $(LIBUTIL) $(XTESTLIB) $(LIB_XRENDER)
# kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp
# kcmkonsole_LDADD = $(LIB_TDEUI)
-# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
noinst_HEADERS = TEWidget.h TEPty.h TEmulation.h TEmuVt102.h \
TECommon.h TEScreen.h konsole.h schema.h session.h konsole_wcwidth.h \
diff --git a/kpager/Makefile.am b/kpager/Makefile.am
index 672dec24..dd72707f 100644
--- a/kpager/Makefile.am
+++ b/kpager/Makefile.am
@@ -6,7 +6,7 @@ kpager_SOURCES = desktop.cpp kpager.cpp config.cpp windowdrag.cpp \
kpagerIface.skel main.cpp
kpager_METASOURCES = AUTO
-kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kpager_LDADD = $(LIB_TDEUI)
diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am
index c4e01d71..304d5503 100644
--- a/kpersonalizer/Makefile.am
+++ b/kpersonalizer/Makefile.am
@@ -5,7 +5,7 @@ kpersonalizer_SOURCES = stylepreview.ui krefinepage.cpp \
kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui tdestylepagedlg.ui \
krefinepagedlg.ui ksysinfo.cpp
-kpersonalizer_LDADD = $(LIB_KIO)
+kpersonalizer_LDADD = $(LIB_TDEIO)
EXTRA_DIST = main.cpp kpersonalizer.cpp kpersonalizer.h kpersonalizer.desktop kcountrypage.cpp kcountrypage.h kospage.cpp kospage.h keyecandypage.cpp keyecandypage.h tdestylepage.cpp tdestylepage.h krefinepage.cpp krefinepage.h cr16-app-kpersonalizer.png cr32-app-kpersonalizer.png README kcountrypagedlg.ui kospage.ui keyecandypagedlg.ui tdestylepagedlg.ui krefinepagedlg.ui kfindlanguage.cpp kfindlanguage.h
@@ -38,7 +38,7 @@ METASOURCES = AUTO
KDE_ICON= AUTO
# the library search path.
-kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
# Uncomment the following two lines if you add a ui.rc file for your application to make use of
# KDEs XML GUI builing
diff --git a/kreadconfig/Makefile.am b/kreadconfig/Makefile.am
index 79670d29..0a4e5693 100644
--- a/kreadconfig/Makefile.am
+++ b/kreadconfig/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -DQT_NO_CAST_ASCII
INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
LDADD = $(LIB_TDECORE)
bin_PROGRAMS = kreadconfig kwriteconfig
diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am
index d9d4a55e..e18adec9 100644
--- a/ksmserver/Makefile.am
+++ b/ksmserver/Makefile.am
@@ -43,7 +43,7 @@ updatedir = $(kde_datadir)/tdeconf_update
EXTRA_PROGRAMS = testsh
testsh_SOURCES = test.cpp timed.ui
-testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../tdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS)
messages:
diff --git a/ksplashml/Makefile.am b/ksplashml/Makefile.am
index f7f7b70a..1313d7ac 100644
--- a/ksplashml/Makefile.am
+++ b/ksplashml/Makefile.am
@@ -6,8 +6,8 @@ METASOURCES=AUTO
bin_PROGRAMS = ksplash
ksplash_SOURCES = wndmain.cpp ksplashiface.skel main.cpp
-ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-ksplash_LDADD = $(LIB_TDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO)
+ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ksplash_LDADD = $(LIB_TDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_TDEIO)
noinst_HEADERS = ksplashiface.h wndmain.h
diff --git a/ksplashml/kcmksplash/Makefile.am b/ksplashml/kcmksplash/Makefile.am
index 478ed775..47c269a9 100644
--- a/ksplashml/kcmksplash/Makefile.am
+++ b/ksplashml/kcmksplash/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kcm_ksplashthemes.la
kcm_ksplashthemes_la_SOURCES = installer.cpp main.cpp
noinst_HEADERS = installer.h
-kcm_ksplashthemes_la_LIBADD = $(LIB_KIO)
+kcm_ksplashthemes_la_LIBADD = $(LIB_TDEIO)
kcm_ksplashthemes_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
xdg_apps_DATA = ksplashthememgr.desktop
diff --git a/ksplashml/themeengine/default/Makefile.am b/ksplashml/themeengine/default/Makefile.am
index 2e78de52..b117cbb2 100644
--- a/ksplashml/themeengine/default/Makefile.am
+++ b/ksplashml/themeengine/default/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
noinst_LTLIBRARIES = libthemedefault.la
libthemedefault_la_SOURCES = themelegacy.cpp
-libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la
kde_module_LTLIBRARIES = ksplashdefault.la
diff --git a/ksplashml/themeengine/redmond/Makefile.am b/ksplashml/themeengine/redmond/Makefile.am
index 28e1eca2..f3bd6432 100644
--- a/ksplashml/themeengine/redmond/Makefile.am
+++ b/ksplashml/themeengine/redmond/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ksplashml/themeengine $(all_includes)
ksplashredmond_la_SOURCES = previewredmond.cpp themeredmond.cpp
ksplashredmond_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
-ksplashredmond_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) ../libksplashthemes.la
+ksplashredmond_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) ../libksplashthemes.la
METASOURCES = AUTO
kde_module_LTLIBRARIES = ksplashredmond.la
diff --git a/ksplashml/themeengine/simple/Makefile.am b/ksplashml/themeengine/simple/Makefile.am
index 200b96b8..bed3bd5d 100644
--- a/ksplashml/themeengine/simple/Makefile.am
+++ b/ksplashml/themeengine/simple/Makefile.am
@@ -3,5 +3,5 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = ksplashsimple
ksplashsimple_SOURCES = main.cpp
-ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT)
diff --git a/ksplashml/themeengine/standard/Makefile.am b/ksplashml/themeengine/standard/Makefile.am
index 6db46916..efd1fbeb 100644
--- a/ksplashml/themeengine/standard/Makefile.am
+++ b/ksplashml/themeengine/standard/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ksplashml/themeengine $(all_includes)
noinst_LTLIBRARIES = libthemestandard.la
libthemestandard_la_SOURCES = themestandard.cpp wndicon.cpp wndstatus.cpp
-libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
libthemestandard_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la
kde_module_LTLIBRARIES = ksplashstandard.la
diff --git a/ksplashml/themeengine/unified/Makefile.am b/ksplashml/themeengine/unified/Makefile.am
index 2e78de52..b117cbb2 100644
--- a/ksplashml/themeengine/unified/Makefile.am
+++ b/ksplashml/themeengine/unified/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
noinst_LTLIBRARIES = libthemedefault.la
libthemedefault_la_SOURCES = themelegacy.cpp
-libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la
kde_module_LTLIBRARIES = ksplashdefault.la
diff --git a/kstart/Makefile.am b/kstart/Makefile.am
index d9e493a9..3165a3be 100644
--- a/kstart/Makefile.am
+++ b/kstart/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kstart
kstart_SOURCES = kstart.cpp
-kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kstart_LDADD = $(LIB_TDECORE)
METASOURCES = kstart.moc
diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am
index 3d849af1..69066d23 100644
--- a/ksysguard/gui/Makefile.am
+++ b/ksysguard/gui/Makefile.am
@@ -31,8 +31,8 @@ ksysguard_SOURCES = \
ksysguard_LDADD = \
ksgrd/libksgrd.la \
SensorDisplayLib/libsensordisplays.la \
- $(LIB_TDEUI) $(LIB_KIO) $(LIB_KDNSSD)
-ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEDNSSD)
+ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kpm_SOURCES = kpm.c
@@ -49,7 +49,7 @@ sysguard_panelapplet_la_SOURCES = \
sysguard_panelapplet_la_LIBADD = \
ksgrd/libksgrd.la \
SensorDisplayLib/libsensordisplays.la \
- $(LIB_TDEUI) $(LIB_KIO)
+ $(LIB_TDEUI) $(LIB_TDEIO)
sysguard_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
EXTRA_DIST = $(lnk_DATA)
diff --git a/ksysguard/gui/SensorDisplayLib/Makefile.am b/ksysguard/gui/SensorDisplayLib/Makefile.am
index a1327a4a..d3f82a3a 100644
--- a/ksysguard/gui/SensorDisplayLib/Makefile.am
+++ b/ksysguard/gui/SensorDisplayLib/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../ksgrd -I../ksgrd $(all_includes)
noinst_LTLIBRARIES = libsensordisplays.la
libsensordisplays_la_LDFLAGS = $(all_libraries) -no-undefined
-libsensordisplays_la_LIBADD = ../ksgrd/libksgrd.la $(LIB_KIO)
+libsensordisplays_la_LIBADD = ../ksgrd/libksgrd.la $(LIB_TDEIO)
# Which sources should be compiled for the sensor display lib.
libsensordisplays_la_SOURCES = \
diff --git a/ksystraycmd/Makefile.am b/ksystraycmd/Makefile.am
index f8f98402..897fcc81 100644
--- a/ksystraycmd/Makefile.am
+++ b/ksystraycmd/Makefile.am
@@ -10,7 +10,7 @@ METASOURCES = ksystraycmd.moc
noinst_HEADERS = ksystraycmd.h
ksystraycmd_SOURCES = ksystraycmd.cpp main.cpp
-ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
messages:
$(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot
diff --git a/ktip/Makefile.am b/ktip/Makefile.am
index 1e6f4814..2a90138a 100644
--- a/ktip/Makefile.am
+++ b/ktip/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = pics
bin_PROGRAMS = ktip
ktip_SOURCES = ktipwindow.cpp
ktip_LDADD = $(LIB_TDEUI)
-ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO
KDE_ICON = AUTO
diff --git a/ktip/tips b/ktip/tips
index 6a2f3229..9f3540bd 100644
--- a/ktip/tips
+++ b/ktip/tips
@@ -844,7 +844,7 @@ other containers.
<tip category="General">
<html>
<p>
-TDE's 'kio slaves' do not just work in Konqueror: you can use network
+TDE's 'tdeio slaves' do not just work in Konqueror: you can use network
URLs in any TDE application. For example, you can enter a URL like
ftp://www.server.com/myfile in the Kate Open dialog, and Kate will
open the file and save changes back to the FTP server when you click
diff --git a/kxkb/Makefile.am b/kxkb/Makefile.am
index 8e771956..f3a8e33a 100644
--- a/kxkb/Makefile.am
+++ b/kxkb/Makefile.am
@@ -13,7 +13,7 @@ kde_module_LTLIBRARIES = kcm_keyboard.la
kcm_keyboard_la_SOURCES = extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp \
kcmlayout.cpp kcmlayoutwidget.ui kcmmisc.cpp kcmmiscwidget.ui
kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_keyboard_la_LIBADD = -lxkbfile $(XTESTLIB) $(LIB_KIO)
+kcm_keyboard_la_LIBADD = -lxkbfile $(XTESTLIB) $(LIB_TDEIO)
#kxkb_la_includedir = .
#kxkb_la_include_HEADERS = kxkb.h
diff --git a/libkonq/Makefile.am b/libkonq/Makefile.am
index 8d4cc121..131449d7 100644
--- a/libkonq/Makefile.am
+++ b/libkonq/Makefile.am
@@ -21,7 +21,7 @@ SUBDIRS = pics favicons
lib_LTLIBRARIES = libkonq.la
libkonq_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libkonq_la_LIBADD = $(LIB_KPARTS)
+libkonq_la_LIBADD = $(LIB_TDEPARTS)
libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
konq_xmlguiclient.cc\
diff --git a/libkonq/favicons/Makefile.am b/libkonq/favicons/Makefile.am
index 6676fd54..194d9d14 100644
--- a/libkonq/favicons/Makefile.am
+++ b/libkonq/favicons/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_favicons.la
INCLUDES = $(all_includes)
kded_favicons_la_SOURCES = favicons.cpp favicons.skel
kded_favicons_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_favicons_la_LIBADD = $(LIB_KSYCOCA)
+kded_favicons_la_LIBADD = $(LIB_TDESYCOCA)
METASOURCES = AUTO
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc
index a6072e80..51d85587 100644
--- a/libkonq/konq_undo.cc
+++ b/libkonq/konq_undo.cc
@@ -464,7 +464,7 @@ void KonqUndoManager::undoMovingFiles()
d->m_uiserver->moving( d->m_uiserverJobId, op.m_dst, op.m_src );
}
- // The above KIO jobs are lowlevel, they don't trigger KDirNotify notification
+ // The above TDEIO jobs are lowlevel, they don't trigger KDirNotify notification
// So we need to do it ourselves (but schedule it to the end of the undo, to compress them)
KURL url( op.m_dst );
url.setPath( url.directory() );
diff --git a/nsplugins/Makefile.am b/nsplugins/Makefile.am
index d23881b6..acb8be79 100644
--- a/nsplugins/Makefile.am
+++ b/nsplugins/Makefile.am
@@ -16,7 +16,7 @@ libnsplugin_la_LIBADD = -ltdeparts
bin_PROGRAMS = nspluginscan
nspluginscan_SOURCES = pluginscan.cpp
nspluginscan_LDFLAGS = $(KDE_RPATH) $(all_libraries) -export-dynamic
-nspluginscan_LDADD = $(LIB_TDEUI) $(LIB_KSYCOCA) -lXt libpluginpaths.la
+nspluginscan_LDADD = $(LIB_TDEUI) $(LIB_TDESYCOCA) -lXt libpluginpaths.la
kcm_nsplugins_la_SOURCES = kcm_nsplugins.cpp
kcm_nsplugins_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
diff --git a/nsplugins/test/Makefile.am b/nsplugins/test/Makefile.am
index 24985baa..af17ade4 100644
--- a/nsplugins/test/Makefile.am
+++ b/nsplugins/test/Makefile.am
@@ -4,7 +4,7 @@ noinst_HEADERS = testnsplugin.h
check_PROGRAMS = testnsplugin
testnsplugin_SOURCES = testnsplugin.cpp
-testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testnsplugin_LDADD = $(LIB_TDEUI) ../libnsplugin.la
$(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h
diff --git a/nsplugins/viewer/Makefile.am b/nsplugins/viewer/Makefile.am
index 12a0301b..6b2bbb05 100644
--- a/nsplugins/viewer/Makefile.am
+++ b/nsplugins/viewer/Makefile.am
@@ -6,6 +6,6 @@ bin_PROGRAMS = nspluginviewer
nspluginviewer_SOURCES = NSPluginCallbackIface.stub NSPluginClassIface.skel \
nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp glibevents.cpp
nspluginviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic `pkg-config --libs glib-2.0`
-nspluginviewer_LDADD = $(LIB_KIO) $(LIB_KPARTS) -lXt
+nspluginviewer_LDADD = $(LIB_TDEIO) $(LIB_TDEPARTS) -lXt
NSPluginCallbackIface_DIR = $(srcdir)/..
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index d6327be3..8d41f943 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1895,7 +1895,7 @@ bool NSPluginStream::get( const TQString& url, const TQString& mimeType,
{
// create new stream
if ( create( url, mimeType, notify ) ) {
- // start the kio job
+ // start the tdeio job
_job = TDEIO::get(KURL( url ), false, false);
_job->addMetaData("errorPage", "false");
_job->addMetaData("AllowCompressedPage", "false");
@@ -1923,7 +1923,7 @@ bool NSPluginStream::post( const TQString& url, const TQByteArray& data,
{
// create new stream
if ( create( url, mimeType, notify ) ) {
- // start the kio job
+ // start the tdeio job
_job = TDEIO::http_post(KURL( url ), data, false);
_job->addMetaData("content-type", args.contentType());
_job->addMetaData("errorPage", "false");
diff --git a/tdeioslave/about/Makefile.am b/tdeioslave/about/Makefile.am
index 7ac082ee..9fca3428 100644
--- a/tdeioslave/about/Makefile.am
+++ b/tdeioslave/about/Makefile.am
@@ -1,14 +1,14 @@
## Makefile.am of tdebase/tdeioslave/about
INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
####### Files
kde_module_LTLIBRARIES = tdeio_about.la
tdeio_about_la_SOURCES = tdeio_about.cpp
-tdeio_about_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_about_la_LIBADD = $(LIB_TDESYCOCA)
tdeio_about_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = tdeio_about.h
diff --git a/tdeioslave/cgi/Makefile.am b/tdeioslave/cgi/Makefile.am
index b996757c..dd4391e0 100644
--- a/tdeioslave/cgi/Makefile.am
+++ b/tdeioslave/cgi/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = tdeio_cgi.la
tdeio_cgi_la_SOURCES = cgi.cpp
-tdeio_cgi_la_LIBADD = $(LIB_KIO)
+tdeio_cgi_la_LIBADD = $(LIB_TDEIO)
tdeio_cgi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = cgi.h
diff --git a/tdeioslave/cgi/cgi.h b/tdeioslave/cgi/cgi.h
index 165b34a4..2113acd0 100644
--- a/tdeioslave/cgi/cgi.h
+++ b/tdeioslave/cgi/cgi.h
@@ -15,8 +15,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KIO_CGI_H
-#define KIO_CGI_H
+#ifndef TDEIO_CGI_H
+#define TDEIO_CGI_H
#include <tqobject.h>
diff --git a/tdeioslave/cgi/kcmcgi/Makefile.am b/tdeioslave/cgi/kcmcgi/Makefile.am
index 32f4be3e..366c59c0 100644
--- a/tdeioslave/cgi/kcmcgi/Makefile.am
+++ b/tdeioslave/cgi/kcmcgi/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_cgi.la
kcm_cgi_la_SOURCES = kcmcgi.cpp
kcm_cgi_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_cgi_la_LIBADD = -ltdeui $(LIB_KIO)
+kcm_cgi_la_LIBADD = -ltdeui $(LIB_TDEIO)
INCLUDES= $(all_includes)
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
index 592371cb..70eec4d4 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -69,7 +69,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
updateButton();
TDEAboutData *about =
new TDEAboutData( I18N_NOOP("kcmcgi"),
- I18N_NOOP("CGI KIO Slave Control Module"),
+ I18N_NOOP("CGI TDEIO Slave Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2002 Cornelius Schumacher") );
@@ -144,7 +144,7 @@ void KCMCgi::removePath()
TQString KCMCgi::quickHelp() const
{
- return i18n("<h1>CGI Scripts</h1> The CGI KIO slave lets you execute "
+ return i18n("<h1>CGI Scripts</h1> The CGI TDEIO slave lets you execute "
"local CGI programs without the need to run a web server. "
"In this control module you can configure the paths that "
"are searched for CGI scripts.");
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
index 0b4bb3b2..33a7604d 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
@@ -85,147 +85,147 @@ Name[xh]=Amagama ashicilelwe phantsi CGI
Name[zh_CN]=CGI 脚本
Name[zh_TW]=CGI 命令稿
Name[zu]=Izikript ze-CGI
-Comment=Configure the CGI KIO slave
-Comment[af]=Stel die CGI KIO slaaf op
-Comment[ar]=تهيئة CGI KIO slave
-Comment[be]=Настаўленні CGI KIO slave
-Comment[bg]=Настройване на модула за изпълнение на скриптове без уеб сървър - CGI KIO
-Comment[bn]=CGI KIO স্লেভ কনফিগার করুন
-Comment[bs]=Podešavanje CGI KIO slave-a
-Comment[ca]=Configura l'esclau KIO CGI
+Comment=Configure the CGI TDEIO slave
+Comment[af]=Stel die CGI TDEIO slaaf op
+Comment[ar]=تهيئة CGI TDEIO slave
+Comment[be]=Настаўленні CGI TDEIO slave
+Comment[bg]=Настройване на модула за изпълнение на скриптове без уеб сървър - CGI TDEIO
+Comment[bn]=CGI TDEIO স্লেভ কনফিগার করুন
+Comment[bs]=Podešavanje CGI TDEIO slave-a
+Comment[ca]=Configura l'esclau TDEIO CGI
Comment[cs]=Nastavení CGI pro TDE
Comment[csb]=Kònfigùracëjô procedurë òbsłużënkù CGI
-Comment[cy]=Ffurfweddu'r gwas CGI KIO
-Comment[da]=Indstilling af CGI KIO-slaven
+Comment[cy]=Ffurfweddu'r gwas CGI TDEIO
+Comment[da]=Indstilling af CGI TDEIO-slaven
Comment[de]=Ein-/Ausgabemodul für CGI einrichten
-Comment[el]=Ρυθμίστε το CGI KIO slave
+Comment[el]=Ρυθμίστε το CGI TDEIO slave
Comment[eo]=Agordu CGI-enel-sklavon
-Comment[es]=Configuración del KIO slave de CGI
-Comment[et]=CGI KIO mooduli seadistamine
-Comment[eu]=CGI KIO slave-a konfiguratu
-Comment[fa]=پیکربندی پی‌رو CGI KIO
-Comment[fi]=Muokkaa CGI-KIO-palvelun asetuksia
-Comment[fr]=Configuration du CGI KIO slave
+Comment[es]=Configuración del TDEIO slave de CGI
+Comment[et]=CGI TDEIO mooduli seadistamine
+Comment[eu]=CGI TDEIO slave-a konfiguratu
+Comment[fa]=پیکربندی پی‌رو CGI TDEIO
+Comment[fi]=Muokkaa CGI-TDEIO-palvelun asetuksia
+Comment[fr]=Configuration du CGI TDEIO slave
Comment[fy]=Hjir kinne jo de CGI Kio-slave ynstelle
-Comment[ga]=Cumraigh an sclábhaí CGI KIO
-Comment[gl]=Configuración do escravo KIO de CGI
+Comment[ga]=Cumraigh an sclábhaí CGI TDEIO
+Comment[gl]=Configuración do escravo TDEIO de CGI
Comment[he]=שינוי הגדרות פרוטוקול ה־CGI
Comment[hi]=सीजीआई केआईओ स्लेव कॉन्फ़िगर करें
-Comment[hr]=Konfiguriranje CGI KIO podčinjenog
+Comment[hr]=Konfiguriranje CGI TDEIO podčinjenog
Comment[hu]=A CGI TDE-protokoll beállításai
Comment[is]=Stilla CGI þrælinn
-Comment[it]=Configura il KIO-slave CGI
-Comment[ja]=CGI KIO スレーブの設定
-Comment[ka]=CGI KIO slave-ის კონფიგურაცია
-Comment[kk]=CGI KIO slave-ты баптау
-Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​កូនចៅ CGI KIO
-Comment[ko]=CGI KIO 슬레이브 설정
+Comment[it]=Configura il TDEIO-slave CGI
+Comment[ja]=CGI TDEIO スレーブの設定
+Comment[ka]=CGI TDEIO slave-ის კონფიგურაცია
+Comment[kk]=CGI TDEIO slave-ты баптау
+Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​កូនចៅ CGI TDEIO
+Comment[ko]=CGI TDEIO 슬레이브 설정
Comment[lo]=ປັບແຕ່ງກ້ອງ
-Comment[lt]=Konfigūruoti CGI KIO slave
-Comment[lv]=Konfigurēt CGI KIO vergu
-Comment[mk]=Конфигурација на CGI KIO служителот
+Comment[lt]=Konfigūruoti CGI TDEIO slave
+Comment[lv]=Konfigurēt CGI TDEIO vergu
+Comment[mk]=Конфигурација на CGI TDEIO служителот
Comment[mn]=CGI-Оролт/Гаралтын-Модул тохируулах
-Comment[ms]=Konfigur hamba CGI KIO
+Comment[ms]=Konfigur hamba CGI TDEIO
Comment[mt]=Ikkonfigura l-iskjav CGI
-Comment[nb]=Tilpass CGI KIO slave
+Comment[nb]=Tilpass CGI TDEIO slave
Comment[nds]=Den CGI-In-/Utgaavdeenst instellen
-Comment[ne]=CGI KIO स्लेभ कन्फिगर गर्नुहोस्
+Comment[ne]=CGI TDEIO स्लेभ कन्फिगर गर्नुहोस्
Comment[nl]=Hier kunt u de CGI Kio-slave instellen
-Comment[nn]=Set opp CGI-KIO-slaven
-Comment[nso]=Beakanya lekgoba la KIO ya CGI
-Comment[pa]=CGI KIO ਸਲੇਵ ਸੰਰਚਨਾ
+Comment[nn]=Set opp CGI-TDEIO-slaven
+Comment[nso]=Beakanya lekgoba la TDEIO ya CGI
+Comment[pa]=CGI TDEIO ਸਲੇਵ ਸੰਰਚਨਾ
Comment[pl]=Konfiguracja procedury obsługi CGI
-Comment[pt]=Configuração do KIO slave de CGIs
-Comment[pt_BR]=Configurar o KIO (escravo) do CGI
+Comment[pt]=Configuração do TDEIO slave de CGIs
+Comment[pt_BR]=Configurar o TDEIO (escravo) do CGI
Comment[ro]=Configurează dispozitivul I/O CGI
-Comment[ru]=Настройка CGI KIO slave
-Comment[rw]=Kuboneza CGI KIO umugaragu
-Comment[se]=Heivet CGI-KIO-šláva
+Comment[ru]=Настройка CGI TDEIO slave
+Comment[rw]=Kuboneza CGI TDEIO umugaragu
+Comment[se]=Heivet CGI-TDEIO-šláva
Comment[sk]=Nastavenie IO klienta CGI
-Comment[sl]=Nastavi podrejenega KIO CGI
-Comment[sr]=Подешавање CGI KIO slave-а
-Comment[sr@Latn]=Podešavanje CGI KIO slave-a
+Comment[sl]=Nastavi podrejenega TDEIO CGI
+Comment[sr]=Подешавање CGI TDEIO slave-а
+Comment[sr@Latn]=Podešavanje CGI TDEIO slave-a
Comment[sv]=Anpassa I/O-slaven för CGI
-Comment[ta]=CGI KIO slaveஐ வடிவமை
-Comment[tg]=Бандаи CGI KIO-ро танзим кунед
-Comment[th]=ปรับแต่ง CGI KIO slave
-Comment[tr]=CGI KIO aracısını yapılandır
-Comment[tt]=CGI KIO slave caylawı
-Comment[uk]=Налаштування підлеглого KIO CGI
-Comment[uz]=CGI KIO sleyvni moslash
-Comment[uz@cyrillic]=CGI KIO слейвни мослаш
-Comment[ven]=Dzudzanyani phuli CGI KIO
-Comment[vi]=Cấu hình đày tớCGI KIO
-Comment[wa]=Apontyî li mandaye KIO CGI
-Comment[xh]=Qwlalsela i CGI KIO slave
-Comment[zh_CN]=配置 CGI KIO 仆人
-Comment[zh_TW]=設定 CGI KIO slave
-Comment[zu]=Hlanganisela i-CGI KIO slave
+Comment[ta]=CGI TDEIO slaveஐ வடிவமை
+Comment[tg]=Бандаи CGI TDEIO-ро танзим кунед
+Comment[th]=ปรับแต่ง CGI TDEIO slave
+Comment[tr]=CGI TDEIO aracısını yapılandır
+Comment[tt]=CGI TDEIO slave caylawı
+Comment[uk]=Налаштування підлеглого TDEIO CGI
+Comment[uz]=CGI TDEIO sleyvni moslash
+Comment[uz@cyrillic]=CGI TDEIO слейвни мослаш
+Comment[ven]=Dzudzanyani phuli CGI TDEIO
+Comment[vi]=Cấu hình đày tớCGI TDEIO
+Comment[wa]=Apontyî li mandaye TDEIO CGI
+Comment[xh]=Qwlalsela i CGI TDEIO slave
+Comment[zh_CN]=配置 CGI TDEIO 仆人
+Comment[zh_TW]=設定 CGI TDEIO slave
+Comment[zu]=Hlanganisela i-CGI TDEIO slave
-Keywords=CGI,KIO,Slave,Paths
-Keywords[ar]=CGI,KIO,Slave,Paths,مسارات
-Keywords[az]=CGI,KIO,Slave,Paths,Cığırlar
-Keywords[be]=Шляхі,CGI,KIO,Slave,Paths
-Keywords[bg]=скриптове, уеб, динамичен, скрипт, Интернет, път, пътища, CGI, KIO, Slave, Paths
-Keywords[br]=CGI,KIO,sklav,hentoù
-Keywords[ca]=CGI,KIO,Esclau,Rutes
-Keywords[cs]=CGI,KIO,slave,cesty
-Keywords[csb]=CGI,KIO,procedurë wé/wi,stegnë
-Keywords[cy]=CGI,KIO,Gwas,Llwybrau
-Keywords[da]=CGI,KIO,Slave,Stier
-Keywords[de]=CGI,KIO,Ein-/Ausgabemodul,Pfade
-Keywords[el]=CGI,KIO,Slave,Διαδρομές
+Keywords=CGI,TDEIO,Slave,Paths
+Keywords[ar]=CGI,TDEIO,Slave,Paths,مسارات
+Keywords[az]=CGI,TDEIO,Slave,Paths,Cığırlar
+Keywords[be]=Шляхі,CGI,TDEIO,Slave,Paths
+Keywords[bg]=скриптове, уеб, динамичен, скрипт, Интернет, път, пътища, CGI, TDEIO, Slave, Paths
+Keywords[br]=CGI,TDEIO,sklav,hentoù
+Keywords[ca]=CGI,TDEIO,Esclau,Rutes
+Keywords[cs]=CGI,TDEIO,slave,cesty
+Keywords[csb]=CGI,TDEIO,procedurë wé/wi,stegnë
+Keywords[cy]=CGI,TDEIO,Gwas,Llwybrau
+Keywords[da]=CGI,TDEIO,Slave,Stier
+Keywords[de]=CGI,TDEIO,Ein-/Ausgabemodul,Pfade
+Keywords[el]=CGI,TDEIO,Slave,Διαδρομές
Keywords[eo]=CGI,Enel,K-enel,sklavo,servo,vojoj
-Keywords[es]=CGI,KIO,Slave,Rutas
-Keywords[et]=CGI,KIO,moodul,otsinguteed
-Keywords[fa]=CGI، KIO، Slave، مسیرها
-Keywords[fi]=CGI,KIO,KIO-palvelu,palvelu,Polut
-Keywords[fr]=CGI,KIO,Slave,Paths,Chemins,Emplacements
-Keywords[fy]=cgi,kio,slave,paths,paden
-Keywords[ga]=CGI,KIO,Sclábhaí,Bealaí
-Keywords[gl]=CGI,KIO,Escravo,Camiños
-Keywords[he]=CGI,KIO,פרוטוקול,נתיבים, Slave,Paths
+Keywords[es]=CGI,TDEIO,Slave,Rutas
+Keywords[et]=CGI,TDEIO,moodul,otsinguteed
+Keywords[fa]=CGI، TDEIO، Slave، مسیرها
+Keywords[fi]=CGI,TDEIO,TDEIO-palvelu,palvelu,Polut
+Keywords[fr]=CGI,TDEIO,Slave,Paths,Chemins,Emplacements
+Keywords[fy]=cgi,tdeio,slave,paths,paden
+Keywords[ga]=CGI,TDEIO,Sclábhaí,Bealaí
+Keywords[gl]=CGI,TDEIO,Escravo,Camiños
+Keywords[he]=CGI,TDEIO,פרוטוקול,נתיבים, Slave,Paths
Keywords[hi]=सीजीआई,केआईओ,स्लेव,पथ
-Keywords[hr]=CGI,KIO,Slave,Paths,podčinjeni,putanje
-Keywords[hu]=CGI,KIO,protokoll,elérési utak
-Keywords[is]=CGI,KIO,þræll,slóðir
-Keywords[it]=CGI,KIO,tdeioslave,percorsi
-Keywords[ja]=CGI,KIO,スレーブ,パス
-Keywords[km]=CGI,KIO,កូនចៅ,ផ្លូវ
-Keywords[lt]=CGI,KIO,Slave,Paths, keliai
-Keywords[lv]=CGI,KIO,vergi,ceļi
-Keywords[mk]=CGI,KIO,Slave,Paths,Патеки
-Keywords[mn]=CGI,KIO,Оролт/Гаралтын-Модул,Зам
-Keywords[mt]=CGI,KIO,Slave,Paths,skjav,passaġġ
-Keywords[nb]=CGI,KIO,Slave,slave,stier
-Keywords[nds]=CGI,KIO,Slave,IU,In-/Utgaavdeenst,Deenst,Padden
-Keywords[ne]=CGI,KIO,स्लेभ, मार्ग
-Keywords[nl]=cgi,kio,slave,paths,paden
-Keywords[nn]=CGI,KIO,slave,stiar
-Keywords[nso]=CGI,KIO,Lekgoba,Ditsejana
-Keywords[pa]=CGI,KIO,ਸਲੇਵ,ਮਾਰਗ
-Keywords[pl]=CGI,KIO,procedury we/wy,ścieżki
-Keywords[pt]=CGI,KIO,Slave,Localizações
-Keywords[pt_BR]=CGI,KIO,Escravo,Caminhos
-Keywords[ro]=I/E,IE,CGI,KIO,dispozitiv,căi
-Keywords[rw]=CGI,KIO,Umugaragu,Inzira
-Keywords[se]=CGI,KIO,šláva,bálgát
-Keywords[sk]=CGI,KIO,klient,cesty
-Keywords[sl]=CGI,KIO,podrejeni,pot
-Keywords[sr]=CGI,KIO,Slave,Путање
-Keywords[sr@Latn]=CGI,KIO,Slave,Putanje
-Keywords[sv]=CGI,KIO,Slav,Sökvägar
-Keywords[ta]=CGI,KIO,ஸ்லேவ்,பாதைகள்
+Keywords[hr]=CGI,TDEIO,Slave,Paths,podčinjeni,putanje
+Keywords[hu]=CGI,TDEIO,protokoll,elérési utak
+Keywords[is]=CGI,TDEIO,þræll,slóðir
+Keywords[it]=CGI,TDEIO,tdeioslave,percorsi
+Keywords[ja]=CGI,TDEIO,スレーブ,パス
+Keywords[km]=CGI,TDEIO,កូនចៅ,ផ្លូវ
+Keywords[lt]=CGI,TDEIO,Slave,Paths, keliai
+Keywords[lv]=CGI,TDEIO,vergi,ceļi
+Keywords[mk]=CGI,TDEIO,Slave,Paths,Патеки
+Keywords[mn]=CGI,TDEIO,Оролт/Гаралтын-Модул,Зам
+Keywords[mt]=CGI,TDEIO,Slave,Paths,skjav,passaġġ
+Keywords[nb]=CGI,TDEIO,Slave,slave,stier
+Keywords[nds]=CGI,TDEIO,Slave,IU,In-/Utgaavdeenst,Deenst,Padden
+Keywords[ne]=CGI,TDEIO,स्लेभ, मार्ग
+Keywords[nl]=cgi,tdeio,slave,paths,paden
+Keywords[nn]=CGI,TDEIO,slave,stiar
+Keywords[nso]=CGI,TDEIO,Lekgoba,Ditsejana
+Keywords[pa]=CGI,TDEIO,ਸਲੇਵ,ਮਾਰਗ
+Keywords[pl]=CGI,TDEIO,procedury we/wy,ścieżki
+Keywords[pt]=CGI,TDEIO,Slave,Localizações
+Keywords[pt_BR]=CGI,TDEIO,Escravo,Caminhos
+Keywords[ro]=I/E,IE,CGI,TDEIO,dispozitiv,căi
+Keywords[rw]=CGI,TDEIO,Umugaragu,Inzira
+Keywords[se]=CGI,TDEIO,šláva,bálgát
+Keywords[sk]=CGI,TDEIO,klient,cesty
+Keywords[sl]=CGI,TDEIO,podrejeni,pot
+Keywords[sr]=CGI,TDEIO,Slave,Путање
+Keywords[sr@Latn]=CGI,TDEIO,Slave,Putanje
+Keywords[sv]=CGI,TDEIO,Slav,Sökvägar
+Keywords[ta]=CGI,TDEIO,ஸ்லேவ்,பாதைகள்
Keywords[te]=సిజిఐ,కెఐఒ,బానిస,దారులు
-Keywords[th]=CGI,KIO,Slave,เส้นทาง
-Keywords[tr]=CGI,KIO,Aracı,Yollar
-Keywords[uk]=CGI,KIO,підлеглий,шлях
-Keywords[uz]=CGI,KIO,Sleyv,Yoʻllar
-Keywords[uz@cyrillic]=CGI,KIO,Слейв,Йўллар
-Keywords[ven]=CGI,KIO,Phuli,Ludila
-Keywords[vi]=CGI,KIO,Đày tớ,Đường dẫn
-Keywords[wa]=CGI,KIO,Slave,Paths,tchimins,mandaye
-Keywords[zh_CN]=CGI,KIO,Slave,Paths,路径
-Keywords[zh_TW]=CGI,KIO,Slave,Paths,路徑
-Keywords[zu]=CGI,KIO,Slave,Izindlela
+Keywords[th]=CGI,TDEIO,Slave,เส้นทาง
+Keywords[tr]=CGI,TDEIO,Aracı,Yollar
+Keywords[uk]=CGI,TDEIO,підлеглий,шлях
+Keywords[uz]=CGI,TDEIO,Sleyv,Yoʻllar
+Keywords[uz@cyrillic]=CGI,TDEIO,Слейв,Йўллар
+Keywords[ven]=CGI,TDEIO,Phuli,Ludila
+Keywords[vi]=CGI,TDEIO,Đày tớ,Đường dẫn
+Keywords[wa]=CGI,TDEIO,Slave,Paths,tchimins,mandaye
+Keywords[zh_CN]=CGI,TDEIO,Slave,Paths,路径
+Keywords[zh_TW]=CGI,TDEIO,Slave,Paths,路徑
+Keywords[zu]=CGI,TDEIO,Slave,Izindlela
Categories=Qt;TDE;X-TDE-settings-webbrowsing;
diff --git a/tdeioslave/filter/Makefile.am b/tdeioslave/filter/Makefile.am
index 2a972960..0ccdf55e 100644
--- a/tdeioslave/filter/Makefile.am
+++ b/tdeioslave/filter/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = tdeio_filter.la
tdeio_filter_la_SOURCES = filter.cc
-tdeio_filter_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_filter_la_LIBADD = $(LIB_TDESYCOCA)
tdeio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = filter.h
diff --git a/tdeioslave/finger/Makefile.am b/tdeioslave/finger/Makefile.am
index 46e0ff69..c5b95f2d 100644
--- a/tdeioslave/finger/Makefile.am
+++ b/tdeioslave/finger/Makefile.am
@@ -2,7 +2,7 @@
## Edit from Makefile.am of tdebase/tdeioslave/man
INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
####### Files
diff --git a/tdeioslave/fish/Makefile.am b/tdeioslave/fish/Makefile.am
index e060da76..3c79a3d3 100644
--- a/tdeioslave/fish/Makefile.am
+++ b/tdeioslave/fish/Makefile.am
@@ -1,10 +1,10 @@
kde_module_LTLIBRARIES = tdeio_fish.la
INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeio_fish_la_SOURCES = fish.cpp
-tdeio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL)
+tdeio_fish_la_LIBADD = $(LIB_TDESYCOCA) $(LIBUTIL)
tdeio_fish_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lutil
noinst_HEADERS = fishcode.h fish.h
diff --git a/tdeioslave/fish/fish.protocol b/tdeioslave/fish/fish.protocol
index dfff5a78..e4ab09d5 100644
--- a/tdeioslave/fish/fish.protocol
+++ b/tdeioslave/fish/fish.protocol
@@ -43,11 +43,11 @@ Description[ja]=FISH プロトコルのための tdeioslave
Description[ka]=tdeioslave FISH პროტოკოლისთვის
Description[kk]=FISH протоколға арналған файл жүйесінің модулі
Description[km]=tdeioslave សម្រាប់​ពិធីការ FISH
-Description[ko]=FISH 프로토콜을 위한 KIO 슬레이브
+Description[ko]=FISH 프로토콜을 위한 TDEIO 슬레이브
Description[lt]=Kiovergas FISH protokolui
-Description[lv]=KIO vergs FISH protokolam
+Description[lv]=TDEIO vergs FISH protokolam
Description[mk]=КИО-служител за протоколот FISH
-Description[ms]=Hamba kio untuk protokol FISH
+Description[ms]=Hamba tdeio untuk protokol FISH
Description[nb]=En IU-slave for FISH-protokollen
Description[nds]=En In-/Utgaavdeenst för dat FISH-Protokoll
Description[ne]=FISH प्रोटोकलका लागि एउटा किओस्लेभ
@@ -59,7 +59,7 @@ Description[pt]=Um 'tdeioslave' para o protocolo FISH
Description[pt_BR]=Uma implementação para o protocolo FISH
Description[ro]=Un dispozitiv de I/E pentru protocolul FISH
Description[ru]=Модуль файловой системы для протокола FISH
-Description[rw]=kio-umugaragu ya Porotokole FISH
+Description[rw]=tdeio-umugaragu ya Porotokole FISH
Description[se]=SO-šláva FISH-protokolla várás
Description[sk]=tdeioslave pre protokol FISH
Description[sl]=tdeioslave za protokol FISH
@@ -76,6 +76,6 @@ Description[uz]=FISH protokoli uchun KCH-sleyv
Description[uz@cyrillic]=FISH протоколи учун КЧ-слейв
Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho giao thức FISH
Description[wa]=On tdeioslave pol protocole FISH
-Description[zh_CN]=FISH 协议的 KIO 仆人
+Description[zh_CN]=FISH 协议的 TDEIO 仆人
Description[zh_TW]=用於 FISH 通訊協定的 tdeioslave
DocPath=tdeioslave/fish.html
diff --git a/tdeioslave/fish/nxfish.protocol b/tdeioslave/fish/nxfish.protocol
index 27f1fb85..38a100cf 100644
--- a/tdeioslave/fish/nxfish.protocol
+++ b/tdeioslave/fish/nxfish.protocol
@@ -41,8 +41,8 @@ Description[ja]=NXFISH プロトコルのための tdeioslave
Description[ka]=tdeioslave NXFISH ოქმისთვის
Description[kk]=NXFISH протоколы үшін tdeioslave
Description[km]=tdeioslave សម្រាប់​ពិធីការ NXFISH
-Description[ko]=FISH 프로토콜을 위한 KIO 슬레이브
-Description[lt]=Pagalbinė kio programa NXFISH protokolui
+Description[ko]=FISH 프로토콜을 위한 TDEIO 슬레이브
+Description[lt]=Pagalbinė tdeio programa NXFISH protokolui
Description[mk]=КИО-служител за протоколот NXFISH
Description[nb]=En kioskslave for NXFISH-protokollen
Description[nds]=En In-/Utgaavdeenst för dat NXFISH-Protokoll
@@ -69,6 +69,6 @@ Description[uz]=NXFISH protokoli uchun KCH-sleyvi
Description[uz@cyrillic]=NXFISH протоколи учун КЧ-слейви
Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho giao thức NXFISH
Description[wa]=On tdeioslave pol protocole NXFISH
-Description[zh_CN]=NXFISH 协议的 KIO 仆人
+Description[zh_CN]=NXFISH 协议的 TDEIO 仆人
Description[zh_TW]=用於 NXFISH 通訊協定的 tdeioslave
DocPath=tdeioslave/fish.html
diff --git a/tdeioslave/floppy/Makefile.am b/tdeioslave/floppy/Makefile.am
index e6b52fe1..da97e433 100644
--- a/tdeioslave/floppy/Makefile.am
+++ b/tdeioslave/floppy/Makefile.am
@@ -8,7 +8,7 @@ AM_LDFLAGS = $(all_libraries)
kde_module_LTLIBRARIES = tdeio_floppy.la
tdeio_floppy_la_SOURCES = tdeio_floppy.cpp program.cpp
-tdeio_floppy_la_LIBADD = $(LIB_KIO)
+tdeio_floppy_la_LIBADD = $(LIB_TDEIO)
tdeio_floppy_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kdelnk_DATA = floppy.protocol
diff --git a/tdeioslave/floppy/tdeio_floppy.h b/tdeioslave/floppy/tdeio_floppy.h
index d3834072..07892a46 100644
--- a/tdeioslave/floppy/tdeio_floppy.h
+++ b/tdeioslave/floppy/tdeio_floppy.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KIO_FLOPPY_H
-#define KIO_FLOPPY_H
+#ifndef TDEIO_FLOPPY_H
+#define TDEIO_FLOPPY_H
#include <tdeio/slavebase.h>
#include <tdeio/global.h>
diff --git a/tdeioslave/home/Makefile.am b/tdeioslave/home/Makefile.am
index d40341aa..3bd07885 100644
--- a/tdeioslave/home/Makefile.am
+++ b/tdeioslave/home/Makefile.am
@@ -7,7 +7,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_home.la
tdeio_home_la_SOURCES = dummy.cpp
-tdeio_home_la_LIBADD = libtdeiohome.la $(LIB_KIO)
+tdeio_home_la_LIBADD = libtdeiohome.la $(LIB_TDEIO)
tdeio_home_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
dummy.cpp:
@@ -20,7 +20,7 @@ libtdeiohome_la_SOURCES = tdeio_home.cpp homeimpl.cpp
check_PROGRAMS = testhome
testhome_SOURCES = testhome.cpp
-testhome_LDADD = libtdeiohome.la $(LIB_KIO)
+testhome_LDADD = libtdeiohome.la $(LIB_TDEIO)
testhome_LDFLAGS = $(all_libraries)
## TODO in unsermake: TESTS = testhome
diff --git a/tdeioslave/home/kdedmodule/Makefile.am b/tdeioslave/home/kdedmodule/Makefile.am
index 3d7a54f9..e0bf9757 100644
--- a/tdeioslave/home/kdedmodule/Makefile.am
+++ b/tdeioslave/home/kdedmodule/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kded_homedirnotify_la_SOURCES = homedirnotify.cpp homedirnotify.skel homedirnotifymodule.cpp homedirnotifymodule.skel
kded_homedirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_homedirnotify_la_LIBADD = $(LIB_KSYCOCA)
+kded_homedirnotify_la_LIBADD = $(LIB_TDESYCOCA)
servicesdir = $(kde_servicesdir)/kded
diff --git a/tdeioslave/home/tdeio_home.h b/tdeioslave/home/tdeio_home.h
index db5d8902..51187af7 100644
--- a/tdeioslave/home/tdeio_home.h
+++ b/tdeioslave/home/tdeio_home.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KIO_HOME_H
-#define KIO_HOME_H
+#ifndef TDEIO_HOME_H
+#define TDEIO_HOME_H
#include <tdeio/forwardingslavebase.h>
#include "homeimpl.h"
diff --git a/tdeioslave/info/Makefile.am b/tdeioslave/info/Makefile.am
index 1b2d21f3..a682f4a7 100644
--- a/tdeioslave/info/Makefile.am
+++ b/tdeioslave/info/Makefile.am
@@ -9,7 +9,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_info.la
tdeio_info_la_SOURCES = info.cc
-tdeio_info_la_LIBADD = $(LIB_KIO)
+tdeio_info_la_LIBADD = $(LIB_TDEIO)
tdeio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = info.h
diff --git a/tdeioslave/ldap/Makefile.am b/tdeioslave/ldap/Makefile.am
index f2190222..8861d6c6 100644
--- a/tdeioslave/ldap/Makefile.am
+++ b/tdeioslave/ldap/Makefile.am
@@ -3,14 +3,14 @@
INCLUDES = $(all_includes) $(LDAP_INCS)
AM_CXXFLAGS = -DLDAP_DEPRECATED
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH)
-LDADD = $(LIB_KIO) $(LDAP_LIBS)
+LDADD = $(LIB_TDEIO) $(LDAP_LIBS)
####### Files
kde_module_LTLIBRARIES = tdeio_ldap.la
tdeio_ldap_la_SOURCES = tdeio_ldap.cpp
-tdeio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_TDEABC)
+tdeio_ldap_la_LIBADD = $(LIB_TDEIO) $(LDAP_LIBS) $(LIB_TDEABC)
tdeio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN)
noinst_HEADERS = tdeio_ldap.h
diff --git a/tdeioslave/mac/Makefile.am b/tdeioslave/mac/Makefile.am
index 42f73b50..9d926705 100644
--- a/tdeioslave/mac/Makefile.am
+++ b/tdeioslave/mac/Makefile.am
@@ -1,7 +1,7 @@
## Makfile.am for tdeio_mac
INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
####### Files
diff --git a/tdeioslave/mac/mac.protocol b/tdeioslave/mac/mac.protocol
index 1a904415..c21307a8 100644
--- a/tdeioslave/mac/mac.protocol
+++ b/tdeioslave/mac/mac.protocol
@@ -39,9 +39,9 @@ Description[ka]=tdeioslave MacOS HFS+ პარტიციებისთვი
Description[kk]=MacOS HFS+ файл жүйесінің енгізу-шығару модулі
Description[km]=tdeioslave សម្រាប់​ភាគ MacOS HFS+
Description[lt]=Kiovergas MacOS HFS+ dalmenims
-Description[lv]=KIO vergs MacOS HFS+ partīcijām
-Description[mk]=kio-служител за HFS+ партиции од MacOS
-Description[ms]=Hamba kio untuk MacOS HFS+ petak
+Description[lv]=TDEIO vergs MacOS HFS+ partīcijām
+Description[mk]=tdeio-служител за HFS+ партиции од MacOS
+Description[ms]=Hamba tdeio untuk MacOS HFS+ petak
Description[nb]=En kioskslave for MacOS HFS+-partisjoner
Description[nds]=En In-/Utgaavdeenst för MacOS-HFS+-Partitschonen
Description[ne]=MacOS HFS+ विभाजनका लागि किओस्लेभ
@@ -67,7 +67,7 @@ Description[tt]=MacOS HFS+ bülemnäre öçen birem sistemeneñ modulı
Description[uk]=Підлеглий B/В для розділів MacOS HFS+
Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho MacOS HFS và các phân vùng
Description[wa]=On tdeioslave po MacOS HFS + pårticions
-Description[zh_CN]=MacOS HFS+ 分区的 KIO 仆人
+Description[zh_CN]=MacOS HFS+ 分区的 TDEIO 仆人
Description[zh_TW]=用於 MacOS HFS+ 分割區的 tdeioslave
Icon=mac
DocPath=tdeioslave/mac.html
diff --git a/tdeioslave/man/Makefile.am b/tdeioslave/man/Makefile.am
index 7b2554ba..e1dd3c86 100644
--- a/tdeioslave/man/Makefile.am
+++ b/tdeioslave/man/Makefile.am
@@ -1,28 +1,28 @@
## Makefile.am of tdebase/tdeioslave/man
INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
EXTRA_PROGRAMS = tdeio_man_test man2html
####### just for testing (j.habenicht@europemail.com, 15.02.2001)
tdeio_man_test_SOURCES = tdeio_man_test.cpp
-tdeio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdeio_man_test_LDADD = man2html.lo tdeio_man.lo $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+tdeio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeio_man_test_LDADD = man2html.lo tdeio_man.lo $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
####### Files
kde_module_LTLIBRARIES = tdeio_man.la libkmanpart.la
tdeio_man_la_SOURCES = man2html.cpp tdeio_man.cpp
-tdeio_man_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_man_la_LIBADD = $(LIB_TDESYCOCA)
tdeio_man_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = tdeio_man.h
### TODO Why is man2htmk.h distributed?
libkmanpart_la_SOURCES = kmanpart.cpp
-libkmanpart_la_LIBADD = -ltdehtml $(LIB_KPARTS)
+libkmanpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS)
libkmanpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kdelnk_DATA = man.protocol kmanpart.desktop
@@ -39,7 +39,7 @@ messages:
man2html_SOURCES = dummy.cpp
man2html_LDADD = man2html_simple.o $(LIB_QT)
-man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
dummy.cpp:
echo > $@
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index a2f8365c..67354e1b 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -318,7 +318,7 @@ static void InitStringDefinitions( void )
// Missing characters from man(7):
// \*S "Change to default font size"
#ifndef SIMPLE_MAN2HTML
- // Special KDE KIO man:
+ // Special KDE TDEIO man:
const TQCString tdeversion(TDE_VERSION_STRING);
s_stringDefinitionMap.insert( ".TDE_VERSION_STRING", StringDefinition( tdeversion.length(), tdeversion ) );
#endif
@@ -1428,7 +1428,7 @@ static int read_only_number_register( const TQCString& name )
else if ( name == ".A" )
return s_nroff;
#ifndef SIMPLE_MAN2HTML
- // Special KDE KIO man:
+ // Special KDE TDEIO man:
else if ( name == ".TDE_VERSION_MAJOR" )
return TDE_VERSION_MAJOR;
else if ( name == ".TDE_VERSION_MINOR" )
diff --git a/tdeioslave/media/Makefile.am b/tdeioslave/media/Makefile.am
index c827568a..a5551fb2 100644
--- a/tdeioslave/media/Makefile.am
+++ b/tdeioslave/media/Makefile.am
@@ -11,7 +11,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_media.la
tdeio_media_la_SOURCES = dummy.cpp
-tdeio_media_la_LIBADD = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO)
+tdeio_media_la_LIBADD = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_TDEIO)
tdeio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
dummy.cpp:
@@ -24,7 +24,7 @@ libtdeiomedia_la_SOURCES = tdeio_media.cpp mediaimpl.cpp mediaimpl.skel
check_PROGRAMS = testmedia
testmedia_SOURCES = testmedia.cpp
-testmedia_LDADD = libtdeiomedia.la $(LIB_KIO)
+testmedia_LDADD = libtdeiomedia.la $(LIB_TDEIO)
testmedia_LDFLAGS = $(all_libraries)
## TODO in unsermake: TESTS = testmedia
diff --git a/tdeioslave/media/mediamanager/Makefile.am b/tdeioslave/media/mediamanager/Makefile.am
index 45289a9e..0641dd57 100644
--- a/tdeioslave/media/mediamanager/Makefile.am
+++ b/tdeioslave/media/mediamanager/Makefile.am
@@ -24,7 +24,7 @@ noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB)
+kded_mediamanager_la_LIBADD = $(LIB_TDESYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB)
servicesdir = $(kde_servicesdir)/kded
diff --git a/tdeioslave/media/medianotifier/Makefile.am b/tdeioslave/media/medianotifier/Makefile.am
index b3135481..a1972795 100644
--- a/tdeioslave/media/medianotifier/Makefile.am
+++ b/tdeioslave/media/medianotifier/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(all_includes)
kde_module_LTLIBRARIES = kded_medianotifier.la
kded_medianotifier_la_LDFLAGS = -module -avoid-version $(all_libraries)
kded_medianotifier_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDECORE) \
- $(LIB_TDEUI) $(LIB_KIO)
+ $(LIB_TDEUI) $(LIB_TDEIO)
kded_medianotifier_la_SOURCES = medianotifier.cpp medianotifier.skel \
notificationdialog.cpp notificationdialogview.ui
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index 9b4c0e17..bb8948db 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -137,7 +137,7 @@ bool MediaNotifier::autostart( const KFileItem &medium )
}
// From now we're sure the medium is already mounted.
- // We can use the local path for stating, no need to use KIO here.
+ // We can use the local path for stating, no need to use TDEIO here.
bool local;
TQString path = medium.mostLocalURL( local ).path(); // local is always true here...
diff --git a/tdeioslave/media/mounthelper/Makefile.am b/tdeioslave/media/mounthelper/Makefile.am
index c1e056c1..b541ecb6 100644
--- a/tdeioslave/media/mounthelper/Makefile.am
+++ b/tdeioslave/media/mounthelper/Makefile.am
@@ -5,8 +5,8 @@ AM_LDFLAGS = $(all_libraries)
tdeio_media_mounthelper_SOURCES = tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
-tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI)
+tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO) $(LIB_TDEUI)
METASOURCES = AUTO
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
index 0fc6aa69..97df6b7e 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KIO_MEDIA_MOUNTHELPER_H_
-#define _KIO_MEDIA_MOUNTHELPER_H_
+#ifndef _TDEIO_MEDIA_MOUNTHELPER_H_
+#define _TDEIO_MEDIA_MOUNTHELPER_H_
#include <tdeapplication.h>
#include <tqstring.h>
diff --git a/tdeioslave/media/propsdlgplugin/Makefile.am b/tdeioslave/media/propsdlgplugin/Makefile.am
index 5e3d8af8..7202681a 100644
--- a/tdeioslave/media/propsdlgplugin/Makefile.am
+++ b/tdeioslave/media/propsdlgplugin/Makefile.am
@@ -2,7 +2,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = media_propsdlgplugin.la
-media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO)
+media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO)
media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
AM_CPPFLAGS = $(all_includes)
diff --git a/tdeioslave/media/tdecmodule/Makefile.am b/tdeioslave/media/tdecmodule/Makefile.am
index 72f9f385..5bb7948a 100644
--- a/tdeioslave/media/tdecmodule/Makefile.am
+++ b/tdeioslave/media/tdecmodule/Makefile.am
@@ -9,7 +9,7 @@ kcm_media_la_SOURCES = notifiermodule.cpp notifiermoduleview.ui \
main.cpp
kcm_media_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO)
+kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO)
noinst_HEADERS = notifiermodule.h managermodule.h \
serviceconfigdialog.h mimetypelistboxitem.h \
diff --git a/tdeioslave/media/tdefile-plugin/Makefile.am b/tdeioslave/media/tdefile-plugin/Makefile.am
index 15807ea1..c15adce9 100644
--- a/tdeioslave/media/tdefile-plugin/Makefile.am
+++ b/tdeioslave/media/tdefile-plugin/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_media.la
tdefile_media_la_SOURCES = tdefilemediaplugin.cpp
tdefile_media_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
-tdefile_media_la_LIBADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la
+tdefile_media_la_LIBADD = $(LIB_TDEIO) ../libmediacommon/libmediacommon.la
kdelnkdir = $(kde_servicesdir)
kde_services_DATA = tdefile_media.desktop
diff --git a/tdeioslave/media/tdeio_media.h b/tdeioslave/media/tdeio_media.h
index bf132547..7acc44df 100644
--- a/tdeioslave/media/tdeio_media.h
+++ b/tdeioslave/media/tdeio_media.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KIO_MEDIA_H_
-#define _KIO_MEDIA_H_
+#ifndef _TDEIO_MEDIA_H_
+#define _TDEIO_MEDIA_H_
#include <tdeio/forwardingslavebase.h>
diff --git a/tdeioslave/nfs/Makefile.am b/tdeioslave/nfs/Makefile.am
index 0857fa22..bda4479d 100644
--- a/tdeioslave/nfs/Makefile.am
+++ b/tdeioslave/nfs/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am of tdebase/tdeioslave/man
INCLUDES= $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
####### Files
diff --git a/tdeioslave/nfs/tdeio_nfs.h b/tdeioslave/nfs/tdeio_nfs.h
index b548fc48..0930924a 100644
--- a/tdeioslave/nfs/tdeio_nfs.h
+++ b/tdeioslave/nfs/tdeio_nfs.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KIO_NFS_H
-#define KIO_NFS_H
+#ifndef TDEIO_NFS_H
+#define TDEIO_NFS_H
#include <tdeio/slavebase.h>
#include <tdeio/global.h>
diff --git a/tdeioslave/nntp/Makefile.am b/tdeioslave/nntp/Makefile.am
index 9f1b322e..2cc883c3 100644
--- a/tdeioslave/nntp/Makefile.am
+++ b/tdeioslave/nntp/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
kde_module_LTLIBRARIES = tdeio_nntp.la
tdeio_nntp_la_SOURCES = nntp.cpp
-tdeio_nntp_la_LIBADD = $(LIB_KIO)
+tdeio_nntp_la_LIBADD = $(LIB_TDEIO)
tdeio_nntp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO
diff --git a/tdeioslave/pop3/Makefile.am b/tdeioslave/pop3/Makefile.am
index 1bd5c95e..130fb34d 100644
--- a/tdeioslave/pop3/Makefile.am
+++ b/tdeioslave/pop3/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = tdeio_pop3.la
tdeio_pop3_la_SOURCES = pop3.cc
-tdeio_pop3_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS)
+tdeio_pop3_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS)
tdeio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = pop3.h
diff --git a/tdeioslave/remote/Makefile.am b/tdeioslave/remote/Makefile.am
index 780e0ac3..9505065f 100644
--- a/tdeioslave/remote/Makefile.am
+++ b/tdeioslave/remote/Makefile.am
@@ -7,7 +7,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_remote.la
tdeio_remote_la_SOURCES = dummy.cpp
-tdeio_remote_la_LIBADD = libtdeioremote.la $(LIB_KIO)
+tdeio_remote_la_LIBADD = libtdeioremote.la $(LIB_TDEIO)
tdeio_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
dummy.cpp:
@@ -20,7 +20,7 @@ libtdeioremote_la_SOURCES = tdeio_remote.cpp remoteimpl.cpp
check_PROGRAMS = testremote
testremote_SOURCES = testremote.cpp
-testremote_LDADD = libtdeioremote.la $(LIB_KIO)
+testremote_LDADD = libtdeioremote.la $(LIB_TDEIO)
testremote_LDFLAGS = $(all_libraries)
## TODO in unsermake: TESTS = testremote
diff --git a/tdeioslave/remote/kdedmodule/Makefile.am b/tdeioslave/remote/kdedmodule/Makefile.am
index 61f4d226..af916998 100644
--- a/tdeioslave/remote/kdedmodule/Makefile.am
+++ b/tdeioslave/remote/kdedmodule/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kded_remotedirnotify_la_SOURCES = remotedirnotify.cpp remotedirnotify.skel remotedirnotifymodule.cpp remotedirnotifymodule.skel
kded_remotedirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_remotedirnotify_la_LIBADD = $(LIB_KSYCOCA)
+kded_remotedirnotify_la_LIBADD = $(LIB_TDESYCOCA)
servicesdir = $(kde_servicesdir)/kded
diff --git a/tdeioslave/remote/tdeio_remote.h b/tdeioslave/remote/tdeio_remote.h
index ebc6dd1a..47d80c04 100644
--- a/tdeioslave/remote/tdeio_remote.h
+++ b/tdeioslave/remote/tdeio_remote.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KIO_REMOTE_H
-#define KIO_REMOTE_H
+#ifndef TDEIO_REMOTE_H
+#define TDEIO_REMOTE_H
#include <tdeio/slavebase.h>
#include "remoteimpl.h"
diff --git a/tdeioslave/settings/Makefile.am b/tdeioslave/settings/Makefile.am
index 2c2ac932..b470a778 100644
--- a/tdeioslave/settings/Makefile.am
+++ b/tdeioslave/settings/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
kde_module_LTLIBRARIES = tdeio_settings.la
tdeio_settings_la_SOURCES = tdeio_settings.cc
-tdeio_settings_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_settings_la_LIBADD = $(LIB_TDESYCOCA)
tdeio_settings_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = tdeio_settings.h
diff --git a/tdeioslave/sftp/Makefile.am b/tdeioslave/sftp/Makefile.am
index d64f7567..2d2079e0 100644
--- a/tdeioslave/sftp/Makefile.am
+++ b/tdeioslave/sftp/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am of tdebase/tdeioslave/sftp
INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO
####### Files
@@ -9,12 +9,12 @@ METASOURCES = AUTO
check_PROGRAMS = ksshprocesstest
ksshprocesstest_SOURCES = ksshprocesstest.cpp
-ksshprocesstest_LDADD = $(LIB_KSYCOCA) ksshprocess.lo process.lo atomicio.lo
+ksshprocesstest_LDADD = $(LIB_TDESYCOCA) ksshprocess.lo process.lo atomicio.lo
kde_module_LTLIBRARIES = tdeio_sftp.la
tdeio_sftp_la_SOURCES = process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
-tdeio_sftp_la_LIBADD = $(LIB_KIO)
+tdeio_sftp_la_LIBADD = $(LIB_TDEIO)
tdeio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = atomicio.h tdeio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
diff --git a/tdeioslave/sftp/sftp.protocol b/tdeioslave/sftp/sftp.protocol
index 522b23b0..6c998f02 100644
--- a/tdeioslave/sftp/sftp.protocol
+++ b/tdeioslave/sftp/sftp.protocol
@@ -44,10 +44,10 @@ Description[it]=Un tdeioslave per sftp
Description[ja]=sftp のための tdeioslave
Description[kk]=sftp-ке арналған енгізу-шығару модулі
Description[km]=tdeioslave របស់ sftp
-Description[ko]=SFTP KIO 슬레이브
+Description[ko]=SFTP TDEIO 슬레이브
Description[lt]=Kiovergas sftp protokolui
-Description[lv]=KIO vergs priekš sftp
-Description[mk]=kio-служител за sftp
+Description[lv]=TDEIO vergs priekš sftp
+Description[mk]=tdeio-служител за sftp
Description[ms]=Kioslave untuk sftp
Description[nb]=En tdeioslave for sftp
Description[nds]=En In-/Utgaavdeenst för sftpl
diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index 1e529363..eab0eae4 100644
--- a/tdeioslave/sftp/tdeio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -81,17 +81,17 @@ extern "C"
{
TDEInstance instance( "tdeio_sftp" );
- kdDebug(KIO_SFTP_DB) << "*** Starting tdeio_sftp " << endl;
+ kdDebug(TDEIO_SFTP_DB) << "*** Starting tdeio_sftp " << endl;
if (argc != 4) {
- kdDebug(KIO_SFTP_DB) << "Usage: tdeio_sftp protocol domain-socket1 domain-socket2" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "Usage: tdeio_sftp protocol domain-socket1 domain-socket2" << endl;
exit(-1);
}
sftpProtocol slave(argv[2], argv[3]);
slave.dispatchLoop();
- kdDebug(KIO_SFTP_DB) << "*** tdeio_sftp Done" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "*** tdeio_sftp Done" << endl;
return 0;
}
}
@@ -134,12 +134,12 @@ static int writeToFile (int fd, const char *buf, size_t len)
sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("tdeio_sftp", pool_socket, app_socket),
mConnected(false), mPort(-1), mMsgId(0) {
- kdDebug(KIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl;
}
sftpProtocol::~sftpProtocol() {
- kdDebug(KIO_SFTP_DB) << "~sftpProtocol(): pid = " << getpid() << endl;
+ kdDebug(TDEIO_SFTP_DB) << "~sftpProtocol(): pid = " << getpid() << endl;
closeConnection();
}
@@ -183,7 +183,7 @@ bool sftpProtocol::isSupportedOperation(int type) {
case SSH2_FXP_SYMLINK:
return sftpVersion >= 3 ? true : false;
default:
- kdDebug(KIO_SFTP_DB) << "isSupportedOperation(type:"
+ kdDebug(TDEIO_SFTP_DB) << "isSupportedOperation(type:"
<< type << "): unrecognized operation type" << endl;
break;
}
@@ -193,7 +193,7 @@ bool sftpProtocol::isSupportedOperation(int type) {
void sftpProtocol::copy(const KURL &src, const KURL &dest, int permissions, bool overwrite)
{
- kdDebug(KIO_SFTP_DB) << "copy(): " << src << " -> " << dest << endl;
+ kdDebug(TDEIO_SFTP_DB) << "copy(): " << src << " -> " << dest << endl;
bool srcLocal = src.isLocalFile();
bool destLocal = dest.isLocalFile();
@@ -208,7 +208,7 @@ void sftpProtocol::copy(const KURL &src, const KURL &dest, int permissions, bool
void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool overwrite)
{
- kdDebug(KIO_SFTP_DB) << "sftpCopyGet(): " << src << " -> " << dest << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet(): " << src << " -> " << dest << endl;
// Attempt to establish a connection...
openConnection();
@@ -251,7 +251,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool
if (canResume( buff_part.st_size ))
{
offset = buff_part.st_size;
- kdDebug(KIO_SFTP_DB) << "sftpCopyGet: Resuming @ " << offset << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet: Resuming @ " << offset << endl;
}
}
@@ -283,7 +283,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool
if(fd == -1)
{
- kdDebug(KIO_SFTP_DB) << "sftpCopyGet: Unable to open (" << fd << ") for writting." << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet: Unable to open (" << fd << ") for writting." << endl;
if (errno == EACCES)
error (ERR_WRITE_ACCESS_DENIED, dest.prettyURL());
else
@@ -320,7 +320,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool
}
data(TQByteArray());
- kdDebug(KIO_SFTP_DB) << "sftpCopyGet(): emit finished()" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet(): emit finished()" << endl;
finished();
}
@@ -333,7 +333,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t o
res.code = 0;
res.size = 0;
- kdDebug(KIO_SFTP_DB) << "sftpGet(): " << src << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpGet(): " << src << endl;
// stat the file first to get its size
if( (code = sftpStat(src, attr)) != SSH2_FX_OK ) {
@@ -371,7 +371,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t o
TQ_UINT32 len = 60*1024;
code = SSH2_FX_OK;
- kdDebug(KIO_SFTP_DB) << "sftpGet(): offset = " << offset << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpGet(): offset = " << offset << endl;
while( code == SSH2_FX_OK ) {
if( (code = sftpRead(handle, offset, len, buff)) == SSH2_FX_OK ) {
offset += buff.size();
@@ -386,7 +386,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t o
// determine mimetype
KMimeMagicResult* result =
KMimeMagic::self()->findBufferFileType(mimeBuffer, src.fileName());
- kdDebug(KIO_SFTP_DB) << "sftpGet(): mimetype is " <<
+ kdDebug(TDEIO_SFTP_DB) << "sftpGet(): mimetype is " <<
result->mimeType() << endl;
mimeType(result->mimeType());
@@ -442,7 +442,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t o
}
void sftpProtocol::get(const KURL& url) {
- kdDebug(KIO_SFTP_DB) << "get(): " << url << endl ;
+ kdDebug(TDEIO_SFTP_DB) << "get(): " << url << endl ;
openConnection();
if( !mConnected )
@@ -452,7 +452,7 @@ void sftpProtocol::get(const KURL& url) {
TQ_UINT64 offset = config()->readUnsignedLongNumEntry("resume");
if( offset > 0 ) {
canResume();
- kdDebug(KIO_SFTP_DB) << "get(): canResume(), offset = " << offset << endl;
+ kdDebug(TDEIO_SFTP_DB) << "get(): canResume(), offset = " << offset << endl;
}
Status info = sftpGet(url, offset);
@@ -464,14 +464,14 @@ void sftpProtocol::get(const KURL& url) {
}
data(TQByteArray());
- kdDebug(KIO_SFTP_DB) << "get(): emit finished()" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "get(): emit finished()" << endl;
finished();
}
void sftpProtocol::setHost (const TQString& h, int port, const TQString& user, const TQString& pass)
{
- kdDebug(KIO_SFTP_DB) << "setHost(): " << user << "@" << h << ":" << port << endl;
+ kdDebug(TDEIO_SFTP_DB) << "setHost(): " << user << "@" << h << ":" << port << endl;
if( mHost != h || mPort != port || user != mUsername || mPassword != pass )
closeConnection();
@@ -500,13 +500,13 @@ void sftpProtocol::openConnection() {
if(mConnected)
return;
- kdDebug(KIO_SFTP_DB) << "openConnection(): " << mUsername << "@"
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): " << mUsername << "@"
<< mHost << ":" << mPort << endl;
infoMessage( i18n("Opening SFTP connection to host <b>%1:%2</b>").arg(mHost).arg(mPort));
if( mHost.isEmpty() ) {
- kdDebug(KIO_SFTP_DB) << "openConnection(): Need hostname..." << endl;
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): Need hostname..." << endl;
error(ERR_UNKNOWN_HOST, i18n("No hostname specified"));
return;
}
@@ -529,7 +529,7 @@ void sftpProtocol::openConnection() {
// Check for cached authentication info if a username AND password were
// not specified in setHost().
if( mUsername.isEmpty() && mPassword.isEmpty() ) {
- kdDebug(KIO_SFTP_DB) << "openConnection(): checking cache "
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): checking cache "
<< "info.username = " << info.username
<< ", info.url = " << info.url.prettyURL() << endl;
@@ -611,7 +611,7 @@ void sftpProtocol::openConnection() {
while( !(mConnected = ssh.connect()) ) {
err = ssh.error();
- kdDebug(KIO_SFTP_DB) << "openConnection(): "
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): "
"Got " << err << " from KSshProcess::connect()" << endl;
switch(err) {
@@ -626,7 +626,7 @@ void sftpProtocol::openConnection() {
else
info.prompt = i18n("Please enter your username and password.");
- kdDebug(KIO_SFTP_DB) << "openConnection(): info.username = " << info.username
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): info.username = " << info.username
<< ", info.url = " << info.url.prettyURL() << endl;
if( firstTime )
@@ -644,7 +644,7 @@ void sftpProtocol::openConnection() {
else {
// user canceled or dialog failed to open
error(ERR_USER_CANCELED, TQString::null);
- kdDebug(KIO_SFTP_DB) << "openConnection(): user canceled, dlgResult = " << dlgResult << endl;
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): user canceled, dlgResult = " << dlgResult << endl;
closeConnection();
return;
}
@@ -658,7 +658,7 @@ void sftpProtocol::openConnection() {
// the password option so the user is not prompted for
// it again.
if( mUsername != info.username ) {
- kdDebug(KIO_SFTP_DB) << "openConnection(): Username changed from "
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): Username changed from "
<< mUsername << " to " << info.username << endl;
ssh.disconnect();
@@ -668,14 +668,14 @@ void sftpProtocol::openConnection() {
// the iterators will be equal to the empty iterator.
// Create the opts now and add them to the opt list.
if( usernameIt == KSshProcess::SshOptListIterator() ) {
- kdDebug(KIO_SFTP_DB) << "openConnection(): "
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): "
"Adding username to options list" << endl;
opt.opt = KSshProcess::SSH_USERNAME;
usernameIt = opts.append(opt);
}
if( passwdIt == KSshProcess::SshOptListIterator() ) {
- kdDebug(KIO_SFTP_DB) << "openConnection(): "
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): "
"Adding password to options list" << endl;
opt.opt = KSshProcess::SSH_PASSWD;
passwdIt = opts.append(opt);
@@ -765,7 +765,7 @@ void sftpProtocol::openConnection() {
}
// Now send init packet.
- kdDebug(KIO_SFTP_DB) << "openConnection(): Sending SSH2_FXP_INIT packet." << endl;
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): Sending SSH2_FXP_INIT packet." << endl;
TQByteArray p;
TQDataStream packet(p, IO_WriteOnly);
packet << (TQ_UINT32)5; // packet length
@@ -779,11 +779,11 @@ void sftpProtocol::openConnection() {
TQ_UINT32 version;
TQ_UINT8 type;
s >> type;
- kdDebug(KIO_SFTP_DB) << "openConnection(): Got type " << type << endl;
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): Got type " << type << endl;
if( type == SSH2_FXP_VERSION ) {
s >> version;
- kdDebug(KIO_SFTP_DB) << "openConnection(): Got server version " << version << endl;
+ kdDebug(TDEIO_SFTP_DB) << "openConnection(): Got server version " << version << endl;
// XXX Get extensions here
sftpVersion = version;
@@ -812,7 +812,7 @@ void sftpProtocol::openConnection() {
info.url.setUser(mUsername);
info.username = mUsername;
info.password = mPassword;
- kdDebug(KIO_SFTP_DB) << "sftpProtocol(): caching info.username = " << info.username <<
+ kdDebug(TDEIO_SFTP_DB) << "sftpProtocol(): caching info.username = " << info.username <<
", info.url = " << info.url.prettyURL() << endl;
cacheAuthentication(info);
mConnected = true;
@@ -825,7 +825,7 @@ void sftpProtocol::openConnection() {
}
void sftpProtocol::closeConnection() {
- kdDebug(KIO_SFTP_DB) << "closeConnection()" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "closeConnection()" << endl;
ssh.disconnect();
mConnected = false;
}
@@ -865,7 +865,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool
if( !mConnected )
return;
- kdDebug(KIO_SFTP_DB) << "sftpPut(): " << dest
+ kdDebug(TDEIO_SFTP_DB) << "sftpPut(): " << dest
<< ", resume=" << resume
<< ", overwrite=" << overwrite << endl;
@@ -877,7 +877,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool
int code = sftpStat(origUrl, origAttr);
if( code == SSH2_FX_OK ) {
- kdDebug(KIO_SFTP_DB) << "sftpPut(): <file> already exists" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpPut(): <file> already exists" << endl;
// Delete remote file if its size is zero
if( origAttr.fileSize() == 0 ) {
@@ -916,7 +916,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool
code = sftpStat(partUrl, partAttr);
if( code == SSH2_FX_OK ) {
- kdDebug(KIO_SFTP_DB) << "sftpPut(): .part file already exists" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpPut(): .part file already exists" << endl;
partExists = true;
offset = partAttr.fileSize();
@@ -943,7 +943,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool
else
resume = canResume( offset );
- kdDebug(KIO_SFTP_DB) << "sftpPut(): can resume = " << resume
+ kdDebug(TDEIO_SFTP_DB) << "sftpPut(): can resume = " << resume
<< ", offset = " << offset;
if( !resume ) {
@@ -1083,14 +1083,14 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool
}
void sftpProtocol::put ( const KURL& url, int permissions, bool overwrite, bool resume ){
- kdDebug(KIO_SFTP_DB) << "put(): " << url << ", overwrite = " << overwrite
+ kdDebug(TDEIO_SFTP_DB) << "put(): " << url << ", overwrite = " << overwrite
<< ", resume = " << resume << endl;
sftpPut( url, permissions, resume, overwrite );
}
void sftpProtocol::stat ( const KURL& url ){
- kdDebug(KIO_SFTP_DB) << "stat(): " << url << endl;
+ kdDebug(TDEIO_SFTP_DB) << "stat(): " << url << endl;
openConnection();
if( !mConnected )
@@ -1141,13 +1141,13 @@ void sftpProtocol::stat ( const KURL& url ){
finished();
- kdDebug(KIO_SFTP_DB) << "stat: END" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "stat: END" << endl;
return;
}
void sftpProtocol::mimetype ( const KURL& url ){
- kdDebug(KIO_SFTP_DB) << "mimetype(): " << url << endl;
+ kdDebug(TDEIO_SFTP_DB) << "mimetype(): " << url << endl;
openConnection();
if( !mConnected )
@@ -1171,7 +1171,7 @@ void sftpProtocol::mimetype ( const KURL& url ){
offset += mydata.size();
processedSize(offset);
- kdDebug(KIO_SFTP_DB) << "mimetype(): offset = " << offset << endl;
+ kdDebug(TDEIO_SFTP_DB) << "mimetype(): offset = " << offset << endl;
}
}
@@ -1180,12 +1180,12 @@ void sftpProtocol::mimetype ( const KURL& url ){
processedSize(offset);
sftpClose(handle);
finished();
- kdDebug(KIO_SFTP_DB) << "mimetype(): END" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "mimetype(): END" << endl;
}
void sftpProtocol::listDir(const KURL& url) {
- kdDebug(KIO_SFTP_DB) << "listDir(): " << url << endl;
+ kdDebug(TDEIO_SFTP_DB) << "listDir(): " << url << endl;
openConnection();
if( !mConnected )
@@ -1194,7 +1194,7 @@ void sftpProtocol::listDir(const KURL& url) {
if( !url.hasPath() ) {
KURL newUrl ( url );
if( sftpRealPath(url, newUrl) == SSH2_FX_OK ) {
- kdDebug(KIO_SFTP_DB) << "listDir: Redirecting to " << newUrl << endl;
+ kdDebug(TDEIO_SFTP_DB) << "listDir: Redirecting to " << newUrl << endl;
redirection(newUrl);
finished();
return;
@@ -1205,7 +1205,7 @@ void sftpProtocol::listDir(const KURL& url) {
TQByteArray handle;
if( (code = sftpOpenDirectory(url, handle)) != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "listDir(): open directory failed" << endl;
+ kdError(TDEIO_SFTP_DB) << "listDir(): open directory failed" << endl;
processStatus(code, url.prettyURL());
return;
}
@@ -1216,17 +1216,17 @@ void sftpProtocol::listDir(const KURL& url) {
code = sftpReadDir(handle, url);
if( code != SSH2_FX_OK && code != SSH2_FX_EOF )
processStatus(code, url.prettyURL());
- kdDebug(KIO_SFTP_DB) << "listDir(): return code = " << code << endl;
+ kdDebug(TDEIO_SFTP_DB) << "listDir(): return code = " << code << endl;
}
if( (code = sftpClose(handle)) != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "listdir(): closing of directory failed" << endl;
+ kdError(TDEIO_SFTP_DB) << "listdir(): closing of directory failed" << endl;
processStatus(code, url.prettyURL());
return;
}
finished();
- kdDebug(KIO_SFTP_DB) << "listDir(): END" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "listDir(): END" << endl;
}
/** Make a directory.
@@ -1238,7 +1238,7 @@ void sftpProtocol::listDir(const KURL& url) {
*/
void sftpProtocol::mkdir(const KURL&url, int permissions){
- kdDebug(KIO_SFTP_DB) << "mkdir() creating dir: " << url.path() << endl;
+ kdDebug(TDEIO_SFTP_DB) << "mkdir() creating dir: " << url.path() << endl;
openConnection();
if( !mConnected )
@@ -1263,7 +1263,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){
s.writeBytes(path.data(), len);
s << attr;
- kdDebug(KIO_SFTP_DB) << "mkdir(): packet size is " << p.size() << endl;
+ kdDebug(TDEIO_SFTP_DB) << "mkdir(): packet size is " << p.size() << endl;
putPacket(p);
getPacket(p);
@@ -1273,14 +1273,14 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "mkdir: sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "mkdir: sftp packet id mismatch" << endl;
error(ERR_COULD_NOT_MKDIR, path);
finished();
return;
}
if( type != SSH2_FXP_STATUS ) {
- kdError(KIO_SFTP_DB) << "mkdir(): unexpected packet type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "mkdir(): unexpected packet type of " << type << endl;
error(ERR_COULD_NOT_MKDIR, path);
finished();
return;
@@ -1289,7 +1289,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){
int code;
r >> code;
if( code != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "mkdir(): failed with code " << code << endl;
+ kdError(TDEIO_SFTP_DB) << "mkdir(): failed with code " << code << endl;
// Check if mkdir failed because the directory already exists so that
// we can return the appropriate message...
@@ -1307,7 +1307,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){
}
void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite){
- kdDebug(KIO_SFTP_DB) << "rename(" << src << " -> " << dest << ")" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "rename(" << src << " -> " << dest << ")" << endl;
if (!isSupportedOperation(SSH2_FXP_RENAME)) {
error(ERR_UNSUPPORTED_ACTION,
@@ -1352,11 +1352,11 @@ void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite){
}
finished();
- kdDebug(KIO_SFTP_DB) << "rename(): END" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "rename(): END" << endl;
}
void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwrite){
- kdDebug(KIO_SFTP_DB) << "symlink()" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "symlink()" << endl;
if (!isSupportedOperation(SSH2_FXP_SYMLINK)) {
error(ERR_UNSUPPORTED_ACTION,
@@ -1408,7 +1408,7 @@ void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwr
void sftpProtocol::chmod(const KURL& url, int permissions){
TQString perms;
perms.setNum(permissions, 8);
- kdDebug(KIO_SFTP_DB) << "chmod(" << url << ", " << perms << ")" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "chmod(" << url << ", " << perms << ")" << endl;
openConnection();
if( !mConnected )
@@ -1421,7 +1421,7 @@ void sftpProtocol::chmod(const KURL& url, int permissions){
int code;
if( (code = sftpSetStat(url, attr)) != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "chmod(): sftpSetStat failed with error " << code << endl;
+ kdError(TDEIO_SFTP_DB) << "chmod(): sftpSetStat failed with error " << code << endl;
if( code == SSH2_FX_FAILURE )
error(ERR_CANNOT_CHMOD, TQString::null);
else
@@ -1432,7 +1432,7 @@ void sftpProtocol::chmod(const KURL& url, int permissions){
void sftpProtocol::del(const KURL &url, bool isfile){
- kdDebug(KIO_SFTP_DB) << "del(" << url << ", " << (isfile?"file":"dir") << ")" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "del(" << url << ", " << (isfile?"file":"dir") << ")" << endl;
openConnection();
if( !mConnected )
@@ -1440,14 +1440,14 @@ void sftpProtocol::del(const KURL &url, bool isfile){
int code;
if( (code = sftpRemove(url, isfile)) != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "del(): sftpRemove failed with error code " << code << endl;
+ kdError(TDEIO_SFTP_DB) << "del(): sftpRemove failed with error code " << code << endl;
processStatus(code, url.prettyURL());
}
finished();
}
void sftpProtocol::slave_status() {
- kdDebug(KIO_SFTP_DB) << "slave_status(): connected to "
+ kdDebug(TDEIO_SFTP_DB) << "slave_status(): connected to "
<< mHost << "? " << mConnected << endl;
slaveStatus ((mConnected ? mHost : TQString::null), mConnected);
@@ -1460,7 +1460,7 @@ bool sftpProtocol::getPacket(TQByteArray& msg) {
ssize_t len = atomicio(ssh.stdioFd(), buf.data(), 4, true /*read*/);
if( len == 0 || len == -1 ) {
- kdDebug(KIO_SFTP_DB) << "getPacket(): read of packet length failed, ret = "
+ kdDebug(TDEIO_SFTP_DB) << "getPacket(): read of packet length failed, ret = "
<< len << ", error =" << strerror(errno) << endl;
closeConnection();
error( ERR_CONNECTION_BROKEN, mHost);
@@ -1472,7 +1472,7 @@ bool sftpProtocol::getPacket(TQByteArray& msg) {
TQDataStream s(buf, IO_ReadOnly);
s >> msgLen;
- //kdDebug(KIO_SFTP_DB) << "getPacket(): Message size = " << msgLen << endl;
+ //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Message size = " << msgLen << endl;
msg.resize(0);
@@ -1488,7 +1488,7 @@ bool sftpProtocol::getPacket(TQByteArray& msg) {
errmsg = i18n("Connection closed");
else
errmsg = i18n("Could not read SFTP packet");
- kdDebug(KIO_SFTP_DB) << "getPacket(): nothing to read, ret = " <<
+ kdDebug(TDEIO_SFTP_DB) << "getPacket(): nothing to read, ret = " <<
len << ", error =" << strerror(errno) << endl;
closeConnection();
error(ERR_CONNECTION_BROKEN, errmsg);
@@ -1498,8 +1498,8 @@ bool sftpProtocol::getPacket(TQByteArray& msg) {
b.writeBlock(buf.data(), len);
- //kdDebug(KIO_SFTP_DB) << "getPacket(): Read Message size = " << len << endl;
- //kdDebug(KIO_SFTP_DB) << "getPacket(): Copy Message size = " << msg.size() << endl;
+ //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Read Message size = " << len << endl;
+ //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Copy Message size = " << msg.size() << endl;
msgLen -= len;
}
@@ -1511,11 +1511,11 @@ bool sftpProtocol::getPacket(TQByteArray& msg) {
/** Send an sftp packet to stdin of the ssh process. */
bool sftpProtocol::putPacket(TQByteArray& p){
-// kdDebug(KIO_SFTP_DB) << "putPacket(): size == " << p.size() << endl;
+// kdDebug(TDEIO_SFTP_DB) << "putPacket(): size == " << p.size() << endl;
int ret;
ret = atomicio(ssh.stdioFd(), p.data(), p.size(), false /*write*/);
if( ret <= 0 ) {
- kdDebug(KIO_SFTP_DB) << "putPacket(): write failed, ret =" << ret <<
+ kdDebug(TDEIO_SFTP_DB) << "putPacket(): write failed, ret =" << ret <<
", error = " << strerror(errno) << endl;
return false;
}
@@ -1529,7 +1529,7 @@ pathnames without a leading slash into absolute paths.
Returns the canonicalized url. */
int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){
- kdDebug(KIO_SFTP_DB) << "sftpRealPath(" << url << ", newUrl)" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpRealPath(" << url << ", newUrl)" << endl;
TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
@@ -1552,7 +1552,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpRealPath: sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpRealPath: sftp packet id mismatch" << endl;
return -1;
}
@@ -1563,14 +1563,14 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){
}
if( type != SSH2_FXP_NAME ) {
- kdError(KIO_SFTP_DB) << "sftpRealPath(): unexpected packet type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpRealPath(): unexpected packet type of " << type << endl;
return -1;
}
TQ_UINT32 count;
r >> count;
if( count != 1 ) {
- kdError(KIO_SFTP_DB) << "sftpRealPath(): Bad number of file attributes for realpath command" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpRealPath(): Bad number of file attributes for realpath command" << endl;
return -1;
}
@@ -1633,7 +1633,7 @@ void sftpProtocol::processStatus(TQ_UINT8 code, const TQString& message){
/** Opens a directory handle for url.path. Returns true if succeeds. */
int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){
- kdDebug(KIO_SFTP_DB) << "sftpOpenDirectory(" << url << ", handle)" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpOpenDirectory(" << url << ", handle)" << endl;
TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
@@ -1656,7 +1656,7 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpOpenDirectory: sftp packet id mismatch: " <<
+ kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: sftp packet id mismatch: " <<
"expected " << expectedId << ", got " << id << endl;
return -1;
}
@@ -1668,24 +1668,24 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){
}
if( type != SSH2_FXP_HANDLE ) {
- kdError(KIO_SFTP_DB) << "sftpOpenDirectory: unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: unexpected message type of " << type << endl;
return -1;
}
r >> handle;
if( handle.size() > 256 ) {
- kdError(KIO_SFTP_DB) << "sftpOpenDirectory: handle exceeds max length" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: handle exceeds max length" << endl;
return -1;
}
- kdDebug(KIO_SFTP_DB) << "sftpOpenDirectory: handle (" << handle.size() << "): [" << handle << "]" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpOpenDirectory: handle (" << handle.size() << "): [" << handle << "]" << endl;
return SSH2_FX_OK;
}
/** Closes a directory or file handle. */
int sftpProtocol::sftpClose(const TQByteArray& handle){
- kdDebug(KIO_SFTP_DB) << "sftpClose()" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpClose()" << endl;
TQ_UINT32 id, expectedId;
id = expectedId = mMsgId++;
@@ -1705,19 +1705,19 @@ int sftpProtocol::sftpClose(const TQByteArray& handle){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpClose: sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpClose: sftp packet id mismatch" << endl;
return -1;
}
if( type != SSH2_FXP_STATUS ) {
- kdError(KIO_SFTP_DB) << "sftpClose: unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpClose: unexpected message type of " << type << endl;
return -1;
}
TQ_UINT32 code;
r >> code;
if( code != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "sftpClose: close failed with err code " << code << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpClose: close failed with err code " << code << endl;
}
return code;
@@ -1726,7 +1726,7 @@ int sftpProtocol::sftpClose(const TQByteArray& handle){
/** Set a files attributes. */
int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){
- kdDebug(KIO_SFTP_DB) << "sftpSetStat(" << url << ", attr)" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpSetStat(" << url << ", attr)" << endl;
TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
@@ -1750,20 +1750,20 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpSetStat(): sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpSetStat(): sftp packet id mismatch" << endl;
return -1;
// XXX How do we do a fatal error?
}
if( type != SSH2_FXP_STATUS ) {
- kdError(KIO_SFTP_DB) << "sftpSetStat(): unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpSetStat(): unexpected message type of " << type << endl;
return -1;
}
TQ_UINT32 code;
r >> code;
if( code != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "sftpSetStat(): set stat failed with err code " << code << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpSetStat(): set stat failed with err code " << code << endl;
}
return code;
@@ -1772,7 +1772,7 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){
/** Sends a sftp command to remove a file or directory. */
int sftpProtocol::sftpRemove(const KURL& url, bool isfile){
- kdDebug(KIO_SFTP_DB) << "sftpRemove(): " << url << ", isFile ? " << isfile << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpRemove(): " << url << ", isFile ? " << isfile << endl;
TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
@@ -1795,19 +1795,19 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "del(): sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "del(): sftp packet id mismatch" << endl;
return -1;
}
if( type != SSH2_FXP_STATUS ) {
- kdError(KIO_SFTP_DB) << "del(): unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "del(): unexpected message type of " << type << endl;
return -1;
}
TQ_UINT32 code;
r >> code;
if( code != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "del(): del failed with err code " << code << endl;
+ kdError(TDEIO_SFTP_DB) << "del(): del failed with err code " << code << endl;
}
return code;
@@ -1816,7 +1816,7 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){
/** Send a sftp command to rename a file or directoy. */
int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){
- kdDebug(KIO_SFTP_DB) << "sftpRename(" << src << " -> " << dest << ")" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpRename(" << src << " -> " << dest << ")" << endl;
TQCString srcPath = remoteEncoding()->encode(src.path());
TQCString destPath = remoteEncoding()->encode(dest.path());
@@ -1845,19 +1845,19 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpRename(): sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpRename(): sftp packet id mismatch" << endl;
return -1;
}
if( type != SSH2_FXP_STATUS ) {
- kdError(KIO_SFTP_DB) << "sftpRename(): unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpRename(): unexpected message type of " << type << endl;
return -1;
}
int code;
r >> code;
if( code != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "sftpRename(): rename failed with err code " << code << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpRename(): rename failed with err code " << code << endl;
}
return code;
@@ -1865,7 +1865,7 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){
/** Get directory listings. */
int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
// url is needed so we can lookup the link destination
- kdDebug(KIO_SFTP_DB) << "sftpReadDir(): " << url << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpReadDir(): " << url << endl;
TQ_UINT32 id, expectedId, count;
TQ_UINT8 type;
@@ -1888,7 +1888,7 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpReadDir(): sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpReadDir(): sftp packet id mismatch" << endl;
return -1;
}
@@ -1899,12 +1899,12 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
}
if( type != SSH2_FXP_NAME ) {
- kdError(KIO_SFTP_DB) << "tdeio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
+ kdError(TDEIO_SFTP_DB) << "tdeio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
return -1;
}
r >> count;
- kdDebug(KIO_SFTP_DB) << "sftpReadDir(): got " << count << " entries" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpReadDir(): got " << count << " entries" << endl;
while(count--) {
r >> attr;
@@ -1931,13 +1931,13 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){
- kdDebug(KIO_SFTP_DB) << "sftpReadLink(): " << url << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): " << url << endl;
TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
- //kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path << endl;
- //kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Size: " << len << endl;
+ //kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path << endl;
+ //kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Encoded Size: " << len << endl;
TQ_UINT32 id, expectedId;
id = expectedId = mMsgId++;
@@ -1958,26 +1958,26 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpReadLink(): sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpReadLink(): sftp packet id mismatch" << endl;
return -1;
}
if( type == SSH2_FXP_STATUS ) {
TQ_UINT32 code;
r >> code;
- kdDebug(KIO_SFTP_DB) << "sftpReadLink(): read link failed with code " << code << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): read link failed with code " << code << endl;
return code;
}
if( type != SSH2_FXP_NAME ) {
- kdError(KIO_SFTP_DB) << "sftpReadLink(): unexpected packet type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpReadLink(): unexpected packet type of " << type << endl;
return -1;
}
TQ_UINT32 count;
r >> count;
if( count != 1 ) {
- kdError(KIO_SFTP_DB) << "sftpReadLink(): Bad number of file attributes for realpath command" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpReadLink(): Bad number of file attributes for realpath command" << endl;
return -1;
}
@@ -1985,7 +1985,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){
r >> linkAddress;
linkAddress.truncate(linkAddress.size());
- kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Link address: " << linkAddress << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Link address: " << linkAddress << endl;
target = remoteEncoding()->decode(linkAddress);
@@ -1999,7 +1999,7 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){
uint dlen = destPath.length();
uint tlen = target.length();
- kdDebug(KIO_SFTP_DB) << "sftpSymLink(" << target << " -> " << destPath << ")" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpSymLink(" << target << " -> " << destPath << ")" << endl;
TQ_UINT32 id, expectedId;
id = expectedId = mMsgId++;
@@ -2022,19 +2022,19 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpSymLink(): sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpSymLink(): sftp packet id mismatch" << endl;
return -1;
}
if( type != SSH2_FXP_STATUS ) {
- kdError(KIO_SFTP_DB) << "sftpSymLink(): unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpSymLink(): unexpected message type of " << type << endl;
return -1;
}
TQ_UINT32 code;
r >> code;
if( code != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "sftpSymLink(): rename failed with err code " << code << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpSymLink(): rename failed with err code " << code << endl;
}
return code;
@@ -2043,7 +2043,7 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){
/** Stats a file. */
int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
- kdDebug(KIO_SFTP_DB) << "sftpStat(): " << url << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpStat(): " << url << endl;
TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
@@ -2066,25 +2066,25 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpStat(): sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpStat(): sftp packet id mismatch" << endl;
return -1;
}
if( type == SSH2_FXP_STATUS ) {
TQ_UINT32 errCode;
r >> errCode;
- kdError(KIO_SFTP_DB) << "sftpStat(): stat failed with code " << errCode << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpStat(): stat failed with code " << errCode << endl;
return errCode;
}
if( type != SSH2_FXP_ATTRS ) {
- kdError(KIO_SFTP_DB) << "sftpStat(): unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpStat(): unexpected message type of " << type << endl;
return -1;
}
r >> attr;
attr.setFilename(url.fileName());
- kdDebug(KIO_SFTP_DB) << "sftpStat(): " << attr << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpStat(): " << attr << endl;
// If the stat'ed resource is a symlink, perform a recursive stat
// to determine the actual destination's type (file/dir).
@@ -2094,11 +2094,11 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
int code = sftpReadLink( url, target );
if ( code != SSH2_FX_OK ) {
- kdError(KIO_SFTP_DB) << "sftpStat(): Unable to stat symlink destination" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpStat(): Unable to stat symlink destination" << endl;
return -1;
}
- kdDebug(KIO_SFTP_DB) << "sftpStat(): Resource is a symlink to -> " << target << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpStat(): Resource is a symlink to -> " << target << endl;
KURL dest( url );
if( target[0] == '/' )
@@ -2121,7 +2121,7 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
attr.setLinkDestination(target);
- kdDebug(KIO_SFTP_DB) << "sftpStat(): File type: " << attr.fileType() << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpStat(): File type: " << attr.fileType() << endl;
}
}
@@ -2131,7 +2131,7 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags,
const sftpFileAttr& attr, TQByteArray& handle) {
- kdDebug(KIO_SFTP_DB) << "sftpOpen(" << url << ", handle" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpOpen(" << url << ", handle" << endl;
TQCString path = remoteEncoding()->encode(url.path());
uint len = path.length();
@@ -2158,7 +2158,7 @@ int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags,
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpOpen(): sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpOpen(): sftp packet id mismatch" << endl;
return -1;
}
@@ -2169,24 +2169,24 @@ int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags,
}
if( type != SSH2_FXP_HANDLE ) {
- kdError(KIO_SFTP_DB) << "sftpOpen(): unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpOpen(): unexpected message type of " << type << endl;
return -1;
}
r >> handle;
if( handle.size() > 256 ) {
- kdError(KIO_SFTP_DB) << "sftpOpen(): handle exceeds max length" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpOpen(): handle exceeds max length" << endl;
return -1;
}
- kdDebug(KIO_SFTP_DB) << "sftpOpen(): handle (" << handle.size() << "): [" << handle << "]" << endl;
+ kdDebug(TDEIO_SFTP_DB) << "sftpOpen(): handle (" << handle.size() << "): [" << handle << "]" << endl;
return SSH2_FX_OK;
}
int sftpProtocol::sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data)
{
- // kdDebug(KIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl;
+ // kdDebug(TDEIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl;
TQByteArray p;
TQDataStream s(p, IO_WriteOnly);
@@ -2209,19 +2209,19 @@ int sftpProtocol::sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset,
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpRead: sftp packet id mismatch" << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpRead: sftp packet id mismatch" << endl;
return -1;
}
if( type == SSH2_FXP_STATUS ) {
TQ_UINT32 errCode;
r >> errCode;
- kdError(KIO_SFTP_DB) << "sftpRead: read failed with code " << errCode << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpRead: read failed with code " << errCode << endl;
return errCode;
}
if( type != SSH2_FXP_DATA ) {
- kdError(KIO_SFTP_DB) << "sftpRead: unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpRead: unexpected message type of " << type << endl;
return -1;
}
@@ -2232,7 +2232,7 @@ int sftpProtocol::sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset,
int sftpProtocol::sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset, const TQByteArray& data){
-// kdDebug(KIO_SFTP_DB) << "sftpWrite( offset = " << offset <<
+// kdDebug(TDEIO_SFTP_DB) << "sftpWrite( offset = " << offset <<
// ", data sz = " << data.size() << ")" << endl;
TQByteArray p;
TQDataStream s(p, IO_WriteOnly);
@@ -2249,28 +2249,28 @@ int sftpProtocol::sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset,
s << offset; // we don't have a convienient 64 bit int so set upper int to zero
s << data;
-// kdDebug(KIO_SFTP_DB) << "sftpWrite(): SSH2_FXP_WRITE, id:"
+// kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): SSH2_FXP_WRITE, id:"
// << id << ", handle:" << handle << ", offset:" << offset << ", some data" << endl;
-// kdDebug(KIO_SFTP_DB) << "sftpWrite(): send packet [" << p << "]" << endl;
+// kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): send packet [" << p << "]" << endl;
putPacket(p);
getPacket(p);
-// kdDebug(KIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]" << endl;
+// kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]" << endl;
TQDataStream r(p, IO_ReadOnly);
TQ_UINT8 type;
r >> type >> id;
if( id != expectedId ) {
- kdError(KIO_SFTP_DB) << "sftpWrite(): sftp packet id mismatch, got "
+ kdError(TDEIO_SFTP_DB) << "sftpWrite(): sftp packet id mismatch, got "
<< id << ", expected " << expectedId << endl;
return -1;
}
if( type != SSH2_FXP_STATUS ) {
- kdError(KIO_SFTP_DB) << "sftpWrite(): unexpected message type of " << type << endl;
+ kdError(TDEIO_SFTP_DB) << "sftpWrite(): unexpected message type of " << type << endl;
return -1;
}
diff --git a/tdeioslave/sftp/tdeio_sftp.h b/tdeioslave/sftp/tdeio_sftp.h
index 23ff101b..30c452f9 100644
--- a/tdeioslave/sftp/tdeio_sftp.h
+++ b/tdeioslave/sftp/tdeio_sftp.h
@@ -30,7 +30,7 @@
#include "sftpfileattr.h"
#include "ksshprocess.h"
-#define KIO_SFTP_DB 7120
+#define TDEIO_SFTP_DB 7120
class sftpProtocol : public TDEIO::SlaveBase
diff --git a/tdeioslave/smb/tdeio_smb.cpp b/tdeioslave/smb/tdeio_smb.cpp
index 8ee27025..28c54b3a 100644
--- a/tdeioslave/smb/tdeio_smb.cpp
+++ b/tdeioslave/smb/tdeio_smb.cpp
@@ -62,7 +62,7 @@ int KDE_EXPORT kdemain( int argc, char **argv )
TDEInstance instance( "tdeio_smb" );
if( argc != 4 )
{
- kdDebug(KIO_SMB) << "Usage: tdeio_smb protocol domain-socket1 domain-socket2"
+ kdDebug(TDEIO_SMB) << "Usage: tdeio_smb protocol domain-socket1 domain-socket2"
<< endl;
return -1;
}
diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h
index b2566cb5..a81728d5 100644
--- a/tdeioslave/smb/tdeio_smb.h
+++ b/tdeioslave/smb/tdeio_smb.h
@@ -33,8 +33,8 @@
/////////////////////////////////////////////////////////////////////////////
-#ifndef KIO_SMB_H_INCLUDED
-#define KIO_SMB_H_INCLUDED
+#ifndef TDEIO_SMB_H_INCLUDED
+#define TDEIO_SMB_H_INCLUDED
//-------------
// QT includes
@@ -84,7 +84,7 @@ extern "C"
#include "tdeio_smb_internal.h"
#define MAX_XFER_BUF_SIZE 16348
-#define KIO_SMB 7106
+#define TDEIO_SMB 7106
using namespace TDEIO;
class TDEProcess;
@@ -298,4 +298,4 @@ int kdemain( int argc, char **argv );
}
-#endif //#endif KIO_SMB_H_INCLUDED
+#endif //#endif TDEIO_SMB_H_INCLUDED
diff --git a/tdeioslave/smb/tdeio_smb_auth.cpp b/tdeioslave/smb/tdeio_smb_auth.cpp
index ebc15c1c..87dd8c02 100644
--- a/tdeioslave/smb/tdeio_smb_auth.cpp
+++ b/tdeioslave/smb/tdeio_smb_auth.cpp
@@ -61,10 +61,10 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
SMBUrlType t = m_current_url.getType();
if( t == SMBURLTYPE_ENTIRE_NETWORK )
{
- kdDebug(KIO_SMB) << "we don't really need to authenticate for this top level url, returning" << endl;
+ kdDebug(TDEIO_SMB) << "we don't really need to authenticate for this top level url, returning" << endl;
return;
}
- kdDebug(KIO_SMB) << "AAAAAAAAAAAAAA auth_smbc_get_dat: set user=" << username << ", workgroup=" << workgroup
+ kdDebug(TDEIO_SMB) << "AAAAAAAAAAAAAA auth_smbc_get_dat: set user=" << username << ", workgroup=" << workgroup
<< " server=" << server << ", share=" << share << endl;
TQString s_server = TQString::fromUtf8(server);
@@ -85,7 +85,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
info.password = s_password;
info.verifyPath = true;
- kdDebug(KIO_SMB) << "libsmb-auth-callback URL:" << info.url << endl;
+ kdDebug(TDEIO_SMB) << "libsmb-auth-callback URL:" << info.url << endl;
if ( !checkCachedAuthentication( info ) )
{
@@ -103,7 +103,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
}
} else
- kdDebug(KIO_SMB) << "got password through cache" << endl;
+ kdDebug(TDEIO_SMB) << "got password through cache" << endl;
strncpy(username, info.username.utf8(), unmaxlen - 1);
strncpy(password, info.password.utf8(), pwmaxlen - 1);
@@ -111,7 +111,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
bool SMBSlave::checkPassword(SMBUrl &url)
{
- kdDebug(KIO_SMB) << "checkPassword for " << url << endl;
+ kdDebug(TDEIO_SMB) << "checkPassword for " << url << endl;
TDEIO::AuthInfo info;
info.url = KURL("smb:///");
@@ -139,15 +139,15 @@ bool SMBSlave::checkPassword(SMBUrl &url)
.arg( share );
info.username = url.user();
- kdDebug(KIO_SMB) << "call openPassDlg for " << info.url << endl;
+ kdDebug(TDEIO_SMB) << "call openPassDlg for " << info.url << endl;
if ( openPassDlg(info) ) {
- kdDebug(KIO_SMB) << "openPassDlg returned " << info.username << endl;
+ kdDebug(TDEIO_SMB) << "openPassDlg returned " << info.username << endl;
url.setUser(info.username);
url.setPass(info.password);
return true;
}
- kdDebug(KIO_SMB) << "no value from openPassDlg\n";
+ kdDebug(TDEIO_SMB) << "no value from openPassDlg\n";
return false;
}
@@ -159,10 +159,10 @@ bool SMBSlave::auth_initialize_smbc()
{
SMBCCTX *smb_context = NULL;
- kdDebug(KIO_SMB) << "auth_initialize_smbc " << endl;
+ kdDebug(TDEIO_SMB) << "auth_initialize_smbc " << endl;
if(m_initialized_smbc == false)
{
- kdDebug(KIO_SMB) << "smbc_init call" << endl;
+ kdDebug(TDEIO_SMB) << "smbc_init call" << endl;
KSimpleConfig cfg( "tdeioslaverc", true );
cfg.setGroup( "SMB" );
diff --git a/tdeioslave/smb/tdeio_smb_browse.cpp b/tdeioslave/smb/tdeio_smb_browse.cpp
index c8d39b8f..e6113d16 100644
--- a/tdeioslave/smb/tdeio_smb_browse.cpp
+++ b/tdeioslave/smb/tdeio_smb_browse.cpp
@@ -46,8 +46,8 @@ using namespace TDEIO;
int SMBSlave::cache_stat(const SMBUrl &url, struct stat* st )
{
int result = smbc_stat( url.toSmbcUrl(), st);
- kdDebug(KIO_SMB) << "smbc_stat " << url << " " << errno << " " << result << endl;
- kdDebug(KIO_SMB) << "size " << (TDEIO::filesize_t)st->st_size << endl;
+ kdDebug(TDEIO_SMB) << "smbc_stat " << url << " " << errno << " " << result << endl;
+ kdDebug(TDEIO_SMB) << "size " << (TDEIO::filesize_t)st->st_size << endl;
return result;
}
@@ -63,7 +63,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
{
if(!S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode))
{
- kdDebug(KIO_SMB)<<"SMBSlave::browse_stat_path mode: "<<st.st_mode<<endl;
+ kdDebug(TDEIO_SMB)<<"SMBSlave::browse_stat_path mode: "<<st.st_mode<<endl;
warning(i18n("%1:\n"
"Unknown file type, neither directory or file.").arg(url.prettyURL()));
return false;
@@ -125,7 +125,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
} else if (errno == ENOENT || errno == ENOTDIR) {
warning(i18n("File does not exist: %1").arg(url.url()));
}
- kdDebug(KIO_SMB) << "SMBSlave::browse_stat_path ERROR!!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::browse_stat_path ERROR!!"<< endl;
return false;
}
@@ -135,7 +135,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign
//===========================================================================
void SMBSlave::stat( const KURL& kurl )
{
- kdDebug(KIO_SMB) << "SMBSlave::stat on "<< kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::stat on "<< kurl << endl;
// make a valid URL
KURL url = checkURL(kurl);
@@ -175,12 +175,12 @@ void SMBSlave::stat( const KURL& kurl )
if (browse_stat_path(m_current_url, udsentry, false))
break;
else {
- kdDebug(KIO_SMB) << "SMBSlave::stat ERROR!!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::stat ERROR!!"<< endl;
finished();
return;
}
default:
- kdDebug(KIO_SMB) << "SMBSlave::stat UNKNOWN " << url << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::stat UNKNOWN " << url << endl;
finished();
return;
}
@@ -193,7 +193,7 @@ void SMBSlave::stat( const KURL& kurl )
// TODO: complete checking
KURL SMBSlave::checkURL(const KURL& kurl) const
{
- kdDebug(KIO_SMB) << "checkURL " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "checkURL " << kurl << endl;
TQString surl = kurl.url();
if (surl.startsWith("smb:/")) {
if (surl.length() == 5) // just the above
@@ -201,7 +201,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const
if (surl.at(5) != '/') {
surl = "smb://" + surl.mid(5);
- kdDebug(KIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl;
+ kdDebug(TDEIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl;
return KURL(surl);
}
}
@@ -218,7 +218,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const
} else {
url.setUser(userinfo);
}
- kdDebug(KIO_SMB) << "checkURL return2 " << url << endl;
+ kdDebug(TDEIO_SMB) << "checkURL return2 " << url << endl;
return url;
}
@@ -228,13 +228,13 @@ KURL SMBSlave::checkURL(const KURL& kurl) const
if (url.path().isEmpty())
url.setPath("/");
- kdDebug(KIO_SMB) << "checkURL return3 " << url << endl;
+ kdDebug(TDEIO_SMB) << "checkURL return3 " << url << endl;
return url;
}
void SMBSlave::reportError(const SMBUrl &url)
{
- kdDebug(KIO_SMB) << "reportError " << url << " " << perror << endl;
+ kdDebug(TDEIO_SMB) << "reportError " << url << " " << perror << endl;
switch(errno)
{
case ENOENT:
@@ -312,7 +312,7 @@ void SMBSlave::reportError(const SMBUrl &url)
//===========================================================================
void SMBSlave::listDir( const KURL& kurl )
{
- kdDebug(KIO_SMB) << "SMBSlave::listDir on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::listDir on " << kurl << endl;
// check (correct) URL
KURL url = checkURL(kurl);
@@ -332,11 +332,11 @@ void SMBSlave::listDir( const KURL& kurl )
UDSAtom atom;
dirfd = smbc_opendir( m_current_url.toSmbcUrl() );
- kdDebug(KIO_SMB) << "SMBSlave::listDir open " << m_current_url.toSmbcUrl() << " " << m_current_url.getType() << " " << dirfd << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::listDir open " << m_current_url.toSmbcUrl() << " " << m_current_url.getType() << " " << dirfd << endl;
if(dirfd >= 0)
{
do {
- kdDebug(KIO_SMB) << "smbc_readdir " << endl;
+ kdDebug(TDEIO_SMB) << "smbc_readdir " << endl;
dirp = smbc_readdir(dirfd);
if(dirp == 0)
break;
@@ -355,7 +355,7 @@ void SMBSlave::listDir( const KURL& kurl )
} else
atom.m_str = dirpName;
- kdDebug(KIO_SMB) << "dirp->name " << dirp->name << " " << dirpName << " '" << comment << "'" << " " << dirp->smbc_type << endl;
+ kdDebug(TDEIO_SMB) << "dirp->name " << dirp->name << " " << dirpName << " '" << comment << "'" << " " << dirp->smbc_type << endl;
udsentry.append( atom );
if (atom.m_str.upper()=="IPC$" || atom.m_str=="." || atom.m_str == ".." ||
@@ -405,7 +405,7 @@ void SMBSlave::listDir( const KURL& kurl )
// when libsmbclient knows
// atom.m_str = TQString("smb://%1?WORKGROUP=%2").arg(dirpName).arg(workgroup.upper());
- kdDebug(KIO_SMB) << "list item " << atom.m_str << endl;
+ kdDebug(TDEIO_SMB) << "list item " << atom.m_str << endl;
udsentry.append(atom);
atom.m_uds = TDEIO::UDS_MIME_TYPE;
@@ -444,7 +444,7 @@ void SMBSlave::listDir( const KURL& kurl )
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave::listDir SMBC_UNKNOWN :" << dirpName << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::listDir SMBC_UNKNOWN :" << dirpName << endl;
// TODO: we don't handle SMBC_IPC_SHARE, SMBC_PRINTER_SHARE
// SMBC_LINK, SMBC_COMMS_SHARE
//SlaveBase::error(ERR_INTERNAL, TEXT_UNSUPPORTED_FILE_TYPE);
diff --git a/tdeioslave/smb/tdeio_smb_dir.cpp b/tdeioslave/smb/tdeio_smb_dir.cpp
index e2742033..1e707e14 100644
--- a/tdeioslave/smb/tdeio_smb_dir.cpp
+++ b/tdeioslave/smb/tdeio_smb_dir.cpp
@@ -51,7 +51,7 @@ void SMBSlave::copy( const KURL& ksrc,
TDEIO::filesize_t processed_size = 0;
unsigned char buf[MAX_XFER_BUF_SIZE];
- kdDebug(KIO_SMB) << "SMBSlave::copy with src = " << ksrc << "and dest = " << kdst << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::copy with src = " << ksrc << "and dest = " << kdst << endl;
// setup urls
src = ksrc;
@@ -152,7 +152,7 @@ void SMBSlave::copy( const KURL& ksrc,
n = smbc_write(dstfd, buf, n);
if(n == -1)
{
- kdDebug(KIO_SMB) << "SMBSlave::copy copy now TDEIO::ERR_COULD_NOT_WRITE" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::copy copy now TDEIO::ERR_COULD_NOT_WRITE" << endl;
error( TDEIO::ERR_COULD_NOT_WRITE, dst.prettyURL());
break;
}
@@ -199,13 +199,13 @@ void SMBSlave::copy( const KURL& ksrc,
//===========================================================================
void SMBSlave::del( const KURL &kurl, bool isfile)
{
- kdDebug(KIO_SMB) << "SMBSlave::del on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::del on " << kurl << endl;
m_current_url = kurl;
if(isfile)
{
// Delete file
- kdDebug(KIO_SMB) << "SMBSlave:: unlink " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave:: unlink " << kurl << endl;
if(smbc_unlink(m_current_url.toSmbcUrl()) == -1)
{
switch(errno)
@@ -220,7 +220,7 @@ void SMBSlave::del( const KURL &kurl, bool isfile)
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave:: rmdir " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave:: rmdir " << kurl << endl;
// Delete directory
if(smbc_rmdir(m_current_url.toSmbcUrl()) == -1)
{
@@ -234,7 +234,7 @@ void SMBSlave::del( const KURL &kurl, bool isfile)
//===========================================================================
void SMBSlave::mkdir( const KURL &kurl, int permissions )
{
- kdDebug(KIO_SMB) << "SMBSlave::mkdir on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::mkdir on " << kurl << endl;
m_current_url = kurl;
if(smbc_mkdir(m_current_url.toSmbcUrl(), 0777) != 0)
@@ -253,7 +253,7 @@ void SMBSlave::mkdir( const KURL &kurl, int permissions )
}
} else
reportError(kurl);
- kdDebug(KIO_SMB) << "SMBSlave::mkdir exit with error " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::mkdir exit with error " << kurl << endl;
}
else
{
@@ -275,35 +275,35 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite )
SMBUrl src;
SMBUrl dst;
- kdDebug(KIO_SMB) << "SMBSlave::rename, old name = " << ksrc << ", new name = " << kdest << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename, old name = " << ksrc << ", new name = " << kdest << endl;
src = ksrc;
dst = kdest;
// Check to se if the destination exists
- kdDebug(KIO_SMB) << "SMBSlave::rename stat dst" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename stat dst" << endl;
if(cache_stat(dst, &st) != -1)
{
if(S_ISDIR(st.st_mode))
{
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_DIR_ALREADY_EXIST" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_DIR_ALREADY_EXIST" << endl;
error( TDEIO::ERR_DIR_ALREADY_EXIST, dst.prettyURL());
finished();
return;
}
if(!overwrite)
{
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_FILE_ALREADY_EXIST" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_FILE_ALREADY_EXIST" << endl;
error( TDEIO::ERR_FILE_ALREADY_EXIST, dst.prettyURL());
finished();
return;
}
}
- kdDebug(KIO_SMB ) << "smbc_rename " << src.toSmbcUrl() << " " << dst.toSmbcUrl() << endl;
+ kdDebug(TDEIO_SMB ) << "smbc_rename " << src.toSmbcUrl() << " " << dst.toSmbcUrl() << endl;
if(smbc_rename(src.toSmbcUrl(), dst.toSmbcUrl())!=0)
{
- kdDebug(KIO_SMB ) << "failed " << perror << endl;
+ kdDebug(TDEIO_SMB ) << "failed " << perror << endl;
switch(errno)
{
case ENOENT:
@@ -311,12 +311,12 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite )
{
if(errno == EACCES)
{
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl;
error(TDEIO::ERR_ACCESS_DENIED, src.prettyURL());
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_DOES_NOT_EXIST" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_DOES_NOT_EXIST" << endl;
error(TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
}
}
@@ -324,21 +324,21 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite )
case EACCES:
case EPERM:
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl;
error( TDEIO::ERR_ACCESS_DENIED, dst.prettyURL() );
break;
default:
- kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_CANNOT_RENAME" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_CANNOT_RENAME" << endl;
error( TDEIO::ERR_CANNOT_RENAME, src.prettyURL() );
}
- kdDebug(KIO_SMB) << "SMBSlave::rename exit with error" << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::rename exit with error" << endl;
return;
}
- kdDebug(KIO_SMB ) << "everything fine\n";
+ kdDebug(TDEIO_SMB ) << "everything fine\n";
finished();
}
diff --git a/tdeioslave/smb/tdeio_smb_file.cpp b/tdeioslave/smb/tdeio_smb_file.cpp
index a6c01052..2152c746 100644
--- a/tdeioslave/smb/tdeio_smb_file.cpp
+++ b/tdeioslave/smb/tdeio_smb_file.cpp
@@ -48,7 +48,7 @@ void SMBSlave::get( const KURL& kurl )
TQByteArray filedata;
SMBUrl url;
- kdDebug(KIO_SMB) << "SMBSlave::get on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::get on " << kurl << endl;
// check (correct) URL
KURL kvurl = checkURL(kurl);
@@ -163,7 +163,7 @@ void SMBSlave::put( const KURL& kurl,
mode_t mode;
TQByteArray filedata;
- kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl << endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl << endl;
exists = (cache_stat(m_current_url, &st) != -1 );
@@ -171,12 +171,12 @@ void SMBSlave::put( const KURL& kurl,
{
if (S_ISDIR(st.st_mode))
{
- kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" already isdir !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl <<" already isdir !!"<< endl;
error( TDEIO::ERR_DIR_ALREADY_EXIST, m_current_url.prettyURL());
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" already exist !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl <<" already exist !!"<< endl;
error( TDEIO::ERR_FILE_ALREADY_EXIST, m_current_url.prettyURL());
}
return;
@@ -184,7 +184,7 @@ void SMBSlave::put( const KURL& kurl,
if (exists && !resume && overwrite)
{
- kdDebug(KIO_SMB) << "SMBSlave::put exists try to remove " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put exists try to remove " << m_current_url.toSmbcUrl()<< endl;
// remove(m_current_url.url().local8Bit());
}
@@ -192,7 +192,7 @@ void SMBSlave::put( const KURL& kurl,
if (resume)
{
// append if resuming
- kdDebug(KIO_SMB) << "SMBSlave::put resume " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put resume " << m_current_url.toSmbcUrl()<< endl;
filefd = smbc_open(m_current_url.toSmbcUrl(), O_RDWR, 0 );
smbc_lseek(filefd, 0, SEEK_END);
}
@@ -207,7 +207,7 @@ void SMBSlave::put( const KURL& kurl,
mode = 600;//0666;
}
- kdDebug(KIO_SMB) << "SMBSlave::put NO resume " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put NO resume " << m_current_url.toSmbcUrl()<< endl;
filefd = smbc_open(m_current_url.toSmbcUrl(), O_CREAT | O_TRUNC | O_WRONLY, mode);
}
@@ -215,12 +215,12 @@ void SMBSlave::put( const KURL& kurl,
{
if ( errno == EACCES )
{
- kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" access denied !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put error " << kurl <<" access denied !!"<< endl;
error( TDEIO::ERR_WRITE_ACCESS_DENIED, m_current_url.prettyURL());
}
else
{
- kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" can not open for writing !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put error " << kurl <<" can not open for writing !!"<< endl;
error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, m_current_url.prettyURL());
}
finished();
@@ -230,33 +230,33 @@ void SMBSlave::put( const KURL& kurl,
// Loop until we got 0 (end of data)
while(1)
{
- kdDebug(KIO_SMB) << "SMBSlave::put request data "<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put request data "<< endl;
dataReq(); // Request for data
- kdDebug(KIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl;
if (readData(filedata) <= 0)
{
- kdDebug(KIO_SMB) << "readData <= 0" << endl;
+ kdDebug(TDEIO_SMB) << "readData <= 0" << endl;
break;
}
- kdDebug(KIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl;
buf = filedata.data();
bufsize = filedata.size();
int size = smbc_write(filefd, buf, bufsize);
if ( size < 0)
{
- kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" could not write !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put error " << kurl <<" could not write !!"<< endl;
error( TDEIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL());
finished();
return;
}
- kdDebug(KIO_SMB ) << "wrote " << size << endl;
+ kdDebug(TDEIO_SMB ) << "wrote " << size << endl;
}
- kdDebug(KIO_SMB) << "SMBSlave::put close " << m_current_url.toSmbcUrl()<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put close " << m_current_url.toSmbcUrl()<< endl;
if(smbc_close(filefd))
{
- kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" could not write !!"<< endl;
+ kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl <<" could not write !!"<< endl;
error( TDEIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL());
finished();
return;
diff --git a/tdeioslave/smb/tdeio_smb_internal.cpp b/tdeioslave/smb/tdeio_smb_internal.cpp
index ebb91b30..1b466e19 100644
--- a/tdeioslave/smb/tdeio_smb_internal.cpp
+++ b/tdeioslave/smb/tdeio_smb_internal.cpp
@@ -79,7 +79,7 @@ void SMBUrl::updateCache()
cleanPath();
// SMB URLs are UTF-8 encoded
- kdDebug(KIO_SMB) << "updateCache " << KURL::path() << endl;
+ kdDebug(TDEIO_SMB) << "updateCache " << KURL::path() << endl;
if (KURL::url() == "smb:/")
m_surl = "smb://";
else {
diff --git a/tdeioslave/smb/tdeio_smb_internal.h b/tdeioslave/smb/tdeio_smb_internal.h
index 3eeae43a..d0473629 100644
--- a/tdeioslave/smb/tdeio_smb_internal.h
+++ b/tdeioslave/smb/tdeio_smb_internal.h
@@ -28,8 +28,8 @@
//
/////////////////////////////////////////////////////////////////////////////
-#ifndef KIO_SMB_INTERNAL_H_INCLUDED
-#define KIO_SMB_INTERNAL_H_INCLUDED
+#ifndef TDEIO_SMB_INTERNAL_H_INCLUDED
+#define TDEIO_SMB_INTERNAL_H_INCLUDED
#include <tdeio/authinfo.h>
diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp
index 0cf9775d..0aef9269 100644
--- a/tdeioslave/smb/tdeio_smb_mount.cpp
+++ b/tdeioslave/smb/tdeio_smb_mount.cpp
@@ -37,7 +37,7 @@ void SMBSlave::readStdErr(TDEProcess *, char *buffer, int buflen)
void SMBSlave::special( const TQByteArray & data)
{
- kdDebug(KIO_SMB)<<"Smb::special()"<<endl;
+ kdDebug(TDEIO_SMB)<<"Smb::special()"<<endl;
int tmp;
TQDataStream stream(data, IO_ReadOnly);
stream >> tmp;
@@ -56,12 +56,12 @@ void SMBSlave::special( const TQByteArray & data)
{
host=(*sl.at(0)).mid(2);
share=(*sl.at(1));
- kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl;
+ kdDebug(TDEIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl;
}
remotePath.replace('\\', '/'); // smbmounterplugin sends \\host/share
- kdDebug(KIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl;
+ kdDebug(TDEIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl;
if (tmp==3) {
if (!TDEStandardDirs::makeDir(mountPoint)) {
@@ -126,7 +126,7 @@ void SMBSlave::special( const TQByteArray & data)
return;
}
- kdDebug(KIO_SMB) << "mount exit " << proc.exitStatus() << endl
+ kdDebug(TDEIO_SMB) << "mount exit " << proc.exitStatus() << endl
<< "stdout:" << mybuf << endl << "stderr:" << mystderr << endl;
if (proc.exitStatus() != 0)
@@ -167,7 +167,7 @@ void SMBSlave::special( const TQByteArray & data)
return;
}
- kdDebug(KIO_SMB) << "smbumount exit " << proc.exitStatus() << endl
+ kdDebug(TDEIO_SMB) << "smbumount exit " << proc.exitStatus() << endl
<< "stdout:" << mybuf << endl << "stderr:" << mystderr << endl;
if (proc.exitStatus() != 0)
diff --git a/tdeioslave/smtp/Makefile.am b/tdeioslave/smtp/Makefile.am
index e6db9885..5d0ad64c 100644
--- a/tdeioslave/smtp/Makefile.am
+++ b/tdeioslave/smtp/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = tdeio_smtp.la
tdeio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
-tdeio_smtp_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS)
+tdeio_smtp_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS)
tdeio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = smtp.h request.h response.h capabilities.h command.h transactionstate.h
diff --git a/tdeioslave/smtp/TODO b/tdeioslave/smtp/TODO
index cad79f13..bdfc5425 100644
--- a/tdeioslave/smtp/TODO
+++ b/tdeioslave/smtp/TODO
@@ -4,7 +4,7 @@
SMTP server that supports it).
3. Better error message (translated standard meanings of the known
response codes, ENHANCEDSTATUSCODES extension (rfc2034)).
-4. (KIO) MultiPutJob to support pipelining across messages.
+4. (TDEIO) MultiPutJob to support pipelining across messages.
5. Ged rid of slave's header generation after checking who on earth
uses that...
diff --git a/tdeioslave/smtp/compliance.txt b/tdeioslave/smtp/compliance.txt
index 5b305a76..52acb2aa 100644
--- a/tdeioslave/smtp/compliance.txt
+++ b/tdeioslave/smtp/compliance.txt
@@ -29,5 +29,5 @@ General:
Known shortcomings:
- Doesn't enforce the CRLF lineending convention on user-supplied data.
-- Due to the lack of a Mulit_Put_ in the KIO infrastructure, pipelining
+- Due to the lack of a Mulit_Put_ in the TDEIO infrastructure, pipelining
across messages isn't supported.
diff --git a/tdeioslave/smtp/response.h b/tdeioslave/smtp/response.h
index f2caf62e..97220661 100644
--- a/tdeioslave/smtp/response.h
+++ b/tdeioslave/smtp/response.h
@@ -56,7 +56,7 @@ namespace KioSMTP {
/** Return an internationalized error message according to the
response's code. */
TQString errorMessage() const;
- /** Translate the SMTP error code into a KIO one */
+ /** Translate the SMTP error code into a TDEIO one */
int errorCode() const;
enum Reply {
diff --git a/tdeioslave/smtp/transactionstate.h b/tdeioslave/smtp/transactionstate.h
index a5a78f49..ec39e3ac 100644
--- a/tdeioslave/smtp/transactionstate.h
+++ b/tdeioslave/smtp/transactionstate.h
@@ -102,7 +102,7 @@ namespace KioSMTP {
bool complete() const { return mComplete; }
void setComplete() { mComplete = true; }
- /** @return an appropriate KIO error code in case the transaction
+ /** @return an appropriate TDEIO error code in case the transaction
failed, or 0 otherwise */
int errorCode() const;
/** @return an appropriate error message in case the transaction
diff --git a/tdeioslave/system/Makefile.am b/tdeioslave/system/Makefile.am
index 58d779a9..da49adca 100644
--- a/tdeioslave/system/Makefile.am
+++ b/tdeioslave/system/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_system.la
tdeio_system_la_SOURCES = dummy.cpp
-tdeio_system_la_LIBADD = libtdeiosystem.la $(LIB_KIO)
+tdeio_system_la_LIBADD = libtdeiosystem.la $(LIB_TDEIO)
tdeio_system_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
dummy.cpp:
@@ -19,7 +19,7 @@ libtdeiosystem_la_SOURCES = tdeio_system.cpp systemimpl.cpp
check_PROGRAMS = testsystem
testsystem_SOURCES = testsystem.cpp
-testsystem_LDADD = libtdeiosystem.la $(LIB_KIO)
+testsystem_LDADD = libtdeiosystem.la $(LIB_TDEIO)
testsystem_LDFLAGS = $(all_libraries)
## TODO in unsermake: TESTS = testsystem
diff --git a/tdeioslave/system/kdedmodule/Makefile.am b/tdeioslave/system/kdedmodule/Makefile.am
index bc368f9b..9550f9e0 100644
--- a/tdeioslave/system/kdedmodule/Makefile.am
+++ b/tdeioslave/system/kdedmodule/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kded_systemdirnotify_la_SOURCES = systemdirnotify.cpp systemdirnotify.skel systemdirnotifymodule.cpp systemdirnotifymodule.skel
kded_systemdirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_systemdirnotify_la_LIBADD = $(LIB_KSYCOCA)
+kded_systemdirnotify_la_LIBADD = $(LIB_TDESYCOCA)
servicesdir = $(kde_servicesdir)/kded
diff --git a/tdeioslave/system/tdeio_system.h b/tdeioslave/system/tdeio_system.h
index fb342388..198b7f40 100644
--- a/tdeioslave/system/tdeio_system.h
+++ b/tdeioslave/system/tdeio_system.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KIO_MEDIA_H_
-#define _KIO_MEDIA_H_
+#ifndef _TDEIO_MEDIA_H_
+#define _TDEIO_MEDIA_H_
#include <tdeio/forwardingslavebase.h>
diff --git a/tdeioslave/tar/Makefile.am b/tdeioslave/tar/Makefile.am
index caec5236..1388d640 100644
--- a/tdeioslave/tar/Makefile.am
+++ b/tdeioslave/tar/Makefile.am
@@ -1,19 +1,19 @@
## Makefile.am of tdebase/tdeioslave/tar
INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_tar.la
tdeio_tar_la_SOURCES = tar.cc
-tdeio_tar_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_tar_la_LIBADD = $(LIB_TDESYCOCA)
tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
check_PROGRAMS = ktartest
ktartest_SOURCES = ktartest.cpp
-ktartest_LDADD = $(LIB_KSYCOCA)
+ktartest_LDADD = $(LIB_TDESYCOCA)
noinst_HEADERS = tar.h
diff --git a/tdeioslave/tar/tar.h b/tdeioslave/tar/tar.h
index 42cb2457..775578b4 100644
--- a/tdeioslave/tar/tar.h
+++ b/tdeioslave/tar/tar.h
@@ -42,7 +42,7 @@ protected:
* \brief find, check and open the archive file
* \param url The URL of the archive
* \param path Path where the archive really is (returned value)
- * \param errNum KIO error number (undefined if the function returns true)
+ * \param errNum TDEIO error number (undefined if the function returns true)
* \return true if file was found, false if there was an error
*/
bool checkNewFile( const KURL & url, TQString & path, TDEIO::Error& errorNum );
diff --git a/tdeioslave/thumbnail/Makefile.am b/tdeioslave/thumbnail/Makefile.am
index 5dcdbe5c..91355023 100644
--- a/tdeioslave/thumbnail/Makefile.am
+++ b/tdeioslave/thumbnail/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am of tdebase/tdeioslave/thumbnail
INCLUDES = $(all_includes) $(EXR_FLAGS)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO
if have_xcursor
@@ -20,15 +20,15 @@ kde_module_LTLIBRARIES = tdeio_thumbnail.la imagethumbnail.la \
$(EXR_MODULE)
tdeio_thumbnail_la_SOURCES = thumbnail.cpp
-tdeio_thumbnail_la_LIBADD = $(LIB_KIO)
+tdeio_thumbnail_la_LIBADD = $(LIB_TDEIO)
tdeio_thumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
imagethumbnail_la_SOURCES = imagecreator.cpp
-imagethumbnail_la_LIBADD = $(LIB_KIO) # for kimageio
+imagethumbnail_la_LIBADD = $(LIB_TDEIO) # for kimageio
imagethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
textthumbnail_la_SOURCES = textcreator.cpp
-textthumbnail_la_LIBADD = $(LIB_KIO) # for kmimetype
+textthumbnail_la_LIBADD = $(LIB_TDEIO) # for kmimetype
textthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
htmlthumbnail_la_SOURCES = htmlcreator.cpp
diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index f2ad65d2..02b43e90 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -6,13 +6,13 @@ SUBDIRS = . tdefile-plugin
kde_module_LTLIBRARIES = tdeio_trash.la
tdeio_trash_la_SOURCES = tdeio_trash.cpp
-tdeio_trash_la_LIBADD = libtrashcommon.la $(LIB_KIO)
+tdeio_trash_la_LIBADD = libtrashcommon.la $(LIB_TDEIO)
tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
bin_PROGRAMS = ktrash
ktrash_SOURCES = ktrash.cpp
-ktrash_LDADD = $(LIB_KIO)
-ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ktrash_LDADD = $(LIB_TDEIO)
+ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kde_services_DATA = trash.protocol
@@ -21,7 +21,7 @@ libtrashcommon_la_SOURCES = trashimpl.cpp
check_PROGRAMS = testtrash
testtrash_SOURCES = testtrash.cpp
-testtrash_LDADD = libtrashcommon.la $(LIB_KIO)
+testtrash_LDADD = libtrashcommon.la $(LIB_TDEIO)
testtrash_LDFLAGS = $(all_libraries)
TESTS = testtrash
diff --git a/tdeioslave/trash/tdefile-plugin/Makefile.am b/tdeioslave/trash/tdefile-plugin/Makefile.am
index 50d2373e..4b2c5d40 100644
--- a/tdeioslave/trash/tdefile-plugin/Makefile.am
+++ b/tdeioslave/trash/tdefile-plugin/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = tdefile_trash.la
tdefile_trash_la_SOURCES = tdefile_trash.cpp
tdefile_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_trash_la_LIBADD = ../libtrashcommon.la $(LIB_KIO)
+tdefile_trash_la_LIBADD = ../libtrashcommon.la $(LIB_TDEIO)
METASOURCES = AUTO
diff --git a/tdeioslave/trash/tdeio_trash.h b/tdeioslave/trash/tdeio_trash.h
index ceaa27cf..954dbe7a 100644
--- a/tdeioslave/trash/tdeio_trash.h
+++ b/tdeioslave/trash/tdeio_trash.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KIO_TRASH_H
-#define KIO_TRASH_H
+#ifndef TDEIO_TRASH_H
+#define TDEIO_TRASH_H
#include <tdeio/slavebase.h>
#include "trashimpl.h"
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index cf37b8b9..c96d15d3 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -57,7 +57,7 @@ TrashImpl::TrashImpl() :
m_homeDevice( 0 ),
m_trashDirectoriesScanned( false ),
m_mibEnum( TDEGlobal::locale()->fileEncodingMib() ),
- // not using tdeio_trashrc since KIO uses that one already for tdeio_trash
+ // not using tdeio_trashrc since TDEIO uses that one already for tdeio_trash
// so better have a separate one, for faster parsing by e.g. kmimetype.cpp
m_config( "trashrc" )
{
@@ -325,7 +325,7 @@ bool TrashImpl::moveToTrash( const TQString& origPath, int trashId, const TQStri
const TQString dest = filesPath( trashId, fileId );
if ( !move( origPath, dest ) ) {
// Maybe the move failed due to no permissions to delete source.
- // In that case, delete dest to keep things consistent, since KIO doesn't do it.
+ // In that case, delete dest to keep things consistent, since TDEIO doesn't do it.
if ( TQFileInfo( dest ).isFile() )
TQFile::remove( dest );
else
@@ -367,7 +367,7 @@ bool TrashImpl::move( const TQString& src, const TQString& dest )
urlDest.setPath( dest );
kdDebug() << k_funcinfo << urlSrc << " -> " << urlDest << endl;
TDEIO::CopyJob* job = TDEIO::moveAs( urlSrc, urlDest, false );
-#ifdef KIO_COPYJOB_HAS_SETINTERACTIVE
+#ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE
job->setInteractive( false );
#endif
connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
@@ -414,7 +414,7 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest )
urlDest.setPath( dest );
kdDebug() << k_funcinfo << "copying " << src << " to " << dest << endl;
TDEIO::CopyJob* job = TDEIO::copyAs( urlSrc, urlDest, false );
-#ifdef KIO_COPYJOB_HAS_SETINTERACTIVE
+#ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE
job->setInteractive( false );
#endif
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h
index 34308a71..3a06dd9e 100644
--- a/tdeioslave/trash/trashimpl.h
+++ b/tdeioslave/trash/trashimpl.h
@@ -98,7 +98,7 @@ public:
/// Move data from the old trash system to the new one
void migrateOldTrash();
- /// KIO error code
+ /// TDEIO error code
int lastErrorCode() const { return m_lastErrorCode; }
TQString lastErrorMessage() const { return m_lastErrorMessage; }
diff --git a/tdepasswd/Makefile.am b/tdepasswd/Makefile.am
index 65261086..1675f997 100644
--- a/tdepasswd/Makefile.am
+++ b/tdepasswd/Makefile.am
@@ -3,8 +3,8 @@ SUBDIRS = kcm
bin_PROGRAMS = tdepasswd
tdepasswd_SOURCES = tdepasswd.cpp passwd.cpp passwddlg.cpp
-tdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdepasswd_LDADD = $(LIB_KIO)
+tdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdepasswd_LDADD = $(LIB_TDEIO)
METASOURCES = AUTO
AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes)
diff --git a/tdeprint/slave/Makefile.am b/tdeprint/slave/Makefile.am
index 5da6a536..6942fc96 100644
--- a/tdeprint/slave/Makefile.am
+++ b/tdeprint/slave/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES= $(all_includes)
kde_module_LTLIBRARIES = tdeio_print.la
tdeio_print_la_SOURCES = tdeio_print.cpp
-tdeio_print_la_LIBADD = $(LIB_KIO) -ltdeprint
+tdeio_print_la_LIBADD = $(LIB_TDEIO) -ltdeprint
tdeio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO
diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp
index 1106b802..fa03bf03 100644
--- a/tdeprint/slave/tdeio_print.cpp
+++ b/tdeprint/slave/tdeio_print.cpp
@@ -150,19 +150,19 @@ int kdemain(int argc, char **argv)
TDECmdLineArgs::init( &about );
TDEApplication app;
- KIO_Print slave(argv[2], argv[3]);
+ TDEIO_Print slave(argv[2], argv[3]);
slave.dispatchLoop();
PRINT_DEBUG << "done" << endl;
return 0;
}
-KIO_Print::KIO_Print(const TQCString& pool, const TQCString& app)
+TDEIO_Print::TDEIO_Print(const TQCString& pool, const TQCString& app)
: TDEIO::SlaveBase("print", pool, app)
{
}
-void KIO_Print::listDir(const KURL& url)
+void TDEIO_Print::listDir(const KURL& url)
{
if ( url.protocol() == "printdb" )
{
@@ -233,7 +233,7 @@ void KIO_Print::listDir(const KURL& url)
}
}
-void KIO_Print::listRoot()
+void TDEIO_Print::listRoot()
{
PRINT_DEBUG << "listing root entry" << endl;
@@ -266,7 +266,7 @@ void KIO_Print::listRoot()
finished();
}
-void KIO_Print::listDirDB( const KURL& url )
+void TDEIO_Print::listDirDB( const KURL& url )
{
PRINT_DEBUG << "listDirDB: " << url << endl;
@@ -373,7 +373,7 @@ void KIO_Print::listDirDB( const KURL& url )
*/
}
-void KIO_Print::stat(const KURL& url)
+void TDEIO_Print::stat(const KURL& url)
{
if ( url.protocol() == "printdb" )
{
@@ -430,7 +430,7 @@ void KIO_Print::stat(const KURL& url)
error(TDEIO::ERR_DOES_NOT_EXIST, url.path());
}
-void KIO_Print::statDB( const KURL& url )
+void TDEIO_Print::statDB( const KURL& url )
{
PRINT_DEBUG << "statDB: " << url << endl;
TDEIO::UDSEntry entry;
@@ -443,7 +443,7 @@ void KIO_Print::statDB( const KURL& url )
finished();
}
-bool KIO_Print::getDBFile( const KURL& src )
+bool TDEIO_Print::getDBFile( const KURL& src )
{
PRINT_DEBUG << "downloading " << src.url() << endl;
@@ -468,7 +468,7 @@ bool KIO_Print::getDBFile( const KURL& src )
return ( m_httpError == 0 );
}
-void KIO_Print::getDB( const KURL& url )
+void TDEIO_Print::getDB( const KURL& url )
{
PRINT_DEBUG << "downloading PPD file for " << url.url() << endl;
@@ -498,7 +498,7 @@ void KIO_Print::getDB( const KURL& url )
}
}
-void KIO_Print::slotResult( TDEIO::Job *j )
+void TDEIO_Print::slotResult( TDEIO::Job *j )
{
/*
* store slave results for later user (job gets deleted
@@ -513,7 +513,7 @@ void KIO_Print::slotResult( TDEIO::Job *j )
kapp->exit_loop();
}
-void KIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d )
+void TDEIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d )
{
PRINT_DEBUG << "HTTP data received (size=" << d.size() << ")" << endl;
if ( d.size() > 0 )
@@ -528,17 +528,17 @@ void KIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d )
}
}
-void KIO_Print::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t sz )
+void TDEIO_Print::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t sz )
{
totalSize( sz );
}
-void KIO_Print::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t sz )
+void TDEIO_Print::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t sz )
{
processedSize( sz );
}
-void KIO_Print::get(const KURL& url)
+void TDEIO_Print::get(const KURL& url)
{
if ( url.protocol() == "printdb" )
{
@@ -626,7 +626,7 @@ void KIO_Print::get(const KURL& url)
error(TDEIO::ERR_INTERNAL, i18n("Unable to determine source type for %1.").arg(printer));
}
-void KIO_Print::showPrinterInfo(KMPrinter *printer)
+void TDEIO_Print::showPrinterInfo(KMPrinter *printer)
{
if (!KMManager::self()->completePrinter(printer))
error(TDEIO::ERR_INTERNAL, i18n("Unable to retrieve printer information for %1.").arg(printer->name()));
@@ -667,7 +667,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer)
}
}
-void KIO_Print::showClassInfo(KMPrinter *printer)
+void TDEIO_Print::showClassInfo(KMPrinter *printer)
{
if (!KMManager::self()->completePrinter(printer))
error(TDEIO::ERR_INTERNAL, i18n("Unable to retrieve class information for %1.").arg(printer->name()));
@@ -714,7 +714,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
}
}
-void KIO_Print::showSpecialInfo(KMPrinter *printer)
+void TDEIO_Print::showSpecialInfo(KMPrinter *printer)
{
mimeType("text/html");
@@ -753,7 +753,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
finished();
}
-bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer)
+bool TDEIO_Print::loadTemplate(const TQString& filename, TQString& buffer)
{
TQFile f(locate("data", TQString::fromLatin1("tdeprint/template/")+filename));
if (f.exists() && f.open(IO_ReadOnly))
@@ -769,7 +769,7 @@ bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer)
}
}
-void KIO_Print::showData(const TQString& pathname)
+void TDEIO_Print::showData(const TQString& pathname)
{
PRINT_DEBUG << "sending data: " << pathname << endl;
TQFile f(pathname);
@@ -792,7 +792,7 @@ void KIO_Print::showData(const TQString& pathname)
* - $TDEDIR/share/apps/tdeprint/template/
* - as a desktop icon
*/
-TQString KIO_Print::locateData(const TQString& item)
+TQString TDEIO_Print::locateData(const TQString& item)
{
TQString path = locate("data", "tdeprint/template/"+item);
if (path.isEmpty())
@@ -800,7 +800,7 @@ TQString KIO_Print::locateData(const TQString& item)
return path;
}
-void KIO_Print::showJobs(KMPrinter *prt, bool completed)
+void TDEIO_Print::showJobs(KMPrinter *prt, bool completed)
{
mimeType("text/html");
@@ -886,7 +886,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
finished();
}
-void KIO_Print::showDriver(KMPrinter *prt)
+void TDEIO_Print::showDriver(KMPrinter *prt)
{
mimeType("text/html");
diff --git a/tdeprint/slave/tdeio_print.h b/tdeprint/slave/tdeio_print.h
index 1b7158eb..ff56cb42 100644
--- a/tdeprint/slave/tdeio_print.h
+++ b/tdeprint/slave/tdeio_print.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
**/
-#ifndef KIO_PRINT_H
-#define KIO_PRINT_H
+#ifndef TDEIO_PRINT_H
+#define TDEIO_PRINT_H
#include <tdeio/slavebase.h>
#include <tdeio/global.h>
@@ -30,11 +30,11 @@ namespace TDEIO {
class Job;
}
-class KIO_Print : public TQObject, public TDEIO::SlaveBase
+class TDEIO_Print : public TQObject, public TDEIO::SlaveBase
{
Q_OBJECT
public:
- KIO_Print(const TQCString& pool, const TQCString& app);
+ TDEIO_Print(const TQCString& pool, const TQCString& app);
void listDir(const KURL& url);
void get(const KURL& url);
diff --git a/tdeprint/tdeprint_part/Makefile.am b/tdeprint/tdeprint_part/Makefile.am
index 27422bd8..0ebc3376 100644
--- a/tdeprint/tdeprint_part/Makefile.am
+++ b/tdeprint/tdeprint_part/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdeprint_part.la
libtdeprint_part_la_SOURCES = printpart.cpp
libtdeprint_part_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-libtdeprint_part_la_LIBADD = -ltdeprint_management $(LIB_KPARTS)
+libtdeprint_part_la_LIBADD = -ltdeprint_management $(LIB_TDEPARTS)
noinst_HEADERS = printpart.h
diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am
index 124cd23c..eb886bdf 100644
--- a/tdeprint/tdeprintfax/Makefile.am
+++ b/tdeprint/tdeprintfax/Makefile.am
@@ -3,8 +3,8 @@ INCLUDES= $(all_includes)
bin_PROGRAMS = tdeprintfax
tdeprintfax_SOURCES = main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \
conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp
-tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdeprintfax_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) -ltdeabc
+tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeprintfax_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) -ltdeabc
tdeprintfax_METASOURCES = AUTO
xdg_apps_DATA = tdeprintfax.desktop
diff --git a/tdescreensaver/Makefile.am b/tdescreensaver/Makefile.am
index f46573d5..fba437d8 100644
--- a/tdescreensaver/Makefile.am
+++ b/tdescreensaver/Makefile.am
@@ -4,7 +4,7 @@
AM_CPPFLAGS = -UQT_NO_ASCII_CAST
INCLUDES = $(GLINC) $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
bin_PROGRAMS = krandom.kss kblankscrn.kss
diff --git a/tdesu/tdesu/Makefile.am b/tdesu/tdesu/Makefile.am
index 2afc27b7..e4f66a3d 100644
--- a/tdesu/tdesu/Makefile.am
+++ b/tdesu/tdesu/Makefile.am
@@ -5,8 +5,8 @@ INCLUDES= $(all_includes)
## tdesu
bin_PROGRAMS = tdesu
tdesu_SOURCES = tdesu.cpp sudlg.cpp
-tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdesu_LDADD = $(LIB_KIO) -ltdesu
+tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdesu_LDADD = $(LIB_TDEIO) -ltdesu
tdesu_METASOURCES = AUTO
noinst_HEADERS = sudlg.h
diff --git a/tdm/README b/tdm/README
index 2679e7ae..dc46ccc7 100644
--- a/tdm/README
+++ b/tdm/README
@@ -17,7 +17,7 @@ configure options that affect TDM
if PAM is not used.
--with-krb4[=path]
- Compile TDM (and the LDAP KIO slave) with KTH Kerberos 4 support. Note
+ Compile TDM (and the LDAP TDEIO slave) with KTH Kerberos 4 support. Note
that this does not work with the Kerberos 4 compatibility layer found in
MIT Kerberos 5. This affects TDM only if PAM is not used.
diff --git a/tdm/kfrontend/Makefile.am b/tdm/kfrontend/Makefile.am
index c659ca62..dfbfb8a0 100644
--- a/tdm/kfrontend/Makefile.am
+++ b/tdm/kfrontend/Makefile.am
@@ -24,12 +24,12 @@ tdm_greet_SOURCES = \
tdmadmindialog.cpp \
kgreeter.cpp \
kgapp.cpp
-tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdm_greet_LDADD = themer/libtdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4)
krootimage_SOURCES = krootimage.cpp
-krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO)
+krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_TDEIO)
METASOURCES = AUTO
diff --git a/tqt3integration/module/Makefile.am b/tqt3integration/module/Makefile.am
index d730db97..1012d5e7 100644
--- a/tqt3integration/module/Makefile.am
+++ b/tqt3integration/module/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kded_kdeintegration.la
kded_kdeintegration_la_SOURCES = module.cpp
kded_kdeintegration_la_METASOURCES = AUTO
kded_kdeintegration_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kdeintegration_la_LIBADD = $(LIB_KIO)
+kded_kdeintegration_la_LIBADD = $(LIB_TDEIO)
CLEANFILES = module_functions.cpp module_functions.h
diff --git a/twin/clients/keramik/Makefile.am b/twin/clients/keramik/Makefile.am
index a1525f1e..17c1c3f9 100644
--- a/twin/clients/keramik/Makefile.am
+++ b/twin/clients/keramik/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = tiles.h
embedtool_SOURCES = embedtool.cpp
embedtool_LDADD = $(LIB_QT)
-embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kde_module_LTLIBRARIES = twin3_keramik.la
diff --git a/twin/clients/kwmtheme/cli_installer/Makefile.am b/twin/clients/kwmtheme/cli_installer/Makefile.am
index d311639e..d9ee417c 100644
--- a/twin/clients/kwmtheme/cli_installer/Makefile.am
+++ b/twin/clients/kwmtheme/cli_installer/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = kwmtheme
kwmtheme_SOURCES = main.cpp
# the library search path.
-kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
diff --git a/twin/killer/Makefile.am b/twin/killer/Makefile.am
index 74e8858a..048d403e 100644
--- a/twin/killer/Makefile.am
+++ b/twin/killer/Makefile.am
@@ -4,6 +4,6 @@ bin_PROGRAMS = twin_killer_helper
twin_killer_helper_SOURCES = killer.cpp
twin_killer_helper_LDADD = $(LIB_TDEUI)
-twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO
diff --git a/twin/tools/Makefile.am b/twin/tools/Makefile.am
index 555b576c..9593481d 100644
--- a/twin/tools/Makefile.am
+++ b/twin/tools/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = decobenchmark
INCLUDES = $(all_includes)
test_gravity_SOURCES = test_gravity.cpp
-test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test_gravity_LDADD = $(LIB_X11)
METASOURCES = AUTO