Rename a number of libraries and executables to avoid conflicts with KDE4

CMakeLists.txt

@@ -112,7 +112,7 @@ option( BUILD_DOC "Build doc" ${BUILD_ALL} )
 option( BUILD_FILESHARING "Build filesharing" ${BUILD_ALL} )
 option( BUILD_KDICT "Build kdict" ${BUILD_ALL} )
 option( BUILD_KDNSSD "Build tdednssd" ${BUILD_ALL} )
-option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
+option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
 option( BUILD_KGET "Build kget" ${BUILD_ALL} )
 option( BUILD_KNEWSTICKER "Build knewsticker" ${BUILD_ALL} )
 option( BUILD_KOPETE "Build kopete" ${BUILD_ALL} )
@@ -150,7 +150,7 @@ tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_FILESHARING filesharing )
 tde_conditional_add_subdirectory( BUILD_KDICT kdict )
 tde_conditional_add_subdirectory( BUILD_KDNSSD tdednssd )
-tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
+tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
 tde_conditional_add_subdirectory( BUILD_KGET kget )
 tde_conditional_add_subdirectory( BUILD_KNEWSTICKER knewsticker )
 tde_conditional_add_subdirectory( BUILD_KOPETE kopete )

dcoprss/service.cpp

@@ -17,7 +17,7 @@
  ***************************************************************************/
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "service.h"
 #include "cache.h"
 

dcoprss/xmlrpciface.cpp

@@ -25,7 +25,7 @@
 #include "xmlrpciface.h"
 
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 

doc/kopete/index.docbook

@@ -873,7 +873,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
 <title>Web Presence</title>
 <para>Web Presence allows you to publicize your &im; presence on the Web.  Give it the path to a file on an FTP server (for example), and it will upload a short piece of HTML to that file, which you can include in your homepage.  &kde;'s network transparency makes this simple.  Useful for bloggers to make friends with, or you could use it to use &im; in your business.</para>
 <para>Example: <userinput>sftp://username@somehost.org/path/to/homes/user/im.html</userinput> uses the <acronym>SFTP</acronym> protocol to upload your presence directly onto the webserver.</para>
-<para>See <ulink url="help:/kioslave/index.html">the KIO manuals</ulink> for tips on specific network protocols.</para>
+<para>See <ulink url="help:/tdeioslave/index.html">the KIO manuals</ulink> for tips on specific network protocols.</para>
 </sect2>
 </sect1>
 <sect1 id="plugins-contributing">

filesharing/Makefile.am

@@ -2,4 +2,4 @@ SUBDIRS = advanced simple
 
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name '*.ui'` > rc.cpp
-	$(XGETTEXT) rc.cpp `find . -name '*.cpp' -or -name '*.h'` -o $(podir)/kfileshare.pot 
+	$(XGETTEXT) rc.cpp `find . -name '*.cpp' -or -name '*.h'` -o $(podir)/tdefileshare.pot 

filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp

@@ -40,7 +40,7 @@
 #include <kaction.h>
 #include <krestrictedline.h>
 #include <klocale.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <kdirlister.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>

filesharing/advanced/kcm_sambaconf/hiddenfileview.h

@@ -29,7 +29,7 @@
 #ifndef _HIDDENFILEVIEW_H_
 #define _HIDDENFILEVIEW_H_
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klistview.h>
 
 #include "qmultichecklistitem.h"

filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp

@@ -1434,7 +1434,7 @@ extern "C"
 {
   KDE_EXPORT TDECModule *create_KcmSambaConf(TQWidget *parent, const char *name)
   {
-    TDEGlobal::locale()->insertCatalogue("kfileshare");
+    TDEGlobal::locale()->insertCatalogue("tdefileshare");
     return new KcmSambaConf(parent, name);
   }
 }

filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kcmsambaconf
+Exec=tdecmshell kcmsambaconf
 Icon=samba
 Type=Application
 

filesharing/advanced/kcm_sambaconf/sambafile.cpp

@@ -24,7 +24,7 @@
 #include <ksimpleconfig.h>
 #include <kdebug.h>
 #include <tqfileinfo.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <klocale.h>

filesharing/advanced/kcm_sambaconf/sambafile.h

@@ -24,7 +24,7 @@
 #include <tqdict.h>
 #include <tqstring.h>
 #include <tqobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "sambashare.h"
 

filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp

@@ -58,7 +58,7 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <kdirlister.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>

filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp

@@ -32,7 +32,7 @@
 #include <tqlabel.h>
  
 #include <kapplication.h> 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
  

filesharing/advanced/nfs/nfsdialog.cpp

@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <klistview.h>
 #include <kaccel.h>

filesharing/advanced/propsdlgplugin/CMakeLists.txt

@@ -43,6 +43,6 @@ tde_add_kpart( fileshare_propsdlgplugin AUTOMOC
   SOURCES propsdlgshareplugin.cpp
   LINK
     propsdlgplugin_common-static filesharenfs-static
-    filesharesamba-static kio-shared
+    filesharesamba-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

filesharing/advanced/propsdlgplugin/propertiespage.cpp

@@ -25,13 +25,13 @@
 #include <kpushbutton.h>
 #include <tqtimer.h>
 
-#include <kfileshare.h>
+#include <tdefileshare.h>
 #include <knfsshare.h>
 #include <ksambashare.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
 #include <klineedit.h>

filesharing/advanced/propsdlgplugin/propertiespage.h

@@ -20,7 +20,7 @@
 #ifndef PROPERTIESPAGE_H
 #define PROPERTIESPAGE_H
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include "propertiespagegui.h"
 
 class NFSFile;

filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp

@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <kfileshare.h>
+#include <tdefileshare.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
@@ -49,7 +49,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
                     const char *, const TQStringList & )
   : KPropsDlgPlugin(dlg), d(0)
 {
-  TDEGlobal::locale()->insertCatalogue("kfileshare");                            
+  TDEGlobal::locale()->insertCatalogue("tdefileshare");                            
                             
   if (KFileShare::shareMode() == KFileShare::Simple) {     
       kdDebug(5009) << "PropsDlgSharePlugin: Sharing mode is simple. Aborting." << endl;
@@ -101,7 +101,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
 void PropsDlgSharePlugin::slotConfigureFileSharing()
 {
     TDEProcess proc;
-    proc << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare";
+    proc << KStandardDirs::findExe("tdesu") << locate("exe", "tdecmshell") << "fileshare";
     proc.start( TDEProcess::DontCare );
 }
 

filesharing/simple/CMakeLists.txt

@@ -36,6 +36,6 @@ tde_add_kpart( kcm_fileshare AUTOMOC
     krichtextlabel.cpp
   LINK
     propsdlgplugin_common-static filesharenfs-static filesharesamba-static
-    kio-shared
+    tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

filesharing/simple/fileshare.cpp

@@ -35,7 +35,7 @@
 #include <kiconloader.h>
 #include <knfsshare.h>
 #include <ksambashare.h>
-#include <kfileshare.h>
+#include <tdefileshare.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kmessagebox.h>
@@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") )
 KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &):
     TDECModule(ShareFactory::instance(), parent, name)
 {
-  TDEGlobal::locale()->insertCatalogue("kfileshare");                            
+  TDEGlobal::locale()->insertCatalogue("tdefileshare");                            
 
   TQBoxLayout* layout = new TQVBoxLayout(this,0,
 				       KDialog::spacingHint());

filesharing/simple/fileshare.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell fileshare
+Exec=tdecmshell fileshare
 Icon=share
 Type=Application
 

filesharing/simple/fileshare.h

@@ -19,7 +19,7 @@
 #ifndef __fileshare_h__
 #define __fileshare_h__
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "tdecmodule.h"
 class TQRadioButton;

kdict/applet/kdictapplet.cpp

@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqtooltip.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klocale.h>

kdict/options.cpp

@@ -27,7 +27,7 @@
 #include <tqpainter.h>
 
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <knumvalidator.h>
 #include <knuminput.h>

kdict/queryview.cpp

@@ -18,9 +18,9 @@
 #include <tqclipboard.h>
 #include <tqtimer.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kcursor.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>

kfile-plugins/torrent/Makefile.am

@@ -1,22 +0,0 @@
-## Makefile.am for folder file meta info plugin
-
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_torrent.h bbase.h bdict.h bytetape.h \
-                   bstring.h bint.h blist.h
-
-kde_module_LTLIBRARIES = kfile_torrent.la
-
-kfile_torrent_la_SOURCES = bytetape.cpp bint.cpp bstring.cpp blist.cpp bdict.cpp kfile_torrent.cpp
-kfile_torrent_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kfile_torrent_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-services_DATA = kfile_torrent.desktop
-servicesdir = $(kde_servicesdir)
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_torrent.pot

kget/CMakeLists.txt

@@ -39,13 +39,13 @@ install( FILES kgetui.rc eventsrc DESTINATION ${DATA_INSTALL_DIR}/kget )
 tde_add_executable( kget AUTOMOC
   SOURCES
     getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp
-    transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp kfileio.cpp
+    transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp tdefileio.cpp
     droptarget.cpp docking.cpp dlgconnectionbase.ui dlgautomationbase.ui
     dlglimitsbase.ui dlgadvancedbase.ui dlgdirectoriesbase.ui
     dlgsystembase.ui dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp
     dlgIndividual.cpp dlgDirectories.cpp dlgConnection.cpp
     dlgAutomation.cpp dlgAdvanced.cpp main.cpp dockindividual.cpp
     kget_iface.skel safedelete.cpp
-  LINK kio-shared Xext
+  LINK tdeio-shared Xext
   DESTINATION ${BIN_INSTALL_DIR}
 )

kget/Makefile.am

@@ -8,7 +8,7 @@ kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT)
 kget_LDADD   = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET)
 kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
                transfer.cpp settings.cpp logwindow.cpp \
-               kmainwidget.cpp kfileio.cpp droptarget.cpp docking.cpp \
+               kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
                dlgconnectionbase.ui dlgautomationbase.ui dlglimitsbase.ui \
                dlgadvancedbase.ui dlgdirectoriesbase.ui dlgsystembase.ui \
                dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp \
@@ -20,7 +20,7 @@ noinst_HEADERS = common.h \
                  dlgAdvanced.h dlgAutomation.h dlgConnection.h \
                  dlgDirectories.h dlgIndividual.h dlgLimits.h \
                  dlgPreferences.h dlgSystem.h docking.h droptarget.h \
-                 kfileio.h kmainwidget.h logwindow.h settings.h \
+                 tdefileio.h kmainwidget.h logwindow.h settings.h \
                  transfer.h transferlist.h version.h slave.h \
                  slaveevent.h http_defaults.h getfilejob.h dockindividual.h
 

kget/dlgAdvanced.cpp

@@ -30,7 +30,7 @@
 #include <kprotocolmanager.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "settings.h"
 #include "kmainwidget.h"

kget/dlgDirectories.cpp

@@ -31,7 +31,7 @@
 
 #include <tqdir.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kglobal.h>
 #include <klocale.h>

kget/dlgIndividual.cpp

@@ -43,7 +43,7 @@
 #include <klocale.h>
 #include <ktoolbar.h>
 #include <krun.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include "common.h"
 
 #include "transfer.h"

kget/dlgIndividual.h

@@ -31,7 +31,7 @@
 
 #include <tqwidget.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class Transfer;
 

kget/droptarget.cpp

@@ -28,7 +28,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <kmainwindow.h>

kget/getfilejob.h

@@ -18,7 +18,7 @@
 #ifndef GETFILEJOB_H
 #define GETFILEJOB_H
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 
 namespace TDEIO

kget/kmainwidget.cpp

@@ -50,7 +50,7 @@
 #include <kinputdialog.h>
 
 #include <kprotocolinfo.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
@@ -64,19 +64,19 @@
 #include <khelpmenu.h>
 #include <kedittoolbar.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
-#include <kio/netaccess.h>
+#include <tdeconfig.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kmenubar.h>
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 
 #include "safedelete.h"
 #include "settings.h"
 #include "transfer.h"
 #include "transferlist.h"
 #include "kmainwidget.h"
-#include "kfileio.h"
+#include "tdefileio.h"
 #include "dlgPreferences.h"
 #include "logwindow.h"
 #include "docking.h"
@@ -85,8 +85,8 @@
 
 
 
-#include <kio/authinfo.h>
-#include <kio/global.h>
+#include <tdeio/authinfo.h>
+#include <tdeio/global.h>
 #include <tqiconset.h>
 
 #include "version.h"
@@ -128,7 +128,7 @@ KMainWidget::KMainWidget(bool bStartDocked)
 #endif
 
     {
-        TDEConfig cfg( "kioslaverc", false, false);
+        TDEConfig cfg( "tdeioslaverc", false, false);
         cfg.setGroup(TQString());
         cfg.writeEntry("AutoResume", true);
         cfg.sync();

kget/safedelete.cpp

@@ -1,7 +1,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqfileinfo.h>
 

kget/settings.cpp

@@ -26,7 +26,7 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <twin.h>
 #include <kmessagebox.h>

kget/slave.cpp

@@ -26,7 +26,7 @@
 
 
 #include <kapplication.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 
 #include "getfilejob.h"
 #include "slave.h"

kget/tdefileio.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-*                                kfileio.cpp
+*                                tdefileio.cpp
 *                             -------------------
 *
 *    Revision     : $Id$
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#include "kfileio.h"
+#include "tdefileio.h"
 
 //-----------------------------------------------------------------------------
 TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose)

kget/tdefileio.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-*                                kfileio.h
+*                                tdefileio.h
 *                             -------------------
 *
 *    Revision     : $Id$
@@ -17,8 +17,8 @@
  * Author: Stefan Taferner <taferner@kde.org>
  * This code is under GPL.
  */
-#ifndef kfileio_h
-#define kfileio_h
+#ifndef tdefileio_h
+#define tdefileio_h
 
 /** Load a file. Returns a pointer to the memory-block that contains
  * the loaded file. Returns a NULL string if the file could not be loaded.
@@ -41,4 +41,4 @@ bool kCStringToFile(const TQCString & buffer, const TQString & fileName, bool as
 bool kByteArrayToFile(const TQByteArray & buffer, const TQString & fileName, bool askIfExists = FALSE, bool createBackup = TRUE, bool withDialogs = TRUE);
 
 
-#endif                          /* kfileio_h */
+#endif                          /* tdefileio_h */

kget/transfer.cpp

@@ -12,7 +12,7 @@
 /***************************************************************************
  *
  *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public Lkio/global.h:icense as published by
+ *   it under the terms of the GNU General Public Ltdeio/global.h:icense as published by
  *   the Free Software Foundation; either version 2 of the License, or
  *   (at your option) any later version.
  *
@@ -45,9 +45,9 @@
 #include "transfer.h"
 
 #include <kapplication.h>
-#include <kio/passdlg.h>
-#include <kio/global.h>
-#include <kio/netaccess.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/global.h>
+#include <tdeio/netaccess.h>
 
 
 extern Settings ksettings;

kget/transfer.h

@@ -34,7 +34,7 @@
 #include <tqmap.h>
 
 #include <kurl.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 #include "slave.h"
 

kget/transferlist.cpp

@@ -29,10 +29,10 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "transfer.h"
 #include "transferlist.h"

knewsticker/CMakeLists.txt

@@ -43,6 +43,6 @@ tde_add_kpart( knewsticker_panelapplet AUTOMOC
     newsscroller.cpp knewsticker.cpp knewsticker.skel
     knewstickerconfig.cpp knewstickerconfigwidget.ui
     newssourcedlgimpl.cpp newssourcedlg.ui
-  LINK knewstickercommon-static kio-shared
+  LINK knewstickercommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

knewsticker/Makefile.am

@@ -18,7 +18,7 @@ knewsticker_panelapplet_la_LIBADD = common/libknewstickercommon.la \
 appdatadir = $(kde_datadir)/knewsticker
 appdata_DATA = eventsrc
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = knewsticker.upd
 update_SCRIPTS = knt-0.1-0.2.pl
 

knewsticker/common/configaccess.h

@@ -14,8 +14,8 @@
 #include "configiface.h"
 #include "newsengine.h"
 
-#include <kconfig.h>
-#include <kio/job.h>
+#include <tdeconfig.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 
 #include <tqpixmap.h>

knewsticker/common/newsengine.h

@@ -22,7 +22,7 @@
 #include <tqmap.h>
 #include <tqpixmap.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <ksharedptr.h>
 

knewsticker/common/newsiconmgr.h

@@ -15,7 +15,7 @@
 #include <tqpixmap.h>
 
 #include <dcopobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 class DCOPClient;

knewsticker/common/xmlnewsaccess.h

@@ -18,7 +18,7 @@
 #include <tqvaluelist.h>
 #include <tqobject.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 class TQBuffer;

knewsticker/knewstickerstub/CMakeLists.txt

@@ -33,6 +33,6 @@ install( FILES
 
 tde_add_executable( knewstickerstub AUTOMOC
   SOURCES knewstickerstub.cpp
-  LINK knewstickercommon-static kio-shared
+  LINK knewstickercommon-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

kopete/INSTALL

@@ -193,9 +193,9 @@ directory where TDE doesn't look for additional resources like plugins.
 It's also possible that you've just been too impatient :)
 
 Kopete installs several .desktop files that have to be processed by a
-TDE application called 'kbuildsycoca'. If you run Kopete directly
+TDE application called 'tdebuildsycoca'. If you run Kopete directly
 after installing it this process might still be running and Kopete
-doesn't see the new plugins yet. Try running 'kbuildsycoca' from a
+doesn't see the new plugins yet. Try running 'tdebuildsycoca' from a
 console and restart Kopete when it finishes. If that doesn't help,
 please read on.
 

kopete/kopete/CMakeLists.txt

@@ -14,7 +14,7 @@ add_subdirectory( addcontactwizard )
 add_subdirectory( contactlist )
 add_subdirectory( chatwindow )
 add_subdirectory( config )
-add_subdirectory( kconf_update )
+add_subdirectory( tdeconf_update )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}

kopete/kopete/Makefile.am

@@ -23,7 +23,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \
 KDE_ICON = AUTO
 METASOURCES = AUTO
 
-SUBDIRS = addaccountwizard addcontactwizard contactlist chatwindow config . kconf_update
+SUBDIRS = addaccountwizard addcontactwizard contactlist chatwindow config . tdeconf_update
 
 bin_PROGRAMS = kopete
 kopete_SOURCES = main.cpp 	kopeteapplication.cpp kopeteiface.cpp \

kopete/kopete/addcontactwizard/addcontactwizard.cpp

@@ -46,7 +46,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 

kopete/kopete/chatwindow/chatmessagepart.cpp

@@ -50,7 +50,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdehtmlview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -60,8 +60,8 @@
 #include <kstringhandler.h>
 #include <ktempfile.h>
 #include <kurldrag.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>

kopete/kopete/chatwindow/chatview.cpp

@@ -32,7 +32,7 @@
 #include "kopetecontactlist.h"
 #include "kopeteviewmanager.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktabwidget.h>
 #include <kdebug.h>
 #include <klocale.h>

kopete/kopete/chatwindow/kopetechatwindow.cpp

@@ -30,7 +30,7 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <kmenubar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>

kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp

@@ -30,9 +30,9 @@
 #include <kzip.h>
 #include <ktar.h>
 #include <kmimetype.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "kopetechatwindowstyle.h"

kopete/kopete/chatwindow/kopetechatwindowstylemanager.h

@@ -20,7 +20,7 @@
 
 #include <tqobject.h>
 #include <tqmap.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kopete_export.h>
 
 class ChatWindowStyle;

kopete/kopete/chatwindow/kopeteemailwindow.cpp

@@ -34,7 +34,7 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeversion.h>

kopete/kopete/chatwindow/krichtexteditpart.cpp

@@ -4,7 +4,7 @@
 #include <kglobalsettings.h>
 #include <kfontdialog.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tqapplication.h>
 #include <tqclipboard.h>

kopete/kopete/config/appearance/appearanceconfig.cpp

@@ -43,11 +43,11 @@
 #include <kapplication.h>
 #include <kcolorcombo.h>
 #include <kcolorbutton.h>
-#include <kconfig.h> // for KNewStuff emoticon fetching
+#include <tdeconfig.h> // for KNewStuff emoticon fetching
 #include <kdebug.h>
 #include <kfontrequester.h>
 #include <kgenericfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdehtmlview.h>
 #include <klineedit.h>
 #include <klocale.h>
@@ -59,7 +59,7 @@
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <krun.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <knewstuff/downloaddialog.h> // knewstuff emoticon and chatwindow fetching
 #include <knewstuff/engine.h>         // "
@@ -696,7 +696,7 @@ void AppearanceConfig::slotGetChatStyles()
 	// you have to do this by hand when providing your own Engine
 	KNS::ProviderLoader *provider = new KNS::ProviderLoader( this );
 	TQObject::connect( provider, TQT_SIGNAL( providersLoaded(Provider::List*) ), downloadDialog, TQT_SLOT( slotProviders (Provider::List *) ) );
-	provider->load( "kopete/chatstyle", "http://download.kde.org/khotnewstuff/kopetestyles12-providers.xml" );
+	provider->load( "kopete/chatstyle", "http://download.kde.org/tdehotnewstuff/kopetestyles12-providers.xml" );
 	downloadDialog->exec();
 }
 
@@ -856,7 +856,7 @@ void AppearanceConfig::slotGetEmoticonThemes()
 	TDEConfig* config = TDEGlobal::config();
 	config->setGroup( "KNewStuff" );
 	config->writeEntry( "ProvidersUrl",
-						"http://download.kde.org/khotnewstuff/emoticons-providers.xml" );
+						"http://download.kde.org/tdehotnewstuff/emoticons-providers.xml" );
 	config->writeEntry( "StandardResource", "emoticons" );
 	config->writeEntry( "Uncompress", "application/x-gzip" );
 	config->sync();

kopete/kopete/config/appearance/emoticonseditdialog.cpp

@@ -23,8 +23,8 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 #include <tqpixmap.h>
 #include <tqheader.h>
 #include <tqlayout.h>

kopete/kopete/config/avdevice/avdeviceconfig.cpp

@@ -32,7 +32,7 @@
 #include <kpushbutton.h>
 #include <kgenericfactory.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <tqimage.h>
 #include <tqpixmap.h>

kopete/kopete/config/behavior/behaviorconfig.cpp

@@ -33,7 +33,7 @@
 #include <kpushbutton.h>
 #include <kgenericfactory.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 
 #include "kopeteprefs.h"

kopete/kopete/config/identity/kopeteidentityconfig.cpp

@@ -30,7 +30,7 @@
 
 // KDE includes
 #include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -45,7 +45,7 @@
 #include <kmdcodec.h>
 
 // KDE KIO includes
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // KDE KABC(AddressBook) includes
 #include <kabc/addresseedialog.h>

kopete/kopete/config/identity/kopeteidentityconfig.h

@@ -19,7 +19,7 @@
 #define _IDENTITYCONFIG_H
 
 #include <tdecmodule.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "kopetemetacontact.h"
 

kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kopeteidentityconfigpreferences.kcfg
 ClassName=KopeteIdentityConfigPreferences
 Singleton=true

kopete/kopete/contactlist/customnotificationprops.cpp

@@ -23,7 +23,7 @@
 #include <tqlineedit.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurlrequester.h>
 
 #include "customnotifications.h"

kopete/kopete/contactlist/kopetelviprops.cpp

@@ -33,7 +33,7 @@
 #include <tqcombobox.h>
 
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
@@ -521,7 +521,7 @@ void KopeteMetaLVIProps::slotFromKABCClicked()
 
 void KopeteMetaLVIProps::slotOpenSoundDialog( KURLRequester *requester )
 {
-	// taken from tdelibs/kio/kfile/knotifydialog.cpp
+	// taken from tdelibs/tdeio/tdefile/knotifydialog.cpp
 	// only need to init this once
 	requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )),
 						this, TQT_SLOT( slotOpenSoundDialog( KURLRequester * )));

kopete/kopete/contactlist/kopetemetacontactlvi.cpp

@@ -34,7 +34,7 @@
 #include <kpassivepopup.h>
 #include <kpopupmenu.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <kabc/addressbook.h>

kopete/kopete/kconf_update/CMakeLists.txt

@@ -1,64 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_definitions( -DKDE_NO_COMPAT )
-
-include_directories(
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-##### other data ################################
-
-install( FILES
-    kopete-pluginloader.upd kopete-account-kconf_update.upd
-    kopete-pluginloader2.upd kopete-jabberproxytype-kconf_update.upd
-    kopete-jabberpriorityaddition-kconf_update.upd
-    kopete-nameTracking.upd
-  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
-
-install( PROGRAMS
-    kopete-pluginloader.pl kopete-jabberpriorityaddition-kconf_update.sh
-    kopete-pluginloader2.sh kopete-jabberproxytype-kconf_update.sh
-    kopete-account-0.10.pl kopete-account-kconf_update.sh
-  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
-
-
-##### kopete_account_kconf_update (executable) ##
-
-tde_add_executable( "kopete-account-kconf_update"
-  SOURCES kopete-account-kconf_update.cpp
-  LINK ${TQT_LIBRARIES}
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
-)
-
-
-##### kopete_pluginloader2_kconf_update (executable)
-
-tde_add_executable( "kopete-pluginloader2-kconf_update"
-  SOURCES kopete-pluginloader2.cpp
-  LINK ${TQT_LIBRARIES}
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
-)
-
-
-##### kopete_nameTracking_kconf_update (executable)
-
-tde_add_executable( "kopete-nameTracking-kconf_update"
-  SOURCES kopete-nameTracking.cpp
-  LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
-)

kopete/kopete/kconf_update/Makefile.am

@@ -1,32 +0,0 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes)
-
-update_DATA = kopete-pluginloader.upd kopete-account-kconf_update.upd \
-	kopete-pluginloader2.upd kopete-jabberproxytype-kconf_update.upd \
-	kopete-jabberpriorityaddition-kconf_update.upd kopete-nameTracking.upd
-update_SCRIPTS = kopete-pluginloader.pl kopete-account-kconf_update.sh \
-	kopete-pluginloader2.sh kopete-jabberproxytype-kconf_update.sh \
-	kopete-jabberpriorityaddition-kconf_update.sh kopete-account-0.10.pl
-updatedir = $(kde_datadir)/kconf_update
-
-# The Qt app cannot go into kde_datadir, that is not portable.
-# install to kde_bindir/kconf_update_bin instead.
-# KDE 3.2 will allow kconf_update scripts to run directly from there,
-# but for us that's too late. Use the .sh script as a workaround.
-kconf_PROGRAMS = kopete-account-kconf_update kopete-pluginloader2-kconf_update \
-	kopete-nameTracking-kconf_update
-kconfdir = $(libdir)/kconf_update_bin
-
-kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp
-kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kopete_account_kconf_update_LDADD = $(LIB_QT)
-
-kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp
-kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT)
-
-kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp
-kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE)
-
-# vim: set noet:
-

kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd

@@ -1,4 +0,0 @@
-Id=kopete0.9/r1
-File=kopeterc
-Script=kopete-jabberpriorityaddition-kconf_update.sh,sh
-

kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.upd

@@ -1,4 +0,0 @@
-Id=kopete0.9/r1
-File=kopeterc
-Script=kopete-jabberproxytype-kconf_update.sh,sh
-

kopete/kopete/kconf_update/kopete-nameTracking.upd

@@ -1,3 +0,0 @@
-Id=kopete0.9/r1
-File=kopeterc
-Script=kopete-nameTracking-kconf_update

kopete/kopete/kopeteapplication.cpp

@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>

kopete/kopete/kopeteeditglobalidentitywidget.cpp

@@ -31,9 +31,9 @@
 #include <ktoolbar.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kpixmapregionselectordialog.h>
 
 // Kopete include

kopete/kopete/kopeteiface.cpp

@@ -17,7 +17,7 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "kopeteiface.h"

kopete/kopete/kopetewindow.cpp

@@ -32,7 +32,7 @@
 
 #include <kaction.h>
 #include <kactionclasses.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>

kopete/kopete/tdeconf_update/CMakeLists.txt

@@ -0,0 +1,64 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_definitions( -DKDE_NO_COMPAT )
+
+include_directories(
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES
+    kopete-pluginloader.upd kopete-account-tdeconf_update.upd
+    kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd
+    kopete-jabberpriorityaddition-tdeconf_update.upd
+    kopete-nameTracking.upd
+  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+
+install( PROGRAMS
+    kopete-pluginloader.pl kopete-jabberpriorityaddition-tdeconf_update.sh
+    kopete-pluginloader2.sh kopete-jabberproxytype-tdeconf_update.sh
+    kopete-account-0.10.pl kopete-account-tdeconf_update.sh
+  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+
+
+##### kopete_account_tdeconf_update (executable) ##
+
+tde_add_executable( "kopete-account-tdeconf_update"
+  SOURCES kopete-account-tdeconf_update.cpp
+  LINK ${TQT_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
+)
+
+
+##### kopete_pluginloader2_tdeconf_update (executable)
+
+tde_add_executable( "kopete-pluginloader2-tdeconf_update"
+  SOURCES kopete-pluginloader2.cpp
+  LINK ${TQT_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
+)
+
+
+##### kopete_nameTracking_tdeconf_update (executable)
+
+tde_add_executable( "kopete-nameTracking-tdeconf_update"
+  SOURCES kopete-nameTracking.cpp
+  LINK tdecore-shared
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
+)

kopete/kopete/tdeconf_update/Makefile.am

@@ -0,0 +1,32 @@
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes)
+
+update_DATA = kopete-pluginloader.upd kopete-account-tdeconf_update.upd \
+	kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd \
+	kopete-jabberpriorityaddition-tdeconf_update.upd kopete-nameTracking.upd
+update_SCRIPTS = kopete-pluginloader.pl kopete-account-tdeconf_update.sh \
+	kopete-pluginloader2.sh kopete-jabberproxytype-tdeconf_update.sh \
+	kopete-jabberpriorityaddition-tdeconf_update.sh kopete-account-0.10.pl
+updatedir = $(kde_datadir)/tdeconf_update
+
+# The Qt app cannot go into kde_datadir, that is not portable.
+# install to kde_bindir/tdeconf_update_bin instead.
+# KDE 3.2 will allow tdeconf_update scripts to run directly from there,
+# but for us that's too late. Use the .sh script as a workaround.
+tdeconf_PROGRAMS = kopete-account-tdeconf_update kopete-pluginloader2-tdeconf_update \
+	kopete-nameTracking-tdeconf_update
+tdeconfdir = $(libdir)/tdeconf_update_bin
+
+kopete_account_tdeconf_update_SOURCES = kopete-account-tdeconf_update.cpp
+kopete_account_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_account_tdeconf_update_LDADD = $(LIB_QT)
+
+kopete_pluginloader2_tdeconf_update_SOURCES = kopete-pluginloader2.cpp
+kopete_pluginloader2_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_pluginloader2_tdeconf_update_LDADD = $(LIB_QT)
+
+kopete_nameTracking_tdeconf_update_SOURCES = kopete-nameTracking.cpp
+kopete_nameTracking_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_nameTracking_tdeconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE)
+
+# vim: set noet:
+

kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp

@@ -1,5 +1,5 @@
 /*
-    kconf_update app for migrating kopete 0.6.x accounts to 0.7. Code is
+    tdeconf_update app for migrating kopete 0.6.x accounts to 0.7. Code is
     not up to my normal standards, but it does the job, and since it's
     supposed to run exactly once on each system that's good enough for me :)
 

kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IFS=:
-SUFF=kconf_update_bin/kopete-account-kconf_update
+SUFF=tdeconf_update_bin/kopete-account-tdeconf_update
 for path in `tde-config --path lib`; do
   if test -x "$path/$SUFF"; then
      exec "$path/$SUFF"

kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.upd

@@ -1,6 +1,6 @@
 Id=kopete0.7/r1
 File=kopeterc
-Script=kopete-account-kconf_update.sh,sh
+Script=kopete-account-tdeconf_update.sh,sh
 
 #remove the PluginData_ProtocolID_ prefix from config keys
 Id=kopete0.10/r1

kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd

@@ -0,0 +1,4 @@
+Id=kopete0.9/r1
+File=kopeterc
+Script=kopete-jabberpriorityaddition-tdeconf_update.sh,sh
+

kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd

@@ -0,0 +1,4 @@
+Id=kopete0.9/r1
+File=kopeterc
+Script=kopete-jabberproxytype-tdeconf_update.sh,sh
+

kopete/kopete/tdeconf_update/kopete-nameTracking.cpp

@@ -1,5 +1,5 @@
 /*
-    kconf_update app for updating the contactlist format ( <= 0.9.0) for MetaContacts to
+    tdeconf_update app for updating the contactlist format ( <= 0.9.0) for MetaContacts to
     track the name of a subcontact.
 
     Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>

kopete/kopete/tdeconf_update/kopete-nameTracking.upd

@@ -0,0 +1,3 @@
+Id=kopete0.9/r1
+File=kopeterc
+Script=kopete-nameTracking-tdeconf_update

kopete/kopete/tdeconf_update/kopete-pluginloader2.cpp

@@ -1,5 +1,5 @@
 /*
-    kconf_update app for migrating the list of loaded plugins in
+    tdeconf_update app for migrating the list of loaded plugins in
     kopete 0.7.x to the new KPluginSelector format.
 
     Copyright (c) 2003      by Martijn Klingens <klingens@kde.org>

kopete/kopete/tdeconf_update/kopete-pluginloader2.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IFS=:
-SUFF=kconf_update_bin/kopete-pluginloader2-kconf_update
+SUFF=tdeconf_update_bin/kopete-pluginloader2-tdeconf_update
 for path in `tde-config --path lib`; do
   if test -x "$path/$SUFF"; then
      exec "$path/$SUFF"

kopete/libkopete/avdevice/videodevicepool.h

@@ -32,7 +32,7 @@
 #include "videodevice.h"
 #include "kopete_export.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 namespace Kopete {

kopete/libkopete/kautoconfig.cpp

@@ -23,7 +23,7 @@
 #include <kglobal.h>
 #include <tqsqlpropertymap.h>
 #include <tqobjectlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <tdeversion.h>
 
@@ -101,8 +101,8 @@ public:
   }
 };
 
-KAutoConfig::KAutoConfig(TDEConfig *kconfig, TQObject *parent,
-    const char *name) : TQObject(parent, name), config(kconfig) {
+KAutoConfig::KAutoConfig(TDEConfig *tdeconfig, TQObject *parent,
+    const char *name) : TQObject(parent, name), config(tdeconfig) {
   d = new KAutoConfigPrivate();
 }
 

kopete/libkopete/kautoconfig.h

@@ -119,12 +119,12 @@ signals:
 public:
   /**
    * Constructor.
-   * @param kconfig - TDEConfig to use when retrieving/saving the widgets
+   * @param tdeconfig - TDEConfig to use when retrieving/saving the widgets
    * that KAutoConfig knows about.
    * @param parent - Parent object.
    * @param name - Object name.
    */ 
-  KAutoConfig( TDEConfig *kconfig, TQObject *parent=0, const char *name=0 );
+  KAutoConfig( TDEConfig *tdeconfig, TQObject *parent=0, const char *name=0 );
  
   /**
    * Constructor.

kopete/libkopete/knotification.cpp

@@ -24,7 +24,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpassivepopup.h>
 #include <kactivelabel.h>
 #include <kprocess.h>

kopete/libkopete/kopeteaccount.cpp

@@ -19,7 +19,7 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>

kopete/libkopete/kopeteaccountmanager.cpp

@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kplugininfo.h>

kopete/libkopete/kopeteaway.cpp

@@ -29,7 +29,7 @@
 #include "kopetecontact.h"
 #include "kopeteprefs.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtimer.h>
 #include <kapplication.h>
 #include <dcopref.h>

kopete/libkopete/kopeteblacklister.cpp

@@ -17,7 +17,7 @@
 
 #include "kopetecontact.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include <tqstringlist.h>

kopete/libkopete/kopetecontactlistelement.cpp

@@ -18,7 +18,7 @@
 
 #include "kopetecontactlistelement.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 

kopete/libkopete/kopeteglobal.cpp

@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kprogress.h>

kopete/libkopete/kopetemimetypehandler.cpp

@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kprogress.h>

kopete/libkopete/kopetepassword.cpp

@@ -28,7 +28,7 @@
 
 #include <kactivelabel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>

kopete/libkopete/kopetepluginmanager.cpp

@@ -505,7 +505,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /*
 	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Plugins" );
 
-	// FIXME: What is this for? This sort of thing is kconf_update's job - Richard
+	// FIXME: What is this for? This sort of thing is tdeconf_update's job - Richard
 	if ( !pluginId.startsWith( TQString::fromLatin1( "kopete_" ) ) )
 		pluginId.prepend( TQString::fromLatin1( "kopete_" ) );
 

kopete/libkopete/kopeteprefs.cpp

@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 

kopete/libkopete/kopetetransfermanager.cpp

@@ -18,10 +18,10 @@
 
 #include <klocale.h>
 #include <kstaticdeleter.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
 #include <kmessagebox.h>
-#include <kio/observer.h>
+#include <tdeio/observer.h>
 
 #include "kopetemetacontact.h"
 #include "kopetecontact.h"

kopete/libkopete/kopetetransfermanager.h

@@ -24,7 +24,7 @@
 #include <tqmap.h>
 #include "kopete_export.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace Kopete
 {

kopete/libkopete/kopeteutils.cpp

@@ -2,7 +2,7 @@
     Kopete Utils.
     Copyright (c) 2005 Duncan Mac-Vicar Prett <duncan@kde.org>
 
-      isHostReachable function code derived from KDE's HTTP kioslave
+      isHostReachable function code derived from KDE's HTTP tdeioslave
         Copyright (c) 2005 Waldo Bastian <bastian@kde.org>
 
     Kopete    (c) 2002-2003 by the Kopete developers  <kopete-devel@kde.org>

kopete/libkopete/private/kopeteviewmanager.cpp

@@ -16,7 +16,7 @@
 
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqptrlist.h>

kopete/libkopete/ui/addressbookselectorwidget.cpp

@@ -27,7 +27,7 @@
 
 #include <tqcheckbox.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 

kopete/libkopete/ui/kopetefileconfirmdialog.cpp

@@ -18,9 +18,9 @@
 #include <tqtextedit.h>
 
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 

kopete/libkopete/ui/kopetelistview.cpp

@@ -24,7 +24,7 @@
 
 #include <tqapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqtimer.h>

kopete/libkopete/ui/metacontactselectorwidget.cpp

@@ -27,7 +27,7 @@
 #include <tqvaluelist.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 

kopete/plugins/addbookmarks/CMakeLists.txt

@@ -25,7 +25,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_addbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_addbookmarks_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_addbookmarks_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_addbookmarks (module) ##############

kopete/plugins/addbookmarks/Makefile.am

@@ -19,4 +19,4 @@ service_DATA = kopete_addbookmarks.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_addbookmarks_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog

kopete/plugins/addbookmarks/addbookmarksplugin.h

@@ -16,7 +16,7 @@
 #include <kgenericfactory.h>
 #include <kopeteplugin.h>
 #include <kbookmarkmanager.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqcstring.h>
 #include <tqmap.h>
 

kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp

@@ -10,7 +10,7 @@
 //
 //
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "addbookmarksprefssettings.h"

kopete/plugins/alias/CMakeLists.txt

@@ -26,7 +26,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_alias.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_alias_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_alias_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_alias (module) #####################

kopete/plugins/alias/Makefile.am

@@ -15,5 +15,5 @@ service_DATA = kopete_alias.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_alias_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 

kopete/plugins/alias/aliaspreferences.cpp

@@ -14,7 +14,7 @@
 #include <kglobal.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqregexp.h>
 #include <tqlayout.h>
 #include <kplugininfo.h>

kopete/plugins/autoreplace/CMakeLists.txt

@@ -26,7 +26,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_autoreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_autoreplace_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_autoreplace_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_autoreplace (module) ###############

kopete/plugins/autoreplace/Makefile.am

@@ -17,5 +17,5 @@ service_DATA = kopete_autoreplace.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_autoreplace_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 

kopete/plugins/autoreplace/autoreplaceconfig.cpp

@@ -18,7 +18,7 @@
 
 #include "autoreplaceconfig.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 

kopete/plugins/cryptography/CMakeLists.txt

@@ -26,7 +26,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_cryptography.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_cryptography_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_cryptography_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES cryptographyui.rc cryptographychatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_cryptography )
 
 

kopete/plugins/cryptography/Makefile.am

@@ -18,7 +18,7 @@ service_DATA = kopete_cryptography.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_cryptography_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 mydatadir = $(kde_datadir)/kopete_cryptography
 mydata_DATA = cryptographyui.rc cryptographychatui.rc

kopete/plugins/cryptography/cryptographyguiclient.cpp

@@ -21,7 +21,7 @@
 #include "kopetechatsession.h"
 
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 

kopete/plugins/cryptography/cryptographyplugin.cpp

@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tdeversion.h>
 #include <kaboutdata.h>

kopete/plugins/cryptography/popuppublic.cpp

@@ -43,7 +43,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 #include "popuppublic.h"

kopete/plugins/highlight/CMakeLists.txt

@@ -28,7 +28,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_highlight.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_highlight_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_highlight_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_highlight (module) #################

kopete/plugins/highlight/Makefile.am

@@ -18,4 +18,4 @@ service_DATA = kopete_highlight.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_highlight_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog

kopete/plugins/history/CMakeLists.txt

@@ -28,7 +28,7 @@ link_directories(
 
 install( FILES kopete_history.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES historyui.rc  historychatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_history )
-install( FILES kopete_history_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_history_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES historyconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 

kopete/plugins/history/Makefile.am

@@ -21,6 +21,6 @@ mydatadir = $(kde_datadir)/kopete_history
 mydata_DATA = historyui.rc  historychatui.rc
 
 kcm_DATA = kopete_history_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 kde_kcfg_DATA = historyconfig.kcfg

kopete/plugins/history/converter.cpp

@@ -20,7 +20,7 @@
 #include "kopeteprotocol.h"
 #include "kopeteuiglobal.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>

kopete/plugins/history/historyconfig.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=historyconfig.kcfg
 ClassName=HistoryConfig
 Singleton=true

kopete/plugins/history/historyplugin.cpp

@@ -19,7 +19,7 @@
 #include <kaboutdata.h>
 #include <kaction.h>
 #include <kmessagebox.h>
-//#include <kconfig.h>
+//#include <tdeconfig.h>
 #include <kplugininfo.h>
 #include <tdeversion.h>
 

kopete/plugins/latex/CMakeLists.txt

@@ -27,7 +27,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_latex.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_latex_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_latex_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( PROGRAMS kopete_latexconvert.sh DESTINATION ${BIN_INSTALL_DIR} )
 install( FILES latexconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES latexchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_latex )

kopete/plugins/latex/Makefile.am

@@ -18,7 +18,7 @@ service_DATA = kopete_latex.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_latex_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 bin_SCRIPTS = kopete_latexconvert.sh
 kde_kcfg_DATA = latexconfig.kcfg

kopete/plugins/latex/latexconfig.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=latexconfig.kcfg
 ClassName=LatexConfig
 Singleton=true

kopete/plugins/latex/latexguiclient.h

@@ -23,7 +23,7 @@
 #include <tqobject.h>
 #include <kxmlguiclient.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetemessage.h"
 #include "kopeteplugin.h"

kopete/plugins/motionautoaway/CMakeLists.txt

@@ -26,7 +26,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_motionaway.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_motionaway_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_motionaway_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES motionawayconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 

kopete/plugins/motionautoaway/Makefile.am

@@ -18,7 +18,7 @@ service_DATA = kopete_motionaway.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_motionaway_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 kde_kcfg_DATA = motionawayconfig.kcfg
 
 

kopete/plugins/motionautoaway/motionawayplugin.cpp

@@ -38,7 +38,7 @@
 
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 
@@ -159,12 +159,12 @@ MotionAwayPlugin::~MotionAwayPlugin()
 }
 
 void MotionAwayPlugin::loadSettings(){
-	TDEConfig *kconfig = TDEGlobal::config();
-	kconfig->setGroup("MotionAway Plugin");
+	TDEConfig *tdeconfig = TDEGlobal::config();
+	tdeconfig->setGroup("MotionAway Plugin");
 
-	awayTimeout = kconfig->readNumEntry("AwayTimeout", 1);
-	becomeAvailableWithActivity = kconfig->readBoolEntry("BecomeAvailableWithActivity", true);
-	videoDevice = kconfig->readEntry("VideoDevice", "/dev/video0");
+	awayTimeout = tdeconfig->readNumEntry("AwayTimeout", 1);
+	becomeAvailableWithActivity = tdeconfig->readBoolEntry("BecomeAvailableWithActivity", true);
+	videoDevice = tdeconfig->readEntry("VideoDevice", "/dev/video0");
 	m_awayTimer->changeInterval(awayTimeout * 60 * 1000);
 }
 

kopete/plugins/netmeeting/CMakeLists.txt

@@ -31,7 +31,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_netmeeting.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_netmeeting_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_netmeeting_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES netmeetingchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_netmeeting )
 
 

kopete/plugins/netmeeting/Makefile.am

@@ -20,4 +20,4 @@ kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
 
 
 kcm_DATA = kopete_netmeeting_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog

kopete/plugins/netmeeting/netmeetinginvitation.cpp

@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 

kopete/plugins/netmeeting/netmeetingpreferences.cpp

@@ -21,7 +21,7 @@
 #include <klineedit.h>
 #include <tdeparts/componentfactory.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcombobox.h>
 #include <klistview.h>

kopete/plugins/nowlistening/CMakeLists.txt

@@ -29,7 +29,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_nowlistening.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_nowlistening_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_nowlistening_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES nowlisteningconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES nowlisteningui.rc nowlisteningchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete )
 

kopete/plugins/nowlistening/Makefile.am

@@ -16,7 +16,7 @@ service_DATA = kopete_nowlistening.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_nowlistening_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 kde_kcfg_DATA = nowlisteningconfig.kcfg
 

kopete/plugins/nowlistening/nowlisteningconfig.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=nowlisteningconfig.kcfg
 ClassName=NowListeningConfig
 Singleton=true

kopete/plugins/smpppdcs/CMakeLists.txt

@@ -31,7 +31,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_smpppdcs.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_smpppdcs_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_smpppdcs_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES smpppdcs.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 

kopete/plugins/smpppdcs/Makefile.am

@@ -26,7 +26,7 @@ service_DATA = kopete_smpppdcs.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_smpppdcs_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 kde_kcfg_DATA = smpppdcs.kcfg
 

kopete/plugins/smpppdcs/detectorsmpppd.cpp

@@ -16,7 +16,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include "iconnector.h"

kopete/plugins/texteffect/CMakeLists.txt

@@ -28,7 +28,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_texteffect.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_texteffect_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_texteffect_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_texteffect (module) ################

kopete/plugins/texteffect/Makefile.am

@@ -17,4 +17,4 @@ service_DATA = kopete_texteffect.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_texteffect_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog

kopete/plugins/texteffect/texteffectconfig.cpp

@@ -19,7 +19,7 @@
 #include <tqstring.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "texteffectconfig.h"
 

kopete/plugins/translator/CMakeLists.txt

@@ -25,7 +25,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_translator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_translator_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_translator_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES translatorui.rc translatorchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_translator )
 
 

kopete/plugins/translator/Makefile.am

@@ -17,7 +17,7 @@ service_DATA = kopete_translator.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_translator_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 mydatadir = $(kde_datadir)/kopete_translator
 mydata_DATA = translatorui.rc translatorchatui.rc

kopete/plugins/translator/translatorguiclient.h

@@ -23,7 +23,7 @@
 #include <tqobject.h>
 #include <kxmlguiclient.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetemessage.h"
 #include "kopeteplugin.h"

kopete/plugins/translator/translatorplugin.cpp

@@ -29,7 +29,7 @@
 #include <kaction.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kaboutdata.h>
 

kopete/plugins/translator/translatorplugin.h

@@ -27,7 +27,7 @@
 #include <tqintdict.h>
 
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetemessage.h"
 #include "kopeteplugin.h"

kopete/plugins/webpresence/CMakeLists.txt

@@ -31,7 +31,7 @@ install( FILES
 
 install( FILES
     kopete_webpresence_config.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 install( FILES
     webpresence_html.xsl webpresence_html_images.xsl

kopete/plugins/webpresence/Makefile.am

@@ -17,7 +17,7 @@ service_DATA = kopete_webpresence.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_webpresence_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 mydata_DATA = webpresence_html.xsl\
 	      webpresence_html_images.xsl\

kopete/plugins/webpresence/webpresenceplugin.cpp

@@ -25,7 +25,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
@@ -73,33 +73,33 @@ WebPresencePlugin::~WebPresencePlugin()
 
 void WebPresencePlugin::loadSettings()
 {
-	TDEConfig *kconfig = TDEGlobal::config();
-	kconfig->setGroup( "Web Presence Plugin" );
+	TDEConfig *tdeconfig = TDEGlobal::config();
+	tdeconfig->setGroup( "Web Presence Plugin" );
 
-	frequency = kconfig->readNumEntry("UploadFrequency", 15);
-	resultURL = kconfig->readPathEntry("uploadURL");
+	frequency = tdeconfig->readNumEntry("UploadFrequency", 15);
+	resultURL = tdeconfig->readPathEntry("uploadURL");
 
 	resultFormatting = WEB_UNDEFINED;
 
-	if ( kconfig->readBoolEntry( "formatHTML", false ) ) {
+	if ( tdeconfig->readBoolEntry( "formatHTML", false ) ) {
 		resultFormatting = WEB_HTML;
-	} else if ( kconfig->readBoolEntry( "formatXHTML", false ) ) {
+	} else if ( tdeconfig->readBoolEntry( "formatXHTML", false ) ) {
 		resultFormatting = WEB_XHTML;
-	} else if ( kconfig->readBoolEntry( "formatXML", false ) ) {
+	} else if ( tdeconfig->readBoolEntry( "formatXML", false ) ) {
 		resultFormatting = WEB_XML;
-	} else if ( kconfig->readBoolEntry( "formatStylesheet", false ) ) {
+	} else if ( tdeconfig->readBoolEntry( "formatStylesheet", false ) ) {
 		resultFormatting = WEB_CUSTOM;
-		userStyleSheet = kconfig->readEntry("formatStylesheetURL");
+		userStyleSheet = tdeconfig->readEntry("formatStylesheetURL");
 	}
 
 	// Default to HTML if we dont get anything useful from config file.
 	if ( resultFormatting == WEB_UNDEFINED )
 		resultFormatting = WEB_HTML;
 
-	useImagesInHTML = kconfig->readBoolEntry( "useImagesHTML", false );
-	useImName = kconfig->readBoolEntry("showName", true);
-	userName = kconfig->readEntry("showThisName");
-	showAddresses = kconfig->readBoolEntry("includeIMAddress", false);
+	useImagesInHTML = tdeconfig->readBoolEntry( "useImagesHTML", false );
+	useImName = tdeconfig->readBoolEntry("showName", true);
+	userName = tdeconfig->readEntry("showThisName");
+	showAddresses = tdeconfig->readBoolEntry("includeIMAddress", false);
 
 	// Update file when settings are changed.
 	slotWriteFile();

kopete/plugins/webpresence/webpresenceplugin.h

@@ -22,7 +22,7 @@
 
 #include <tqvaluestack.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetecontact.h"
 #include "kopeteonlinestatus.h"

kopete/protocols/gadu/gaduaccount.cpp

@@ -37,14 +37,14 @@
 #include "kopeteglobal.h"
 
 #include <kpassdlg.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqapplication.h>
 #include <tqdialog.h>

kopete/protocols/gadu/gaduaccount.h

@@ -37,7 +37,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class GaduAccountPrivate;
 

kopete/protocols/gadu/gaducontact.cpp

@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 #include "gaduaccount.h"

kopete/protocols/gadu/gaduprotocol.cpp

@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <libgadu.h>
 

kopete/protocols/groupwise/gwaccount.cpp

@@ -24,7 +24,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kinputdialog.h>

kopete/protocols/groupwise/ui/gweditaccountwidget.cpp

@@ -26,7 +26,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpassdlg.h>

kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp

@@ -19,7 +19,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kopetecontact.h>
 #include <kopeteglobal.h>

kopete/protocols/irc/ircaccount.cpp

@@ -43,7 +43,7 @@
 #include <kaction.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcompletionbox.h>
 #include <kdebug.h>
 #include <kglobal.h>

kopete/protocols/irc/irccontactmanager.cpp

@@ -31,7 +31,7 @@
 #include <kopetecontactlist.h>
 #include <kopeteview.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <tqtimer.h>
@@ -67,7 +67,7 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou
 			this, TQT_SLOT( slotContactAdded( Kopete::MetaContact* )));
 
 	socketTimeout = 15000;
-	TQString timeoutPath = locate( "config", "kioslaverc" );
+	TQString timeoutPath = locate( "config", "tdeioslaverc" );
 	if( !timeoutPath.isEmpty() )
 	{
 		TDEConfig config( timeoutPath );

kopete/protocols/irc/ircprotocol.cpp

@@ -23,7 +23,7 @@
 #include "ircchannelcontact.h"
 #include "irccontactmanager.h"
 
-#include "networkconfig.h"
+#include "networtdeconfig.h"
 #include "channellist.h"
 #include "ircguiclient.h"
 #include "ircusercontact.h"

kopete/protocols/irc/ircusercontact.cpp

@@ -28,7 +28,7 @@
 
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 #include <tqtimer.h>

kopete/protocols/irc/libkirc/kircengine.cpp

@@ -24,7 +24,7 @@
 #include "kircengine.h"
 #include "ksslsocket.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kextsock.h>
 #include <klocale.h>

kopete/protocols/irc/libkirc/ksslsocket.cpp

@@ -184,16 +184,16 @@ void KSSLSocket::showInfoDialog()
 {
 	if( socketStatus() == connected )
 	{
-		if (!d->dcc->isApplicationRegistered("kio_uiserver"))
+		if (!d->dcc->isApplicationRegistered("tdeio_uiserver"))
 		{
-			TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+			TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList());
 		}
 
 		TQByteArray data, ignore;
 		TQCString ignoretype;
 		TQDataStream arg(data, IO_WriteOnly);
 		arg << "irc://" + peerAddress()->pretty() + ":" + port() << d->metaData;
-		d->dcc->call("kio_uiserver", "UIServer",
+		d->dcc->call("tdeio_uiserver", "UIServer",
 			"showSSLInfoDialog(TQString,TDEIO::MetaData)", data, ignoretype, ignore);
 	}
 }
@@ -233,12 +233,12 @@ int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQStrin
 	TQDataStream arg(data, IO_WriteOnly);
 	arg << (int)1 << (int)type << text << caption << buttonYes << buttonNo;
 
-	if (!d->dcc->isApplicationRegistered("kio_uiserver"))
+	if (!d->dcc->isApplicationRegistered("tdeio_uiserver"))
 	{
-		TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+		TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList());
 	}
 
-	d->dcc->call("kio_uiserver", "UIServer",
+	d->dcc->call("tdeio_uiserver", "UIServer",
 			"messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result);
 
 	if( returnType == "int" )

kopete/protocols/irc/libkirc/ksslsocket.h

@@ -22,7 +22,7 @@
 
 #include <tqvariant.h>
 #include <kextsock.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class KSSLSocketPrivate;
 

kopete/protocols/irc/ui/CMakeLists.txt

@@ -26,5 +26,5 @@ include_directories(
 tde_add_library( kopeteircui STATIC_PIC AUTOMOC
   SOURCES
     ircadd.ui empty.cpp irceditaccountwidget.cpp irceditaccount.ui
-    channellist.cpp channellistdialog.cpp networkconfig.ui
+    channellist.cpp channellistdialog.cpp networtdeconfig.ui
 )

kopete/protocols/irc/ui/Makefile.am

@@ -8,5 +8,5 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \
 
 
 libkopeteircui_la_SOURCES = ircadd.ui empty.cpp irceditaccountwidget.cpp \
-	irceditaccount.ui channellist.cpp channellistdialog.cpp networkconfig.ui
+	irceditaccount.ui channellist.cpp channellistdialog.cpp networtdeconfig.ui
 EXTRA_DIST = ircadd.ui ircprefs.ui empty.cpp

kopete/protocols/irc/ui/irceditaccountwidget.cpp

@@ -32,7 +32,7 @@
 #include <klistview.h>
 #include <kdebug.h>
 #include <kextsock.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcharsets.h>
 

kopete/protocols/jabber/CMakeLists.txt

@@ -12,7 +12,7 @@
 add_subdirectory( ui )
 add_subdirectory( icons )
 add_subdirectory( libiris )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 
 if( WITH_JINGLE )
   add_subdirectory( jingle )

kopete/protocols/jabber/Makefile.am

@@ -5,7 +5,7 @@ JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jin
 endif
 
 METASOURCES = AUTO
-SUBDIRS = ui icons libiris $(JINGLE) . kioslave
+SUBDIRS = ui icons libiris $(JINGLE) . tdeioslave
 AM_CPPFLAGS = $(KOPETE_INCLUDES) \
 	-I$(srcdir)/libiris/iris/include \
 	-I$(srcdir)/libiris/iris/xmpp-im \

kopete/protocols/jabber/jabberaccount.cpp

@@ -37,7 +37,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>

kopete/protocols/jabber/jabberbasecontact.cpp

@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqregexp.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 
 #include <kopetegroup.h>

kopete/protocols/jabber/jabberchatsession.cpp

@@ -25,7 +25,7 @@
 #include <tqiconset.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include "kopetechatsessionmanager.h"
@@ -38,7 +38,7 @@
 #include "jabbercontact.h"
 #include "jabberresource.h"
 #include "jabberresourcepool.h"
-#include "kioslave/jabberdisco.h"
+#include "tdeioslave/jabberdisco.h"
 
 
 JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user,

kopete/protocols/jabber/jabbercontact.cpp

@@ -31,11 +31,11 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kaction.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kinputdialog.h>
 #include <kopeteview.h>
 

kopete/protocols/jabber/jabberfiletransfer.cpp

@@ -21,7 +21,7 @@
 #include "jabberfiletransfer.h"
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kopeteuiglobal.h"
 #include "kopetemetacontact.h"
 #include "kopetecontactlist.h"

kopete/protocols/jabber/jabbergroupcontact.cpp

@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include "jabberprotocol.h"
 #include "jabberaccount.h"

kopete/protocols/jabber/jabbergroupmembercontact.cpp

@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "jabberprotocol.h"
 #include "jabberaccount.h"
 #include "jabberfiletransfer.h"

kopete/protocols/jabber/jabberprotocol.cpp

@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>

kopete/protocols/jabber/jabbertransport.cpp

@@ -34,7 +34,7 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "xmpp_tasks.h"
 

kopete/protocols/jabber/tdeioslave/CMakeLists.txt

@@ -37,6 +37,6 @@ tde_add_kpart( kio_jabberdisco AUTOMOC
   LINK
     jabberclient-static
     iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
-    qca-static cutestuff_network-static cutestuff_util-static kio-shared idn
+    qca-static cutestuff_network-static cutestuff_util-static tdeio-shared idn
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kopete/protocols/jabber/tdeioslave/Makefile.am

@@ -22,4 +22,4 @@ protocol_DATA = jabberdisco.protocol
 protocoldir = $(kde_servicesdir)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_jabberdisco.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_jabberdisco.pot

kopete/protocols/jabber/tdeioslave/jabberdisco.h

@@ -25,8 +25,8 @@
 #include <tqcstring.h>
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 #include <jabberclient.h>
 
 #define JABBER_DISCO_DEBUG		0

kopete/protocols/jabber/tdeioslave/jabberdisco.protocol

@@ -10,35 +10,35 @@ linking=false
 moving=false
 Icon=remote
 Description=A KIO slave for Jabber Service Discovery
-Description[be]=Модуль kioslave для пошуку сервісаў Jabber
+Description[be]=Модуль tdeioslave для пошуку сервісаў Jabber
 Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ
 Description[bs]=KIO slave za otkrivanje Jabber servisa
 Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber
 Description[cs]=Pomocný protokol pro zjišťování služeb Jabber
-Description[da]=En kioslave til at opdage jabber service
+Description[da]=En tdeioslave til at opdage jabber service
 Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten
-Description[el]=Ένα kioslave για την ανίχνευση υπηρεσίας Jabber
-Description[es]=Un «kioslave» para el servicio de descubrimiento jabber
+Description[el]=Ένα tdeioslave για την ανίχνευση υπηρεσίας Jabber
+Description[es]=Un «tdeioslave» para el servicio de descubrimiento jabber
 Description[et]=Jabberi teenuste tuvastamise KIO-moodul
 Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat
 Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber
 Description[fr]=Un module d'entrée / sortie pour la recherche de service Jabber
 Description[gl]=Un KIO slave para Jabber Service Discovery
 Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához
-Description[is]=kioslave fyrir Jabber þjónustu uppgötvun
+Description[is]=tdeioslave fyrir Jabber þjónustu uppgötvun
 Description[it]=Un KIO slave per il servizio di discovery per Jabber
 Description[ja]=Jabber Service Discovery の KIO スレーブ
 Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის
 Description[kk]=Jabber қызметін байқау KIO slave қызметі
 Description[km]=KIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber
-Description[lt]=Priedas (kioslave) FISH protokolui
-Description[nb]=En kioslave for Jabber tjenestesøk
+Description[lt]=Priedas (tdeioslave) FISH protokolui
+Description[nb]=En tdeioslave for Jabber tjenestesøk
 Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten
 Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ
-Description[nl]=Een kioslave voor Jabber Service Discovery
+Description[nl]=Een tdeioslave voor Jabber Service Discovery
 Description[nn]=Ein KIO-slave for Jabber-tenesteoppdaging
 Description[pl]=Wtyczka protokołu KIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery)
-Description[pt]=Um 'kioslave' para a Descoberta de Serviços do Jabber
+Description[pt]=Um 'tdeioslave' para a Descoberta de Serviços do Jabber
 Description[pt_BR]=Um KIO-Slave para a descoberta de serviço do Jabber
 Description[ru]=Обработчик KIO для обнаружения служб Jabber
 Description[sk]=KIO otrok pre Jabber Service Discovery
@@ -50,4 +50,4 @@ Description[tr]=Jabber Servis Bulucu için KIOSlave
 Description[uk]=Підлеглий В/В для виявлення служби Jabber
 Description[zh_CN]=Jabber 服务发现的 KIO slave
 Description[zh_HK]=用於發現 Jabber 服務的 KIO slave
-Description[zh_TW]=Jabber 服務的 kioslave
+Description[zh_TW]=Jabber 服務的 tdeioslave

kopete/protocols/jabber/ui/dlgjabbervcard.cpp

@@ -36,8 +36,8 @@
 #include <kurllabel.h>
 #include <kmessagebox.h>
 #include <krun.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <kpixmapregionselectordialog.h>
 #include <kstandarddirs.h>
 

kopete/protocols/jabber/ui/jabberchooseserver.cpp

@@ -21,9 +21,9 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <tqtable.h>
 #include <tqlabel.h>
 #include "jabberprotocol.h"

kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp

@@ -25,7 +25,7 @@
 #include <tqcombobox.h>
 #include <tqlabel.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kpassdlg.h>

kopete/protocols/meanwhile/meanwhileaccount.cpp

@@ -28,7 +28,7 @@
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <klocale.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include "kopeteaway.h"
 #include <kinputdialog.h>
 #include <kmessagebox.h>

kopete/protocols/msn/config/CMakeLists.txt

@@ -25,7 +25,7 @@ link_directories(
 
 install( FILES
     kopete_msn_config.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kopete_msn (module) ###################

kopete/protocols/msn/config/Makefile.am

@@ -8,5 +8,5 @@ kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
 kcm_kopete_msn_la_LIBADD  = ../../../libkopete/libkopete.la $(LIB_KUTILS)
 
 service_DATA = kopete_msn_config.desktop
-servicedir = $(kde_servicesdir)/kconfiguredialog
+servicedir = $(kde_servicesdir)/tdeconfiguredialog
 

kopete/protocols/msn/msnaccount.cpp

@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>

kopete/protocols/msn/msnchatsession.cpp

@@ -24,7 +24,7 @@
 #include <tqiconset.h>
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klocale.h>

kopete/protocols/msn/msncontact.cpp

@@ -26,17 +26,17 @@
 #undef KDE_NO_COMPAT
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <krun.h>
 #include <ktempfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqregexp.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetecontactlist.h"
 #include "kopetechatsessionmanager.h"

kopete/protocols/msn/msnfiletransfersocket.cpp

@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kserversocket.h>
 #include <kbufferedsocket.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 #include "kopetetransfermanager.h"

kopete/protocols/msn/msnnotifysocket.cpp

@@ -40,9 +40,9 @@
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <krun.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotification.h>
 
 #include "kopeteuiglobal.h"

kopete/protocols/msn/msnprotocol.cpp

@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kaboutdata.h>
 

kopete/protocols/msn/msnsecureloginhandler.cpp

@@ -20,7 +20,7 @@
 #include <tqregexp.h>
 
 // KDE includes
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <kdebug.h>
 

kopete/protocols/msn/msnsocket.cpp

@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kbufferedsocket.h>
 #include <kserversocket.h>
 #include <kresolver.h>

kopete/protocols/msn/msnswitchboardsocket.cpp

@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <ktempfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>

kopete/protocols/msn/ui/msneditaccountwidget.cpp

@@ -31,15 +31,15 @@
 #include <kcombobox.h>
 
 #include <kautoconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <kpassdlg.h>
 #include <krun.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpixmapregionselectordialog.h>
 
 #include "kopeteuiglobal.h"

kopete/protocols/msn/webcam.cpp

@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tqevent.h>
 #include <tqdatetime.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "dispatcher.h"
 

kopete/protocols/oscar/aim/aimaccount.cpp

@@ -17,7 +17,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kpopupmenu.h>

kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp

@@ -11,7 +11,7 @@
 #include <kdebug.h>
 #include <krun.h>
 #include <kpassdlg.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kopetepassword.h"
 #include "kopetepasswordwidget.h"

kopete/protocols/oscar/icq/icqaccount.cpp

@@ -17,7 +17,7 @@
 
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpopupmenu.h>

kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 #include <tqpushbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>

kopete/protocols/oscar/oscaraccount.cpp

@@ -42,7 +42,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpassivepopup.h>

kopete/protocols/oscar/oscarversionupdater.cpp

@@ -20,8 +20,8 @@
 #include <tqmutex.h>
 
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kconfig.h>
+#include <tdeio/job.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 

kopete/protocols/sms/services/gsmlib.cpp

@@ -28,7 +28,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 
 #include <unistd.h>
 #include <gsmlib/gsm_me_ta.h>

kopete/protocols/sms/services/smsclient.cpp

@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 
 #include "kopeteaccount.h"
 #include "kopeteuiglobal.h"

kopete/protocols/sms/services/smssend.cpp

@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kurlrequester.h>

kopete/protocols/sms/services/smssendprovider.cpp

@@ -18,7 +18,7 @@
 #include <tqlabel.h>
 #include <tqfile.h>
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kprocess.h>
 #include <klineedit.h>
 #include <kmessagebox.h>

kopete/protocols/sms/smsaccount.cpp

@@ -16,7 +16,7 @@
 
 #undef KDE_NO_COMPAT
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <kprocess.h>

kopete/protocols/sms/smscontact.cpp

@@ -15,7 +15,7 @@
 */
 
 #undef KDE_NO_COMPAT
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kaction.h>
 #include <kdebug.h>
 #include <klocale.h>

kopete/protocols/sms/smseditaccountwidget.cpp

@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <krestrictedline.h>

kopete/protocols/sms/smsprotocol.cpp

@@ -16,7 +16,7 @@
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 #include "kopeteaccountmanager.h"

kopete/protocols/winpopup/libwinpopup/libwinpopup.h

@@ -27,7 +27,7 @@
 
 // KDE Includes
 #include <kprocio.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup");
 

kopete/protocols/winpopup/wpaccount.cpp

@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kpopupmenu.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // Kopete Includes
 

kopete/protocols/winpopup/wpeditaccount.cpp

@@ -32,7 +32,7 @@
 #include <knuminput.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 

kopete/protocols/yahoo/libkyahoo/logintask.cpp

@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <stdlib.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmdcodec.h>
 
 extern "C"

kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp

@@ -25,9 +25,9 @@
 #include <tqdatastream.h>
 #include <tqdom.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kbufferedsocket.h>
 
 using namespace KNetwork;

kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp

@@ -24,9 +24,9 @@
 #include <tqfile.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent)
 {

kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp

@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstreamsocket.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 using namespace KNetwork;
 

kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp

@@ -22,9 +22,9 @@
 #include <tqstring.h>
 #include <tqfile.h>
 #include <tqdatastream.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kbufferedsocket.h>
 #include <kdebug.h>
 #include <klocale.h>

kopete/protocols/yahoo/libkyahoo/yabtask.cpp

@@ -22,9 +22,9 @@
 #include "client.h"
 #include <tqstring.h>
 #include <tqdatastream.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <klocale.h>
 
 YABTask::YABTask(Task* parent) : Task(parent)

kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp

@@ -21,9 +21,9 @@
 // KDE Includes
 #include <kdebug.h>
 #include <ktempfile.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <klocale.h>

kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp

@@ -22,9 +22,9 @@
 #include "client.h"
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <tqdom.h>
 
 YahooChatTask::YahooChatTask(Task* parent) : Task(parent)

kopete/protocols/yahoo/yahooaccount.cpp

@@ -33,7 +33,7 @@
 
 // KDE
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kpopupmenu.h>

kopete/protocols/yahoo/yahoochatsession.cpp

@@ -21,7 +21,7 @@
 #include <tqfile.h>
 #include <tqiconset.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klocale.h>

kopete/protocols/yahoo/yahooconferencemessagemanager.cpp

@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kopetecontactaction.h>
 #include <kopetecontactlist.h>

kopete/protocols/yahoo/yahoocontact.cpp

@@ -52,13 +52,13 @@
 #include <kshortcut.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kurl.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kimageio.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 YahooContact::YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact )
 	: Kopete::Contact( account, userId, metaContact )

kopete/protocols/yahoo/yahooeditaccount.cpp

@@ -32,9 +32,9 @@
 #include <kmessagebox.h>
 #include <krun.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpassdlg.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kpixmapregionselectordialog.h>
 

kopete/protocols/yahoo/yahooverifyaccount.cpp

@@ -23,9 +23,9 @@
 #include <klineedit.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kstandarddirs.h>
 
 // Kopete Includes

kpf/src/Applet.cpp

@@ -33,7 +33,7 @@
 #include <dcopclient.h>
 #include <kiconloader.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
 #include <klocale.h>

kpf/src/CMakeLists.txt

@@ -35,7 +35,7 @@ tde_add_kpart( kpf_panelapplet AUTOMOC
     ErrorMessageConfigDialog.cpp ActiveMonitor.cpp ActiveMonitorItem.cpp
     ActiveMonitorWindow.cpp BandwidthGraph.cpp ServerWizard.cpp
     AppletItem.cpp Applet.cpp Defaults.cpp Help.cpp
-  LINK tdednssd-shared kio-shared
+  LINK tdednssd-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -46,6 +46,6 @@ tde_add_kpart( kpfpropertiesdialog AUTOMOC
   SOURCES
     PropertiesDialogPlugin.cpp StartingKPFDialog.cpp WebServer.stub
     WebServerManager.stub Defaults.cpp Help.cpp
-  LINK tdednssd-shared kio-shared
+  LINK tdednssd-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kpf/src/ConfigDialogPage.cpp

@@ -30,7 +30,7 @@
 
 #include <klocale.h>
 #include <kseparator.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "Defines.h"
 #include "ErrorMessageConfigDialog.h"

kpf/src/ErrorMessageConfigDialog.cpp

@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 
 #include <kurlrequester.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdialog.h>
 

kpf/src/PropertiesDialogPlugin.cpp

@@ -39,7 +39,7 @@
 #include <kdialogbase.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kseparator.h>
 #include <kgenericfactory.h>

kpf/src/Response.cpp

@@ -25,7 +25,7 @@
 #include <tqtextstream.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "Defines.h"
 #include "Utils.h"

kpf/src/ServerWizard.cpp

@@ -33,7 +33,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "Defines.h"
 #include "ServerWizard.h"

kpf/src/WebServer.cpp

@@ -33,7 +33,7 @@
 
 // KDE includes
 #include "config.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <klocale.h>

kpf/src/WebServerManager.cpp

@@ -22,7 +22,7 @@
 */
 
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kapplication.h>
 

kppp/CMakeLists.txt

@@ -46,6 +46,6 @@ tde_add_executable( kppp SETUID AUTOMOC
     acctselect.cpp ruleset.cpp docking.cpp runtests.cpp loginterm.cpp
     ppplog.cpp newwidget.cpp requester.cpp opener.cpp modemdb.cpp
     utils.cpp providerdb.cpp modems.cpp KPPPIface.skel
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

kppp/ChangeLog

@@ -1028,7 +1028,7 @@
 
 	* some KDE style guide conformant changes
 	* some code cleanups
-	* removed -lkfile and -lkfm from Makefile.am
+	* removed -ltdefile and -lkfm from Makefile.am
 	* added debug switch to pppd command line when debugging
 	is turned on
 	* Improved the response time for modem output. Modem output is

kppp/kpppwidget.cpp

@@ -40,7 +40,7 @@
 #include <kbuttonbox.h>
 #include <kglobalsettings.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h> // For BarIcon
 #include <klocale.h>

kppp/logview/CMakeLists.txt

@@ -33,6 +33,6 @@ install( FILES
 tde_add_executable( kppplogview AUTOMOC
   SOURCES
     main.cpp loginfo.cpp log.cpp monthly.cpp export.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

kppp/logview/export.h

@@ -33,7 +33,7 @@
 
 #include <kwizard.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class Export;
 

kppp/modemdb.cpp

@@ -39,7 +39,7 @@
 #include <klocale.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdguiitem.h>
 
 ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) {

kppp/pppdata.cpp

@@ -28,7 +28,7 @@
 #include "runtests.h"
 #include "devices.h"
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kglobalsettings.h>

krdc/hostpreferences.cpp

@@ -21,7 +21,7 @@
 #include "rdp/rdphostpref.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 
 #include <tqregexp.h>

krdc/krdc.cpp

@@ -21,7 +21,7 @@
 #include "hostpreferences.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <kurl.h>

krdc/main.cpp

@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdewallet.h>
 #include <tqwindowdefs.h>

krdc/rdp/rdphostpref.cpp

@@ -18,7 +18,7 @@
 */
 
 #include "rdphostpref.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 const TQString RdpHostPref::RdpType = "RDP";

krdc/vnc/vnchostpref.cpp

@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "vnchostpref.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 const TQString VncHostPref::VncType = "VNC";

krfb/kcm_krfb/CMakeLists.txt

@@ -30,6 +30,6 @@ install( FILES kcmkrfb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_krfb AUTOMOC
   SOURCES configurationwidget.ui kcm_krfb.cpp
-  LINK krfbconfig-static srvloc-static tdednssd-shared kio-shared
+  LINK krfbconfig-static srvloc-static tdednssd-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

krfb/kcm_krfb/kcm_krfb.cpp

@@ -32,7 +32,7 @@
 #include <knuminput.h>
 #include <klocale.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kdatastream.h>
 #include <kdebug.h>

krfb/kcm_krfb/kcmkrfb.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=krfb
 Type=Application
-Exec=kcmshell kcmkrfb
+Exec=tdecmshell kcmkrfb
 DocPath=krfb/krfb-configuration.html
 
 X-TDE-ModuleType=Library

krfb/kinetd/kinetd.cpp

@@ -25,7 +25,7 @@
 #include <kservicetype.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotifyclient.h>
 #include <ksockaddr.h>
 #include <kextsock.h>

krfb/krfb/CMakeLists.txt

@@ -39,7 +39,7 @@ tde_add_executable( krfb AUTOMOC
     rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui
     krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc
   LINK
-    krfbconfig-static vncserver-static srvloc-static tdeui-shared kio-shared jpeg Xext pthread ${XTST_LIBRARIES}
+    krfbconfig-static vncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

krfb/krfb/configuration.cc

@@ -467,7 +467,7 @@ void Configuration::inviteEmail() {
 ////////////// invoke kcontrol module //////////////////////////
 
 void Configuration::showConfigurationModule() {
-		KRun::run( "kcmshell kcmkrfb", KURL::List() );
+		KRun::run( "tdecmshell kcmkrfb", KURL::List() );
 }
 
 

krfb/krfb/configuration.h

@@ -25,7 +25,7 @@
 #include "invitedialog.h"
 
 #include <dcopref.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtimer.h>
 #include <tqobject.h>
 #include <tqvalidator.h>

krfb/krfb/invitation.h

@@ -20,7 +20,7 @@
 
 #include <kapplication.h>
 #include <klistview.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqdatetime.h>

ksirc/CMakeLists.txt

@@ -68,5 +68,5 @@ tde_add_tdeinit_executable( ksirc AUTOMOC
     dccNewbase.ui dccNew.cpp
   LINK
     ksprefs-static ksprogress-static ksopenksirc-static ksticker-static
-    kio-shared
+    tdeio-shared
 )

ksirc/FilterRuleEditor.cpp

@@ -15,7 +15,7 @@
 #include <tqlineedit.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kiconloader.h>

ksirc/KSOpenkSirc/open_ksirc.cpp

@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kmdcodec.h>
 

ksirc/KSPrefs/page_autoconnect.cpp

@@ -17,7 +17,7 @@
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <knuminput.h>
 

ksirc/KSPrefs/page_colors.cpp

@@ -14,7 +14,7 @@
 #include <tqradiobutton.h>
 #include <tqlabel.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>

ksirc/KSPrefs/page_irccolors.cpp

@@ -11,7 +11,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolorbutton.h>
 
 PageIRCColors::PageIRCColors( TQWidget *parent, const char *name ) : PageIRCColorsBase( parent, name)

ksirc/KSPrefs/page_looknfeel.cpp

@@ -13,7 +13,7 @@
 
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "page_looknfeel.h"
 
 PageLooknFeel::PageLooknFeel( TQWidget *parent, const char *name ) : PageLooknFeelBase( parent, name)

ksirc/KSPrefs/page_servchan.cpp

@@ -13,7 +13,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name)
 {

ksirc/KSPrefs/page_startup.cpp

@@ -12,7 +12,7 @@
 #include <tqlistbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <keditlistbox.h>
 
 #include <kdebug.h>

ksirc/KSTicker/ksticker.cpp

@@ -17,7 +17,7 @@
 #include "../ksopts.h"
 #include "../nickColourMaker.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 #include <kdebug.h>
 

ksirc/KSTicker/ksttest.cpp

@@ -1,5 +1,5 @@
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqapplication.h>
 #include <tqsocketnotifier.h>
 #include <tqregexp.h>

ksirc/NewWindowDialog.cpp

@@ -1,5 +1,5 @@
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <tqhbox.h>

ksirc/dccNew.cpp

@@ -17,7 +17,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kcombobox.h>

ksirc/iocontroller.cpp

@@ -84,7 +84,7 @@
 #include <tdeversion.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 int KSircIOController::counter = 0;
 

ksirc/ksirc.cpp

@@ -21,7 +21,7 @@
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 //#include "cdate.h"

ksirc/ksircprocess.cpp

@@ -107,7 +107,7 @@
 
 #include <tqtimer.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>

ksirc/ksopts.cpp

@@ -1,6 +1,6 @@
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #if KDE_IS_VERSION(3,1,92)
 #include <kuser.h>

ksirc/ksview.cpp

@@ -32,8 +32,8 @@
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
 #include <knotifyclient.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 #include <kurldrag.h>
 
 #include "ksopts.h"

ksirc/mditoplevel.cpp

@@ -5,7 +5,7 @@
 
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kpopupmenu.h>
 #include <klocale.h>

ksirc/puke/Makefile.am

@@ -12,7 +12,7 @@ libpuke_la_SOURCES = pwidget.cpp pobject.cpp \
 	pprogress.cpp ptablevw.cpp plistbox.cpp \
 	plabel.cpp pmenudta.cpp	ppopmenu.cpp \
 	palistbox.cpp ptabdialog.cpp \
-	pkfiledialog.cpp pobjfinder.cpp
+	ptdefiledialog.cpp pobjfinder.cpp
 
 $(srcdir)/HOWTO-PUKE.txt: HOWTO-PUKE.pod
 	pod2text $(srcdir)/HOWTO-PUKE.pod > HOWTO-PUKE.txt
@@ -34,7 +34,7 @@ perl_DATA = commands-handler.pl commands-perl.pl convert_commands.pl \
 	puke.pl small.pl test.pl tester.pl \
 	dcc_progress.pm dcc_status.pm load_all.pm \
 	palistbox.pm pbase.pm pboxlayout.pm pbutton.pm pframe.pm \
-	pkfiledialog.pm plabel.pm plined.pm plistbox.pm pmenudta.pm \
+	ptdefiledialog.pm plabel.pm plined.pm plistbox.pm pmenudta.pm \
 	ppopmenu.pm pprogress.pm ppushbt.pm ptabdialog.pm ptablevw.pm \
 	pwidget.pm pobjfinder.pm
 

ksirc/puke/controller.cpp

@@ -30,7 +30,7 @@ using namespace std; // iostream.h include cstring which puts strlen into
 #include "palistbox.h"
 #include "pbutton.h"
 #include "pframe.h"
-#include "pkfiledialog.h"
+#include "ptdefiledialog.h"
 #include "plabel.h"
 #include "ptqlayout.h"
 #include "plined.h"

ksirc/puke/dcc_status.pm

@@ -11,7 +11,7 @@
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
 &docommand("/load plined.pm");
-&docommand("/load pkfiledialog.pm");
+&docommand("/load ptdefiledialog.pm");
 &docommand("/load ppopmenu.pm");
 
 &docommand("/load dcc_progress.pm");

ksirc/puke/load_all.pm

@@ -10,5 +10,5 @@
 &docommand("/load plistbox.pm");
 &docommand("/load ppopmenu.pm");
 &docommand("/load ptabdialog.pm");
-&docommand("/load pkfiledialog.pm");
+&docommand("/load ptdefiledialog.pm");
 &docommand("/load pobjfinder.pm");  

ksirc/puke/ptdefiledialog.cpp

@@ -3,8 +3,8 @@
 
 #include <kdebug.h>
 
-#include "pkfiledialog.h"
-#include "pkfiledialog-cmd.h"
+#include "ptdefiledialog.h"
+#include "ptdefiledialog-cmd.h"
 
 PObject *
 PKFileDialog::createWidget(CreateArgs &ca)
@@ -120,4 +120,4 @@ KFileDialog *PKFileDialog::widget()
   return kfbd;
 }
 
-#include "pkfiledialog.moc"
+#include "ptdefiledialog.moc"

ksirc/puke/ptdefiledialog.h

@@ -3,7 +3,7 @@
 
 class PKFileDialog;
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "pmessage.h"
 #include "pwidget.h"
 #include "controller.h"

ksirc/puke/ptdefiledialog.pm

@@ -2,7 +2,7 @@
 &::PukeSendMessage($PUKE_WIDGET_LOAD, 
 		   $::PUKE_CONTROLLER, 
 		   $PWIDGET_KFILEDIALOG,
-		   "pkfiledialog.so",
+		   "ptdefiledialog.so",
 		   sub { my %ARG = %{shift()};
 			 if($ARG{'iArg'} == 1){
 			   print "*E* PKFileDialog Load failed!\n";

ksirc/servercontroller.cpp

@@ -82,7 +82,7 @@
 #include <tqregexp.h>
 
 #include <kmenubar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontdialog.h>
 #include <kiconloader.h>
 #include <twin.h>

ksirc/topic.cpp

@@ -21,8 +21,8 @@
 #include <krun.h>
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 
 #include "ksopts.h"
 #include "ksparser.h"

ksirc/toplevel.cpp

@@ -67,9 +67,9 @@
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <kaction.h>

ksirc/usercontrolmenu.cpp

@@ -1,7 +1,7 @@
 #include "usercontrolmenu.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 TQPtrList<UserControlMenu> UserControlMenu::UserMenu;

ktalkd/kcmktalkd/CMakeLists.txt

@@ -32,6 +32,6 @@ install( FILES kcmktalkd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 tde_add_kpart( kcm_ktalkd AUTOMOC
   SOURCES
     main.cpp soundpage.cpp answmachpage.cpp forwmachpage.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

ktalkd/kcmktalkd/kcmktalkd.desktop

@@ -2,7 +2,7 @@
 Icon=ktalkd
 Type=Application
 DocPath=kcontrol/kcmtalkd/index.html
-Exec=kcmshell kcmktalkd
+Exec=tdecmshell kcmktalkd
 
 X-TDE-ModuleType=Library
 X-TDE-Library=ktalkd

ktalkd/ktalkd/readcfg++.cpp

@@ -50,7 +50,7 @@
 #include <pwd.h>
 
 /* KDE & TQt includes */
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <tqfile.h>

ktalkd/ktalkdlg/ktalkdlg.cpp

@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kaudioplayer.h>
 #include <klocale.h>

lanbrowsing/kcmlisa/kcmkiolan.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Icon=samba
-Exec=kcmshell kcmkiolan
+Exec=tdecmshell kcmkiolan
 
 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser
@@ -9,7 +9,7 @@ X-TDE-FactoryName=kiolan
 
 Name=LAN KIO Slave
 Name[ar]=الشبكة المحلية KIO Slave
-Name[be]=Модуль kioslave для мясцовай сетцы
+Name[be]=Модуль tdeioslave для мясцовай сетцы
 Name[bn]=ল্যান কে-আই-ও স্লেভ
 Name[br]=Sklav LAN evit KIO
 Name[bs]=LAN KIO slave

lanbrowsing/kcmlisa/kcmkiolan.h

@@ -23,7 +23,7 @@
 
 #include "portsettingsbar.h"
 #include <tdecmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TQCheckBox;
 class TQLineEdit;

lanbrowsing/kcmlisa/kcmlisa.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Icon=samba
-Exec=kcmshell kcmlisa
+Exec=tdecmshell kcmlisa
 
 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser

lanbrowsing/kcmlisa/kcmlisa.h

@@ -21,7 +21,7 @@
 #ifndef KCMLISA_H
 #define KCMLISA_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdecmodule.h>
 
 class TQPushButton;

lanbrowsing/kcmlisa/kcmreslisa.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Icon=samba
-Exec=kcmshell kcmreslisa
+Exec=tdecmshell kcmreslisa
 
 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser

lanbrowsing/kcmlisa/kcmreslisa.h

@@ -22,7 +22,7 @@
 #define KCMRESLISA_H
 
 #include <tdecmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class TQSpinBox;

lanbrowsing/kio_lan/CMakeLists.txt

@@ -43,6 +43,6 @@ install( FILES
 
 tde_add_kpart( kio_lan
   SOURCES kio_lan.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

lanbrowsing/kio_lan/Makefile.am

@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/man
+## Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
 
@@ -27,5 +27,5 @@ konq_sidebartreedir = $(kde_datadir)/konqsidebartng/virtual_folders/services
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_lan.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_lan.pot
 

lanbrowsing/kio_lan/README

@@ -8,9 +8,9 @@ use the automake/configure stuff.
 On some systems (e.g. Solaris) you will have to add some libraries, like
 -lnsl, I think.
 
-Copy this directory e.g. under tdebase/kioslave and enter it in
-tdebase/kioslave/Makefile.am in the SUBDIR line. The rerun make in
-tdebase/kioslave.
+Copy this directory e.g. under tdebase/tdeioslave and enter it in
+tdebase/tdeioslave/Makefile.am in the SUBDIR line. The rerun make in
+tdebase/tdeioslave.
 
 Alexander Neundorf
 <neundorf@kde.org>

lanbrowsing/kio_lan/kio_lan.cpp

@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kinstance.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kprocess.h>
 

lanbrowsing/kio_lan/kio_lan.h

@@ -20,9 +20,9 @@
 #ifndef KIO_XLAN_H
 #define KIO_XLAN_H
 
-#include <kio/slavebase.h>
-#include <kio/tcpslavebase.h>
-#include <kio/global.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/tcpslavebase.h>
+#include <tdeio/global.h>
 
 #include <tqvaluevector.h>
 #include <tqcstring.h>

lanbrowsing/kio_lan/lan.protocol

@@ -10,6 +10,6 @@ makedir=false
 deleting=false
 linking=false
 moving=false
-DocPath=kioslave/lan.html
+DocPath=tdeioslave/lan.html
 Icon=network_local
 Class=:local

lanbrowsing/kio_lan/rlan.protocol

@@ -10,6 +10,6 @@ makedir=false
 deleting=false
 linking=false
 moving=false
-DocPath=kioslave/rlan.html
+DocPath=tdeioslave/rlan.html
 Icon=network_local
 Class=:local

librss/CMakeLists.txt

@@ -36,7 +36,7 @@ tde_add_library( rss SHARED AUTOMOC
     article.cpp document.cpp image.cpp textinput.cpp tools_p.cpp
     loader.cpp
   VERSION 1.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

librss/image.cpp

@@ -11,7 +11,7 @@
 #include "image.h"
 #include "tools_p.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 #include <tqbuffer.h>

librss/loader.cpp

@@ -11,7 +11,7 @@
 #include "loader.h"
 #include "document.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <kurl.h>
 

librss/loader.h

@@ -113,7 +113,7 @@ namespace RSS
 			/**
 			 * @return The error code for the last process of retrieving data.
 			 * The returned numbers correspond directly to the error codes
-			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/kio/KIO.html#Error">as
+			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
 			 * defined by KIO</a>.
 			 */
 			virtual int errorCode() const;

tdednssd/ioslave/CMakeLists.txt

@@ -39,6 +39,6 @@ install( FILES
 
 tde_add_kpart( kio_zeroconf AUTOMOC
   SOURCES dnssd.cpp
-  LINK tdednssd-shared kio-shared
+  LINK tdednssd-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdednssd/ioslave/CONFIG_FORMAT

@@ -37,7 +37,7 @@ UserEntry=u
 PasswordEntry=p
 
 
-Resolved URL will be ssh://user:password@machine:port/ . ssh is helper protocol so ktelnetservice will be launched for
+Resolved URL will be ssh://user:password@machine:port/ . ssh is helper protocol so tdetelnetservice will be launched for
 this URL.
 
 

tdednssd/ioslave/Makefile.am

@@ -16,6 +16,6 @@ remote_DATA = zeroconf.desktop
 remotedir = $(kde_datadir)/remoteview
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_zeroconf.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_zeroconf.pot
 
 METASOURCES = AUTO

tdednssd/ioslave/dnssd.cpp

@@ -31,7 +31,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kinstance.h>

tdednssd/ioslave/dnssd.h

@@ -26,8 +26,8 @@
 #include <tqobject.h>
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 #include <dnssd/servicebrowser.h>
 #include <dnssd/remoteservice.h>
 #include <tqstringlist.h>

tdednssd/ioslave/zeroconf.protocol

@@ -12,52 +12,52 @@ deleting=false
 linking=false
 moving=false
 Icon=network_local
-Description=A kioslave for ZeroConf
-Description[be]=Модуль kioslave для ZeroConf
+Description=A tdeioslave for ZeroConf
+Description[be]=Модуль tdeioslave для ZeroConf
 Description[bn]=জিরো-কন্ফ এর জন্য একটি কে-আই-ও স্লেভ
 Description[br]=Ur c'hioslave evit ZeroConf
-Description[bs]=kioslave za ZeroConf
-Description[ca]=Un kioslave per ZeroConf
+Description[bs]=tdeioslave za ZeroConf
+Description[ca]=Un tdeioslave per ZeroConf
 Description[cs]=Pomocný protokol pro Zeroconf
-Description[da]=En kioslave for Zeroconf
+Description[da]=En tdeioslave for Zeroconf
 Description[de]=Ein Ein-/Ausgabemodul für ZeroConf
-Description[el]=Ένα kioslave για το ZeroConf
-Description[es]=Un «kioslave» para ZeroConf
+Description[el]=Ένα tdeioslave για το ZeroConf
+Description[es]=Un «tdeioslave» para ZeroConf
 Description[et]=ZeroConfi I/O-moodul
-Description[eu]= kioslave bat ZeroConf-erako
-Description[fa]=یک kioslave برای ZeroConf
+Description[eu]= tdeioslave bat ZeroConf-erako
+Description[fa]=یک tdeioslave برای ZeroConf
 Description[fi]=Siirräntätyöskentelijä ZeroConfille
 Description[fr]=Un module d'entrée / sortie pour ZeroConf
 Description[gl]=Un kioslabe para ZeroConf
-Description[he]=kioslave בשביל ZeroConf
+Description[he]=tdeioslave בשביל ZeroConf
 Description[hu]=KDE-protokoll a Zeroconf használatához
-Description[is]=kioslave fyrir ZeroConf
-Description[it]=Un kioslave per Zeroconf
-Description[ja]=ZeroConf の kioslave
-Description[ka]= kioslave ZeroConfსთვის
-Description[kk]=ZeroConf-тың kioslave-і
-Description[km]=kioslave មួយ​សម្រាប់ ZeroConf
+Description[is]=tdeioslave fyrir ZeroConf
+Description[it]=Un tdeioslave per Zeroconf
+Description[ja]=ZeroConf の tdeioslave
+Description[ka]= tdeioslave ZeroConfსთვის
+Description[kk]=ZeroConf-тың tdeioslave-і
+Description[km]=tdeioslave មួយ​សម្រាប់ ZeroConf
 Description[lt]=Antrinė KDE programa skirta ZeroConf
-Description[nb]=En kioslave for ZeroConf
+Description[nb]=En tdeioslave for ZeroConf
 Description[nds]=In-/Utgaavmoduul för ZeroConf
 Description[ne]=जेरोकन्फका लागि कियोस्लाभ
-Description[nl]=Een kioslave voor ZeroConf
+Description[nl]=Een tdeioslave voor ZeroConf
 Description[nn]=Ein kio-slave for ZeroConf
 Description[pl]=Wtyczka protokołu ZeroConf
-Description[pt]=Um 'kioslave' para o ZeroConf
+Description[pt]=Um 'tdeioslave' para o ZeroConf
 Description[pt_BR]=Um IO-Slave para o ZeroConf
 Description[ro]=Un dispozitiv de I/E pentru ZeroConf
 Description[ru]=Kioslave для ZeroConf
-Description[sk]=kioslave pre ZeroConf
+Description[sk]=tdeioslave pre ZeroConf
 Description[sl]=Kioslave za ZeroConf
-Description[sr]=kioslave за ZeroConf
-Description[sr@Latn]=kioslave za ZeroConf
+Description[sr]=tdeioslave за ZeroConf
+Description[sr@Latn]=tdeioslave za ZeroConf
 Description[sv]=En I/O-slav för Zeroconf
-Description[tr]=Zeroconf kioslave'i
+Description[tr]=Zeroconf tdeioslave'i
 Description[uk]=Kioslave для ZeroConf
-Description[zh_CN]=ZeroConf 的 kioslave
-Description[zh_HK]=用於 ZeroConf 的 kioslave
-Description[zh_TW]=ZeroConf 的 kioslave
+Description[zh_CN]=ZeroConf 的 tdeioslave
+Description[zh_HK]=用於 ZeroConf 的 tdeioslave
+Description[zh_TW]=ZeroConf 的 tdeioslave
 maxInstances=4
 Class=:local
 

tdefile-plugins/torrent/CMakeLists.txt

@@ -23,16 +23,16 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    kfile_torrent.desktop
+    tdefile_torrent.desktop
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kfile_torrent (module) ####################
+##### tdefile_torrent (module) ####################
 
-tde_add_kpart( kfile_torrent AUTOMOC
+tde_add_kpart( tdefile_torrent AUTOMOC
   SOURCES
     bytetape.cpp bint.cpp bstring.cpp blist.cpp
-    bdict.cpp kfile_torrent.cpp
-  LINK kio-shared
+    bdict.cpp tdefile_torrent.cpp
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdefile-plugins/torrent/Makefile.am

@@ -0,0 +1,22 @@
+## Makefile.am for folder file meta info plugin
+
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_torrent.h bbase.h bdict.h bytetape.h \
+                   bstring.h bint.h blist.h
+
+kde_module_LTLIBRARIES = tdefile_torrent.la
+
+tdefile_torrent_la_SOURCES = bytetape.cpp bint.cpp bstring.cpp blist.cpp bdict.cpp tdefile_torrent.cpp
+tdefile_torrent_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdefile_torrent_la_LIBADD = $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+services_DATA = tdefile_torrent.desktop
+servicesdir = $(kde_servicesdir)
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_torrent.pot

tdefile-plugins/torrent/README

@@ -3,5 +3,5 @@ This is a meta information plugin for BitTorrent files (*.torrent).
 It doesn't depend on BitTorrent or any non-standard library being installed.
 
 The .torrent files used by BitTorrent are coded in what is called a b-encoding
-by the BitTorrent author.  Please see the actual kfile plugin source code for
+by the BitTorrent author.  Please see the actual tdefile plugin source code for
 more information on the encoding.

tdefile-plugins/torrent/tdefile_torrent.cpp

@@ -25,14 +25,14 @@
 #include <kmessagebox.h>
 #include <kgenericfactory.h>
 
-#include "kfile_torrent.h"
+#include "tdefile_torrent.h"
 #include "bdict.h"
 #include "blist.h"
 #include "bint.h"
 #include "bstring.h"
 
 typedef KGenericFactory<KTorrentPlugin> TorrentFactory;
-K_EXPORT_COMPONENT_FACTORY(kfile_torrent, TorrentFactory("kfile_torrent"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_torrent, TorrentFactory("tdefile_torrent"))
 
 TQStringList filesList (BList *list);
 TQ_ULLONG filesLength (BList *list);
@@ -399,6 +399,6 @@ bool KTorrentPlugin::writeInfo(const KFileMetaInfo &info) const
     return m_dict->writeToDevice(*TQT_TQIODEVICE(&output));
 }
 
-#include "kfile_torrent.moc"
+#include "tdefile_torrent.moc"
 
 // vim: set ts=4 sw=4 et:

tdefile-plugins/torrent/tdefile_torrent.desktop

@@ -49,7 +49,7 @@ Name[zh_CN]=BitTorrent 信息
 Name[zh_HK]=Bit Torrent 資訊
 Name[zh_TW]=Bit Torrent 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_torrent
+X-TDE-Library=tdefile_torrent
 # change MimeType here! (example: inode/directory)
 MimeType=application/x-bittorrent
 # change PreferredGroups here! (example: FolderInfo)

tdefile-plugins/torrent/tdefile_torrent.h

@@ -19,7 +19,7 @@
 #ifndef _KFILE_TORRENT_H
 #define _KFILE_TORRENT_H
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #include "bdict.h"
 

wifi/kcmwifi/CMakeLists.txt

@@ -33,6 +33,6 @@ tde_add_kpart( kcm_wifi AUTOMOC
     wificonfig.cpp kcmwifi.cpp configcrypto.ui ifconfigpagebase.ui
     configpower.ui mainconfigbase.ui mainconfig.cpp ifconfigpage.cpp
     vendorconfig.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

wifi/kcmwifi/kcmwifi.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kwifimanager
 Type=Application
-Exec=kcmshell kcmwifi
+Exec=tdecmshell kcmwifi
 DocPath=
 X-TDE-ModuleType=Library
 X-TDE-Library=wifi

wifi/kwifimanager.cpp

@@ -31,7 +31,7 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmenubar.h>
 #include <klocale.h>
 #include <kstdaction.h>
@@ -558,7 +558,7 @@ void
 KWiFiManagerApp::slotStartConfigEditor ()
 {
   TDEProcess startConf;
-  startConf << "tdesu" << locate("exe", "kcmshell") << "kcmwifi";
+  startConf << "tdesu" << locate("exe", "tdecmshell") << "kcmwifi";
   startConf.start (TDEProcess::DontCare);
 }
 
@@ -612,7 +612,7 @@ TQStringList usedInterfacesList()
   client->registerAs( "kwifimanager" );
   client->setDefaultObject( "dcop_interface" );
 
-  // shamelessly stolen from tdelibs/kio/booksmarks/kbookmarkimporter_crash.cc
+  // shamelessly stolen from tdelibs/tdeio/booksmarks/kbookmarkimporter_crash.cc
   TQStringList ignoreInterfaces;
   QCStringList apps = client->registeredApplications();
   for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )

wifi/kwireless/kwireless.cpp

@@ -9,7 +9,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 

wifi/kwireless/kwireless.h

@@ -16,7 +16,7 @@
 
 #include <kpanelapplet.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class KWireLessWidget;