Rename kioslaves

CMakeLists.txt

@@ -87,9 +87,9 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 
 ##### options comments ##########################
 
-# WITH_SASL         affects tdeioslaves(kio_ldap kio_smtp kio_pop3)
-# WITH_LDAP         affects tdeioslaves(kio_ldap)
-# WITH_SAMBA        affects tdeioslaves(kio_samba) kcontrol
+# WITH_SASL         affects tdeioslaves(tdeio_ldap tdeio_smtp tdeio_pop3)
+# WITH_LDAP         affects tdeioslaves(tdeio_ldap)
+# WITH_SAMBA        affects tdeioslaves(tdeio_samba) kcontrol
 # WITH_OPENEXR      affects tdeioslaves(thumbnail)
 # WITH_XCOMPOSITE   affects twin kicker(taskmanager) tdm
 # WITH_XCURSOR      affects tdeioslaves(thumbnail), kcontrol(input), kdesktop

kcontrol/CMakeLists.txt

@@ -38,7 +38,7 @@ if( BUILD_KCONTROL )
   add_subdirectory( launch )
   add_subdirectory( keys )
   add_subdirectory( tdm )
-  add_subdirectory( kio )
+  add_subdirectory( tdeio )
   add_subdirectory( konq )
   add_subdirectory( style )
   add_subdirectory( konqhtml )

kcontrol/kfontinst/CMakeLists.txt

@@ -15,6 +15,6 @@ add_subdirectory( viewpart )
 add_subdirectory( kcmfontinst )
 add_subdirectory( tdefile-plugin )
 add_subdirectory( kfontinst )
-add_subdirectory( kio )
+add_subdirectory( tdeio )
 
 install( FILES installfont.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )

kcontrol/kfontinst/tdeio/CMakeLists.txt

@@ -30,9 +30,9 @@ install( FILES fonts.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virt
 install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION ${MIME_INSTALL_DIR}/fonts )
 
 
-##### kio_fonts (module) #######################
+##### tdeio_fonts (module) #######################
 
-tde_add_kpart( kio_fonts AUTOMOC
+tde_add_kpart( tdeio_fonts AUTOMOC
   SOURCES KioFonts.cpp
   LINK kxftconfig-static kfontinst-shared tdesu-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}

kcontrol/kfontinst/tdeio/KioFonts.cpp

@@ -28,8 +28,8 @@
 
 /***************************************************************************
 
-    NOTE: Large sections of this code are copied from kio_file
-          -- can't just inherit from kio_file as kio_file uses "error(...);
+    NOTE: Large sections of this code are copied from tdeio_file
+          -- can't just inherit from tdeio_file as tdeio_file uses "error(...);
              return;" So there is no way to know if an error occured!
 
  ***************************************************************************/
@@ -104,13 +104,13 @@ int kdemain(int argc, char **argv)
 {
     if (argc != 4)
     {
-        fprintf(stderr, "Usage: kio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
+        fprintf(stderr, "Usage: tdeio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
         exit(-1);
     }
 
     KLocale::setMainCatalogue(KFI_CATALOGUE);
 
-    TDEInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL);
+    TDEInstance instance("tdeio_" KFI_KIO_FONTS_PROTOCOL);
     KFI::CKioFonts slave(argv[2], argv[3]);
 
     slave.dispatchLoop();

kcontrol/kfontinst/tdeio/Makefile.am

@@ -1,9 +1,9 @@
-kde_module_LTLIBRARIES = kio_fonts.la
-kio_fonts_la_SOURCES = \
+kde_module_LTLIBRARIES = tdeio_fonts.la
+tdeio_fonts_la_SOURCES = \
 KioFonts.cpp
 
-kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la
-kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
+tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la
+tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
 AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
 
 # The kxftconfig stuf really belongs to tdebase/kcontrol/fonts - here only so that can distribute this as an archive.

kcontrol/kfontinst/tdeio/fonts.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_fonts
+exec=tdeio_fonts
 protocol=fonts
 input=none
 output=filesystem

kcontrol/tdeio/CMakeLists.txt

@@ -38,9 +38,9 @@ install( FILES uasprovider.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install( FILES smb.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
 
 
-##### kcm_kio (module) ##########################
+##### kcm_tdeio (module) ##########################
 
-tde_add_kpart( kcm_kio AUTOMOC
+tde_add_kpart( kcm_tdeio AUTOMOC
   SOURCES
     policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp
       main.cpp smbrodlg.cpp useragentdlg.cpp kproxydlgbase.cpp

kcontrol/tdeio/Makefile.am

@@ -5,9 +5,9 @@ AM_LDFLAGS =  $(all_libraries)
 
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kcm_kio.la
+kde_module_LTLIBRARIES = kcm_tdeio.la
 
-kcm_kio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \
+kcm_tdeio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \
       main.cpp smbrodlg.cpp useragentdlg.cpp kproxydlgbase.cpp \
       kmanualproxydlg.cpp kenvvarproxydlg.cpp kproxydlg.cpp \
       kcookiesmanagement.cpp fakeuaprovider.cpp uagentproviderdlg.cpp \
@@ -16,11 +16,11 @@ kcm_kio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \
       policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui \
       manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui
 
-kcm_kio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kcm_kio_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS)
+kcm_tdeio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kcm_tdeio_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kcmtdeio.pot
 
 update_DATA = socks.upd
 updatedir = $(kde_datadir)/tdeconf_update

kcontrol/tdeio/cache.cpp

@@ -39,7 +39,7 @@
 #include "cache_ui.h"
 
 KCacheConfigDialog::KCacheConfigDialog( TQWidget* parent )
-                   :TDECModule( parent, "kcmkio" )
+                   :TDECModule( parent, "kcmtdeio" )
 {
   TQVBoxLayout* mainLayout = new TQVBoxLayout(this, 0, 0);
   m_dlg = new CacheDlgUI(this);
@@ -118,7 +118,7 @@ void KCacheConfigDialog::configChanged()
 void KCacheConfigDialog::slotClearCache()
 {
   TDEProcess process;
-  process << "kio_http_cache_cleaner" << "--clear-all";
+  process << "tdeio_http_cache_cleaner" << "--clear-all";
   process.start(TDEProcess::DontCare);
   // Cleaning up might take a while. Better detach.
   process.detach();

kcontrol/tdeio/cache.desktop

@@ -5,7 +5,7 @@ Icon=cache
 Exec=tdecmshell cache
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=cache
 X-TDE-ParentApp=kcontrol
 

kcontrol/tdeio/cookies.desktop

@@ -5,7 +5,7 @@ Icon=cookie
 Exec=tdecmshell cookies
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=cookie
 X-TDE-ParentApp=kcontrol
 

kcontrol/tdeio/kcookiesmain.cpp

@@ -17,7 +17,7 @@
 #include "kcookiesmanagement.h"
 
 KCookiesMain::KCookiesMain(TQWidget *parent)
-  : TDECModule(parent, "kcmkio")
+  : TDECModule(parent, "kcmtdeio")
 {
     management = 0;
     bool managerOK = true;
@@ -28,7 +28,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent)
     if( !reply.isValid() )
     {
        managerOK = false;
-       kdDebug(7103) << "kcm_kio: KDED could not load KCookiejar!" << endl;
+       kdDebug(7103) << "kcm_tdeio: KDED could not load KCookiejar!" << endl;
        KMessageBox::sorry(0, i18n("Unable to start the cookie handler service.\n"
                              "You will not be able to manage the cookies that "
                              "are stored on your computer."));

kcontrol/tdeio/kcookiesmanagement.cpp

@@ -100,7 +100,7 @@ TQString CookieListViewItem::text(int f) const
 }
 
 KCookiesManagement::KCookiesManagement(TQWidget *parent)
-                   : TDECModule(parent, "kcmkio")
+                   : TDECModule(parent, "kcmtdeio")
 {
   // Toplevel layout
   TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(),

kcontrol/tdeio/kcookiespolicies.cpp

@@ -47,7 +47,7 @@
 #include "kcookiespoliciesdlg_ui.h"
 
 KCookiesPolicies::KCookiesPolicies(TQWidget *parent)
-                 :TDECModule(parent, "kcmkio")
+                 :TDECModule(parent, "kcmtdeio")
 {
     TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, 0);
 

kcontrol/tdeio/kproxydlg.cpp

@@ -41,7 +41,7 @@
 #include "kproxydlg_ui.h"
 
 KProxyOptions::KProxyOptions (TQWidget* parent )
-              :TDECModule (parent, "kcmkio")
+              :TDECModule (parent, "kcmtdeio")
 {
   TQVBoxLayout *layout = new TQVBoxLayout(this);
   
@@ -96,7 +96,7 @@ TQString KProxyOptions::quickHelp() const
 
 
 KProxyDialog::KProxyDialog( TQWidget* parent)
-             :TDECModule( parent, "kcmkio" )
+             :TDECModule( parent, "kcmtdeio" )
 {
   TQVBoxLayout* mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                               KDialog::spacingHint() );

kcontrol/tdeio/ksaveioconfig.cpp

@@ -68,7 +68,7 @@ TDEConfig* KSaveIOConfig::http_config()
      d = new KSaveIOConfigPrivate;
 
   if (!d->http_config)
-     d->http_config = new TDEConfig("kio_httprc", false, false);
+     d->http_config = new TDEConfig("tdeio_httprc", false, false);
 
   return d->http_config;
 }

kcontrol/tdeio/lanbrowser.desktop

@@ -4,7 +4,7 @@ Icon=samba
 Exec=tdecmshell lanbrowser
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=lanbrowser
 
 Name=Local Network Browsing

kcontrol/tdeio/main.cpp

@@ -1,7 +1,7 @@
 // (c) Torben Weis 1998
 // (c) David Faure 1998
 /*
- * main.cpp for lisa,reslisa,kio_lan and kio_rlan kcm module
+ * main.cpp for lisa,reslisa,tdeio_lan and tdeio_rlan kcm module
  *
  *  Copyright (C) 2000,2001 Alexander Neundorf <neundorf@kde.org>
  *
@@ -78,7 +78,7 @@ extern "C"
 }
 
 LanBrowser::LanBrowser(TQWidget *parent)
-:TDECModule(parent,"kcmkio")
+:TDECModule(parent,"kcmtdeio")
 ,layout(this)
 ,tabs(this)
 {
@@ -119,11 +119,11 @@ LanBrowser::LanBrowser(TQWidget *parent)
 //     connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
 //   }
 
-   kioLanPage = TDECModuleLoader::loadModule("kcmkiolan",  TDECModuleLoader::None, &tabs);
-   if (kioLanPage)
+   tdeioLanPage = TDECModuleLoader::loadModule("kcmtdeiolan",  TDECModuleLoader::None, &tabs);
+   if (tdeioLanPage)
    {
-     tabs.addTab(kioLanPage,i18n("lan:/ Iosla&ve"));
-     connect(kioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+     tabs.addTab(tdeioLanPage,i18n("lan:/ Iosla&ve"));
+     connect(tdeioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
    }
 
    setButtons(Apply|Help);
@@ -137,8 +137,8 @@ void LanBrowser::load()
      lisaPage->load();
 //   if (resLisaPage)
 //     resLisaPage->load();
-   if (kioLanPage)
-     kioLanPage->load();
+   if (tdeioLanPage)
+     tdeioLanPage->load();
    emit changed(false);
 }
 
@@ -147,8 +147,8 @@ void LanBrowser::save()
    smbPage->save();
 //   if (resLisaPage)
 //     resLisaPage->save();
-   if (kioLanPage)
-     kioLanPage->save();
+   if (tdeioLanPage)
+     tdeioLanPage->save();
    if (lisaPage)
      lisaPage->save();
    emit changed(false);

kcontrol/tdeio/main.h

@@ -1,5 +1,5 @@
 /*
- * main.cpp for lisa,reslisa,kio_lan and kio_rlan kcm module
+ * main.cpp for lisa,reslisa,tdeio_lan and tdeio_rlan kcm module
  *
  *  Copyright (C) 2000 Alexander Neundorf <neundorf@kde.org>
  *
@@ -40,7 +40,7 @@ class LanBrowser:public TDECModule
       TDECModule *smbPage;
       TDECModule *lisaPage;
 //      TDECModule *resLisaPage;
-      TDECModule *kioLanPage;
+      TDECModule *tdeioLanPage;
 };
 #endif
 

kcontrol/tdeio/netpref.cpp

@@ -15,7 +15,7 @@
 #define MAX_TIMEOUT_VALUE  3600
 
 KIOPreferences::KIOPreferences( TQWidget* parent )
-               :TDECModule( parent, "kcmkio" )
+               :TDECModule( parent, "kcmtdeio" )
 {
     TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0,
                                                KDialog::spacingHint() );
@@ -90,7 +90,7 @@ void KIOPreferences::load()
   sb_serverConnect->setValue( proto.connectTimeout() );
   sb_proxyConnect->setValue( proto.proxyConnectTimeout() );
 
-  TDEConfig config( "kio_ftprc", true, false );
+  TDEConfig config( "tdeio_ftprc", true, false );
   cb_ftpEnablePasv->setChecked( !config.readBoolEntry( "DisablePassiveMode", false ) );
   cb_ftpMarkPartial->setChecked( config.readBoolEntry( "MarkPartial", true ) );
   emit changed( false );
@@ -103,7 +103,7 @@ void KIOPreferences::save()
   KSaveIOConfig::setConnectTimeout( sb_serverConnect->value() );
   KSaveIOConfig::setProxyConnectTimeout( sb_proxyConnect->value() );
 
-  TDEConfig config( "kio_ftprc", false, false );
+  TDEConfig config( "tdeio_ftprc", false, false );
   config.writeEntry( "DisablePassiveMode", !cb_ftpEnablePasv->isChecked() );
   config.writeEntry( "MarkPartial", cb_ftpMarkPartial->isChecked() );
   config.sync();

kcontrol/tdeio/netpref.desktop

@@ -198,7 +198,7 @@ Name[zh_TW]=連線偏好設定
 Type=Application
 DocPath=kcontrol/netpref/index.html
 X-TDE-FactoryName=netpref
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 
 X-TDE-ParentApp=kcontrol
 

kcontrol/tdeio/proxy.desktop

@@ -5,7 +5,7 @@ Icon=proxy
 Exec=tdecmshell proxy
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=proxy
 X-TDE-ParentApp=kcontrol
 

kcontrol/tdeio/smb.desktop

@@ -5,7 +5,7 @@ Icon=samba
 Exec=tdecmshell smb
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=smb
 X-TDE-ParentApp=kcontrol
 

kcontrol/tdeio/smbrodlg.cpp

@@ -36,7 +36,7 @@
 
 
 SMBRoOptions::SMBRoOptions(TQWidget *parent)
-  : TDECModule(parent, "kcmkio")
+  : TDECModule(parent, "kcmtdeio")
 {
    TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(),
          KDialog::spacingHint());

kcontrol/tdeio/socks.cpp

@@ -35,7 +35,7 @@
 #include <kaboutdata.h>
 
 KSocksConfig::KSocksConfig(TQWidget *parent)
-  : TDECModule(parent, "kcmkio")
+  : TDECModule(parent, "kcmtdeio")
 {
 
   TDEAboutData *about =

kcontrol/tdeio/tdeio_ftprc.kcfg

@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kio_ftprc" />
+ <kcfgfile name="tdeio_ftprc" />
  <group name="DesktopIcons" >
  
    <entry name="DisablePassiveMode" type="Bool">

kcontrol/tdeio/tdeio_ftprc.kcfgc

@@ -1,4 +1,4 @@
-File=kio_ftprc.kcfg
+File=tdeio_ftprc.kcfg
 ClassName=KioFtp
 Singleton=true
 Mutators=true

kcontrol/tdeio/tdeioslave.kcfg

@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kio_ftprc" />
+ <kcfgfile name="tdeio_ftprc" />
  <group name="General">
    <entry name="PersistentProxyConnection" type="Bool">
      <default>false</default>

kcontrol/tdeio/tdeioslave.kcfgc

@@ -1,4 +1,4 @@
-File=kio_ftprc.kcfg
+File=tdeio_ftprc.kcfg
 ClassName=KioFtp
 Singleton=true
 Mutators=true

kcontrol/tdeio/useragent.desktop

@@ -5,7 +5,7 @@ Exec=tdecmshell useragent
 DocPath=kcontrol/useragent/index.html
 
 
-X-TDE-Library=kio
+X-TDE-Library=tdeio
 X-TDE-FactoryName=useragent
 X-TDE-ParentApp=kcontrol
 

kcontrol/tdeio/useragentdlg.cpp

@@ -47,7 +47,7 @@
 #include "useragentdlg_ui.h"
 
 UserAgentDlg::UserAgentDlg( TQWidget * parent )
-             :TDECModule( parent, "kcmkio" )
+             :TDECModule( parent, "kcmtdeio" )
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
@@ -87,7 +87,7 @@ void UserAgentDlg::load()
   d_itemsSelected = 0;
   dlg->lvDomainPolicyList->clear();
 
-  m_config = new TDEConfig("kio_httprc", false, false);
+  m_config = new TDEConfig("tdeio_httprc", false, false);
   m_provider = new FakeUASProvider();
 
   TQStringList list = m_config->groupList();
@@ -186,7 +186,7 @@ void UserAgentDlg::save()
   if (!deleteList.isEmpty())
   {
      // Remove entries from local file.
-     KSimpleConfig cfg("kio_httprc");
+     KSimpleConfig cfg("tdeio_httprc");
      for ( TQStringList::Iterator it = deleteList.begin();
            it != deleteList.end(); ++it )
      {

tdeioslave/DEBUG.howto

@@ -74,7 +74,7 @@ $TDEDIR/share/config/kdebugrc.
        InfoOutput=0
        InfoFilename=/tmp/http 
 
-This redirects all debug info for areas 7103 and 7113 (as used by kio_http) 
+This redirects all debug info for areas 7103 and 7113 (as used by tdeio_http) 
 to the file /tmp/http.
 
 To get debug information from the SMB slave you can add the following to

tdeioslave/DESIGN

@@ -10,7 +10,7 @@ Well, that's nice.  How do they work?
 
 To understand it, you'll need two ice cubes, a pair of handcuffs, and a
 ferret.  Some Crisco (or other shortening) is optional.  Well, that aside,
-this document focuses on the business end of the whole kio library.  The
+this document focuses on the business end of the whole tdeio library.  The
 ioslave. See the documentation of the SlaveBase class for the methods
 you need to reimplement, and see 
 http://developer.kde.org/documentation/design/kde/ioslaves/ for more docu

tdeioslave/about/CMakeLists.txt

@@ -25,12 +25,12 @@ link_directories(
 install( FILES about.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_about (module) ########################
+##### tdeio_about (module) ########################
 
-set( target kio_about )
+set( target tdeio_about )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_about.cpp
+  SOURCES tdeio_about.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/about/Makefile.am

@@ -5,12 +5,12 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_about.la
+kde_module_LTLIBRARIES = tdeio_about.la
 
-kio_about_la_SOURCES = kio_about.cpp
-kio_about_la_LIBADD = $(LIB_KSYCOCA)
-kio_about_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = kio_about.h
+tdeio_about_la_SOURCES = tdeio_about.cpp
+tdeio_about_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_about_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+noinst_HEADERS = tdeio_about.h
 
 kdelnk_DATA = about.protocol
 kdelnkdir = $(kde_servicesdir)

tdeioslave/about/about.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_about
+exec=tdeio_about
 protocol=about
 input=none
 output=filesystem

tdeioslave/about/tdeio_about.cpp

@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kio_about.h"
+#include "tdeio_about.h"
 
 #include <stdlib.h>
 #include <tqstring.h>
@@ -59,11 +59,11 @@ extern "C"
 {
     int KDE_EXPORT kdemain( int argc, char **argv ) {
 
-        TDEInstance instance("kio_about");
+        TDEInstance instance("tdeio_about");
 
         if (argc != 4)
         {
-            fprintf(stderr, "Usage: kio_about protocol domain-socket1 domain-socket2\n");
+            fprintf(stderr, "Usage: tdeio_about protocol domain-socket1 domain-socket2\n");
             exit(-1);
         }
 

tdeioslave/about/tdeio_about.h

@@ -17,8 +17,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_about_h__
-#define __kio_about_h__
+#ifndef __tdeio_about_h__
+#define __tdeio_about_h__
 
 #include <tqcstring.h>
 

tdeioslave/cgi/CMakeLists.txt

@@ -28,9 +28,9 @@ link_directories(
 install( FILES cgi.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_cgi (module) ##########################
+##### tdeio_cgi (module) ##########################
 
-set( target kio_cgi )
+set( target tdeio_cgi )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES cgi.cpp

tdeioslave/cgi/Makefile.am

@@ -2,11 +2,11 @@ SUBDIRS = kcmcgi
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kio_cgi.la
+kde_module_LTLIBRARIES = tdeio_cgi.la
 
-kio_cgi_la_SOURCES = cgi.cpp
-kio_cgi_la_LIBADD = $(LIB_KIO)
-kio_cgi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_cgi_la_SOURCES = cgi.cpp
+tdeio_cgi_la_LIBADD = $(LIB_KIO)
+tdeio_cgi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = cgi.h
 

tdeioslave/cgi/cgi.cpp

@@ -257,13 +257,13 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_cgi" );
+  TDEInstance instance( "tdeio_cgi" );
 
-  kdDebug(7124) << "kio_cgi starting " << getpid() << endl;
+  kdDebug(7124) << "tdeio_cgi starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_cgi protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_cgi protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 

tdeioslave/cgi/cgi.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_cgi
+exec=tdeio_cgi
 protocol=cgi
 input=none
 output=filesystem

tdeioslave/configure.in.in

@@ -3,7 +3,7 @@ KDE_CHECK_SSL
 sasl2_header="no"
 SASL2_LIBS=""
 
-KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap
+KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for tdeio_ldap
 KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
 if test "$sasl2_header" = "yes" ; then
   KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2")

tdeioslave/filter/CMakeLists.txt

@@ -25,9 +25,9 @@ link_directories(
 install( FILES gzip.protocol bzip.protocol bzip2.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_filter (module) #######################
+##### tdeio_filter (module) #######################
 
-set( target kio_filter )
+set( target tdeio_filter )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES filter.cc

tdeioslave/filter/Makefile.am

@@ -2,11 +2,11 @@ KDE_CPPFLAGS = -DQT_NO_CAST_ASCII
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kio_filter.la
+kde_module_LTLIBRARIES = tdeio_filter.la
 
-kio_filter_la_SOURCES = filter.cc
-kio_filter_la_LIBADD = $(LIB_KSYCOCA)
-kio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_filter_la_SOURCES = filter.cc
+tdeio_filter_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = filter.h
 
 METASOURCES = AUTO

tdeioslave/filter/bzip.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_filter
+exec=tdeio_filter
 protocol=bzip
 mimetype=application/x-bzip
 input=stream

tdeioslave/filter/bzip2.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_filter
+exec=tdeio_filter
 protocol=bzip2
 mimetype=application/x-bzip2
 input=stream

tdeioslave/filter/filter.cc

@@ -36,13 +36,13 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char ** argv)
 {
-  TDEInstance instance( "kio_filter" );
+  TDEInstance instance( "tdeio_filter" );
 
   kdDebug(7110) << "Starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_filter protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_filter protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 

tdeioslave/filter/gzip.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_filter
+exec=tdeio_filter
 protocol=gzip
 mimetype=application/gzip
 input=stream

tdeioslave/finger/CMakeLists.txt

@@ -23,15 +23,15 @@ link_directories(
 ##### other data ################################
 
 install( FILES finger.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kio_finger.pl kio_finger.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_finger )
+install( FILES tdeio_finger.pl tdeio_finger.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_finger )
 
 
-##### kio_finger (module) #######################
+##### tdeio_finger (module) #######################
 
-set( target kio_finger )
+set( target tdeio_finger )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_finger.cpp
+  SOURCES tdeio_finger.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/finger/Makefile.am

@@ -1,4 +1,4 @@
-## Makfile.am for kio_finger
+## Makfile.am for tdeio_finger
 ## Edit from Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
@@ -6,20 +6,20 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_finger.la
+kde_module_LTLIBRARIES = tdeio_finger.la
 
-kio_finger_la_SOURCES = kio_finger.cpp 
-kio_finger_la_LIBADD = -lkio
-kio_finger_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_finger_la_SOURCES = tdeio_finger.cpp 
+tdeio_finger_la_LIBADD = -ltdeio
+tdeio_finger_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_finger.h 
+noinst_HEADERS = tdeio_finger.h 
 
 kdelnk_DATA = finger.protocol
 kdelnkdir = $(kde_servicesdir)
 
-kio_finger_data_DATA = kio_finger.pl kio_finger.css
-kio_finger_datadir = $(kde_datadir)/tdeio_finger
-EXTRA_DIST=$(kio_finger_data_DATA)   
+tdeio_finger_data_DATA = tdeio_finger.pl tdeio_finger.css
+tdeio_finger_datadir = $(kde_datadir)/tdeio_finger
+EXTRA_DIST=$(tdeio_finger_data_DATA)   
 
 METASOURCES = AUTO
 

tdeioslave/finger/finger.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_finger
+exec=tdeio_finger
 protocol=finger
 input=none
 output=stream

tdeioslave/finger/tdeio_finger.cpp

@@ -1,6 +1,6 @@
 
 /***************************************************************************
-                          kio_finger.cpp  -  description
+                          tdeio_finger.cpp  -  description
                              -------------------
     begin                : Sun Aug 12 2000
     copyright            : (C) 2000 by Andreas Schlapbach
@@ -34,7 +34,7 @@
 #include <klocale.h>
 #include <kurl.h>
 
-#include "kio_finger.h"
+#include "tdeio_finger.h"
 
 
 using namespace TDEIO;
@@ -45,20 +45,20 @@ extern "C"
 {
   KDE_EXPORT int kdemain( int argc, char **argv )
   {
-    TDEInstance instance( "kio_finger" );
+    TDEInstance instance( "tdeio_finger" );
 
-    //kdDebug() << "*** Starting kio_finger " << getpid() << endl;
+    //kdDebug() << "*** Starting tdeio_finger " << getpid() << endl;
 
     if (argc != 4)
       {
-	fprintf(stderr, "Usage: kio_finger protocol domain-socket1 domain-socket2\n");
+	fprintf(stderr, "Usage: tdeio_finger protocol domain-socket1 domain-socket2\n");
 	exit(-1);
       }
 
     FingerProtocol slave(argv[2], argv[3]);
     slave.dispatchLoop();
 
-    //kdDebug() << "*** kio_finger Done" << endl;
+    //kdDebug() << "*** tdeio_finger Done" << endl;
     return 0;
   }
 }
@@ -95,7 +95,7 @@ FingerProtocol::~FingerProtocol()
 
 void FingerProtocol::get(const KURL& url )
 {
-  //kdDebug() << "kio_finger::get(const KURL& url)" << endl ;
+  //kdDebug() << "tdeio_finger::get(const KURL& url)" << endl ;
 
   this->parseCommandLine(url);
 
@@ -198,28 +198,28 @@ void FingerProtocol::getProgramPath()
       //kdDebug() << "Finger command found:" << *myFingerPath << endl;
     }
 
-  myFingerPerlScript = new TQString(locate("data","kio_finger/tdeio_finger.pl"));
+  myFingerPerlScript = new TQString(locate("data","tdeio_finger/tdeio_finger.pl"));
   if (myFingerPerlScript->isEmpty())
     {
-      //kdDebug() << "kio_finger.pl script not found" << endl;
+      //kdDebug() << "tdeio_finger.pl script not found" << endl;
       this->error(ERR_CANNOT_LAUNCH_PROCESS,
-		  i18n("kio_finger Perl script not found."));
+		  i18n("tdeio_finger Perl script not found."));
       exit();
     }
   else
     {
-      //kdDebug() << "kio_finger perl script found: " << *myFingerPerlScript << endl;
+      //kdDebug() << "tdeio_finger perl script found: " << *myFingerPerlScript << endl;
     }
 
-  myFingerCSSFile = new TQString(locate("data","kio_finger/tdeio_finger.css"));
+  myFingerCSSFile = new TQString(locate("data","tdeio_finger/tdeio_finger.css"));
   if (myFingerCSSFile->isEmpty())
     {
-      //kdDebug() << "kio_finger.css file not found" << endl;
-      this->warning(i18n("kio_finger CSS script not found. Output will look ugly."));
+      //kdDebug() << "tdeio_finger.css file not found" << endl;
+      this->warning(i18n("tdeio_finger CSS script not found. Output will look ugly."));
     }
   else
     {
-      //kdDebug() << "kio_finger CSS file found: " << *myFingerCSSFile << endl;
+      //kdDebug() << "tdeio_finger CSS file found: " << *myFingerCSSFile << endl;
     }
 }
 
@@ -261,6 +261,6 @@ void FingerProtocol::parseCommandLine(const KURL& url)
 }
 
 /* ---------------------------------------------------------------------------------- */
-#include "kio_finger.moc"
+#include "tdeio_finger.moc"
 /* ---------------------------------------------------------------------------------- */
 

tdeioslave/finger/tdeio_finger.h

@@ -1,6 +1,6 @@
 
 /***************************************************************************
-                          kio_finger.h  -  description
+                          tdeio_finger.h  -  description
                              -------------------
     begin                : Sun Aug 12 2000
     copyright            : (C) 2000 by Andreas Schlapbach
@@ -17,8 +17,8 @@
  ***************************************************************************/
 
 
-#ifndef __kio_finger_h__
-#define __kio_finger_h__
+#ifndef __tdeio_finger_h__
+#define __tdeio_finger_h__
 
 #include <tqstring.h>
 #include <tqcstring.h>

tdeioslave/fish/CMakeLists.txt

@@ -28,7 +28,7 @@ link_directories(
 install( FILES fish.protocol nxfish.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_fish (module) #########################
+##### tdeio_fish (module) #########################
 
 add_custom_command( OUTPUT fishcode.h
   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/genfishcode.pl ${CMAKE_CURRENT_SOURCE_DIR}/fish.pl > fishcode.h
@@ -36,7 +36,7 @@ add_custom_command( OUTPUT fishcode.h
 
 set_property( SOURCE fish.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/fishcode.h )
 
-set( target kio_fish )
+set( target tdeio_fish )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES fish.cpp

tdeioslave/fish/FAQ

@@ -1,4 +1,4 @@
-Freqeuently Asked Questions, last updated for kio_fish 1.1
+Freqeuently Asked Questions, last updated for tdeio_fish 1.1
 
 Q: Typing fish:/some.host.com does not work
 A: It is fish://some.host.com (double slash)

tdeioslave/fish/Makefile.am

@@ -1,11 +1,11 @@
-kde_module_LTLIBRARIES = kio_fish.la
+kde_module_LTLIBRARIES = tdeio_fish.la
 
 INCLUDES = $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-kio_fish_la_SOURCES = fish.cpp
-kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) 
-kio_fish_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lutil
+tdeio_fish_la_SOURCES = fish.cpp
+tdeio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) 
+tdeio_fish_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lutil
 noinst_HEADERS = fishcode.h fish.h
 
 EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO FAQ fish.pl

tdeioslave/fish/README

@@ -1,4 +1,4 @@
-Overview of kio_fish
+Overview of tdeio_fish
 ====================
 
   ------------------------------------------------------------------------

tdeioslave/fish/fish.cpp

@@ -126,7 +126,7 @@ static void ripper(int)
 
 int KDE_EXPORT kdemain( int argc, char **argv )
 {
-    KLocale::setMainCatalogue("kio_fish");
+    KLocale::setMainCatalogue("tdeio_fish");
     TDEInstance instance("fish");
 
     myDebug( << "*** Starting fish " << endl);

tdeioslave/fish/fish.pl

@@ -3,9 +3,9 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, version 2 of the License
 =pod
-This file was transferred by kio_fish, a network client part of the
+This file was transferred by tdeio_fish, a network client part of the
 KDE project. You may safely delete it, it will be transferred again
-when needed. It's only purpose is to make kio_fish access faster and
+when needed. It's only purpose is to make tdeio_fish access faster and
 more reliable.
 =cut
 

tdeioslave/fish/fish.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_fish
+exec=tdeio_fish
 protocol=fish
 input=none
 output=filesystem

tdeioslave/fish/nxfish.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_fish
+exec=tdeio_fish
 protocol=nxfish
 input=none
 output=filesystem

tdeioslave/floppy/CMakeLists.txt

@@ -26,12 +26,12 @@ link_directories(
 install( FILES floppy.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_floppy (module) #######################
+##### tdeio_floppy (module) #######################
 
-set( target kio_floppy )
+set( target tdeio_floppy )
 
 set( ${target}_SRCS
-  kio_floppy.cpp program.cpp
+  tdeio_floppy.cpp program.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC

tdeioslave/floppy/Makefile.am

@@ -5,11 +5,11 @@ AM_LDFLAGS = $(all_libraries)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_floppy.la
+kde_module_LTLIBRARIES = tdeio_floppy.la
 
-kio_floppy_la_SOURCES = kio_floppy.cpp program.cpp
-kio_floppy_la_LIBADD = $(LIB_KIO)
-kio_floppy_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_floppy_la_SOURCES = tdeio_floppy.cpp program.cpp
+tdeio_floppy_la_LIBADD = $(LIB_KIO)
+tdeio_floppy_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kdelnk_DATA = floppy.protocol
 kdelnkdir = $(kde_servicesdir)

tdeioslave/floppy/floppy.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_floppy
+exec=tdeio_floppy
 protocol=floppy
 input=none
 output=filesystem

tdeioslave/floppy/tdeio_floppy.cpp

@@ -40,7 +40,7 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include "kio_floppy.h"
+#include "tdeio_floppy.h"
 
 #include <kinstance.h>
 #include <kdebug.h>
@@ -53,11 +53,11 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_floppy" );
+  TDEInstance instance( "tdeio_floppy" );
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_floppy protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_floppy protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
   kdDebug(7101) << "Floppy: kdemain: starting" << endl;

tdeioslave/home/CMakeLists.txt

@@ -27,22 +27,22 @@ link_directories(
 install( FILES home.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kiohome (static) ##########################
+##### tdeiohome (static) ##########################
 
-set( target kiohome )
+set( target tdeiohome )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES kio_home.cpp homeimpl.cpp
+  SOURCES tdeio_home.cpp homeimpl.cpp
 )
 
 
-##### kio_home (module) #########################
+##### tdeio_home (module) #########################
 
-set( target kio_home )
+set( target tdeio_home )
 
 tde_add_kpart( ${target}
   SOURCES dummy.cpp
-  EMBED kiohome-static
+  EMBED tdeiohome-static
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/home/Makefile.am

@@ -4,11 +4,11 @@ SUBDIRS= . kdedmodule
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_home.la
+kde_module_LTLIBRARIES = tdeio_home.la
 
-kio_home_la_SOURCES = dummy.cpp
-kio_home_la_LIBADD  = libtdeiohome.la $(LIB_KIO)
-kio_home_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_home_la_SOURCES = dummy.cpp
+tdeio_home_la_LIBADD  = libtdeiohome.la $(LIB_KIO)
+tdeio_home_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
 	echo > dummy.cpp
@@ -16,7 +16,7 @@ dummy.cpp:
 kde_services_DATA = home.protocol
 
 noinst_LTLIBRARIES = libtdeiohome.la
-libtdeiohome_la_SOURCES = kio_home.cpp homeimpl.cpp
+libtdeiohome_la_SOURCES = tdeio_home.cpp homeimpl.cpp
 
 check_PROGRAMS = testhome
 testhome_SOURCES = testhome.cpp

tdeioslave/home/home.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_home
+exec=tdeio_home
 protocol=home
 input=none
 output=filesystem

tdeioslave/home/kdedmodule/homedirnotifymodule.cpp

@@ -30,7 +30,7 @@ HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj)
 extern "C" {
 	KDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj)
 	{
-		TDEGlobal::locale()->insertCatalogue("kio_home");
+		TDEGlobal::locale()->insertCatalogue("tdeio_home");
 		return new HomeDirNotifyModule(obj);
 	}
 }

tdeioslave/home/tdeio_home.cpp

@@ -27,7 +27,7 @@
 #include <kglobal.h>
 
 
-#include "kio_home.h"
+#include "tdeio_home.h"
 
 static const KCmdLineOptions options[] =
 {
@@ -42,7 +42,7 @@ extern "C" {
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
-		TDECmdLineArgs::init(argc, argv, "kio_home", 0, 0, 0, 0);
+		TDECmdLineArgs::init(argc, argv, "tdeio_home", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP

tdeioslave/home/testhome.cpp

@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_home.h"
+#include "tdeio_home.h"
 #include "testhome.h"
 
 #include <config.h>

tdeioslave/info/CMakeLists.txt

@@ -27,9 +27,9 @@ install( FILES kde-info2html.conf DESTINATION ${DATA_INSTALL_DIR}/tdeio_info )
 install( PROGRAMS kde-info2html DESTINATION ${DATA_INSTALL_DIR}/tdeio_info )
 
 
-##### kio_info (module) #########################
+##### tdeio_info (module) #########################
 
-set( target kio_info )
+set( target tdeio_info )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES info.cc

tdeioslave/info/Makefile.am

@@ -6,16 +6,16 @@ METASOURCES = AUTO
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_info.la
+kde_module_LTLIBRARIES = tdeio_info.la
 
-kio_info_la_SOURCES = info.cc
-kio_info_la_LIBADD = $(LIB_KIO)
-kio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_info_la_SOURCES = info.cc
+tdeio_info_la_LIBADD = $(LIB_KIO)
+tdeio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = info.h
 
 kdelnk_DATA = info.protocol
 kdelnkdir = $(kde_servicesdir)
 
-kio_info_data_DATA = kde-info2html.conf
-kio_info_data_SCRIPTS = kde-info2html
-kio_info_datadir = $(kde_datadir)/tdeio_info
+tdeio_info_data_DATA = kde-info2html.conf
+tdeio_info_data_SCRIPTS = kde-info2html
+tdeio_info_datadir = $(kde_datadir)/tdeio_info

tdeioslave/info/info.cc

@@ -26,8 +26,8 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app )
     kdDebug( 7108 ) << "InfoProtocol::InfoProtocol" << endl;
 
     m_perl = TDEGlobal::dirs()->findExe( "perl" );
-    m_infoScript = locate( "data", "kio_info/kde-info2html" );
-    m_infoConf = locate("data", "kio_info/kde-info2html.conf");
+    m_infoScript = locate( "data", "tdeio_info/kde-info2html" );
+    m_infoConf = locate("data", "tdeio_info/kde-info2html.conf");
 
     if( m_perl.isNull() || m_infoScript.isNull() || m_infoConf.isNull() ) {
 	kdError( 7108 ) << "Critical error: Cannot locate files for HTML-conversion" << endl;
@@ -35,7 +35,7 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app )
 	if ( m_perl.isNull() ) {
 		errorStr = "perl.";
 	} else {
-		TQString missing =m_infoScript.isNull() ?  "kio_info/kde-info2html" : "kio_info/kde-info2html.conf";
+		TQString missing =m_infoScript.isNull() ?  "tdeio_info/kde-info2html" : "tdeio_info/kde-info2html.conf";
 		errorStr = "kde-info2html" + i18n( "\nUnable to locate file %1 which is necessary to run this service. "
 				"Please check your software installation" ).arg( missing );
 	}
@@ -244,13 +244,13 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_info" );
+  TDEInstance instance( "tdeio_info" );
 
-  kdDebug() << "kio_info starting " << getpid() << endl;
+  kdDebug() << "tdeio_info starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_info protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_info protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 

tdeioslave/info/info.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_info
+exec=tdeio_info
 protocol=info
 input=none
 output=filesystem

tdeioslave/ldap/CMakeLists.txt

@@ -28,10 +28,10 @@ link_directories(
 install( FILES ldap.protocol ldaps.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_ldap (module) #########################
+##### tdeio_ldap (module) #########################
 
-tde_add_kpart( kio_ldap AUTOMOC
-  SOURCES kio_ldap.cpp
+tde_add_kpart( tdeio_ldap AUTOMOC
+  SOURCES tdeio_ldap.cpp
   LINK kabc-shared ${LDAP_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/ldap/Makefile.am

@@ -7,13 +7,13 @@ LDADD      = $(LIB_KIO) $(LDAP_LIBS)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_ldap.la
+kde_module_LTLIBRARIES = tdeio_ldap.la
 
-kio_ldap_la_SOURCES = kio_ldap.cpp
-kio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_KABC)
-kio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN)
+tdeio_ldap_la_SOURCES = tdeio_ldap.cpp
+tdeio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_KABC)
+tdeio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_ldap.h
+noinst_HEADERS = tdeio_ldap.h
 
 kdelnk_DATA = ldap.protocol ldaps.protocol
 kdelnkdir = $(kde_servicesdir)

tdeioslave/ldap/ldap.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_ldap
+exec=tdeio_ldap
 protocol=ldap
 input=none
 output=filesystem

tdeioslave/ldap/ldaps.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_ldap
+exec=tdeio_ldap
 protocol=ldaps
 input=none
 output=filesystem

tdeioslave/ldap/tdeio_ldap.cpp

@@ -22,7 +22,7 @@
 #endif
 #include <kabc/ldif.h>
 
-#include "kio_ldap.h"
+#include "tdeio_ldap.h"
 
 using namespace TDEIO;
 using namespace KABC;
@@ -34,12 +34,12 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
  */
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_ldap" );
+  TDEInstance instance( "tdeio_ldap" );
 
   kdDebug(7125) << "Starting " << getpid() << endl;
 
   if ( argc != 4 ) {
-    kdError() << "Usage kio_ldap protocol pool app" << endl;
+    kdError() << "Usage tdeio_ldap protocol pool app" << endl;
     return -1;
   }
 
@@ -93,7 +93,7 @@ void LDAPProtocol::LDAPErr( const KURL &url, int err )
   closeConnection();
   
   switch (err) {
-/* FIXME: is it worth mapping the following error codes to kio errors?
+/* FIXME: is it worth mapping the following error codes to tdeio errors?
 
 	LDAP_OPERATIONS_ERROR 
   LDAP_STRONG_AUTH_REQUIRED
@@ -943,14 +943,14 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool )
               FREELDAPMEM;
               return;
             case LDIF::Entry_Del:
-              kdDebug(7125) << "kio_ldap_del" << endl;
+              kdDebug(7125) << "tdeio_ldap_del" << endl;
               controlsFromMetaData( &serverctrls, &clientctrls );
               ldaperr = ldap_delete_ext_s( mLDAP, ldif.dn().utf8(), 
                 serverctrls, clientctrls );
               FREELDAPMEM;
               break;
             case LDIF::Entry_Modrdn:
-              kdDebug(7125) << "kio_ldap_modrdn olddn:" << ldif.dn() << 
+              kdDebug(7125) << "tdeio_ldap_modrdn olddn:" << ldif.dn() << 
                 " newRdn: " <<  ldif.newRdn() << 
                 " newSuperior: " << ldif.newSuperior() << 
                 " deloldrdn: " << ldif.delOldRdn() << endl;
@@ -962,7 +962,7 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool )
               FREELDAPMEM;
               break;
             case LDIF::Entry_Mod:
-              kdDebug(7125) << "kio_ldap_mod"  << endl;
+              kdDebug(7125) << "tdeio_ldap_mod"  << endl;
               if ( lmod ) {
                 controlsFromMetaData( &serverctrls, &clientctrls );
                 ldaperr = ldap_modify_ext_s( mLDAP, ldif.dn().utf8(), lmod,
@@ -971,7 +971,7 @@ void LDAPProtocol::put( const KURL &_url, int, bool overwrite, bool )
               }
               break;
             case LDIF::Entry_Add:
-              kdDebug(7125) << "kio_ldap_add " << ldif.dn() << endl;
+              kdDebug(7125) << "tdeio_ldap_add " << ldif.dn() << endl;
               if ( lmod ) {
                 controlsFromMetaData( &serverctrls, &clientctrls );
                 ldaperr = ldap_add_ext_s( mLDAP, ldif.dn().utf8(), lmod,

tdeioslave/mac/CMakeLists.txt

@@ -26,12 +26,12 @@ install( FILES mac.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 tde_install_icons( )
 
 
-##### kio_mac (module) ##########################
+##### tdeio_mac (module) ##########################
 
-set( target kio_mac )
+set( target tdeio_mac )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_mac.cpp
+  SOURCES tdeio_mac.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/mac/ChangeLog

@@ -18,7 +18,7 @@
 	- Converts some HFS+ file types and application labels into mimetypes
 	- Added a SuSE Makefile
 	- Hopefully managed to get the SuSE RPMs working
-	- When copying files kio-mac now reports the amount progressed so
+	- When copying files tdeio-mac now reports the amount progressed so
   	  you can see how much has been copied
 	- Text files are now copies over in text mode by default
 

tdeioslave/mac/Makefile.am

@@ -1,17 +1,17 @@
-## Makfile.am for kio_mac
+## Makfile.am for tdeio_mac
 
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_mac.la
+kde_module_LTLIBRARIES = tdeio_mac.la
 
-kio_mac_la_SOURCES = kio_mac.cpp
-kio_mac_la_LIBADD = -lkio
-kio_mac_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_mac_la_SOURCES = tdeio_mac.cpp
+tdeio_mac_la_LIBADD = -ltdeio
+tdeio_mac_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_mac.h
+noinst_HEADERS = tdeio_mac.h
 
 kdelnk_DATA = mac.protocol
 kdelnkdir = $(kde_servicesdir)

tdeioslave/mac/README

@@ -7,7 +7,7 @@ From the hfsplus man page:
        2^64  blocks,  resulting in much more efficient storage of
        many small files on large disks."
 
-This kio slave lets you read an HFS+ partition from konqueror
+This tdeio slave lets you read an HFS+ partition from konqueror
 or any other KDE file dialogue.  It uses hfsplus tools so you will
 need these installed for it to work.
 
@@ -52,7 +52,7 @@ For some reason some directories in MacOS end in a funny tall f
 character.  This seems to confuse hfstools.
 
 You can't easiily use the command line tools while you are browsing
-using kio-mac in Konqueror.  Konqueror continuously refreshes it's
+using tdeio-mac in Konqueror.  Konqueror continuously refreshes it's
 view which mean hpmount is being called every few seconds.  Click on
 Konqueror's home button before using the tools yourself on the command
 line.

tdeioslave/mac/TODO

@@ -1,7 +1,7 @@
 FIXMEs:
 	Amazingly, none that I can think of
 
-grep TODO kio_mac.cpp
+grep TODO tdeio_mac.cpp
         //TODO this means dev=foo must be the last argument in the query
         //TODO this error interrupts the user when typing ?dev=foo on each letter of foo
         //TODO are there any more characters to escape?

tdeioslave/mac/mac.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_mac
+exec=tdeio_mac
 protocol=mac
 input=none
 output=filesystem

tdeioslave/mac/tdeio_mac.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kio_mac.cpp
+                          tdeio_mac.cpp
                              -------------------
     copyright            : (C) 2002 Jonathan Riddell
     email                : jr@jriddell.org
@@ -30,13 +30,13 @@
 #include <iostream>
 #include <time.h>
 
-#include "kio_mac.moc"
+#include "tdeio_mac.moc"
 
 using namespace TDEIO;
 
 extern "C" {
     int KDE_EXPORT kdemain(int, char **argv) {
-        TDEInstance instance("kio_mac");
+        TDEInstance instance("tdeio_mac");
         MacProtocol slave(argv[2], argv[3]);
         slave.dispatchLoop();
         return 0;

tdeioslave/man/CMakeLists.txt

@@ -9,7 +9,7 @@
 #
 #################################################
 
-# FIXME not built: man2html, kio_man_test
+# FIXME not built: man2html, tdeio_man_test
 
 
 ##### system checks #############################
@@ -35,15 +35,15 @@ link_directories(
 ##### other data ################################
 
 install( FILES man.protocol kmanpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kio_man.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_man )
+install( FILES tdeio_man.css DESTINATION ${DATA_INSTALL_DIR}/tdeio_man )
 
 
-##### kio_man (module) ##########################
+##### tdeio_man (module) ##########################
 
-set( target kio_man )
+set( target tdeio_man )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES man2html.cpp kio_man.cpp
+  SOURCES man2html.cpp tdeio_man.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/man/Makefile.am

@@ -3,22 +3,22 @@
 INCLUDES= $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-EXTRA_PROGRAMS = kio_man_test man2html
+EXTRA_PROGRAMS = tdeio_man_test man2html
 
 ####### just for testing (j.habenicht@europemail.com, 15.02.2001)
 
-kio_man_test_SOURCES = kio_man_test.cpp
-kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+tdeio_man_test_SOURCES = tdeio_man_test.cpp
+tdeio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeio_man_test_LDADD = man2html.lo tdeio_man.lo $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_man.la  libkmanpart.la
+kde_module_LTLIBRARIES = tdeio_man.la  libkmanpart.la
 
-kio_man_la_SOURCES = man2html.cpp kio_man.cpp
-kio_man_la_LIBADD = $(LIB_KSYCOCA)
-kio_man_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = kio_man.h
+tdeio_man_la_SOURCES = man2html.cpp tdeio_man.cpp
+tdeio_man_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_man_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+noinst_HEADERS = tdeio_man.h
 ### TODO Why is man2htmk.h distributed?
 
 libkmanpart_la_SOURCES = kmanpart.cpp
@@ -28,9 +28,9 @@ libkmanpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 kdelnk_DATA = man.protocol kmanpart.desktop
 kdelnkdir = $(kde_servicesdir)
 
-kio_man_data_DATA = kio_man.css
-kio_man_datadir = $(kde_datadir)/tdeio_man
-EXTRA_DIST=$(kio_man_data_DATA)
+tdeio_man_data_DATA = tdeio_man.css
+tdeio_man_datadir = $(kde_datadir)/tdeio_man
+EXTRA_DIST=$(tdeio_man_data_DATA)
 
 METASOURCES = AUTO
 

tdeioslave/man/man.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_man
+exec=tdeio_man
 protocol=man
 input=none
 output=filesystem

tdeioslave/man/man2html.cpp

@@ -4073,7 +4073,7 @@ static char *scan_request(char *c)
                             // Most English man pages are in ISO-8859-1
                             out_html("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n");
 #else
-                            // kio_man transforms from local to UTF-8
+                            // tdeio_man transforms from local to UTF-8
                             out_html("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
                             out_html(TQTextCodec::codecForLocale()->mimeName());
                             out_html("\">\n");

tdeioslave/man/tdeio_man.cpp

@@ -39,8 +39,8 @@
 #include <klocale.h>
 #include <kmimetype.h>
 
-#include "kio_man.h"
-#include "kio_man.moc"
+#include "tdeio_man.h"
+#include "tdeio_man.moc"
 #include "man2html.h"
 #include <assert.h>
 #include <kfilterbase.h>
@@ -122,7 +122,7 @@ MANProtocol::MANProtocol(const TQCString &pool_socket, const TQCString &app_sock
     m_cssPath=strPath.local8Bit(); // ### TODO encode for CSS
     section_names << "1" << "2" << "3" << "3n" << "3p" << "4" << "5" << "6" << "7"
                   << "8" << "9" << "l" << "n";
-    m_manCSSFile = locate( "data", "kio_man/tdeio_man.css" );
+    m_manCSSFile = locate( "data", "tdeio_man/tdeio_man.css" );
 }
 
 MANProtocol *MANProtocol::self() { return _self; }
@@ -692,13 +692,13 @@ extern "C"
 
     int KDE_EXPORT kdemain( int argc, char **argv ) {
 
-        TDEInstance instance("kio_man");
+        TDEInstance instance("tdeio_man");
 
         kdDebug(7107) <<  "STARTING " << getpid() << endl;
 
         if (argc != 4)
         {
-            fprintf(stderr, "Usage: kio_man protocol domain-socket1 domain-socket2\n");
+            fprintf(stderr, "Usage: tdeio_man protocol domain-socket1 domain-socket2\n");
             exit(-1);
         }
 

tdeioslave/man/tdeio_man.h

@@ -17,8 +17,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_man_h__
-#define __kio_man_h__
+#ifndef __tdeio_man_h__
+#define __tdeio_man_h__
 
 
 #include <tqstring.h>
@@ -93,7 +93,7 @@ private:
     TQCString m_htmlPath; ///< Path to TDE resources, encoded for HTML
     TQCString m_cssPath; ///< Path to TDE resources, encoded for CSS
     TQBuffer m_outputBuffer; ///< Buffer for the output
-    TQString m_manCSSFile; ///< Path to kio_man.css
+    TQString m_manCSSFile; ///< Path to tdeio_man.css
 };
 
 

tdeioslave/man/tdeio_man_test.cpp

@@ -2,19 +2,19 @@
 
 #include <tqobject.h>
 
-#include "kio_man.h"
+#include "tdeio_man.h"
 
 
 #include <kapplication.h>
 #include <klocale.h>
 
 
-class kio_man_test : public  MANProtocol
+class tdeio_man_test : public  MANProtocol
 {
   Q_OBJECT
 
 public:
-  kio_man_test(const TQCString &pool_socket, const TQCString &app_socket);
+  tdeio_man_test(const TQCString &pool_socket, const TQCString &app_socket);
 
 protected:
   virtual void data(int);

tdeioslave/media/CMakeLists.txt

@@ -38,22 +38,22 @@ link_directories(
 install( FILES media.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kiomedia (static) #########################
+##### tdeiomedia (static) #########################
 
-set( target kiomedia )
+set( target tdeiomedia )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES kio_media.cpp mediaimpl.cpp mediaimpl.skel
+  SOURCES tdeio_media.cpp mediaimpl.cpp mediaimpl.skel
 )
 
 
-##### kio_media (module) ########################
+##### tdeio_media (module) ########################
 
-set( target kio_media )
+set( target tdeio_media )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES dummy.cpp
-  EMBED kiomedia-static
+  EMBED tdeiomedia-static
   LINK mediacommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/media/Makefile.am

@@ -8,11 +8,11 @@ SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \
 INCLUDES = -I$(srcdir)/libmediacommon $(all_includes)
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_media.la
+kde_module_LTLIBRARIES = tdeio_media.la
 
-kio_media_la_SOURCES = dummy.cpp
-kio_media_la_LIBADD  = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO)
-kio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_media_la_SOURCES = dummy.cpp
+tdeio_media_la_LIBADD  = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO)
+tdeio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
 	echo > dummy.cpp
@@ -20,7 +20,7 @@ dummy.cpp:
 kde_services_DATA = media.protocol
 
 noinst_LTLIBRARIES = libtdeiomedia.la
-libtdeiomedia_la_SOURCES = kio_media.cpp mediaimpl.cpp mediaimpl.skel
+libtdeiomedia_la_SOURCES = tdeio_media.cpp mediaimpl.cpp mediaimpl.skel
 
 check_PROGRAMS = testmedia
 testmedia_SOURCES = testmedia.cpp

tdeioslave/media/media.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_media
+exec=tdeio_media
 protocol=media
 input=none
 output=filesystem

tdeioslave/media/mediamanager/halbackend.cpp

@@ -377,7 +377,7 @@ void HALBackend::DeviceCondition(const char* udi, const char* condition)
         }
         if (medium) {
 	    TDEProcess p;
-	    p << "kio_media_mounthelper" << "-e" << medium->name();
+	    p << "tdeio_media_mounthelper" << "-e" << medium->name();
 	    p.start(TDEProcess::DontCare);
         }
     }

tdeioslave/media/mediamanager/mediamanager.cpp

@@ -415,7 +415,7 @@ void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &nam
 extern "C" {
     KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
     {
-        TDEGlobal::locale()->insertCatalogue("kio_media");
+        TDEGlobal::locale()->insertCatalogue("tdeio_media");
         return new MediaManager(obj);
     }
 }

tdeioslave/media/mounthelper/CMakeLists.txt

@@ -21,12 +21,12 @@ link_directories(
 )
 
 
-##### kio_media_mounthelper (executable) ########
+##### tdeio_media_mounthelper (executable) ########
 
-set( target kio_media_mounthelper )
+set( target tdeio_media_mounthelper )
 
 set( ${target}_SRCS
-  kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
+  tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
 )
 
 tde_add_executable( ${target} AUTOMOC

tdeioslave/media/mounthelper/Makefile.am

@@ -1,12 +1,12 @@
-bin_PROGRAMS = kio_media_mounthelper
+bin_PROGRAMS = tdeio_media_mounthelper
 
 INCLUDES = -I$(srcdir)/../libmediacommon $(all_includes)
 AM_LDFLAGS = $(all_libraries)
 
-kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
+tdeio_media_mounthelper_SOURCES = tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
 
-kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI)
+tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI)
 
 METASOURCES = AUTO
 

tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp

@@ -35,7 +35,7 @@
 #include <kmimetype.h>
 
 #include "dialog.h"
-#include "kio_media_mounthelper.h"
+#include "tdeio_media_mounthelper.h"
 
 const Medium MountHelper::findMedium(const KURL &url)
 {
@@ -263,12 +263,12 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-	TDECmdLineArgs::init(argc, argv, "kio_media_mounthelper",
-	                   "kio_media_mounthelper", "kio_media_mounthelper",
+	TDECmdLineArgs::init(argc, argv, "tdeio_media_mounthelper",
+	                   "tdeio_media_mounthelper", "tdeio_media_mounthelper",
 	                   "0.1");
 
 	TDECmdLineArgs::addCmdLineOptions( options );
-	TDEGlobal::locale()->setMainCatalogue("kio_media");
+	TDEGlobal::locale()->setMainCatalogue("tdeio_media");
 	TDEApplication::addCmdLineOptions();
 
 	if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
@@ -279,4 +279,4 @@ int main(int argc, char **argv)
 	return app->exec();
 }
 
-#include "kio_media_mounthelper.moc"
+#include "tdeio_media_mounthelper.moc"

tdeioslave/media/services/media_decrypt.desktop

@@ -1,5 +1,5 @@
 [Desktop Action Decrypt]
-Exec=kio_media_mounthelper -d %u
+Exec=tdeio_media_mounthelper -d %u
 Icon=decrypted
 Name=Decrypt
 Name[de]=Entschlüsseln

tdeioslave/media/services/media_eject.desktop

@@ -86,5 +86,5 @@ Name[xh]=Khuphela ngaphandle
 Name[zh_CN]=弹出
 Name[zh_TW]=退出
 Name[zu]=Khipha
-Exec=kio_media_mounthelper -e %u
+Exec=tdeio_media_mounthelper -e %u
 

tdeioslave/media/services/media_mount.desktop

@@ -83,5 +83,5 @@ Name[xh]=Layisha
 Name[zh_CN]=挂载
 Name[zh_TW]=掛載
 Name[zu]=Yenyusa
-Exec=kio_media_mounthelper -m %u
+Exec=tdeio_media_mounthelper -m %u
 

tdeioslave/media/services/media_safelyremove.desktop

@@ -71,5 +71,5 @@ Name[vi]=Gỡ ra An toàn
 Name[wa]=Ositer e såvrité
 Name[zh_CN]=安全删除
 Name[zh_TW]=安全的移除
-Exec=kio_media_mounthelper -s %u
+Exec=tdeio_media_mounthelper -s %u
 

tdeioslave/media/services/media_unmount.desktop

@@ -83,5 +83,5 @@ Name[xh]=Sukuyilayisha
 Name[zh_CN]=卸载
 Name[zh_TW]=卸載
 Name[zu]=Yehlisa
-Exec=kio_media_mounthelper -u %u
+Exec=tdeio_media_mounthelper -u %u
 

tdeioslave/media/tdecmodule/main.cpp

@@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) )
 MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& )
 	: TDECModule(MediaFactory::instance(), parent, name )
 {
-	TDEGlobal::locale()->insertCatalogue("kio_media");
+	TDEGlobal::locale()->insertCatalogue("tdeio_media");
 	TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 	TQTabWidget *tab = new TQTabWidget( this );
 	

tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp

@@ -39,7 +39,7 @@
 #endif
 
 typedef KGenericFactory<KFileMediaPlugin> KFileMediaPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(tdefile_media, KFileMediaPluginFactory("kio_media"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_media, KFileMediaPluginFactory("tdeio_media"))
 
 KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name,
 		                     const TQStringList& args)

tdeioslave/media/tdeio_media.cpp

@@ -28,7 +28,7 @@
 #include <tqeventloop.h>
 
 #include "mediaimpl.h"
-#include "kio_media.h"
+#include "tdeio_media.h"
 
 
 static const KCmdLineOptions options[] =
@@ -44,7 +44,7 @@ extern "C" {
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
-		TDECmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0);
+		TDECmdLineArgs::init(argc, argv, "tdeio_media", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
@@ -273,4 +273,4 @@ void MediaProtocol::slotWarning( const TQString &msg )
 	warning( msg );
 }
 
-#include "kio_media.moc"
+#include "tdeio_media.moc"

tdeioslave/media/testmedia.cpp

@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_media.h"
+#include "tdeio_media.h"
 #include "testmedia.h"
 
 #include <config.h>

tdeioslave/nfs/CMakeLists.txt

@@ -26,9 +26,9 @@ link_directories(
 install( FILES nfs.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_nfs (module) ##########################
+##### tdeio_nfs (module) ##########################
 
-set( target kio_nfs )
+set( target tdeio_nfs )
 
 add_custom_command( OUTPUT mount_xdr.c
   COMMAND rpcgen -c -o mount_xdr.c ${CMAKE_CURRENT_SOURCE_DIR}/mount.x
@@ -39,7 +39,7 @@ add_custom_command( OUTPUT nfs_prot_xdr.c
   DEPENDS nfs_prot.x )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
+  SOURCES tdeio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/nfs/Makefile.am

@@ -5,11 +5,11 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_nfs.la
+kde_module_LTLIBRARIES = tdeio_nfs.la
 
-kio_nfs_la_SOURCES = kio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
-kio_nfs_la_LIBADD = -lkio $(LIBRPC)
-kio_nfs_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_nfs_la_SOURCES = tdeio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
+tdeio_nfs_la_LIBADD = -ltdeio $(LIBRPC)
+tdeio_nfs_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = nfs_prot.h mount.h
 
 kdelnk_DATA = nfs.protocol

tdeioslave/nfs/nfs.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_nfs
+exec=tdeio_nfs
 protocol=nfs
 input=none
 output=filesystem

tdeioslave/nfs/tdeio_nfs.cpp

@@ -58,7 +58,7 @@
 #include "nfs_prot.h"
 #define fhandle _fhandle
 #include "mount.h"
-#include "kio_nfs.h"
+#include "tdeio_nfs.h"
 
 #define MAXHOSTLEN 256
 
@@ -113,11 +113,11 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_nfs" );
+  TDEInstance instance( "tdeio_nfs" );
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_nfs protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_nfs protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
   kdDebug(7121) << "NFS: kdemain: starting" << endl;

tdeioslave/nntp/CMakeLists.txt

@@ -25,9 +25,9 @@ link_directories(
 install( FILES nntp.protocol nntps.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_nntp (module) #########################
+##### tdeio_nntp (module) #########################
 
-set( target kio_nntp )
+set( target tdeio_nntp )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES nntp.cpp

tdeioslave/nntp/Makefile.am

@@ -2,11 +2,11 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_nntp.la
+kde_module_LTLIBRARIES = tdeio_nntp.la
 
-kio_nntp_la_SOURCES = nntp.cpp
-kio_nntp_la_LIBADD  = $(LIB_KIO)
-kio_nntp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_nntp_la_SOURCES = nntp.cpp
+tdeio_nntp_la_LIBADD  = $(LIB_KIO)
+tdeio_nntp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 METASOURCES = AUTO
 

tdeioslave/nntp/nntp.cpp

@@ -39,9 +39,9 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain(int argc, char **argv) {
 
-  TDEInstance instance ("kio_nntp");
+  TDEInstance instance ("tdeio_nntp");
   if (argc != 4) {
-    fprintf(stderr, "Usage: kio_nntp protocol domain-socket1 domain-socket2\n");
+    fprintf(stderr, "Usage: tdeio_nntp protocol domain-socket1 domain-socket2\n");
     exit(-1);
   }
 

tdeioslave/nntp/nntp.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_nntp
+exec=tdeio_nntp
 protocol=nntp
 input=none
 output=filesystem

tdeioslave/nntp/nntps.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_nntp
+exec=tdeio_nntp
 protocol=nntps
 input=none
 output=filesystem

tdeioslave/pop3/CMakeLists.txt

@@ -26,9 +26,9 @@ link_directories(
 install( FILES pop3.protocol pop3s.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_pop3 (module) #########################
+##### tdeio_pop3 (module) #########################
 
-set( target kio_pop3 )
+set( target tdeio_pop3 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES pop3.cc

tdeioslave/pop3/Makefile.am

@@ -2,11 +2,11 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_pop3.la
+kde_module_LTLIBRARIES = tdeio_pop3.la
 
-kio_pop3_la_SOURCES = pop3.cc
-kio_pop3_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
-kio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_pop3_la_SOURCES = pop3.cc
+tdeio_pop3_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
+tdeio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = pop3.h
 

tdeioslave/pop3/pop3.cc

@@ -92,7 +92,7 @@ int kdemain(int argc, char **argv)
 {
 
   if (argc != 4) {
-    POP3_DEBUG << "Usage: kio_pop3 protocol domain-socket1 domain-socket2"
+    POP3_DEBUG << "Usage: tdeio_pop3 protocol domain-socket1 domain-socket2"
         << endl;
     return -1;
   }
@@ -104,7 +104,7 @@ int kdemain(int argc, char **argv)
   }
 #endif
 
-  TDEInstance instance("kio_pop3");
+  TDEInstance instance("tdeio_pop3");
   POP3Protocol *slave;
 
   // Are we looking to use SSL?
@@ -599,7 +599,7 @@ int POP3Protocol::loginSASL( TDEIO::AuthInfo &ai )
 #else
   if (metaData("auth") == "SASL") {
     closeConnection();
-    error(ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_pop3."));
+    error(ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into tdeio_pop3."));
     return -1;
   }
   return 1; //if SASL not explicitly required, try another method (USER/PASS)

tdeioslave/pop3/pop3.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_pop3
+exec=tdeio_pop3
 protocol=pop3
 Capabilities=SASL
 input=none

tdeioslave/pop3/pop3s.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_pop3
+exec=tdeio_pop3
 protocol=pop3s
 Capabilities=SASL
 input=none

tdeioslave/remote/CMakeLists.txt

@@ -27,24 +27,24 @@ link_directories(
 install( FILES remote.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kioremote (static) ########################
+##### tdeioremote (static) ########################
 
-set( target kioremote )
+set( target tdeioremote )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES kio_remote.cpp remoteimpl.cpp
+  SOURCES tdeio_remote.cpp remoteimpl.cpp
 )
 
 
-##### kio_remote (module) #######################
+##### tdeio_remote (module) #######################
 
-set( target kio_remote )
+set( target tdeio_remote )
 
 configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
 
 tde_add_kpart( ${target}
   SOURCES dummy.cpp
-  EMBED kioremote-static
+  EMBED tdeioremote-static
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/remote/Makefile.am

@@ -4,11 +4,11 @@ SUBDIRS= . kdedmodule
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_remote.la
+kde_module_LTLIBRARIES = tdeio_remote.la
 
-kio_remote_la_SOURCES = dummy.cpp
-kio_remote_la_LIBADD  = libtdeioremote.la $(LIB_KIO)
-kio_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_remote_la_SOURCES = dummy.cpp
+tdeio_remote_la_LIBADD  = libtdeioremote.la $(LIB_KIO)
+tdeio_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
 	echo > dummy.cpp
@@ -16,7 +16,7 @@ dummy.cpp:
 kde_services_DATA = remote.protocol
 
 noinst_LTLIBRARIES = libtdeioremote.la
-libtdeioremote_la_SOURCES = kio_remote.cpp remoteimpl.cpp
+libtdeioremote_la_SOURCES = tdeio_remote.cpp remoteimpl.cpp
 
 check_PROGRAMS = testremote
 testremote_SOURCES = testremote.cpp

tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp

@@ -30,7 +30,7 @@ RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj)
 extern "C" {
 	KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj)
 	{
-		TDEGlobal::locale()->insertCatalogue("kio_remote");
+		TDEGlobal::locale()->insertCatalogue("tdeio_remote");
 		return new RemoteDirNotifyModule(obj);
 	}
 }

tdeioslave/remote/remote.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_remote
+exec=tdeio_remote
 protocol=remote
 input=none
 output=filesystem

tdeioslave/remote/tdeio_remote.cpp

@@ -27,7 +27,7 @@
 #include <kglobal.h>
 
 
-#include "kio_remote.h"
+#include "tdeio_remote.h"
 
 static const KCmdLineOptions options[] =
 {
@@ -42,7 +42,7 @@ extern "C" {
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
-		TDECmdLineArgs::init(argc, argv, "kio_remote", 0, 0, 0, 0);
+		TDECmdLineArgs::init(argc, argv, "tdeio_remote", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP

tdeioslave/remote/testremote.cpp

@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_remote.h"
+#include "tdeio_remote.h"
 #include "testremote.h"
 
 #include <config.h>

tdeioslave/settings/CMakeLists.txt

@@ -27,12 +27,12 @@ install( FILES
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_settings (module) #####################
+##### tdeio_settings (module) #####################
 
-set( target kio_settings )
+set( target tdeio_settings )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_settings.cc
+  SOURCES tdeio_settings.cc
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/settings/Makefile.am

@@ -2,13 +2,13 @@ INCLUDES= $(all_includes)
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_settings.la
+kde_module_LTLIBRARIES = tdeio_settings.la
 
-kio_settings_la_SOURCES = kio_settings.cc
-kio_settings_la_LIBADD  = $(LIB_KSYCOCA)
-kio_settings_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_settings_la_SOURCES = tdeio_settings.cc
+tdeio_settings_la_LIBADD  = $(LIB_KSYCOCA)
+tdeio_settings_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_settings.h
+noinst_HEADERS = tdeio_settings.h
 
 kdelnk_DATA = settings.protocol programs.protocol applications.protocol
 kdelnkdir = $(kde_servicesdir)

tdeioslave/settings/applications.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_settings
+exec=tdeio_settings
 protocol=applications
 input=none
 output=filesystem

tdeioslave/settings/programs.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_settings
+exec=tdeio_settings
 protocol=programs
 input=none
 output=filesystem

tdeioslave/settings/settings.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_settings
+exec=tdeio_settings
 protocol=settings
 input=none
 output=filesystem

tdeioslave/settings/tdeio_settings.cc

@@ -52,7 +52,7 @@ extern "C" {
 	KDE_EXPORT int kdemain( int, char **argv )
 	{
 	  kdDebug() << "kdemain for settings tdeioslave" << endl;
-	  TDEInstance instance( "kio_settings" );
+	  TDEInstance instance( "tdeio_settings" );
 	  SettingsProtocol slave(argv[1], argv[2], argv[3]);
 	  slave.dispatchLoop();
 	  return 0;

tdeioslave/sftp/CHANGELOG

@@ -32,7 +32,7 @@
 7-22-2001 - probable solution to getting password prompt -- open with controlling
             but don't connect stdin/out to terminal. duh!
 8-9-2001  - Doh! I haven't kept very good logs. Look at the cvs logs for better info.
-          - At this point kio_sftp is using KSshProcess which I wrote in order to make
+          - At this point tdeio_sftp is using KSshProcess which I wrote in order to make
             a standard interface to the various version of ssh out there. So far it is
             working fairly well.  We also now report host key changes to the user and
             allow them to choose whether or not to continue. This is a big improvement.

tdeioslave/sftp/CMakeLists.txt

@@ -26,12 +26,12 @@ link_directories(
 install( FILES sftp.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_sftp (module) #########################
+##### tdeio_sftp (module) #########################
 
-set( target kio_sftp )
+set( target tdeio_sftp )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES process.cpp atomicio.cpp kio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
+  SOURCES process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/sftp/Makefile.am

@@ -11,12 +11,12 @@ check_PROGRAMS = ksshprocesstest
 ksshprocesstest_SOURCES = ksshprocesstest.cpp
 ksshprocesstest_LDADD = $(LIB_KSYCOCA) ksshprocess.lo process.lo atomicio.lo
 
-kde_module_LTLIBRARIES = kio_sftp.la
+kde_module_LTLIBRARIES = tdeio_sftp.la
 
-kio_sftp_la_SOURCES = process.cpp atomicio.cpp kio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
-kio_sftp_la_LIBADD = $(LIB_KIO)
-kio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = atomicio.h kio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
+tdeio_sftp_la_SOURCES = process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
+tdeio_sftp_la_LIBADD = $(LIB_KIO)
+tdeio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+noinst_HEADERS = atomicio.h tdeio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
 
 kdelnk_DATA = sftp.protocol
 kdelnkdir = $(kde_servicesdir)

tdeioslave/sftp/sftp.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_sftp
+exec=tdeio_sftp
 protocol=sftp
 input=none
 listing=Name,Type,Size,Date,Access,Owner,Group,Link

tdeioslave/sftp/tdeio_sftp.cpp

@@ -68,7 +68,7 @@ So we can't connect.
 #include <kremoteencoding.h>
 
 #include "sftp.h"
-#include "kio_sftp.h"
+#include "tdeio_sftp.h"
 #include "atomicio.h"
 #include "sftpfileattr.h"
 #include "ksshprocess.h"
@@ -79,19 +79,19 @@ extern "C"
 {
   int KDE_EXPORT kdemain( int argc, char **argv )
   {
-    TDEInstance instance( "kio_sftp" );
+    TDEInstance instance( "tdeio_sftp" );
 
-    kdDebug(KIO_SFTP_DB) << "*** Starting kio_sftp " << endl;
+    kdDebug(KIO_SFTP_DB) << "*** Starting tdeio_sftp " << endl;
 
     if (argc != 4) {
-      kdDebug(KIO_SFTP_DB) << "Usage: kio_sftp  protocol domain-socket1 domain-socket2" << endl;
+      kdDebug(KIO_SFTP_DB) << "Usage: tdeio_sftp  protocol domain-socket1 domain-socket2" << endl;
       exit(-1);
     }
 
     sftpProtocol slave(argv[2], argv[3]);
     slave.dispatchLoop();
 
-    kdDebug(KIO_SFTP_DB) << "*** kio_sftp Done" << endl;
+    kdDebug(KIO_SFTP_DB) << "*** tdeio_sftp Done" << endl;
     return 0;
   }
 }
@@ -132,7 +132,7 @@ static int writeToFile (int fd, const char *buf, size_t len)
 }
 
 sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
-             : SlaveBase("kio_sftp", pool_socket, app_socket),
+             : SlaveBase("tdeio_sftp", pool_socket, app_socket),
                   mConnected(false), mPort(-1), mMsgId(0) {
   kdDebug(KIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl;
 }
@@ -1899,7 +1899,7 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
     }
 
     if( type != SSH2_FXP_NAME ) {
-        kdError(KIO_SFTP_DB) << "kio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
+        kdError(KIO_SFTP_DB) << "tdeio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
         return -1;
     }
 

tdeioslave/sftp/tdeio_sftp.h

@@ -14,8 +14,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef __kio_sftp_h__
-#define __kio_sftp_h__
+#ifndef __tdeio_sftp_h__
+#define __tdeio_sftp_h__
 
 #include <tqstring.h>
 #include <tqcstring.h>

tdeioslave/smb/CMakeLists.txt

@@ -32,12 +32,12 @@ install( FILES smb-network.desktop DESTINATION ${DATA_INSTALL_DIR}/remoteview )
 install( FILES x-smb-workgroup.desktop x-smb-server.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
 
 
-##### kio_smb (module) ##########################
+##### tdeio_smb (module) ##########################
 
-tde_add_kpart( kio_smb AUTOMOC
+tde_add_kpart( tdeio_smb AUTOMOC
   SOURCES
-    kio_smb.cpp kio_smb_auth.cpp kio_smb_browse.cpp kio_smb_config.cpp
-    kio_smb_dir.cpp kio_smb_file.cpp kio_smb_internal.cpp kio_smb_mount.cpp
+    tdeio_smb.cpp tdeio_smb_auth.cpp tdeio_smb_browse.cpp tdeio_smb_config.cpp
+    tdeio_smb_dir.cpp tdeio_smb_file.cpp tdeio_smb_internal.cpp tdeio_smb_mount.cpp
   LINK tdeio-shared ${SMBCLIENT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/smb/Makefile.am

@@ -2,21 +2,21 @@
 
 INCLUDES=$(all_includes)
 
-kde_module_LTLIBRARIES = kio_smb.la
-kio_smb_la_SOURCES = kio_smb.cpp \
-             kio_smb_auth.cpp \
-             kio_smb_browse.cpp \
-             kio_smb_config.cpp \
-             kio_smb_dir.cpp \
-             kio_smb_file.cpp \
-             kio_smb_internal.cpp \
-	     kio_smb_mount.cpp
+kde_module_LTLIBRARIES = tdeio_smb.la
+tdeio_smb_la_SOURCES = tdeio_smb.cpp \
+             tdeio_smb_auth.cpp \
+             tdeio_smb_browse.cpp \
+             tdeio_smb_config.cpp \
+             tdeio_smb_dir.cpp \
+             tdeio_smb_file.cpp \
+             tdeio_smb_internal.cpp \
+	     tdeio_smb_mount.cpp
 
-kio_smb_la_LIBADD = -lkio -lsmbclient $(SMBCLIENT_EXTRA_LIBS)
+tdeio_smb_la_LIBADD = -ltdeio -lsmbclient $(SMBCLIENT_EXTRA_LIBS)
 
-kio_smb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_smb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_smb.h kio_smb_internal.h
+noinst_HEADERS = tdeio_smb.h tdeio_smb_internal.h
 
 kdelnk_DATA = smb.protocol
 

tdeioslave/smb/smb.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_smb
+exec=tdeio_smb
 protocol=smb
 input=none
 output=filesystem

tdeioslave/smb/tdeio_smb.cpp

@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        Top level implementation file for kio_smb.cpp
+// File:        Top level implementation file for tdeio_smb.cpp
 //
 // Abstract:    member function implementations for SMBSlave
 //
@@ -28,8 +28,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 //===========================================================================
 SMBSlave::SMBSlave(const TQCString& pool, const TQCString& app)
@@ -59,10 +59,10 @@ SMBSlave* G_TheSlave;
 int KDE_EXPORT kdemain( int argc, char **argv )
 {
 
-    TDEInstance instance( "kio_smb" );
+    TDEInstance instance( "tdeio_smb" );
     if( argc != 4 )
     {
-        kdDebug(KIO_SMB) << "Usage: kio_smb protocol domain-socket1 domain-socket2"
+        kdDebug(KIO_SMB) << "Usage: tdeio_smb protocol domain-socket1 domain-socket2"
                   << endl;
         return -1;
     }

tdeioslave/smb/tdeio_smb.h

@@ -2,9 +2,9 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb.h
+// File:        tdeio_smb.h
 //
-// Abstract:    The main kio slave class declaration.  For convenience,
+// Abstract:    The main tdeio slave class declaration.  For convenience,
 //              in concurrent devlopment, the implementation for this class
 //              is separated into several .cpp files -- the file containing
 //              the implementation should be noted in the comments for each
@@ -79,9 +79,9 @@ extern "C"
 }
 
 //---------------------------
-// kio_smb internal includes
+// tdeio_smb internal includes
 //---------------------------
-#include "kio_smb_internal.h"
+#include "tdeio_smb_internal.h"
 
 #define MAX_XFER_BUF_SIZE           16348
 #define KIO_SMB                     7106
@@ -129,7 +129,7 @@ private:
     struct stat st;
 protected:
     //---------------------------------------------
-    // Authentication functions (kio_smb_auth.cpp)
+    // Authentication functions (tdeio_smb_auth.cpp)
     //---------------------------------------------
     // (please prefix functions with auth)
 
@@ -144,13 +144,13 @@ protected:
 
 
     //---------------------------------------------
-    // Cache functions (kio_smb_auth.cpp)
+    // Cache functions (tdeio_smb_auth.cpp)
     //---------------------------------------------
 
     //Stat methods
 
     //-----------------------------------------
-    // Browsing functions (kio_smb_browse.cpp)
+    // Browsing functions (tdeio_smb_browse.cpp)
     //-----------------------------------------
     // (please prefix functions with browse)
 
@@ -175,19 +175,19 @@ protected:
     int cache_stat( const SMBUrl& url, struct stat* st );
 
     //---------------------------------------------
-    // Configuration functions (kio_smb_config.cpp)
+    // Configuration functions (tdeio_smb_config.cpp)
     //---------------------------------------------
     // (please prefix functions with config)
 
 
     //---------------------------------------
-    // Directory functions (kio_smb_dir.cpp)
+    // Directory functions (tdeio_smb_dir.cpp)
     //---------------------------------------
     // (please prefix functions with dir)
 
 
     //--------------------------------------
-    // File IO functions (kio_smb_file.cpp)
+    // File IO functions (tdeio_smb_file.cpp)
     //--------------------------------------
     // (please prefix functions with file)
 
@@ -233,24 +233,24 @@ public:
     // details)
     //-----------------------------------------------------------------------
 
-    // Functions overwritten in kio_smb.cpp
+    // Functions overwritten in tdeio_smb.cpp
     SMBSlave(const TQCString& pool, const TQCString& app);
     virtual ~SMBSlave();
 
-    // Functions overwritten in kio_smb_browse.cpp
+    // Functions overwritten in tdeio_smb_browse.cpp
     virtual void listDir( const KURL& url );
     virtual void stat( const KURL& url );
 
-    // Functions overwritten in kio_smb_config.cpp
+    // Functions overwritten in tdeio_smb_config.cpp
     virtual void reparseConfiguration();
 
-    // Functions overwritten in kio_smb_dir.cpp
+    // Functions overwritten in tdeio_smb_dir.cpp
     virtual void copy( const KURL& src, const KURL &dest, int permissions, bool overwrite );
     virtual void del( const KURL& kurl, bool isfile);
     virtual void mkdir( const KURL& kurl, int permissions );
     virtual void rename( const KURL& src, const KURL& dest, bool overwrite );
 
-    // Functions overwritten in kio_smb_file.cpp
+    // Functions overwritten in tdeio_smb_file.cpp
     virtual void get( const KURL& kurl );
     virtual void put( const KURL& kurl, int permissions, bool overwrite, bool resume );
 
@@ -289,7 +289,7 @@ void auth_smbc_get_data(const char *server,const char *share,
 
 
 //===========================================================================
-// Main slave entrypoint (see kio_smb.cpp)
+// Main slave entrypoint (see tdeio_smb.cpp)
 extern "C"
 {
 

tdeioslave/smb/tdeio_smb_auth.cpp

@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_auth.cpp
+// File:        tdeio_smb_auth.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              SMB directory access
@@ -29,8 +29,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 #include <ksimpleconfig.h>
 #include <tqdir.h>

tdeioslave/smb/tdeio_smb_browse.cpp

@@ -3,7 +3,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_browse.cpp
+// File:        tdeio_smb_browse.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              SMB browsing
@@ -38,8 +38,8 @@
 
 #include <kglobal.h>
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 using namespace TDEIO;
 

tdeioslave/smb/tdeio_smb_config.cpp

@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_config.cpp
+// File:        tdeio_smb_config.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              KDE/SMB slave configuration
@@ -29,8 +29,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 #include <tdeconfig.h>
 
 #include <tqtextcodec.h>

tdeioslave/smb/tdeio_smb_dir.cpp

@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_dir.cpp
+// File:        tdeio_smb_dir.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              SMB directory access
@@ -29,8 +29,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 
 //===========================================================================

tdeioslave/smb/tdeio_smb_file.cpp

@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_file.cpp
+// File:        tdeio_smb_file.cpp
 //
 // Abstract:    member function implementations for SMBSlave that deal with
 //              SMB file access
@@ -30,8 +30,8 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 #include <kmimetype.h>
 

tdeioslave/smb/tdeio_smb_internal.cpp

@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_internal.cpp
+// File:        tdeio_smb_internal.cpp
 //
 // Abstract:    Utility class implementation used by SMBSlave
 //
@@ -28,8 +28,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#include "kio_smb.h"
-#include "kio_smb_internal.h"
+#include "tdeio_smb.h"
+#include "tdeio_smb_internal.h"
 
 #include <tqtextcodec.h>
 

tdeioslave/smb/tdeio_smb_internal.h

@@ -2,7 +2,7 @@
 //
 // Project:     SMB tdeioslave for KDE2
 //
-// File:        kio_smb_internal.h
+// File:        tdeio_smb_internal.h
 //
 // Abstract:    Utility classes used by SMBSlave
 //

tdeioslave/smb/tdeio_smb_mount.cpp

@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kio_smb.h"
+#include "tdeio_smb.h"
 #include <kstandarddirs.h>
 #include <tqcstring.h>
 #include <unistd.h>
@@ -208,4 +208,4 @@ void SMBSlave::special( const TQByteArray & data)
    finished();
 }
 
-#include "kio_smb.moc"
+#include "tdeio_smb.moc"

tdeioslave/smtp/CMakeLists.txt

@@ -26,9 +26,9 @@ link_directories(
 install( FILES smtp.protocol smtps.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_smtp (module) #########################
+##### tdeio_smtp (module) #########################
 
-set( target kio_smtp )
+set( target tdeio_smtp )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc

tdeioslave/smtp/Makefile.am

@@ -1,11 +1,11 @@
 
 INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 
-kde_module_LTLIBRARIES = kio_smtp.la
+kde_module_LTLIBRARIES = tdeio_smtp.la
 
-kio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
-kio_smtp_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
-kio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
+tdeio_smtp_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
+tdeio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = smtp.h request.h response.h capabilities.h command.h transactionstate.h
 
@@ -25,7 +25,7 @@ test_responseparser_LDADD =  $(LIB_TDECORE)
 test_responseparser_LDFLAGS = $(all_libraries)
 
 test_commands_SOURCES = test_commands.cc
-test_commands_LDADD =  $(kio_smtp_la_LIBADD)
+test_commands_LDADD =  $(tdeio_smtp_la_LIBADD)
 test_commands_LDFLAGS = $(all_libraries)
 
 interactivesmtpserver_SOURCES = interactivesmtpserver.cc

tdeioslave/smtp/capabilities.cc

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     capabilities.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/capabilities.h

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     capabilities.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/command.cc

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     command.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
@@ -239,7 +239,7 @@ static sasl_callback_t callbacks[] = {
     kdDebug(7112) << "Mechanism: " << mMechusing << " one step: " << mOneStep << endl;
 #else
   mSMTP->error(TDEIO::ERR_COULD_NOT_AUTHENTICATE,
-      i18n("Authentication support is not compiled into kio_smtp."));
+      i18n("Authentication support is not compiled into tdeio_smtp."));
 #endif
   }
 

tdeioslave/smtp/command.h

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     command.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/interactivesmtpserver.cc

@@ -3,7 +3,7 @@
 
     Code based on the serverSocket example by Jesper Pedersen.
 
-    This file is part of the testsuite of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of the testsuite of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2004 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/interactivesmtpserver.h

@@ -6,7 +6,7 @@
 
     Code based on the serverSocket example by Jesper Pedersen.
 
-    This file is part of the testsuite of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of the testsuite of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2004 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/request.cc

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     request.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/request.h

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     request.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/response.cc

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     response.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/response.h

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     response.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/smtp.cc

@@ -95,11 +95,11 @@ extern "C" {
 
 int kdemain(int argc, char **argv)
 {
-  TDEInstance instance("kio_smtp");
+  TDEInstance instance("tdeio_smtp");
 
   if (argc != 4) {
     fprintf(stderr,
-            "Usage: kio_smtp protocol domain-socket1 domain-socket2\n");
+            "Usage: tdeio_smtp protocol domain-socket1 domain-socket2\n");
     exit(-1);
   }
 
@@ -199,7 +199,7 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ ,
   KEMailSettings mset;
   KURL open_url = url;
   if ( !request.hasProfile() ) {
-    //kdDebug(7112) << "kio_smtp: Profile is null" << endl;
+    //kdDebug(7112) << "tdeio_smtp: Profile is null" << endl;
     bool hasProfile = mset.profiles().contains( open_url.host() );
     if ( hasProfile ) {
       mset.setProfile(open_url.host());

tdeioslave/smtp/smtp.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_smtp
+exec=tdeio_smtp
 protocol=smtp
 Capabilities=SASL
 input=none

tdeioslave/smtp/smtps.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_smtp
+exec=tdeio_smtp
 protocol=smtps
 Capabilities=SASL
 input=none

tdeioslave/smtp/transactionstate.cc

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     transactionstate.cc
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/smtp/transactionstate.h

@@ -1,7 +1,7 @@
 /*  -*- c++ -*-
     transactionstate.h
 
-    This file is part of kio_smtp, the KDE SMTP tdeioslave.
+    This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
 
     This program is free software; you can redistribute it and/or modify it

tdeioslave/system/CMakeLists.txt

@@ -29,22 +29,22 @@ link_directories(
 install( FILES system.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kiosystem (static) ########################
+##### tdeiosystem (static) ########################
 
-set( target kiosystem )
+set( target tdeiosystem )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES kio_system.cpp systemimpl.cpp
+  SOURCES tdeio_system.cpp systemimpl.cpp
 )
 
 
-##### kio_system (module) #######################
+##### tdeio_system (module) #######################
 
-set( target kio_system )
+set( target tdeio_system )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES dummy.cpp
-  EMBED kiosystem-static
+  EMBED tdeiosystem-static
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/system/Makefile.am

@@ -3,11 +3,11 @@ SUBDIRS= . kdedmodule entries mimetypes
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_system.la
+kde_module_LTLIBRARIES = tdeio_system.la
 
-kio_system_la_SOURCES = dummy.cpp
-kio_system_la_LIBADD  = libtdeiosystem.la $(LIB_KIO)
-kio_system_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_system_la_SOURCES = dummy.cpp
+tdeio_system_la_LIBADD  = libtdeiosystem.la $(LIB_KIO)
+tdeio_system_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
 	echo > dummy.cpp
@@ -15,7 +15,7 @@ dummy.cpp:
 kde_services_DATA = system.protocol
 
 noinst_LTLIBRARIES = libtdeiosystem.la
-libtdeiosystem_la_SOURCES = kio_system.cpp systemimpl.cpp
+libtdeiosystem_la_SOURCES = tdeio_system.cpp systemimpl.cpp
 
 check_PROGRAMS = testsystem
 testsystem_SOURCES = testsystem.cpp

tdeioslave/system/kdedmodule/systemdirnotify.desktop

@@ -56,7 +56,7 @@ Name[vi]=Trình thông báo URL hệ thống KDED
 Name[wa]=Notifiaedje KDED d' URL sistinme di båze
 Name[zh_CN]=KDED 系统基 URL 通知器
 Name[zh_TW]=KDED 系統基礎 URL 通知程式
-Comment=Provides change notification for folders monitored by the system:/ kio plugin
+Comment=Provides change notification for folders monitored by the system:/ tdeio plugin
 ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=systemdirnotify

tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp

@@ -30,7 +30,7 @@ SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj)
 extern "C" {
 	KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj)
 	{
-		TDEGlobal::locale()->insertCatalogue("kio_system");
+		TDEGlobal::locale()->insertCatalogue("tdeio_system");
 		return new SystemDirNotifyModule(obj);
 	}
 }

tdeioslave/system/system.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_system
+exec=tdeio_system
 protocol=system
 input=none
 output=filesystem

tdeioslave/system/tdeio_system.cpp

@@ -27,7 +27,7 @@
 
 #include <tqeventloop.h>
 
-#include "kio_system.h"
+#include "tdeio_system.h"
 
 
 static const KCmdLineOptions options[] =
@@ -43,7 +43,7 @@ extern "C" {
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
-		TDECmdLineArgs::init(argc, argv, "kio_system", 0, 0, 0, 0);
+		TDECmdLineArgs::init(argc, argv, "tdeio_system", 0, 0, 0, 0);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		TDEApplication app( false, false );
 		// We want to be anonymous even if we use DCOP
@@ -186,4 +186,4 @@ void SystemProtocol::listRoot()
 }
 
 
-//#include "kio_system.moc"
+//#include "tdeio_system.moc"

tdeioslave/system/testsystem.cpp

@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_system.h"
+#include "tdeio_system.h"
 #include "testsystem.h"
 
 #include <config.h>

tdeioslave/tar/CMakeLists.txt

@@ -26,9 +26,9 @@ link_directories(
 install( FILES tar.protocol ar.protocol zip.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_tar (module) #######################
+##### tdeio_tar (module) #######################
 
-set( target kio_tar )
+set( target tdeio_tar )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES tar.cc

tdeioslave/tar/Makefile.am

@@ -4,11 +4,11 @@ INCLUDES = $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_tar.la
+kde_module_LTLIBRARIES = tdeio_tar.la
 
-kio_tar_la_SOURCES = tar.cc
-kio_tar_la_LIBADD = $(LIB_KSYCOCA)
-kio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_tar_la_SOURCES = tar.cc
+tdeio_tar_la_LIBADD = $(LIB_KSYCOCA)
+tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 check_PROGRAMS = ktartest
 

tdeioslave/tar/ar.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_tar
+exec=tdeio_tar
 protocol=ar
 mimetype=application/x-archive
 input=filesystem

tdeioslave/tar/tar.cc

@@ -32,13 +32,13 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_tar" );
+  TDEInstance instance( "tdeio_tar" );
 
   kdDebug(7109) << "Starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_tar protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_tar protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 

tdeioslave/tar/tar.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_tar
+exec=tdeio_tar
 protocol=tar
 mimetype=application/x-tar
 input=filesystem

tdeioslave/tar/zip.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_tar
+exec=tdeio_tar
 protocol=zip
 mimetype=application/x-zip
 input=filesystem

tdeioslave/thumbnail/CMakeLists.txt

@@ -46,9 +46,9 @@ install( FILES
 install( FILES thumbcreator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kio_thumbnail (module) ####################
+##### tdeio_thumbnail (module) ####################
 
-set( target kio_thumbnail )
+set( target tdeio_thumbnail )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES thumbnail.cpp

tdeioslave/thumbnail/Makefile.am

@@ -14,14 +14,14 @@ EXR_MODULE = exrthumbnail.la
 EXR_DATAFILE = exrthumbnail.desktop
 endif
 
-kde_module_LTLIBRARIES = kio_thumbnail.la imagethumbnail.la \
+kde_module_LTLIBRARIES = tdeio_thumbnail.la imagethumbnail.la \
 	textthumbnail.la htmlthumbnail.la \
 	djvuthumbnail.la $(CURSOR_MODULE) \
 	$(EXR_MODULE)
 
-kio_thumbnail_la_SOURCES = thumbnail.cpp
-kio_thumbnail_la_LIBADD = $(LIB_KIO)
-kio_thumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_thumbnail_la_SOURCES = thumbnail.cpp
+tdeio_thumbnail_la_LIBADD = $(LIB_KIO)
+tdeio_thumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 imagethumbnail_la_SOURCES = imagecreator.cpp
 imagethumbnail_la_LIBADD = $(LIB_KIO) # for kimageio

tdeioslave/thumbnail/thumbnail.cpp

@@ -96,7 +96,7 @@ int kdemain(int argc, char **argv)
 #endif
 
 #ifdef USE_KINSTANCE
-    TDEInstance instance("kio_thumbnail");
+    TDEInstance instance("tdeio_thumbnail");
 #else
     // creating TDEApplication in a slave in not a very good idea,
     // as dispatchLoop() doesn't allow it to process its messages,
@@ -107,12 +107,12 @@ int kdemain(int argc, char **argv)
     putenv(strdup("SESSION_MANAGER="));
     TDEApplication::disableAutoDcopRegistration();
 
-    TDEApplication app(argc, argv, "kio_thumbnail", false, true);
+    TDEApplication app(argc, argv, "tdeio_thumbnail", false, true);
 #endif
 
     if (argc != 4)
     {
-        kdError(7115) << "Usage: kio_thumbnail protocol domain-socket1 domain-socket2" << endl;
+        kdError(7115) << "Usage: tdeio_thumbnail protocol domain-socket1 domain-socket2" << endl;
         exit(-1);
     }
 

tdeioslave/thumbnail/thumbnail.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_thumbnail
+exec=tdeio_thumbnail
 protocol=thumbnail
 input=stream
 output=stream

tdeioslave/trash/CMakeLists.txt

@@ -37,12 +37,12 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
 )
 
 
-##### kio_trash (module) ########################
+##### tdeio_trash (module) ########################
 
-set( target kio_trash )
+set( target tdeio_trash )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kio_trash.cpp
+  SOURCES tdeio_trash.cpp
   LINK trashcommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/trash/DESIGN

@@ -1,10 +1,10 @@
 DESIGN
 ======
-kio_trash implements the XDG trash standard currently at http://www.ramendik.ru/docs/trashspec.html
+tdeio_trash implements the XDG trash standard currently at http://www.ramendik.ru/docs/trashspec.html
 
-In case race conditions between the various instances of kio_trash
+In case race conditions between the various instances of tdeio_trash
 are a problem, trashimpl could be moved to a kded module, and
-kio_trash would use DCOP to talk to it. It's a bit hard to come up
+tdeio_trash would use DCOP to talk to it. It's a bit hard to come up
 with use cases where the race conditions would matter though.
 
 BUGS
@@ -31,7 +31,7 @@ TODO
 
 * Deleting oldest files when size is bigger than a certain configurable amount (#79553)
 
-Bugs closed by kio_trash
+Bugs closed by tdeio_trash
 ========================
 #79826 (3.3 only)
 #62848 (configurable trash location)

tdeioslave/trash/Makefile.am

@@ -3,11 +3,11 @@ METASOURCES = AUTO
 
 SUBDIRS = . tdefile-plugin
 
-kde_module_LTLIBRARIES = kio_trash.la
+kde_module_LTLIBRARIES = tdeio_trash.la
 
-kio_trash_la_SOURCES = kio_trash.cpp
-kio_trash_la_LIBADD  = libtrashcommon.la $(LIB_KIO)
-kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
+tdeio_trash_la_SOURCES = tdeio_trash.cpp
+tdeio_trash_la_LIBADD  = libtrashcommon.la $(LIB_KIO)
+tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 bin_PROGRAMS = ktrash
 ktrash_SOURCES = ktrash.cpp

tdeioslave/trash/ktrash.cpp

@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     if ( args->isSet( "empty" ) ) {
-        // We use a kio job instead of linking to TrashImpl, for a smaller binary
+        // We use a tdeio job instead of linking to TrashImpl, for a smaller binary
         // (and the possibility of a central service at some point)
         TQByteArray packedArgs;
         TQDataStream stream( packedArgs, IO_WriteOnly );

tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp

@@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY(tdefile_trash, TrashFactory("tdefile_trash"))
 KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name,
         const TQStringList &args) : KFilePlugin(parent, name, args)
 {
-    TDEGlobal::locale()->insertCatalogue( "kio_trash" );
+    TDEGlobal::locale()->insertCatalogue( "tdeio_trash" );
 
     kdDebug(7034) << "Trash file meta info plugin\n";
 

tdeioslave/trash/tdeio_trash.cpp

@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio_trash.h"
+#include "tdeio_trash.h"
 #include <tdeio/job.h>
 
 #include <kapplication.h>
@@ -52,11 +52,11 @@ static const KCmdLineOptions options[] =
 extern "C" {
     int KDE_EXPORT kdemain( int argc, char **argv )
     {
-        //TDEInstance instance( "kio_trash" );
-        // TDEApplication is necessary to use kio_file
+        //TDEInstance instance( "tdeio_trash" );
+        // TDEApplication is necessary to use tdeio_file
         putenv(strdup("SESSION_MANAGER="));
         TDEApplication::disableAutoDcopRegistration();
-        TDECmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0);
+        TDECmdLineArgs::init(argc, argv, "tdeio_trash", 0, 0, 0, 0);
         TDECmdLineArgs::addCmdLineOptions( options );
         TDEApplication app( false, false );
 
@@ -364,7 +364,7 @@ void TrashProtocol::listDir(const KURL& url)
         info.physicalPath += relativePath;
     }
 
-    // List subdir. Can't use kio_file here since we provide our own info...
+    // List subdir. Can't use tdeio_file here since we provide our own info...
     kdDebug() << k_funcinfo << "listing " << info.physicalPath << endl;
     TQStrList entryNames = impl.listDir( info.physicalPath );
     totalSize( entryNames.count() );
@@ -407,7 +407,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString
 
         addAtom( entry, TDEIO::UDS_LINK_DEST, 0, TQFile::decodeName( buffer2 ) );
         // Follow symlink
-        // That makes sense in kio_file, but not in the trash, especially for the size
+        // That makes sense in tdeio_file, but not in the trash, especially for the size
         // #136876
 #if 0
         if ( KDE_stat( physicalPath_c, &buff ) == -1 ) {
@@ -593,4 +593,4 @@ void TrashProtocol::mkdir( const KURL& url, int /*permissions*/ )
 }
 #endif
 
-#include "kio_trash.moc"
+#include "tdeio_trash.moc"

tdeioslave/trash/testtrash.cpp

@@ -21,7 +21,7 @@
 #undef NDEBUG
 #undef NO_DEBUG
 
-#include "kio_trash.h"
+#include "tdeio_trash.h"
 #include "testtrash.h"
 
 #include <config.h>

tdeioslave/trash/trash.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_trash
+exec=tdeio_trash
 protocol=trash
 input=none
 output=filesystem

tdeioslave/trash/trashimpl.cpp

@@ -57,7 +57,7 @@ TrashImpl::TrashImpl() :
     m_homeDevice( 0 ),
     m_trashDirectoriesScanned( false ),
     m_mibEnum( TDEGlobal::locale()->fileEncodingMib() ),
-    // not using kio_trashrc since KIO uses that one already for kio_trash
+    // not using tdeio_trashrc since KIO uses that one already for tdeio_trash
     // so better have a separate one, for faster parsing by e.g. kmimetype.cpp
     m_config( "trashrc" )
 {
@@ -406,7 +406,7 @@ bool TrashImpl::copyFromTrash( const TQString& dest, int trashId, const TQString
 
 bool TrashImpl::copy( const TQString& src, const TQString& dest )
 {
-    // kio_file's copy() method is quite complex (in order to be fast), let's just call it...
+    // tdeio_file's copy() method is quite complex (in order to be fast), let's just call it...
     m_lastErrorCode = 0;
     KURL urlSrc;
     urlSrc.setPath( src );
@@ -561,7 +561,7 @@ TrashImpl::TrashedFileInfoList TrashImpl::list()
         const int trashId = it.key();
         TQString infoPath = it.data();
         infoPath += "/info";
-        // Code taken from kio_file
+        // Code taken from tdeio_file
         TQStrList entryNames = listDir( infoPath );
         //char path_buffer[PATH_MAX];
         //getcwd(path_buffer, PATH_MAX - 1);
@@ -725,7 +725,7 @@ int TrashImpl::findTrashDirectory( const TQString& origPath )
     }
     // new trash dir found, register it
     // but we need stability in the trash IDs, so that restoring or asking
-    // for properties works even kio_trash gets killed because idle.
+    // for properties works even tdeio_trash gets killed because idle.
 #if 0
     kdDebug() << k_funcinfo << "found " << trashDir << endl;
     m_trashDirectories.insert( ++m_lastId, trashDir );
@@ -894,7 +894,7 @@ bool TrashImpl::checkTrashSubdirs( const TQCString& trashDir_c ) const
 
 TQString TrashImpl::trashDirectoryPath( int trashId ) const
 {
-    // Never scanned for trash dirs? (This can happen after killing kio_trash
+    // Never scanned for trash dirs? (This can happen after killing tdeio_trash
     // and reusing a directory listing from the earlier instance.)
     if ( !m_trashDirectoriesScanned )
         scanTrashDirectories();

tdeioslave/trash/trashimpl.h

@@ -31,7 +31,7 @@
 #include <assert.h>
 
 /**
- * Implementation of all low-level operations done by kio_trash
+ * Implementation of all low-level operations done by tdeio_trash
  * The structure of the trash directory follows the freedesktop.org standard <TODO URL>
  */
 class TrashImpl : public TQObject

tdeprint/slave/CMakeLists.txt

@@ -30,10 +30,10 @@ link_directories(
 install( FILES print.protocol printdb.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_print (module) ########################
+##### tdeio_print (module) ########################
 
-tde_add_kpart( kio_print AUTOMOC
-  SOURCES kio_print.cpp
+tde_add_kpart( tdeio_print AUTOMOC
+  SOURCES tdeio_print.cpp
   LINK tdeprint-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeprint/slave/Makefile.am

@@ -4,15 +4,15 @@ SUBDIRS = mimetypes templates
 
 INCLUDES= $(all_includes)
 
-kde_module_LTLIBRARIES = kio_print.la
+kde_module_LTLIBRARIES = tdeio_print.la
 
-kio_print_la_SOURCES = kio_print.cpp
-kio_print_la_LIBADD = $(LIB_KIO) -ltdeprint
-kio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_print_la_SOURCES = tdeio_print.cpp
+tdeio_print_la_LIBADD = $(LIB_KIO) -ltdeprint
+tdeio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 METASOURCES = AUTO
 
-noinst_HEADERS = kio_print.h
+noinst_HEADERS = tdeio_print.h
 
 # Services
 servicesdir = $(kde_servicesdir)

tdeprint/slave/kio_print.cpp

@@ -17,7 +17,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "kio_print.h"
+#include "tdeio_print.h"
 #include <tdeprint/kmprinter.h>
 #include <tdeprint/kmmanager.h>
 #include <tdeprint/kmjobmanager.h>
@@ -46,7 +46,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#define	PRINT_DEBUG	kdDebug(7019) << "kio_print: "
+#define	PRINT_DEBUG	kdDebug(7019) << "tdeio_print: "
 
 extern "C"
 {
@@ -135,17 +135,17 @@ TQString buildGroupTable(DrGroup *grp, bool showHeader = true)
 
 int kdemain(int argc, char **argv)
 {
-	TDEInstance  instance("kio_print");
+	TDEInstance  instance("tdeio_print");
 
 	PRINT_DEBUG << "starting ioslave" << endl;
 	if (argc != 4)
 	{
-		fprintf(stderr, "Usage: kio_print protocol domain-socket1 domain-socket2\n");
+		fprintf(stderr, "Usage: tdeio_print protocol domain-socket1 domain-socket2\n");
 		exit(-1);
 	}
 
 	/* create fake KApplicatiom object, needed for job stuffs */
-	TDEAboutData about( "kio_print", "kio_print", "fake_version", 
+	TDEAboutData about( "tdeio_print", "tdeio_print", "fake_version", 
 			"TDEPrint IO slave", TDEAboutData::License_GPL, "(c) 2003, Michael Goffioul" );
 	TDECmdLineArgs::init( &about );
 	TDEApplication app;
@@ -917,4 +917,4 @@ void KIO_Print::showDriver(KMPrinter *prt)
 	finished();
 }
 
-#include "kio_print.moc"
+#include "tdeio_print.moc"

tdeprint/slave/print.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_print
+exec=tdeio_print
 protocol=print
 input=none
 output=filesystem

tdeprint/slave/printdb.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_print
+exec=tdeio_print
 protocol=printdb
 input=none
 output=filesystem