Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

171 files changed, 2261 insertions, 2261 deletions

diff --git a/kio/DESIGN b/kio/DESIGN
index c84bd2182..08617bbda 100644
--- a/kio/DESIGN
+++ b/kio/DESIGN
@@ -190,7 +190,7 @@ B. customized progress dialogs
  This will be similar to what we had before.
 
  - ProgressBase class that all other dialogs will inherit.
-    will contain an initialization method setJob( KIO::Job*) for apps of the
+    will contain an initialization method setJob( TDEIO::Job*) for apps of the
     second class (see A.2 above), that will connect job's signals to dialog's
     slots
 
diff --git a/kio/DESIGN.metadata b/kio/DESIGN.metadata
index 9890c961d..783d7f52a 100644
--- a/kio/DESIGN.metadata
+++ b/kio/DESIGN.metadata
@@ -132,11 +132,11 @@ DefaultRemoteProtocol	string	Protocol to redirect file://<hostname>/ URLs to, de
 Examples:
 
 E.g. the following disables cookies:
-job = KIO::get( KURL("http://www.kde.org"), false, false);
+job = TDEIO::get( KURL("http://www.kde.org"), false, false);
 job->addMetaData("cookies", "none");
 
 If you want to handle cookies yourself, you can do:
-job = KIO::get( KURL("http://www.kde.org"), false, false);
+job = TDEIO::get( KURL("http://www.kde.org"), false, false);
 job->addMetaData("cookies", "manual");
 job->addMetaData("setcookies", "Cookie: foo=bar; gnat=gnork");
 
diff --git a/kio/Mainpage.dox b/kio/Mainpage.dox
index bb7f2796f..7545c29ef 100644
--- a/kio/Mainpage.dox
+++ b/kio/Mainpage.dox
@@ -6,8 +6,8 @@
  * this to provide its network-enabled file management.
  *
  * The easiest way to use this library from a %Trinity application is via the
- * KIO::NetAccess class (for easy synchronous access) or via the
- * KIO::Job class (for more complex asynchronous jobs).
+ * TDEIO::NetAccess class (for easy synchronous access) or via the
+ * TDEIO::Job class (for more complex asynchronous jobs).
  *
  * This library also implements the System Configuration Cache (KSycoca).
  *
@@ -44,7 +44,7 @@
  * view based on KIconView. Additionally, there are some compound views,
  * like a view using the icon-view for files on the right side and another
  * view for directories on the left. A view, that shows a preview for the
- * currently selected file (using KIO::PreviewJob to generate previews)
+ * currently selected file (using TDEIO::PreviewJob to generate previews)
  * and any other view to show the files is also available.
  *
  * All those views share a common baseclass, named KFileView, which
diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc
index 49999e675..ac0d29b97 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/kio/bookmarks/kbookmarkimporter_kde1.cc
@@ -81,8 +81,8 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString &
                 parentElem.appendChild( groupElem );
                 TQDomElement textElem = m_pDoc->createElement( "title" );
                 groupElem.appendChild( textElem );
-                textElem.appendChild( m_pDoc->createTextNode( KIO::decodeFileName( ep->d_name ) ) );
-                if ( KIO::decodeFileName( ep->d_name ) == "Toolbar" )
+                textElem.appendChild( m_pDoc->createTextNode( TDEIO::decodeFileName( ep->d_name ) ) );
+                if ( TDEIO::decodeFileName( ep->d_name ) == "Toolbar" )
                     groupElem.setAttribute("toolbar","yes");
                 scanIntern( groupElem, file.path() );
             }
@@ -136,7 +136,7 @@ void KBookmarkImporter::parseBookmark( TQDomElement & parentElem, TQCString _tex
     if (icon.right( 4 ) == ".xpm" ) // prevent warnings
         icon.truncate( icon.length() - 4 );
 
-    TQString text = KIO::decodeFileName( TQString::fromLocal8Bit(_text) );
+    TQString text = TDEIO::decodeFileName( TQString::fromLocal8Bit(_text) );
     if ( text.length() > 8 && text.right( 8 ) == ".desktop" )
         text.truncate( text.length() - 8 );
     if ( text.length() > 7 && text.right( 7 ) == ".kdelnk" )
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc
index 9e6d711d2..a87e0f20e 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/kio/bookmarks/kbookmarkmanager.cc
@@ -702,7 +702,7 @@ KBookmarkSettings* KBookmarkSettings::s_self = 0;
 
 void KBookmarkSettings::readSettings()
 {
-   KConfig config("kbookmarkrc", false, false);
+   TDEConfig config("kbookmarkrc", false, false);
    config.setGroup("Bookmarks");
 
    // add bookmark dialog usage - no reparse
diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc
index 20ce42a86..5e85bc1f6 100644
--- a/kio/bookmarks/kbookmarkmenu.cc
+++ b/kio/bookmarks/kbookmarkmenu.cc
@@ -1099,7 +1099,7 @@ void KBookmarkMenuNSImporter::endFolder()
 
 KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &id )
 {
-  KConfig config("kbookmarkrc", false, false);
+  TDEConfig config("kbookmarkrc", false, false);
   config.setGroup("Bookmarks");
 
   DynMenuInfo info;
@@ -1131,7 +1131,7 @@ KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &
 
 TQStringList KBookmarkMenu::dynamicBookmarksList()
 {
-  KConfig config("kbookmarkrc", false, false);
+  TDEConfig config("kbookmarkrc", false, false);
   config.setGroup("Bookmarks");
 
   TQStringList mlist;
@@ -1145,7 +1145,7 @@ TQStringList KBookmarkMenu::dynamicBookmarksList()
 
 void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &newMenu)
 {
-  KConfig config("kbookmarkrc", false, false);
+  TDEConfig config("kbookmarkrc", false, false);
 
   // add group unconditionally
   config.setGroup("DynamicMenu-" + id);
diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h
index fa0368b68..b54398a02 100644
--- a/kio/bookmarks/kbookmarkmenu.h
+++ b/kio/bookmarks/kbookmarkmenu.h
@@ -50,7 +50,7 @@ class KBookmarkOwner;
 class KBookmarkMenu;
 class KPopupMenu;
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 /**
  * This class provides a bookmark menu.  It is typically used in
diff --git a/kio/httpfilter/httpfilter.cc b/kio/httpfilter/httpfilter.cc
index 6a5a1346c..0f2adf20a 100644
--- a/kio/httpfilter/httpfilter.cc
+++ b/kio/httpfilter/httpfilter.cc
@@ -275,7 +275,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d)
         }
      }
      if (!bHasFinished)
-        emit error( KIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost."));
+        emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost."));
      return;
   }
   if (bHasFinished)
@@ -332,7 +332,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d)
      int result = inflate( &zstr, Z_NO_FLUSH );
      if ((result != Z_OK) && (result != Z_STREAM_END))
      {
-        emit error( KIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data."));
+        emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data."));
         break;
      }
      int bytesOut = 8192 - zstr.avail_out;
diff --git a/kio/kcmodule.desktop b/kio/kcmodule.desktop
index c3ab78532..5cbe9b786 100644
--- a/kio/kcmodule.desktop
+++ b/kio/kcmodule.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-TDE-ServiceType=KCModule
+X-TDE-ServiceType=TDECModule
 Name=TDE Control Module
 Name[af]=TDE Beheer Module
 Name[ar]=وحدة تحكم كيدي
diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp
index 8ba9d29bb..3f199fb92 100644
--- a/kio/kfile/kcombiview.cpp
+++ b/kio/kfile/kcombiview.cpp
@@ -305,14 +305,14 @@ KFileView *KCombiView::focusView( KFileView *preferred ) const
     return (preferred && w == preferred->widget()) ? preferred : other;
 }
 
-void KCombiView::readConfig( KConfig *config, const TQString& group )
+void KCombiView::readConfig( TDEConfig *config, const TQString& group )
 {
     left->readConfig( config, group );
     if ( right )
         right->readConfig( config, group );
 }
 
-void KCombiView::writeConfig( KConfig *config, const TQString& group )
+void KCombiView::writeConfig( TDEConfig *config, const TQString& group )
 {
     left->writeConfig( config, group );
     if ( right )
diff --git a/kio/kfile/kcombiview.h b/kio/kfile/kcombiview.h
index 6186ab740..2747c51ad 100644
--- a/kio/kfile/kcombiview.h
+++ b/kio/kfile/kcombiview.h
@@ -93,8 +93,8 @@ public:
 
     virtual void setSorting( TQDir::SortSpec sort );
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
     void ensureItemVisible( const KFileItem * );
 
diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp
index 1c762bfb9..2049860d1 100644
--- a/kio/kfile/kcustommenueditor.cpp
+++ b/kio/kfile/kcustommenueditor.cpp
@@ -119,7 +119,7 @@ void KCustomMenuEditor::refreshButton()
 }
 
 void
-KCustomMenuEditor::load(KConfigBase *cfg)
+KCustomMenuEditor::load(TDEConfigBase *cfg)
 {
    cfg->setGroup(TQString::null);
    int count = cfg->readNumEntry("NrOfItems");
@@ -147,7 +147,7 @@ KCustomMenuEditor::load(KConfigBase *cfg)
 }
 
 void
-KCustomMenuEditor::save(KConfigBase *cfg)
+KCustomMenuEditor::save(TDEConfigBase *cfg)
 {
    // First clear the whole config file.
    TQStringList groups = cfg->groupList();
diff --git a/kio/kfile/kcustommenueditor.h b/kio/kfile/kcustommenueditor.h
index cc20c6204..9112780b0 100644
--- a/kio/kfile/kcustommenueditor.h
+++ b/kio/kfile/kcustommenueditor.h
@@ -22,7 +22,7 @@
 #include <kdialogbase.h>
 
 class KListView;
-class KConfigBase;
+class TDEConfigBase;
 
  /*
   * Dialog for editing custom menus.
@@ -42,12 +42,12 @@ public:
     /**
      * load the custom menu
      */
-    void load(KConfigBase *);
+    void load(TDEConfigBase *);
 
     /**
      * save the custom menu
      */
-    void save(KConfigBase *);
+    void save(TDEConfigBase *);
 
 public slots:
     void slotNewItem();
diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp
index 0f2e9f4e1..1b7e11356 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/kio/kfile/kdiroperator.cpp
@@ -90,7 +90,7 @@ public:
     KActionSeparator *viewActionSeparator;
     int dropOptions;
 
-    KConfig *config;
+    TDEConfig *config;
     TQString configGroup;
 };
 
@@ -388,13 +388,13 @@ void KDirOperator::mkdir()
     TQString where = url().pathOrURL();
     TQString name = i18n( "New Folder" );
     if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() )
-         name = KIO::RenameDlg::suggestName( url(), name );
+         name = TDEIO::RenameDlg::suggestName( url(), name );
 
     TQString dir = KInputDialog::getText( i18n( "New Folder" ),
                                          i18n( "Create new folder in:\n%1" ).arg( where ),
                                          name, &ok, this);
     if (ok)
-      mkdir( KIO::encodeFileName( dir ), true );
+      mkdir( TDEIO::encodeFileName( dir ), true );
 }
 
 bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
@@ -413,8 +413,8 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
     for ( ; it != dirs.end(); ++it )
     {
         url.addPath( *it );
-        exists = KIO::NetAccess::exists( url, false, 0 );
-        writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() );
+        exists = TDEIO::NetAccess::exists( url, false, 0 );
+        writeOk = !exists && TDEIO::NetAccess::mkdir( url, topLevelWidget() );
     }
 
     if ( exists ) // url was already existant
@@ -433,13 +433,13 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
     return writeOk;
 }
 
-KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
+TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
                                     bool ask, bool showProgress )
 {
     return del( items, this, ask, showProgress );
 }
 
-KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
+TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
                                     TQWidget *parent,
                                     bool ask, bool showProgress )
 {
@@ -483,7 +483,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
     }
 
     if ( doIt ) {
-        KIO::DeleteJob *job = KIO::del( urls, false, showProgress );
+        TDEIO::DeleteJob *job = TDEIO::del( urls, false, showProgress );
         job->setWindow (topLevelWidget());
         job->setAutoErrorHandlingEnabled( true, parent );
         return job;
@@ -502,7 +502,7 @@ void KDirOperator::deleteSelected()
         del( *list );
 }
 
-KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
+TDEIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
                                     TQWidget *parent,
                                     bool ask, bool showProgress )
 {
@@ -546,7 +546,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
     }
 
     if ( doIt ) {
-        KIO::CopyJob *job = KIO::trash( urls, showProgress );
+        TDEIO::CopyJob *job = TDEIO::trash( urls, showProgress );
         job->setWindow (topLevelWidget());
         job->setAutoErrorHandlingEnabled( true, parent );
         return job;
@@ -718,7 +718,7 @@ void KDirOperator::pathChanged()
     // it may be, that we weren't ready at this time
     TQApplication::restoreOverrideCursor();
 
-    // when KIO::Job emits finished, the slot will restore the cursor
+    // when TDEIO::Job emits finished, the slot will restore the cursor
     TQApplication::setOverrideCursor( tqwaitCursor );
 
     if ( !isReadable( currUrl )) {
@@ -812,8 +812,8 @@ bool KDirOperator::checkPreviewSupport()
     KToggleAction *previewAction = static_cast<KToggleAction*>( myActionCollection->action( "preview" ));
 
     bool hasPreviewSupport = false;
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs( kc, ConfigGroup );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, ConfigGroup );
     if ( kc->readBoolEntry( "Show Default Preview", true ) )
         hasPreviewSupport = checkPreviewInternal();
 
@@ -823,7 +823,7 @@ bool KDirOperator::checkPreviewSupport()
 
 bool KDirOperator::checkPreviewInternal() const
 {
-    TQStringList supported = KIO::PreviewJob::supportedMimeTypes();
+    TQStringList supported = TDEIO::PreviewJob::supportedMimeTypes();
     // no preview support for directories?
     if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 )
         return false;
@@ -1385,8 +1385,8 @@ void KDirOperator::setupMenu(int whichActions)
         actionMenu->insert( mkdirAction );
         if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
             actionMenu->insert( myActionCollection->action( "trash" ) );
-        KConfig *globalconfig = TDEGlobal::config();
-        KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
+        TDEConfig *globalconfig = TDEGlobal::config();
+        TDEConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
         if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) ||
             globalconfig->readBoolEntry("ShowDeleteCommand", false))
             actionMenu->insert( myActionCollection->action( "delete" ) );
@@ -1439,7 +1439,7 @@ void KDirOperator::updateViewActions()
     detailedAction->setChecked( KFile::isDetailView( fv ));
 }
 
-void KDirOperator::readConfig( KConfig *kc, const TQString& group )
+void KDirOperator::readConfig( TDEConfig *kc, const TQString& group )
 {
     if ( !kc )
         return;
@@ -1495,7 +1495,7 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group )
     kc->setGroup( oldGroup );
 }
 
-void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
+void KDirOperator::writeConfig( TDEConfig *kc, const TQString& group )
 {
     if ( !kc )
         return;
@@ -1718,13 +1718,13 @@ void KDirOperator::slotRefreshItems( const KFileItemList& items )
         m_fileView->updateView( it.current() );
 }
 
-void KDirOperator::setViewConfig( KConfig *config, const TQString& group )
+void KDirOperator::setViewConfig( TDEConfig *config, const TQString& group )
 {
     d->config = config;
     d->configGroup = group;
 }
 
-KConfig * KDirOperator::viewConfig()
+TDEConfig * KDirOperator::viewConfig()
 {
     return d->config;
 }
diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h
index e644f7b98..73798b92c 100644
--- a/kio/kfile/kdiroperator.h
+++ b/kio/kfile/kdiroperator.h
@@ -41,7 +41,7 @@ class KActionSeparator;
 class KActionMenu;
 class TQWidgetStack;
 class KProgress;
-namespace KIO {
+namespace TDEIO {
   class CopyJob;
   class DeleteJob;
 }
@@ -60,7 +60,7 @@ namespace KIO {
  * show either a simple or detailed view and additionally a preview widget
  * (see setPreviewWidget()). KImageFilePreview is one implementation
  * of a preview widget, that displays previews for all supported filetypes
- * utilizing KIO::PreviewJob.
+ * utilizing TDEIO::PreviewJob.
  *
  * Currently, those classes don't support Drag&Drop out of the box -- there
  * you have to use your own view-classes. You can use some DnD-aware views
@@ -407,16 +407,16 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * @since 3.1
      */
 	// ### KDE4: make virtual
-    void setViewConfig( KConfig *config, const TQString& group );
+    void setViewConfig( TDEConfig *config, const TQString& group );
 
     /**
-     * Returns the KConfig object used for saving and restoring view's
+     * Returns the TDEConfig object used for saving and restoring view's
      * configuration.
-     * @returns the KConfig object used for saving and restoring view's
+     * @returns the TDEConfig object used for saving and restoring view's
      * configuration.
      * @since 3.1
      */
-    KConfig *viewConfig();
+    TDEConfig *viewConfig();
 
     /**
      * Returns the group name used for saving and restoring view's
@@ -440,7 +440,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * @see setViewConfig
      * @see writeConfig
      */
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
 
     /**
      * Saves the current settings like sorting, simple or detailed view.
@@ -448,7 +448,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * @see readConfig
      * @see setViewConfig
      */
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null );
 
 
     /**
@@ -482,18 +482,18 @@ class KIO_EXPORT KDirOperator : public TQWidget
     bool mkdir( const TQString& directory, bool enterDirectory = true );
 
     /**
-     * Starts and returns a KIO::DeleteJob to delete the given @p items.
+     * Starts and returns a TDEIO::DeleteJob to delete the given @p items.
      *
      * @param items the list of items to be deleted
      * @param ask specifies whether a confirmation dialog should be shown
      * @param showProgress passed to the DeleteJob to show a progress dialog
      */
 	// ### KDE4: make virtual
-    KIO::DeleteJob * del( const KFileItemList& items,
+    TDEIO::DeleteJob * del( const KFileItemList& items,
                           bool ask = true, bool showProgress = true );
 
     /**
-     * Starts and returns a KIO::DeleteJob to delete the given @p items.
+     * Starts and returns a TDEIO::DeleteJob to delete the given @p items.
      *
      * @param items the list of items to be deleted
      * @param parent the parent widget used for the confirmation dialog
@@ -502,7 +502,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * @since 3.1
      */
 	// ### KDE4: make virtual
-    KIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent,
+    TDEIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent,
                           bool ask = true, bool showProgress = true );
 
     /**
@@ -563,7 +563,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
     void setDropOptions(int options);
 
     /**
-     * Starts and returns a KIO::CopyJob to trash the given @p items.
+     * Starts and returns a TDEIO::CopyJob to trash the given @p items.
      *
      * @param items the list of items to be trashed
      * @param parent the parent widget used for the confirmation dialog
@@ -572,7 +572,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * @since 3.4
      */
      // ### KDE4: make virtual
-    KIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent,
+    TDEIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent,
                        bool ask = true, bool showProgress = true );
 
 protected:
@@ -634,7 +634,7 @@ protected:
     void prepareCompletionObjects();
 
     /**
-     * Checks if there support from KIO::PreviewJob for the currently
+     * Checks if there support from TDEIO::PreviewJob for the currently
      * shown files, taking mimeFilter() and nameFilter() into account
      * Enables/disables the preview-action accordingly.
      */
diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp
index 8f8a8b299..48dd3a2e4 100644
--- a/kio/kfile/kdirselectdialog.cpp
+++ b/kio/kfile/kdirselectdialog.cpp
@@ -267,20 +267,20 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item )
     }
 }
 
-void KDirSelectDialog::readConfig( KConfig *config, const TQString& group )
+void KDirSelectDialog::readConfig( TDEConfig *config, const TQString& group )
 {
     d->urlCombo->clear();
 
-    KConfigGroup conf( config, group );
+    TDEConfigGroup conf( config, group );
     d->urlCombo->setHistoryItems( conf.readPathListEntry( "History Items" ));
 
     TQSize defaultSize( 400, 450 );
     resize( conf.readSizeEntry( "DirSelectDialog Size", &defaultSize ));
 }
 
-void KDirSelectDialog::saveConfig( KConfig *config, const TQString& group )
+void KDirSelectDialog::saveConfig( TDEConfig *config, const TQString& group )
 {
-    KConfigGroup conf( config, group );
+    TDEConfigGroup conf( config, group );
     conf.writePathEntry( "History Items", d->urlCombo->historyItems(), ',',
                      true, true);
     conf.writeEntry( "DirSelectDialog Size", size(), true, true );
@@ -406,9 +406,9 @@ void KDirSelectDialog::slotMkdir()
     TQString where = url().pathOrURL();
     TQString name = i18n( "New Folder" );
     if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() )
-        name = KIO::RenameDlg::suggestName( url(), name );
+        name = TDEIO::RenameDlg::suggestName( url(), name );
 
-    TQString directory = KIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ),
+    TQString directory = TDEIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ),
                                          i18n( "Create new folder in:\n%1" ).arg( where ),
                                          name, &ok, this));
     if (!ok)
@@ -425,8 +425,8 @@ void KDirSelectDialog::slotMkdir()
     for ( ; it != dirs.end(); ++it )
     {
         folderurl.addPath( *it );
-        exists = KIO::NetAccess::exists( folderurl, false, 0 );
-        writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() );
+        exists = TDEIO::NetAccess::exists( folderurl, false, 0 );
+        writeOk = !exists && TDEIO::NetAccess::mkdir( folderurl, topLevelWidget() );
     }
 
     if ( exists ) // url was already existant
@@ -470,7 +470,7 @@ KURL KDirSelectDialog::selectDirectory( const TQString& startDir,
         myDialog.setCaption( caption );
 
     if ( myDialog.exec() == TQDialog::Accepted )
-        return KIO::NetAccess::mostLocalURL(myDialog.url(),parent);
+        return TDEIO::NetAccess::mostLocalURL(myDialog.url(),parent);
     else
         return KURL();
 }
diff --git a/kio/kfile/kdirselectdialog.h b/kio/kfile/kdirselectdialog.h
index 79358f4f3..106fe77fc 100644
--- a/kio/kfile/kdirselectdialog.h
+++ b/kio/kfile/kdirselectdialog.h
@@ -25,7 +25,7 @@
 
 class TQPopupMenu;
 class TQVBoxLayout;
-class KConfig;
+class TDEConfig;
 class KFileTreeBranch;
 class KFileTreeView;
 class KFileTreeViewItem;
@@ -111,8 +111,8 @@ private slots:
     void slotMkdir();
 
 private:
-    void readConfig( KConfig *config, const TQString& group );
-    void saveConfig( KConfig *config, const TQString& group );
+    void readConfig( TDEConfig *config, const TQString& group );
+    void saveConfig( TDEConfig *config, const TQString& group );
     void openNextDir( KFileTreeViewItem *parent );
     KFileTreeBranch * createBranch( const KURL& url );
 
diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp
index 3ab42817b..14936679a 100644
--- a/kio/kfile/kdirsize.cpp
+++ b/kio/kfile/kdirsize.cpp
@@ -24,16 +24,16 @@
 #include <tqtimer.h>
 #include <config-kfile.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 KDirSize::KDirSize( const KURL & directory )
-    : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L)
+    : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L)
 {
     startNextJob( directory );
 }
 
 KDirSize::KDirSize( const KFileItemList & lstItems )
-    : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems)
+    : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems)
 {
     TQTimer::singleShot( 0, this, TQT_SLOT(processList()) );
 }
@@ -69,38 +69,38 @@ void KDirSize::processList()
 
 void KDirSize::startNextJob( const KURL & url )
 {
-    KIO::ListJob * listJob = KIO::listRecursive( url, false /* no GUI */ );
-    connect( listJob, TQT_SIGNAL(entries( KIO::Job *,
-                                      const KIO::UDSEntryList& )),
-             TQT_SLOT( slotEntries( KIO::Job*,
-                                const KIO::UDSEntryList& )));
+    TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ );
+    connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *,
+                                      const TDEIO::UDSEntryList& )),
+             TQT_SLOT( slotEntries( TDEIO::Job*,
+                                const TDEIO::UDSEntryList& )));
     addSubjob( listJob );
 }
 
-void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
+void KDirSize::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
 {
     static const TQString& dot = TDEGlobal::staticQString( "." );
     static const TQString& dotdot = TDEGlobal::staticQString( ".." );
-    KIO::UDSEntryListConstIterator it = list.begin();
-    KIO::UDSEntryListConstIterator end = list.end();
+    TDEIO::UDSEntryListConstIterator it = list.begin();
+    TDEIO::UDSEntryListConstIterator end = list.end();
     for (; it != end; ++it) {
-        KIO::UDSEntry::ConstIterator it2 = (*it).begin();
-        KIO::filesize_t size = 0;
+        TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
+        TDEIO::filesize_t size = 0;
         bool isLink = false;
         bool isDir = false;
         TQString name;
         for( ; it2 != (*it).end(); it2++ ) {
           switch( (*it2).m_uds ) {
-            case KIO::UDS_NAME:
+            case TDEIO::UDS_NAME:
               name = (*it2).m_str;
               break;
-            case KIO::UDS_LINK_DEST:
+            case TDEIO::UDS_LINK_DEST:
               isLink = !(*it2).m_str.isEmpty();
               break;
-            case KIO::UDS_SIZE:
+            case TDEIO::UDS_SIZE:
               size = ((*it2).m_long);
               break;
-            case KIO::UDS_FILE_TYPE:
+            case TDEIO::UDS_FILE_TYPE:
               isDir = S_ISDIR((*it2).m_long);
               break;
             default:
@@ -135,7 +135,7 @@ KDirSize * KDirSize::dirSizeJob( const KFileItemList & lstItems )
 }
 
 //static
-KIO::filesize_t KDirSize::dirSize( const KURL & directory )
+TDEIO::filesize_t KDirSize::dirSize( const KURL & directory )
 {
     KDirSize * dirSize = dirSizeJob( directory );
     dirSize->setSync();
@@ -144,9 +144,9 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory )
 }
 
 
-void KDirSize::slotResult( KIO::Job * job )
+void KDirSize::slotResult( TDEIO::Job * job )
 {
-    kdDebug(kfile_area) << " KDirSize::slotResult( KIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
+    kdDebug(kfile_area) << " KDirSize::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
     if ( !m_lstItems.isEmpty() )
     {
         subjobs.remove(job); // Remove job, but don't kill this job.
@@ -156,11 +156,11 @@ void KDirSize::slotResult( KIO::Job * job )
     {
         if ( !m_bAsync )
             tqApp->exit_loop();
-        KIO::Job::slotResult( job );
+        TDEIO::Job::slotResult( job );
     }
 }
 
 void KDirSize::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
 
 #include "kdirsize.moc"
diff --git a/kio/kfile/kdirsize.h b/kio/kfile/kdirsize.h
index 64ae80765..41fe87eb6 100644
--- a/kio/kfile/kdirsize.h
+++ b/kio/kfile/kdirsize.h
@@ -27,7 +27,7 @@
  * Computes a directory size (similar to "du", but doesn't give the same results
  * since we simply sum up the dir and file sizes, whereas du speaks disk blocks)
  */
-class KIO_EXPORT KDirSize : public KIO::Job
+class KIO_EXPORT KDirSize : public TDEIO::Job
 {
   Q_OBJECT
 protected:
@@ -39,14 +39,14 @@ public:
   /**
    * @return the size we found
    */
-  KIO::filesize_t totalSize() const { return m_totalSize; }
+  TDEIO::filesize_t totalSize() const { return m_totalSize; }
 
   /**
    * @return the total number of files (counting symlinks to files, sockets
    * and character devices as files) in this directory and all sub-directories
    * @since 3.3
    */
-  KIO::filesize_t totalFiles() const { return m_totalFiles; }
+  TDEIO::filesize_t totalFiles() const { return m_totalFiles; }
 
   /**
    * @return the total number of sub-directories found (not including the
@@ -54,7 +54,7 @@ public:
    * as directories)
    * @since 3.3
    */
-  KIO::filesize_t totalSubdirs() const { return m_totalSubdirs; }
+  TDEIO::filesize_t totalSubdirs() const { return m_totalSubdirs; }
 
   /**
    * Asynchronous method. Connect to the result signal.
@@ -75,7 +75,7 @@ public:
    * Synchronous method - you get the result as soon as
    * the call returns.
    */
-  static KIO::filesize_t dirSize( const KURL & directory );
+  static TDEIO::filesize_t dirSize( const KURL & directory );
 
 protected:
   /**
@@ -87,15 +87,15 @@ protected:
 
 protected slots:
 
-  virtual void slotResult( KIO::Job *job );
-  void slotEntries( KIO::Job * , const KIO::UDSEntryList &);
+  virtual void slotResult( TDEIO::Job *job );
+  void slotEntries( TDEIO::Job * , const TDEIO::UDSEntryList &);
   void processList();
 
 private:
   bool m_bAsync;
-  KIO::filesize_t m_totalSize;
-  KIO::filesize_t m_totalFiles;
-  KIO::filesize_t m_totalSubdirs;
+  TDEIO::filesize_t m_totalSize;
+  TDEIO::filesize_t m_totalFiles;
+  TDEIO::filesize_t m_totalSubdirs;
   KFileItemList m_lstItems;
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp
index 21338c058..18245bdcd 100644
--- a/kio/kfile/kdiskfreesp.cpp
+++ b/kio/kfile/kdiskfreesp.cpp
@@ -163,7 +163,7 @@ void KDiskFreeSp::dfDone()
 KDiskFreeSp * KDiskFreeSp::findUsageInfo( const TQString & path )
 {
     KDiskFreeSp * job = new KDiskFreeSp;
-    TQString mountPoint = KIO::findPathMountPoint( path );
+    TQString mountPoint = TDEIO::findPathMountPoint( path );
     job->readDF( mountPoint );
     return job;
 }
diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp
index 1bc6f6257..099a7cee5 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/kio/kfile/kfiledetailview.cpp
@@ -130,12 +130,12 @@ KFileDetailView::~KFileDetailView()
     delete d;
 }
 
-void KFileDetailView::readConfig( KConfig *config, const TQString& group )
+void KFileDetailView::readConfig( TDEConfig *config, const TQString& group )
 {
     restoreLayout( config, group );
 }
 
-void KFileDetailView::writeConfig( KConfig *config, const TQString& group )
+void KFileDetailView::writeConfig( TDEConfig *config, const TQString& group )
 {
     saveLayout( config, group );
 }
@@ -327,7 +327,7 @@ void KFileDetailView::setSortingKey( KFileListViewItem *item,
     TQDir::SortSpec spec = KFileView::sorting();
 
     if ( spec & TQDir::Time )
-        item->setKey( sortingKey( i->time( KIO::UDS_MODIFICATION_TIME ),
+        item->setKey( sortingKey( i->time( TDEIO::UDS_MODIFICATION_TIME ),
                                   i->isDir(), spec ));
     else if ( spec & TQDir::Size )
         item->setKey( sortingKey( i->size(), i->isDir(), spec ));
@@ -399,7 +399,7 @@ void KFileDetailView::slotSortingChanged( int col )
 
     if ( sortSpec & TQDir::Time ) {
         for ( ; (item = it.current()); ++it )
-            viewItem(item)->setKey( sortingKey( item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec ));
+            viewItem(item)->setKey( sortingKey( item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec ));
     }
 
     else if ( sortSpec & TQDir::Size ) {
diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h
index 937c8f56c..9c41cfb91 100644
--- a/kio/kfile/kfiledetailview.h
+++ b/kio/kfile/kfiledetailview.h
@@ -149,8 +149,8 @@ public:
     void determineIcon( KFileListViewItem *item );
     TQScrollView *scrollWidget() const { return (TQScrollView*) this; }
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
 signals:
     /**
diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp
index 5e1634144..1538d5dbc 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/kio/kfile/kfiledialog.cpp
@@ -97,7 +97,7 @@
 enum Buttons { HOTLIST_BUTTON,
                PATH_COMBO, CONFIGURE_BUTTON };
 
-template class TQPtrList<KIO::StatJob>;
+template class TQPtrList<TDEIO::StatJob>;
 
 namespace {
     static void silenceQToolBar(TQtMsgType, const char *)
@@ -136,7 +136,7 @@ struct KFileDialogPrivate
     bool autoSelectExtChecked; // whether or not the _user_ has checked the above box
     TQString extension; // current extension for this filter
 
-    TQPtrList<KIO::StatJob> statJobs;
+    TQPtrList<TDEIO::StatJob> statJobs;
 
     KURL::List urlList; //the list of selected urls
 
@@ -185,7 +185,7 @@ KFileDialog::~KFileDialog()
 {
     hide();
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     if (d->urlBar)
         d->urlBar->save( config );
@@ -402,7 +402,7 @@ void KFileDialog::slotOk()
             }
         }
 
-        KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
+        KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
         if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
              !url.isLocalFile() ) {
 // ### after message freeze, add message for directories!
@@ -446,7 +446,7 @@ void KFileDialog::slotOk()
        return;
     }
 
-    KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
+    KURL url = TDEIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
     if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
          !url.isLocalFile() ) {
         KMessageBox::sorry( d->mainWidget,
@@ -528,12 +528,12 @@ void KFileDialog::slotOk()
 
     if (!kapp->authorizeURLAction("open", KURL(), d->url))
     {
-        TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, d->url.prettyURL());
+        TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, d->url.prettyURL());
         KMessageBox::error( d->mainWidget, msg);
         return;
     }
 
-    KIO::StatJob *job = 0L;
+    TDEIO::StatJob *job = 0L;
     d->statJobs.clear();
     d->filenames = KShell::tildeExpand(locationEdit->currentText());
 
@@ -546,7 +546,7 @@ void KFileDialog::slotOk()
         {
             if (!kapp->authorizeURLAction("open", KURL(), *it))
             {
-                TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, (*it).prettyURL());
+                TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, (*it).prettyURL());
                 KMessageBox::error( d->mainWidget, msg);
                 return;
             }
@@ -554,32 +554,32 @@ void KFileDialog::slotOk()
         for ( KURL::List::ConstIterator it = list.begin();
               it != list.end(); ++it )
         {
-            job = KIO::stat( *it, !(*it).isLocalFile() );
+            job = TDEIO::stat( *it, !(*it).isLocalFile() );
             job->setWindow (topLevelWidget());
-            KIO::Scheduler::scheduleJob( job );
+            TDEIO::Scheduler::scheduleJob( job );
             d->statJobs.append( job );
-            connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-                     TQT_SLOT( slotStatResult( KIO::Job *) ));
+            connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+                     TQT_SLOT( slotStatResult( TDEIO::Job *) ));
         }
         return;
     }
 
-    job = KIO::stat(d->url,!d->url.isLocalFile());
+    job = TDEIO::stat(d->url,!d->url.isLocalFile());
     job->setWindow (topLevelWidget());
     d->statJobs.append( job );
-    connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*)));
 }
 
 
-static bool isDirectory (const KIO::UDSEntry &t)
+static bool isDirectory (const TDEIO::UDSEntry &t)
 {
     bool isDir = false;
 
-    for (KIO::UDSEntry::ConstIterator it = t.begin();
+    for (TDEIO::UDSEntry::ConstIterator it = t.begin();
          it != t.end();
          it++)
     {
-        if ((*it).m_uds == KIO::UDS_FILE_TYPE)
+        if ((*it).m_uds == TDEIO::UDS_FILE_TYPE)
         {
             isDir = S_ISDIR ((mode_t) ((*it).m_long));
             break;
@@ -592,10 +592,10 @@ static bool isDirectory (const KIO::UDSEntry &t)
 // FIXME : count all errors and show messagebox when d->statJobs.count() == 0
 // in case of an error, we cancel the whole operation (clear d->statJobs and
 // don't call accept)
-void KFileDialog::slotStatResult(KIO::Job* job)
+void KFileDialog::slotStatResult(TDEIO::Job* job)
 {
     kdDebug(kfile_area) << "slotStatResult" << endl;
-    KIO::StatJob *sJob = static_cast<KIO::StatJob *>( job );
+    TDEIO::StatJob *sJob = static_cast<TDEIO::StatJob *>( job );
 
     if ( !d->statJobs.removeRef( sJob ) ) {
         return;
@@ -611,7 +611,7 @@ void KFileDialog::slotStatResult(KIO::Job* job)
         return;
     }
 
-    KIO::UDSEntry t = sJob->statResult();
+    TDEIO::UDSEntry t = sJob->statResult();
     if (isDirectory (t))
     {
         if ( ops->dirOnlyMode() )
@@ -672,7 +672,7 @@ void KFileDialog::accept()
         locationEdit->insertItem( file, 1 );
     }
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setForceGlobal( true );
     writeConfig( config, ConfigGroup );
     config->setForceGlobal( false );
@@ -1038,7 +1038,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
 
     initGUI(); // activate GM
 
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     readRecentFiles( config );
 
     adjustSize();
@@ -1550,7 +1550,7 @@ TQString KFileDialog::selectedFile() const
 {
     if ( result() == TQDialog::Accepted )
     {
-      KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
+      KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
        if (url.isLocalFile())
            return url.path();
        else {
@@ -1572,7 +1572,7 @@ TQStringList KFileDialog::selectedFiles() const
             KURL::List urls = parseSelectedURLs();
             TQValueListConstIterator<KURL> it = urls.begin();
             while ( it != urls.end() ) {
-              url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget());
+              url = TDEIO::NetAccess::mostLocalURL(*it,topLevelWidget());
                 if ( url.isLocalFile() )
                     list.append( url.path() );
                 ++it;
@@ -1698,7 +1698,7 @@ KFile::Mode KFileDialog::mode() const
 }
 
 
-void KFileDialog::readConfig( KConfig *kc, const TQString& group )
+void KFileDialog::readConfig( TDEConfig *kc, const TQString& group )
 {
     if ( !kc )
         return;
@@ -1749,7 +1749,7 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group )
     kc->setGroup( oldGroup );
 }
 
-void KFileDialog::writeConfig( KConfig *kc, const TQString& group )
+void KFileDialog::writeConfig( TDEConfig *kc, const TQString& group )
 {
     if ( !kc )
         return;
@@ -1771,7 +1771,7 @@ void KFileDialog::writeConfig( KConfig *kc, const TQString& group )
 }
 
 
-void KFileDialog::readRecentFiles( KConfig *kc )
+void KFileDialog::readRecentFiles( TDEConfig *kc )
 {
     TQString oldGroup = kc->group();
     kc->setGroup( ConfigGroup );
@@ -1786,7 +1786,7 @@ void KFileDialog::readRecentFiles( KConfig *kc )
     kc->setGroup( oldGroup );
 }
 
-void KFileDialog::saveRecentFiles( KConfig *kc )
+void KFileDialog::saveRecentFiles( TDEConfig *kc )
 {
     TQString oldGroup = kc->group();
     kc->setGroup( ConfigGroup );
@@ -1816,7 +1816,7 @@ void KFileDialog::slotCancel()
     ops->close();
     KDialogBase::slotCancel();
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setForceGlobal( true );
     writeConfig( config, ConfigGroup );
     config->setForceGlobal( false );
@@ -2069,8 +2069,8 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
     )
     {
         // exists?
-        KIO::UDSEntry t;
-        if (KIO::NetAccess::stat (url, t, topLevelWidget()))
+        TDEIO::UDSEntry t;
+        if (TDEIO::NetAccess::stat (url, t, topLevelWidget()))
         {
             kdDebug (kfile_area) << "\tfile exists" << endl;
 
@@ -2142,13 +2142,13 @@ void KFileDialog::appendExtension (KURL &url)
     const bool suppressExtension = (dot == len - 1);
     const bool unspecifiedExtension = (dot <= 0);
 
-    // don't KIO::NetAccess::Stat if unnecessary
+    // don't TDEIO::NetAccess::Stat if unnecessary
     if (!(suppressExtension || unspecifiedExtension))
         return;
 
     // exists?
-    KIO::UDSEntry t;
-    if (KIO::NetAccess::stat (url, t, topLevelWidget()))
+    TDEIO::UDSEntry t;
+    if (TDEIO::NetAccess::stat (url, t, topLevelWidget()))
     {
         kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl;
         return;
diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h
index 33e0c9b12..51d817b2f 100644
--- a/kio/kfile/kfiledialog.h
+++ b/kio/kfile/kfiledialog.h
@@ -854,22 +854,22 @@ protected:
     /**
      * Reads configuration and applies it (size, recent directories, ...)
      */
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
 
     /**
      * Saves the current configuration
      */
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null );
 
     /**
      * Reads the recent used files and inserts them into the location combobox
      */
-    virtual void readRecentFiles( KConfig * );
+    virtual void readRecentFiles( TDEConfig * );
 
     /**
      * Saves the entries from the location combobox.
      */
-    virtual void saveRecentFiles( KConfig * );
+    virtual void saveRecentFiles( TDEConfig * );
 
     /**
      * Parses the string "line" for files. If line doesn't contain any ", the
@@ -929,7 +929,7 @@ protected slots:
     void slotFilterChanged();
     void fileHighlighted(const KFileItem *i);
     void fileSelected(const KFileItem *i);
-    void slotStatResult(KIO::Job* job);
+    void slotStatResult(TDEIO::Job* job);
     void slotLoadingFinished();
 
     void fileCompletion( const TQString& );
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index a9882d56f..5d9977de6 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -102,7 +102,7 @@ public:
     KRadioAction *smallColumns, *largeRows;
     KAction *zoomIn, *zoomOut;
     KToggleAction *previews;
-    KIO::PreviewJob *job;
+    TDEIO::PreviewJob *job;
     KFileIconViewItem *dropItem;
     TQTimer previewTimer;
     TQTimer autoOpenTimer;
@@ -187,10 +187,10 @@ KFileIconView::~KFileIconView()
     delete d;
 }
 
-void KFileIconView::readConfig( KConfig *kc, const TQString& group )
+void KFileIconView::readConfig( TDEConfig *kc, const TQString& group )
 {
     TQString gr = group.isEmpty() ? TQString("KFileIconView") : group;
-    KConfigGroupSaver cs( kc, gr );
+    TDEConfigGroupSaver cs( kc, gr );
     TQString small = TQString::fromLatin1("SmallColumns");
     d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE );
     d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) );
@@ -208,10 +208,10 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group )
         showPreviews();
 }
 
-void KFileIconView::writeConfig( KConfig *kc, const TQString& group )
+void KFileIconView::writeConfig( TDEConfig *kc, const TQString& group )
 {
     TQString gr = group.isEmpty() ? TQString("KFileIconView") : group;
-    KConfigGroupSaver cs( kc, gr );
+    TDEConfigGroupSaver cs( kc, gr );
 
     TQString viewMode =  d->smallColumns->isChecked() ?
         TQString::fromLatin1("SmallColumns") :
@@ -578,7 +578,7 @@ void KFileIconView::slotPreviewsToggled( bool on )
 void KFileIconView::showPreviews()
 {
     if ( d->previewMimeTypes.isEmpty() )
-        d->previewMimeTypes = KIO::PreviewJob::supportedMimeTypes();
+        d->previewMimeTypes = TDEIO::PreviewJob::supportedMimeTypes();
 
     stopPreview();
     d->previews->setChecked( true );
@@ -591,18 +591,18 @@ void KFileIconView::showPreviews()
         updateIcons();
     }
 
-    d->job = KIO::filePreview(*items(), d->previewIconSize,d->previewIconSize);
+    d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize);
     d->job->setIgnoreMaximumSize(d->ignoreMaximumSize);
 
-    connect( d->job, TQT_SIGNAL( result( KIO::Job * )),
-             this, TQT_SLOT( slotPreviewResult( KIO::Job * )));
+    connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )),
+             this, TQT_SLOT( slotPreviewResult( TDEIO::Job * )));
     connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )),
              TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
 //     connect( d->job, TQT_SIGNAL( failed( const KFileItem* )),
 //              this, TQT_SLOT( slotFailed( const KFileItem* ) ));
 }
 
-void KFileIconView::slotPreviewResult( KIO::Job *job )
+void KFileIconView::slotPreviewResult( TDEIO::Job *job )
 {
     if ( job == d->job )
         d->job = 0L;
@@ -683,7 +683,7 @@ void KFileIconView::setSorting( TQDir::SortSpec spec )
     if ( spec & TQDir::Time ) {
         for ( ; (item = it.current()); ++it )
             // warning, time_t is often signed -> cast it
-            viewItem(item)->setKey( sortingKey( (unsigned long)item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), spec ));
+            viewItem(item)->setKey( sortingKey( (unsigned long)item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), spec ));
     }
 
     else if ( spec & TQDir::Size ) {
@@ -775,7 +775,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i,
 
     if ( spec & TQDir::Time )
         // warning, time_t is often signed -> cast it
-        item->setKey( sortingKey( (unsigned long) i->time( KIO::UDS_MODIFICATION_TIME ),
+        item->setKey( sortingKey( (unsigned long) i->time( TDEIO::UDS_MODIFICATION_TIME ),
                                   i->isDir(), spec ));
     else if ( spec & TQDir::Size )
         item->setKey( sortingKey( i->size(), i->isDir(), spec ));
diff --git a/kio/kfile/kfileiconview.h b/kio/kfile/kfileiconview.h
index a4fd34ea1..209e4828a 100644
--- a/kio/kfile/kfileiconview.h
+++ b/kio/kfile/kfileiconview.h
@@ -68,7 +68,7 @@ private:
 
 };
 
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
@@ -141,8 +141,8 @@ public:
 
     virtual void setSorting(TQDir::SortSpec sort);
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
     // for KMimeTypeResolver
     void mimeTypeDeterminationFinished();
@@ -212,7 +212,7 @@ private slots:
     void slotLargeRows();
     void slotPreviewsToggled( bool );
 
-    void slotPreviewResult( KIO::Job * );
+    void slotPreviewResult( TDEIO::Job * );
     void gotPreview( const KFileItem *item, const TQPixmap& pix );
     void slotAutoOpen();
 
diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp
index b221a1ebb..04124570b 100644
--- a/kio/kfile/kfilepreview.cpp
+++ b/kio/kfile/kfilepreview.cpp
@@ -264,12 +264,12 @@ KActionCollection * KFilePreview::actionCollection() const
     }
 }
 
-void KFilePreview::readConfig( KConfig *config, const TQString& group )
+void KFilePreview::readConfig( TDEConfig *config, const TQString& group )
 {
     left->readConfig( config, group );
 }
 
-void KFilePreview::writeConfig( KConfig *config, const TQString& group )
+void KFilePreview::writeConfig( TDEConfig *config, const TQString& group )
 {
     left->writeConfig( config, group );
 }
diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h
index 123d221f1..79dda2984 100644
--- a/kio/kfile/kfilepreview.h
+++ b/kio/kfile/kfilepreview.h
@@ -83,8 +83,8 @@ public:
 
     virtual void setSorting( TQDir::SortSpec sort );
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
     /**
      * This overrides KFileView::actionCollection() by returning
diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp
index 9ab3b8ee5..567d929eb 100644
--- a/kio/kfile/kfilespeedbar.cpp
+++ b/kio/kfile/kfilespeedbar.cpp
@@ -35,8 +35,8 @@
 KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name )
     : KURLBar( true, parent, name )
 {
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver cs( config, ConfigGroup );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs( config, ConfigGroup );
     m_initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults",
                                                    true );
     setIconSize(KIcon::SizeSmallMedium);
@@ -121,11 +121,11 @@ KFileSpeedBar::~KFileSpeedBar()
 {
 }
 
-void KFileSpeedBar::save( KConfig *config )
+void KFileSpeedBar::save( TDEConfig *config )
 {
     if ( m_initializeSpeedbar && isModified() )
     {
-        KConfigGroup conf( config, ConfigGroup );
+        TDEConfigGroup conf( config, ConfigGroup );
         // write to kdeglobals
         conf.writeEntry( "Set speedbar defaults", false, true, true );
     }
diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h
index 28c621651..f7a27131b 100644
--- a/kio/kfile/kfilespeedbar.h
+++ b/kio/kfile/kfilespeedbar.h
@@ -21,7 +21,7 @@
 
 #include <kurlbar.h>
 
-class KConfig;
+class TDEConfig;
 
 class KIO_EXPORT KFileSpeedBar : public KURLBar
 {
@@ -30,7 +30,7 @@ public:
     KFileSpeedBar( TQWidget *parent = 0, const char *name = 0 );
     ~KFileSpeedBar();
 
-    virtual void save( KConfig *config );
+    virtual void save( TDEConfig *config );
     virtual TQSize sizeHint() const;
 
 private:
diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp
index b32746aa6..a62b8aa50 100644
--- a/kio/kfile/kfileview.cpp
+++ b/kio/kfile/kfileview.cpp
@@ -212,8 +212,8 @@ sort_by_name:
                     break;
                 case TQDir::Time:
                 {
-                    time_t t1 = fi1->time( KIO::UDS_MODIFICATION_TIME );
-                    time_t t2 = fi2->time( KIO::UDS_MODIFICATION_TIME );
+                    time_t t1 = fi1->time( TDEIO::UDS_MODIFICATION_TIME );
+                    time_t t2 = fi2->time( TDEIO::UDS_MODIFICATION_TIME );
                     if ( t1 != t2 ) {
                         bigger = (t1 > t2);
                         break;
@@ -228,8 +228,8 @@ sort_by_name:
                 }
                 case TQDir::Size:
                 {
-                    KIO::filesize_t s1 = fi1->size();
-                    KIO::filesize_t s2 = fi2->size();
+                    TDEIO::filesize_t s1 = fi1->size();
+                    TDEIO::filesize_t s2 = fi2->size();
                     if ( s1 != s2 ) {
                         bigger = (s1 > s2);
                         break;
@@ -369,11 +369,11 @@ KActionCollection * KFileView::actionCollection() const
     return d->actions;
 }
 
-void KFileView::readConfig( KConfig *, const TQString&  )
+void KFileView::readConfig( TDEConfig *, const TQString&  )
 {
 }
 
-void KFileView::writeConfig( KConfig *, const TQString& )
+void KFileView::writeConfig( TDEConfig *, const TQString& )
 {
 }
 
@@ -386,12 +386,12 @@ TQString KFileView::sortingKey( const TQString& value, bool isDir, int sortSpec
     return result.prepend( start );
 }
 
-TQString KFileView::sortingKey( KIO::filesize_t value, bool isDir, int sortSpec)
+TQString KFileView::sortingKey( TDEIO::filesize_t value, bool isDir, int sortSpec)
 {
     bool reverse = sortSpec & TQDir::Reversed;
     bool dirsFirst = sortSpec & TQDir::DirsFirst;
     char start = (isDir && dirsFirst) ? (reverse ? '2' : '0') : '1';
-    return KIO::number( value ).rightJustify( 24, '0' ).prepend( start );
+    return TDEIO::number( value ).rightJustify( 24, '0' ).prepend( start );
 }
 
 void KFileView::setDropOptions(int options)
diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h
index bce408327..5a6bfd002 100644
--- a/kio/kfile/kfileview.h
+++ b/kio/kfile/kfileview.h
@@ -346,8 +346,8 @@ public:
 
     KFileViewSignaler * signaler() const { return sig; }
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
     /**
      * Various options for drag and drop support. 
@@ -392,10 +392,10 @@ public:
     /**
      * An overloaded method that takes not a TQString, but a number as sort
      * criterion. You can use this for file-sizes or dates/times for example.
-     * If you use a time_t, you need to cast that to KIO::filesize_t because
+     * If you use a time_t, you need to cast that to TDEIO::filesize_t because
      * of ambiguity problems.
      */
-    static TQString sortingKey( KIO::filesize_t value, bool isDir,int sortSpec);
+    static TQString sortingKey( TDEIO::filesize_t value, bool isDir,int sortSpec);
 
     /**
      * @internal
diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp
index c55acaf9e..0cc0ef2a7 100644
--- a/kio/kfile/kimagefilepreview.cpp
+++ b/kio/kfile/kimagefilepreview.cpp
@@ -35,8 +35,8 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
     : KPreviewWidgetBase( parent ),
       m_job( 0L )
 {
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver cs( config, ConfigGroup );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs( config, ConfigGroup );
     autoMode = config->readBoolEntry( "Automatic Preview", true );
 
     TQVBoxLayout *vb = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -62,7 +62,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
     timer = new TQTimer( this );
     connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) );
 
-    setSupportedMimeTypes( KIO::PreviewJob::supportedMimeTypes() );
+    setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() );
 }
 
 KImageFilePreview::~KImageFilePreview()
@@ -70,8 +70,8 @@ KImageFilePreview::~KImageFilePreview()
     if ( m_job )
         m_job->kill();
 
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver cs( config, ConfigGroup );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs( config, ConfigGroup );
     config->writeEntry( "Automatic Preview", autoPreview->isChecked() );
 }
 
@@ -109,8 +109,8 @@ void KImageFilePreview::showPreview( const KURL &url, bool force )
             if ( force ) // explicitly requested previews shall always be generated!
                 m_job->setIgnoreMaximumSize( true );
             
-            connect( m_job, TQT_SIGNAL( result( KIO::Job * )),
-                     this, TQT_SLOT( slotResult( KIO::Job * )));
+            connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )),
+                     this, TQT_SLOT( slotResult( TDEIO::Job * )));
             connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*,
                                                 const TQPixmap& )),
                      TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
@@ -142,11 +142,11 @@ TQSize KImageFilePreview::sizeHint() const
     return TQSize( 20, 200 ); // otherwise it ends up huge???
 }
 
-KIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h )
+TDEIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h )
 {
     KURL::List urls;
     urls.append( url );
-    return KIO::filePreview( urls, w, h, 0, 0, true, false );
+    return TDEIO::filePreview( urls, w, h, 0, 0, true, false );
 }
 
 void KImageFilePreview::gotPreview( const KFileItem* item, const TQPixmap& pm )
@@ -164,7 +164,7 @@ void KImageFilePreview::slotFailed( const KFileItem* item )
                                           KIcon::DisabledState ));
 }
 
-void KImageFilePreview::slotResult( KIO::Job *job )
+void KImageFilePreview::slotResult( TDEIO::Job *job )
 {
     if ( job == m_job )
         m_job = 0L;
diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h
index 864fc5d31..a86f4f923 100644
--- a/kio/kfile/kimagefilepreview.h
+++ b/kio/kfile/kimagefilepreview.h
@@ -23,7 +23,7 @@ class TQTimer;
 
 class KFileDialog;
 class KFileItem;
-namespace KIO { class Job; class PreviewJob; }
+namespace TDEIO { class Job; class PreviewJob; }
 
 /**
  * Image preview widget for the file dialog.
@@ -51,11 +51,11 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
 
 	protected:
 		virtual void resizeEvent(TQResizeEvent *e);
-		virtual KIO::PreviewJob * createJob( const KURL& url,
+		virtual TDEIO::PreviewJob * createJob( const KURL& url,
                                                      int w, int h );
 
 	private slots:
-		void slotResult( KIO::Job * );
+		void slotResult( TDEIO::Job * );
 		virtual void slotFailed( const KFileItem* );
 
 	private:
@@ -66,7 +66,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
 		TQLabel *infoLabel;
 		TQCheckBox *autoPreview;
 		TQPushButton *previewButton;
-		KIO::PreviewJob *m_job;
+		TDEIO::PreviewJob *m_job;
         protected:
                 virtual void virtual_hook( int id, void* data );
         private:
diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp
index 69d7be4e8..088f9be54 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/kio/kfile/knotifydialog.cpp
@@ -915,7 +915,7 @@ void KNotifyWidget::openExecDialog( KURLRequester *requester )
 void KNotifyWidget::playSound()
 {
     TQString soundPath = m_soundPath->url();
-    if (!KIO::NetAccess::exists( m_soundPath->url(), true, 0 )) {        
+    if (!TDEIO::NetAccess::exists( m_soundPath->url(), true, 0 )) {        
         bool foundSound=false;
 
         // find the first "sound"-resource that contains files
@@ -930,7 +930,7 @@ void KNotifyWidget::playSound()
            while ( it != soundDirs.end() ) {
                dir = *it;
                if ( dir.isReadable() && dir.count() > 2 && 
-	            KIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) {
+	            TDEIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) {
                        foundSound=true;
                        soundPath = *it + m_soundPath->url();
                        break;
@@ -1003,8 +1003,8 @@ Application::Application( const TQString &path )
     TQString config_file = path;
     config_file[config_file.find('/')] = '.';
     m_events = 0L;
-    config = new KConfig(config_file, false, false);
-    kc = new KConfig(path, true, false, "data");
+    config = new TDEConfig(config_file, false, false);
+    kc = new TDEConfig(path, true, false, "data");
     kc->setGroup( TQString::fromLatin1("!Global!") );
     m_icon = kc->readEntry(TQString::fromLatin1("IconName"),
                            TQString::fromLatin1("misc"));
diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h
index ef5d356fd..acab7e23f 100644
--- a/kio/kfile/knotifydialog.h
+++ b/kio/kfile/knotifydialog.h
@@ -168,8 +168,8 @@ namespace KNotify
         TQString m_appname;
         EventList *m_events;
 
-        KConfig *kc; // The file that defines the events.
-        KConfig *config; // The file that contains the settings for the events
+        TDEConfig *kc; // The file that defines the events.
+        TDEConfig *config; // The file that contains the settings for the events
     };
 
 
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index 9a3fcabd1..efeaa1f02 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -412,8 +412,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
     // init the history combo and insert it into the URL-Requester
     KHistoryCombo *combo = new KHistoryCombo();
     combo->setDuplicatesEnabled( false );
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
     int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 );
     combo->setMaxCount( max );
     int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"),
@@ -483,7 +483,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
 
   // check to see if we use konsole if not disable the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+  TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
 
   if (bReadOnly || preferredTerminal != "konsole")
@@ -666,7 +666,7 @@ void KOpenWithDlg::slotOK()
 
   if (terminal->isChecked())
   {
-    KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+    TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
     preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
     m_command = preferredTerminal;
     // only add --noclose when we are sure it is konsole we're using
@@ -813,8 +813,8 @@ void KOpenWithDlg::accept()
     if ( combo ) {
         combo->addToHistory( edit->url() );
 
-        KConfig *kc = TDEGlobal::config();
-        KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+        TDEConfig *kc = TDEGlobal::config();
+        TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
         kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() );
 	kc->writeEntry(TQString::fromLatin1("CompletionMode"),
 		       combo->completionMode());
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index 94b95a2b6..e9296ca90 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -146,7 +146,7 @@ static TQString nameFromFileName(TQString nameStr)
    if ( nameStr.endsWith(".kdelnk") )
       nameStr.truncate( nameStr.length() - 7 );
    // Make it human-readable (%2F => '/', ...)
-   nameStr = KIO::decodeFileName( nameStr );
+   nameStr = TDEIO::decodeFileName( nameStr );
    return nameStr;
 }
 
@@ -174,7 +174,7 @@ public:
 KPropertiesDialog::KPropertiesDialog (KFileItem* item,
                                       TQWidget* parent, const char* name,
                                       bool modal, bool autoShow)
-  : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(KIO::decodeFileName(item->url().fileName())),
+  : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(item->url().fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal)
 {
@@ -206,7 +206,7 @@ KPropertiesDialog::KPropertiesDialog (KFileItemList _items,
                  // TODO: replace <never used> with "Properties for 1 item". It's very confusing how it has to be translated otherwise
                  // (empty translation before the "\n" is not allowed by msgfmt...)
 		 _items.count()>1 ? i18n( "<never used>","Properties for %n Selected Items",_items.count()) :
-		 i18n( "Properties for %1" ).arg(KIO::decodeFileName(_items.first()->url().fileName())),
+		 i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_items.first()->url().fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal)
 {
@@ -229,16 +229,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url, mode_t /* _mode is now u
                                       TQWidget* parent, const char* name,
                                       bool modal, bool autoShow)
   : KDialogBase (KDialogBase::Tabbed,
-		 i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())),
+		 i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal),
   m_singleUrl( _url )
 {
   d = new KPropertiesDialogPrivate;
 
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
 
-  KIO::NetAccess::stat(_url, entry, parent);
+  TDEIO::NetAccess::stat(_url, entry, parent);
 
   m_items.append( new KFileItem( entry, _url ) );
   init (modal, autoShow);
@@ -249,16 +249,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url,
                                       TQWidget* parent, const char* name,
                                       bool modal, bool autoShow)
   : KDialogBase (KDialogBase::Tabbed,
-		 i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())),
+		 i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal),
   m_singleUrl( _url )
 {
   d = new KPropertiesDialogPrivate;
 
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
 
-  KIO::NetAccess::stat(_url, entry, parent);
+  TDEIO::NetAccess::stat(_url, entry, parent);
 
   m_items.append( new KFileItem( entry, _url ) );
   init (modal, autoShow);
@@ -269,7 +269,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current
                                       TQWidget* parent, const char* name,
                                       bool modal, bool autoShow)
   : KDialogBase (KDialogBase::Tabbed,
-		 i18n( "Properties for %1" ).arg(KIO::decodeFileName(_tempUrl.fileName())),
+		 i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_tempUrl.fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal),
 
@@ -360,7 +360,7 @@ void KPropertiesDialog::setFileNameReadOnly( bool ro )
     }
 }
 
-void KPropertiesDialog::slotStatResult( KIO::Job * )
+void KPropertiesDialog::slotStatResult( TDEIO::Job * )
 {
 }
 
@@ -725,7 +725,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   TQString mimeComment = item->mimeComment();
   d->mimeType = item->mimetype();
   bool hasTotalSize;
-  KIO::filesize_t totalSize = item->size(hasTotalSize);
+  TDEIO::filesize_t totalSize = item->size(hasTotalSize);
   TQString magicMimeComment;
   if ( isLocal ) {
       KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() );
@@ -894,7 +894,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   {
     TQLabel *lab = new TQLabel(d->m_frame );
     if ( d->bMultiple )
-      lab->setText( KIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) );
+      lab->setText( TDEIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) );
     else
       lab->setText( filename );
     nameArea = lab;
@@ -992,7 +992,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   if ( !hasDirs ) // Only files [and symlinks]
   {
     if(hasTotalSize) {
-      m_sizeLabel->setText(KIO::convertSizeWithBytes(totalSize));
+      m_sizeLabel->setText(TDEIO::convertSizeWithBytes(totalSize));
     }
 
     m_sizeDetermineButton = 0L;
@@ -1034,7 +1034,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   {
     TQDateTime dt;
     bool hasTime;
-    time_t tim = item->time(KIO::UDS_CREATION_TIME, hasTime);
+    time_t tim = item->time(TDEIO::UDS_CREATION_TIME, hasTime);
     if ( hasTime )
     {
       l = new TQLabel(i18n("Created:"), d->m_frame );
@@ -1045,7 +1045,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       grid->addWidget(l, curRow++, 2);
     }
 
-    tim = item->time(KIO::UDS_MODIFICATION_TIME, hasTime);
+    tim = item->time(TDEIO::UDS_MODIFICATION_TIME, hasTime);
     if ( hasTime )
     {
       l = new TQLabel(i18n("Modified:"), d->m_frame );
@@ -1056,7 +1056,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       grid->addWidget(l, curRow++, 2);
     }
 
-    tim = item->time(KIO::UDS_ACCESS_TIME, hasTime);
+    tim = item->time(TDEIO::UDS_ACCESS_TIME, hasTime);
     if ( hasTime )
     {
       l = new TQLabel(i18n("Accessed:"), d->m_frame );
@@ -1074,7 +1074,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     grid->addMultiCellWidget(sep, curRow, curRow, 0, 2);
     ++curRow;
 
-    TQString mountPoint = KIO::findPathMountPoint( url.path() );
+    TQString mountPoint = TDEIO::findPathMountPoint( url.path() );
 
     if (mountPoint != "/")
     {
@@ -1193,8 +1193,8 @@ void KFilePropsPlugin::slotFoundMountPoint( const TQString&,
     d->m_freeSpaceLabel->setText(
 	// xgettext:no-c-format  --  Don't warn about translating the %1 out of %2 part.
 	i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)")
-	.arg(KIO::convertSizeFromKB(kBAvail))
-	.arg(KIO::convertSizeFromKB(kBSize))
+	.arg(TDEIO::convertSizeFromKB(kBAvail))
+	.arg(TDEIO::convertSizeFromKB(kBSize))
 	.arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 }
 
@@ -1208,34 +1208,34 @@ void KFilePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize,
     d->m_freeSpaceLabel->setText(
 	// xgettext:no-c-format  --  Don't warn about translating the %1 out of %2 part.
 	i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)")
-	.arg(KIO::convertSizeFromKB(kBAvail))
-	.arg(KIO::convertSizeFromKB(kBSize))
+	.arg(TDEIO::convertSizeFromKB(kBAvail))
+	.arg(TDEIO::convertSizeFromKB(kBSize))
 	.arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 }
 
 void KFilePropsPlugin::slotDirSizeUpdate()
 {
-    KIO::filesize_t totalSize = d->dirSizeJob->totalSize();
-    KIO::filesize_t totalFiles = d->dirSizeJob->totalFiles();
-         KIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs();
+    TDEIO::filesize_t totalSize = d->dirSizeJob->totalSize();
+    TDEIO::filesize_t totalFiles = d->dirSizeJob->totalFiles();
+         TDEIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs();
     m_sizeLabel->setText( i18n("Calculating... %1 (%2)\n%3, %4")
-			  .arg(KIO::convertSize(totalSize))
+			  .arg(TDEIO::convertSize(totalSize))
                          .arg(TDEGlobal::locale()->formatNumber(totalSize, 0))
         .arg(i18n("1 file","%n files",totalFiles))
         .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs)));
 }
 
-void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job )
+void KFilePropsPlugin::slotDirSizeFinished( TDEIO::Job * job )
 {
   if (job->error())
     m_sizeLabel->setText( job->errorString() );
   else
   {
-    KIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize();
-	KIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles();
-	KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs();
+    TDEIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize();
+	TDEIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles();
+	TDEIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs();
     m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4")
-			  .arg(KIO::convertSize(totalSize))
+			  .arg(TDEIO::convertSize(totalSize))
 			  .arg(TDEGlobal::locale()->formatNumber(totalSize, 0))
         .arg(i18n("1 file","%n files",totalFiles))
         .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs)));
@@ -1259,8 +1259,8 @@ void KFilePropsPlugin::slotSizeDetermine()
   connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ),
            TQT_SLOT( slotDirSizeUpdate() ) );
   d->dirSizeUpdateTimer->start(500);
-  connect( d->dirSizeJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotDirSizeFinished( KIO::Job * ) ) );
+  connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) );
   m_sizeStopButton->setEnabled(true);
   m_sizeDetermineButton->setEnabled(false);
 
@@ -1270,7 +1270,7 @@ void KFilePropsPlugin::slotSizeDetermine()
     bool isLocal;
     KFileItem * item = properties->item();
     KURL url = item->mostLocalURL( isLocal );
-    TQString mountPoint = KIO::findPathMountPoint( url.path() );
+    TQString mountPoint = TDEIO::findPathMountPoint( url.path() );
 
     KDiskFreeSp * job = new KDiskFreeSp;
     connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
@@ -1334,10 +1334,10 @@ void KFilePropsPlugin::applyChanges()
     kdDebug(250) << "oldname = " << oldName << endl;
     kdDebug(250) << "newname = " << n << endl;
     if ( oldName != n || m_bFromTemplate ) { // true for any from-template file
-      KIO::Job * job = 0L;
+      TDEIO::Job * job = 0L;
       KURL oldurl = properties->kurl();
 
-      TQString newFileName = KIO::encodeFileName(n);
+      TQString newFileName = TDEIO::encodeFileName(n);
       if (d->bDesktopFile && !newFileName.endsWith(".desktop") && !newFileName.endsWith(".kdelnk"))
          newFileName += ".desktop";
 
@@ -1353,14 +1353,14 @@ void KFilePropsPlugin::applyChanges()
 
       // Don't remove the template !!
       if ( !m_bFromTemplate ) // (normal renaming)
-        job = KIO::move( oldurl, properties->kurl() );
+        job = TDEIO::move( oldurl, properties->kurl() );
       else // Copying a template
-        job = KIO::copy( oldurl, properties->kurl() );
+        job = TDEIO::copy( oldurl, properties->kurl() );
 
-      connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-               TQT_SLOT( slotCopyFinished( KIO::Job * ) ) );
-      connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL &, const KURL & ) ),
-               TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) );
+      connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
+      connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ),
+               TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) );
       // wait for job
       TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
       tqt_enter_modal(&dummy);
@@ -1378,7 +1378,7 @@ void KFilePropsPlugin::applyChanges()
   slotCopyFinished( 0L );
 }
 
-void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
+void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job )
 {
   kdDebug(250) << "KFilePropsPlugin::slotCopyFinished" << endl;
   if (job)
@@ -1389,7 +1389,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
     {
         job->showErrorDialog( d->m_frame );
         // Didn't work. Revert the URL to the old one
-        properties->updateUrl( static_cast<KIO::CopyJob*>(job)->srcURLs().first() );
+        properties->updateUrl( static_cast<TDEIO::CopyJob*>(job)->srcURLs().first() );
         properties->abortApplying(); // Don't apply the changes to the wrong file !
         return;
     }
@@ -1431,9 +1431,9 @@ void KFilePropsPlugin::applyIconChanges()
   if ( !iconButton || !d->bIconChanged )
     return;
   // handle icon changes - only local files (or pseudo-local) for now
-  // TODO: Use KTempFile and KIO::file_copy with overwrite = true
+  // TODO: Use KTempFile and TDEIO::file_copy with overwrite = true
   KURL url = properties->kurl();
-  url = KIO::NetAccess::mostLocalURL( url, properties );
+  url = TDEIO::NetAccess::mostLocalURL( url, properties );
   if (url.isLocalFile()) {
     TQString path;
 
@@ -1478,7 +1478,7 @@ void KFilePropsPlugin::applyIconChanges()
   }
 }
 
-void KFilePropsPlugin::slotFileRenamed( KIO::Job *, const KURL &, const KURL & newUrl )
+void KFilePropsPlugin::slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & newUrl )
 {
   // This is called in case of an existing local file during the copy/move operation,
   // if the user chooses Rename.
@@ -1633,7 +1633,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   } else {
     //We don't know, for remote files, if they are ours or not.
     //So we let the user change permissions, and
-    //KIO::chmod will tell, if he had no right to do it.
+    //TDEIO::chmod will tell, if he had no right to do it.
     isMyFile = true;
   }
 
@@ -2506,17 +2506,17 @@ void KFilePermissionsPropsPlugin::applyChanges()
       && !permissionChange && !ACLChange && !defaultACLChange )
     return;
 
-  KIO::Job * job;
+  TDEIO::Job * job;
   if (files.count() > 0) {
-    job = KIO::chmod( files, orFilePermissions, ~andFilePermissions,
+    job = TDEIO::chmod( files, orFilePermissions, ~andFilePermissions,
         owner, group, false );
     if ( ACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" );
     if ( defaultACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
 
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-        TQT_SLOT( slotChmodResult( KIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+        TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
     // Wait for job
     TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
     tqt_enter_modal(&dummy);
@@ -2524,15 +2524,15 @@ void KFilePermissionsPropsPlugin::applyChanges()
     tqt_leave_modal(&dummy);
   }
   if (dirs.count() > 0) {
-    job = KIO::chmod( dirs, orDirPermissions, ~andDirPermissions,
+    job = TDEIO::chmod( dirs, orDirPermissions, ~andDirPermissions,
         owner, group, recursive );
     if ( ACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" );
     if ( defaultACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
 
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-        TQT_SLOT( slotChmodResult( KIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+        TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
     // Wait for job
     TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
     tqt_enter_modal(&dummy);
@@ -2541,7 +2541,7 @@ void KFilePermissionsPropsPlugin::applyChanges()
   }
 }
 
-void KFilePermissionsPropsPlugin::slotChmodResult( KIO::Job * job )
+void KFilePermissionsPropsPlugin::slotChmodResult( TDEIO::Job * job )
 {
   kdDebug(250) << "KFilePermissionsPropsPlugin::slotChmodResult" << endl;
   if (job->error())
@@ -3042,8 +3042,8 @@ void KDevicePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize,
   d->m_freeSpaceLabel->setText(
       // xgettext:no-c-format  --  Don't warn about translating the %1 out of %2 part.
       i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)")
-      .arg(KIO::convertSizeFromKB(kBAvail))
-      .arg(KIO::convertSizeFromKB(kBSize))
+      .arg(TDEIO::convertSizeFromKB(kBAvail))
+      .arg(TDEIO::convertSizeFromKB(kBSize))
       .arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 
   d->m_freeSpaceBar->setProgress(percUsed, 100);
@@ -3446,7 +3446,7 @@ void KDesktopPropsPlugin::slotAdvanced()
 
   // check to see if we use konsole if not do not add the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+  TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
 						  TQString::fromLatin1("konsole"));
 
@@ -3672,7 +3672,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 
   // check to see if we use konsole if not do not add the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+  TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
 						  TQString::fromLatin1("konsole"));
 
diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h
index d6a8223dd..df814f7d4 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/kio/kfile/kpropertiesdialog.h
@@ -48,7 +48,7 @@ class TQComboBox;
 
 #define KPropsPage KPropsDlgPlugin
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 /**
  * The main properties dialog class.
@@ -142,7 +142,7 @@ public:
    * @param name is the internal name.
    * @param modal tells the dialog whether it should be modal.
    * IMPORTANT: This constructor, together with modal=true, leads to a grave
-   * display bug (due to KIO::stat() being run before the dialog has all the
+   * display bug (due to TDEIO::stat() being run before the dialog has all the
    * necessary information). Do not use this combination for now.
    * For local files with a known mimetype, simply create a KFileItem and pass
    * it to the other constructor.
@@ -412,7 +412,7 @@ private:
   TQPtrList<KPropsDlgPlugin> m_pageList;
 
 private slots:
-  void slotStatResult( KIO::Job * ); // No longer used
+  void slotStatResult( TDEIO::Job * ); // No longer used
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
@@ -523,10 +523,10 @@ public:
 
 protected slots:
   void slotEditFileType();
-  void slotCopyFinished( KIO::Job * );
-  void slotFileRenamed( KIO::Job *, const KURL &, const KURL & );
+  void slotCopyFinished( TDEIO::Job * );
+  void slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & );
   void slotDirSizeUpdate();
-  void slotDirSizeFinished( KIO::Job * );
+  void slotDirSizeFinished( TDEIO::Job * );
   void slotFoundMountPoint( const TQString& mp, unsigned long kBSize,
 			    unsigned long kBUsed, unsigned long kBAvail );
   void slotSizeStop();
@@ -600,7 +600,7 @@ public:
 
 private slots:
 
-  void slotChmodResult( KIO::Job * );
+  void slotChmodResult( TDEIO::Job * );
   void slotShowAdvancedPermissions();
 
 private:
diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp
index 609668373..6f4a01f3b 100644
--- a/kio/kfile/krecentdirs.cpp
+++ b/kio/kfile/krecentdirs.cpp
@@ -32,7 +32,7 @@
 
 #define MAX_DIR_HISTORY 3
 
-static void recentdirs_done(KConfig *config)
+static void recentdirs_done(TDEConfig *config)
 {
    if (config == TDEGlobal::config())
    {
@@ -44,9 +44,9 @@ static void recentdirs_done(KConfig *config)
    }
 }
 
-static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly)
+static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly)
 {
-   KConfig *config;
+   TDEConfig *config;
    if ((key.length() < 2) || (key[0] != ':'))
      key = ":default";
    if (key[1] == ':') 
@@ -87,7 +87,7 @@ void KRecentDirs::add(const TQString &fileClass, const TQString &directory)
 {
    TQString key = fileClass;
    TQStringList result;
-   KConfig *config = recentdirs_readList(key, result, false);
+   TDEConfig *config = recentdirs_readList(key, result, false);
    // make sure the dir is first in history
    result.remove(directory);
    result.prepend(directory);
diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp
index d91e7551f..1ec4a98c8 100644
--- a/kio/kfile/krecentdocument.cpp
+++ b/kio/kfile/krecentdocument.cpp
@@ -86,7 +86,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
     openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded
 
     kdDebug(250) << "KRecentDocument::add for " << openStr << endl;
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     TQString oldGrp = config->group();
     config->setGroup(TQString::fromLatin1("RecentDocuments"));
     bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true);
@@ -169,8 +169,8 @@ void KRecentDocument::clear()
 
 int KRecentDocument::maximumItems()
 {
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
     return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10);
 }
 
diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp
index 1d2cf1547..95f30ee24 100644
--- a/kio/kfile/kurlbar.cpp
+++ b/kio/kfile/kurlbar.cpp
@@ -577,16 +577,16 @@ KURL KURLBar::currentURL() const
     return item ? item->url() : KURL();
 }
 
-void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup )
+void KURLBar::readConfig( TDEConfig *appConfig, const TQString& itemGroup )
 {
     m_isImmutable = appConfig->groupIsImmutable( itemGroup );
-    KConfigGroupSaver cs( appConfig, itemGroup );
+    TDEConfigGroupSaver cs( appConfig, itemGroup );
     d->defaultIconSize = m_iconSize;
     m_iconSize = appConfig->readNumEntry( "Speedbar IconSize", m_iconSize );
 
     if ( m_useGlobal ) { // read global items
-        KConfig *globalConfig = TDEGlobal::config();
-        KConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)"));
+        TDEConfig *globalConfig = TDEGlobal::config();
+        TDEConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)"));
         int num = globalConfig->readNumEntry( "Number of Entries" );
         for ( int i = 0; i < num; i++ ) {
             readItem( i, globalConfig, false );
@@ -600,7 +600,7 @@ void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup )
     }
 }
 
-void KURLBar::readItem( int i, KConfig *config, bool applicationLocal )
+void KURLBar::readItem( int i, TDEConfig *config, bool applicationLocal )
 {
     TQString number = TQString::number( i );
     KURL url = KURL::fromPathOrURL( config->readPathEntry( TQString("URL_") + number ));
@@ -610,9 +610,9 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal )
     TQString description = config->readEntry( TQString("Description_") + number ); 
 
     if (description.isEmpty() && url.protocol()=="beagle") {
-        KIO::UDSEntry uds;
+        TDEIO::UDSEntry uds;
         const KURL kurl("beagle:?beagled-status");
-        if (!KIO::NetAccess::stat(kurl, uds))
+        if (!TDEIO::NetAccess::stat(kurl, uds))
             return;
 
         description = i18n("Desktop Search");
@@ -626,9 +626,9 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal )
                     config->readNumEntry( TQString("IconGroup_") + number )) );
 }
 
-void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup )
+void KURLBar::writeConfig( TDEConfig *config, const TQString& itemGroup )
 {
-    KConfigGroupSaver cs1( config, itemGroup );
+    TDEConfigGroupSaver cs1( config, itemGroup );
     if(!config->hasDefault("Speedbar IconSize") && m_iconSize == d->defaultIconSize )
         config->revertToDefault("Speedbar IconSize");
     else
@@ -685,7 +685,7 @@ void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup )
     m_isModified = false;
 }
 
-void KURLBar::writeItem( KURLBarItem *item, int i, KConfig *config,
+void KURLBar::writeItem( KURLBarItem *item, int i, TDEConfig *config,
                          bool global )
 {
     if ( !item->isPersistent() )
diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h
index 29a73ff34..df9d15790 100644
--- a/kio/kfile/kurlbar.h
+++ b/kio/kfile/kurlbar.h
@@ -28,7 +28,7 @@
 #include <klistbox.h>
 #include <kurl.h>
 
-class KConfig;
+class TDEConfig;
 class KURLBar;
 
 /**
@@ -215,7 +215,7 @@ class KURLBarListBox;
  * read and write the configuration of all the entries. It can differentiate
  * between global and local entries -- global entries will be saved in the
  * global configuration (kdeglobals), while local entries will be saved in
- * your application's KConfig object.
+ * your application's TDEConfig object.
  *
  * Due to the configurability, you usually only insert some default entries
  * once and then solely use the read and writeConfig methods to preserve the
@@ -331,27 +331,27 @@ public:
      * inside the group @p itemGroup. All items in there will be restored.
      * The reading of every item is delegated to the readItem() method.
      */
-    virtual void readConfig(  KConfig *config, const TQString& itemGroup );
+    virtual void readConfig(  TDEConfig *config, const TQString& itemGroup );
     /**
      * Call this method to save the current configuration into @p config,
      * inside the group @p iconGroup. The writeItem() method is used
      * to save each item.
      */
-    virtual void writeConfig( KConfig *config, const TQString& itemGroup );
+    virtual void writeConfig( TDEConfig *config, const TQString& itemGroup );
 
     /**
      * Called from readConfig() to read the i'th from @p config.
      * After reading a KURLBarItem is created and initialized with the read
      * values (as well as the given @p applicationLocal).
      */
-    virtual void readItem( int i, KConfig *config, bool applicationLocal );
+    virtual void readItem( int i, TDEConfig *config, bool applicationLocal );
     /**
      * Called from writeConfig() to save the KURLBarItem @p item as the
      * i'th entry in the config-object.
      * @p global tell whether it should be saved in the global configuration
-     * or not (using KConfig::writeEntry( key, value, true, global ) ).
+     * or not (using TDEConfig::writeEntry( key, value, true, global ) ).
      */
-    virtual void writeItem( KURLBarItem *item, int i, KConfig *, bool global );
+    virtual void writeItem( KURLBarItem *item, int i, TDEConfig *, bool global );
 
     /**
      * @returns the current KURLBarItem, or 0L if none.
diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp
index 9e00687ac..1fc6da496 100644
--- a/kio/kfile/tests/kcustommenueditortest.cpp
+++ b/kio/kfile/tests/kcustommenueditortest.cpp
@@ -8,7 +8,7 @@ int main(int argc, char** argv)
   KLocale::setMainCatalogue("tdelibs");
   TDEApplication app(argc, argv, "KCustomMenuEditorTest");
   KCustomMenuEditor editor(0);
-  KConfig *cfg = new KConfig("kdesktop_custom_menu2");
+  TDEConfig *cfg = new TDEConfig("kdesktop_custom_menu2");
   editor.load(cfg);
   if (editor.exec())
   {
diff --git a/kio/kio/authinfo.cpp b/kio/kio/authinfo.cpp
index 6f0592ac4..483bc682f 100644
--- a/kio/kio/authinfo.cpp
+++ b/kio/kio/authinfo.cpp
@@ -39,7 +39,7 @@
 
 #define NETRC_READ_BUF_SIZE 4096
 
-using namespace KIO;
+using namespace TDEIO;
 
 AuthInfo::AuthInfo()
 {
@@ -72,7 +72,7 @@ AuthInfo& AuthInfo::operator= ( const AuthInfo& info )
     return *this;
 }
 
-TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a)
+TQDataStream& TDEIO::operator<< (TQDataStream& s, const AuthInfo& a)
 {
     s << a.url << a.username << a.password << a.prompt << a.caption
       << a.comment << a.commentLabel << a.realmValue << a.digestInfo
@@ -81,7 +81,7 @@ TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a)
     return s;
 }
 
-TQDataStream& KIO::operator>> (TQDataStream& s, AuthInfo& a)
+TQDataStream& TDEIO::operator>> (TQDataStream& s, AuthInfo& a)
 {
     TQ_UINT8 verify = 0;
     TQ_UINT8 ro = 0;
diff --git a/kio/kio/authinfo.h b/kio/kio/authinfo.h
index 3f92e58d1..130db0857 100644
--- a/kio/kio/authinfo.h
+++ b/kio/kio/authinfo.h
@@ -26,7 +26,7 @@
 #include <kurl.h>
 
 
-namespace KIO {
+namespace TDEIO {
 
 /**
  * This class is intended to make it easier to prompt for, cache
diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp
index e1d343c10..e1c8a64e4 100644
--- a/kio/kio/chmodjob.cpp
+++ b/kio/kio/chmodjob.cpp
@@ -38,12 +38,12 @@
 
 #include <kdirnotify_stub.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask,
                     int newOwner, int newGroup,
                     bool recursive, bool showProgressInfo )
-    : KIO::Job( showProgressInfo ), state( STATE_LISTING ),
+    : TDEIO::Job( showProgressInfo ), state( STATE_LISTING ),
       m_permissions( permissions ), m_mask( mask ),
       m_newOwner( newOwner ), m_newGroup( newGroup ),
       m_recursive( recursive ), m_lstItems( lstItems )
@@ -76,11 +76,11 @@ void ChmodJob::processList()
             if ( item->isDir() && m_recursive )
             {
                 //kdDebug(7007) << "ChmodJob::processList dir -> listing" << endl;
-                KIO::ListJob * listJob = KIO::listRecursive( item->url(), false /* no GUI */ );
-                connect( listJob, TQT_SIGNAL(entries( KIO::Job *,
-                                                  const KIO::UDSEntryList& )),
-                         TQT_SLOT( slotEntries( KIO::Job*,
-                                            const KIO::UDSEntryList& )));
+                TDEIO::ListJob * listJob = TDEIO::listRecursive( item->url(), false /* no GUI */ );
+                connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *,
+                                                  const TDEIO::UDSEntryList& )),
+                         TQT_SLOT( slotEntries( TDEIO::Job*,
+                                            const TDEIO::UDSEntryList& )));
                 addSubjob( listJob );
                 return; // we'll come back later, when this one's finished
             }
@@ -93,28 +93,28 @@ void ChmodJob::processList()
     chmodNextFile();
 }
 
-void ChmodJob::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
+void ChmodJob::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
 {
-    KIO::UDSEntryListConstIterator it = list.begin();
-    KIO::UDSEntryListConstIterator end = list.end();
+    TDEIO::UDSEntryListConstIterator it = list.begin();
+    TDEIO::UDSEntryListConstIterator end = list.end();
     for (; it != end; ++it) {
-        KIO::UDSEntry::ConstIterator it2 = (*it).begin();
+        TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
         mode_t permissions = 0;
         bool isDir = false;
         bool isLink = false;
         TQString relativePath;
         for( ; it2 != (*it).end(); it2++ ) {
           switch( (*it2).m_uds ) {
-            case KIO::UDS_NAME:
+            case TDEIO::UDS_NAME:
               relativePath = (*it2).m_str;
               break;
-            case KIO::UDS_FILE_TYPE:
+            case TDEIO::UDS_FILE_TYPE:
               isDir = S_ISDIR((*it2).m_long);
               break;
-            case KIO::UDS_LINK_DEST:
+            case TDEIO::UDS_LINK_DEST:
               isLink = !(*it2).m_str.isEmpty();
               break;
-            case KIO::UDS_ACCESS:
+            case TDEIO::UDS_ACCESS:
               permissions = (mode_t)((*it2).m_long);
               break;
             default:
@@ -182,7 +182,7 @@ void ChmodJob::chmodNextFile()
 
         kdDebug(7007) << "ChmodJob::chmodNextFile chmod'ing " << info.url.prettyURL()
                       << " to " << TQString::number(info.permissions,8) << endl;
-        KIO::SimpleJob * job = KIO::chmod( info.url, info.permissions );
+        TDEIO::SimpleJob * job = TDEIO::chmod( info.url, info.permissions );
         // copy the metadata for acl and default acl
         const TQString aclString = queryMetaData( "ACL_STRING" );
         const TQString defaultAclString = queryMetaData( "DEFAULT_ACL_STRING" );
@@ -197,7 +197,7 @@ void ChmodJob::chmodNextFile()
         emitResult();
 }
 
-void ChmodJob::slotResult( KIO::Job * job )
+void ChmodJob::slotResult( TDEIO::Job * job )
 {
     if ( job->error() )
     {
@@ -206,7 +206,7 @@ void ChmodJob::slotResult( KIO::Job * job )
         emitResult();
         return;
     }
-    //kdDebug(7007) << " ChmodJob::slotResult( KIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
+    //kdDebug(7007) << " ChmodJob::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
     switch ( state )
     {
         case STATE_LISTING:
@@ -227,7 +227,7 @@ void ChmodJob::slotResult( KIO::Job * job )
 }
 
 // antlarr: KDE 4: Make owner and group be const TQString &
-KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, int mask,
+KIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask,
                       TQString owner, TQString group,
                       bool recursive, bool showProgressInfo )
 {
@@ -253,6 +253,6 @@ KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions,
 }
 
 void ChmodJob::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
 
 #include "chmodjob.moc"
diff --git a/kio/kio/chmodjob.h b/kio/kio/chmodjob.h
index fdb873b17..c501add6a 100644
--- a/kio/kio/chmodjob.h
+++ b/kio/kio/chmodjob.h
@@ -28,19 +28,19 @@
 #include <kio/job.h>
 #include <kfileitem.h>
 
-namespace KIO {
+namespace TDEIO {
 
     /**
      * This job changes permissions on a list of files or directories,
      * optionally in a recursive manner.
-     * @see KIO::chmod()
+     * @see TDEIO::chmod()
      */
-    class KIO_EXPORT ChmodJob : public KIO::Job
+    class KIO_EXPORT ChmodJob : public TDEIO::Job
     {
         Q_OBJECT
     public:
 	/**
-	 * Create new ChmodJobs using the KIO::chmod() function.
+	 * Create new ChmodJobs using the TDEIO::chmod() function.
 	 */
         ChmodJob( const KFileItemList & lstItems,  int permissions, int mask,
                   int newOwner, int newGroup,
@@ -51,8 +51,8 @@ namespace KIO {
 
     protected slots:
 
-        virtual void slotResult( KIO::Job *job );
-        void slotEntries( KIO::Job * , const KIO::UDSEntryList & );
+        virtual void slotResult( TDEIO::Job *job );
+        void slotEntries( TDEIO::Job * , const TDEIO::UDSEntryList & );
         void processList();
 
     private:
diff --git a/kio/kio/connection.cpp b/kio/kio/connection.cpp
index b2a84a798..d85f4921c 100644
--- a/kio/kio/connection.cpp
+++ b/kio/kio/connection.cpp
@@ -43,7 +43,7 @@
 #include <kdebug.h>
 #include <tqsocketnotifier.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 Connection::Connection()
 {
@@ -83,7 +83,7 @@ void Connection::close()
     delete socket;
     socket = 0;
 
-    // KSocket has already closed the file descriptor, but we need to
+    // TDESocket has already closed the file descriptor, but we need to
     // close the file-stream as well otherwise we leak memory. 
     // As a result we close the file descriptor twice, but that should
     // be harmless
@@ -121,7 +121,7 @@ void Connection::dequeue()
     }
 }
 
-void Connection::init(KSocket *sock)
+void Connection::init(TDESocket *sock)
 {
     delete notifier;
     notifier = 0;
diff --git a/kio/kio/connection.h b/kio/kio/connection.h
index a30131af8..720e4e935 100644
--- a/kio/kio/connection.h
+++ b/kio/kio/connection.h
@@ -30,10 +30,10 @@
 #include <tqptrlist.h>
 #include <tqobject.h>
 
-class KSocket;
+class TDESocket;
 class TQSocketNotifier;
 
-namespace KIO {
+namespace TDEIO {
 
     struct KIO_EXPORT Task {
 	int cmd;
@@ -62,7 +62,7 @@ namespace KIO {
 	 * @param sock the socket to use
 	 * @see inited()
 	 */
-	void init(KSocket *sock);
+	void init(TDESocket *sock);
         /**
 	 * Initialize the connection to use the given file
 	 * descriptors.
@@ -143,7 +143,7 @@ namespace KIO {
     private:
 	int fd_in;
 	FILE *f_out;
-	KSocket *socket;
+	TDESocket *socket;
 	TQSocketNotifier *notifier;
 	TQObject *receiver;
 	const char *member;
diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp
index 0ee463d87..1e3db04d7 100644
--- a/kio/kio/dataprotocol.cpp
+++ b/kio/kio/dataprotocol.cpp
@@ -42,7 +42,7 @@
 #  define DISPATCH(f) f
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 #ifdef DATAKIOSLAVE
 extern "C" {
 
diff --git a/kio/kio/dataprotocol.h b/kio/kio/dataprotocol.h
index 44dccfcce..472b42886 100644
--- a/kio/kio/dataprotocol.h
+++ b/kio/kio/dataprotocol.h
@@ -37,14 +37,14 @@ class KURL;
 #  include "kio/dataslave.h"
 #endif
 
-namespace KIO {
+namespace TDEIO {
 
 /** This kioslave provides support of data urls as specified by rfc 2397
  * @see http://www.ietf.org/rfc/rfc2397.txt
  * @author Leo Savernik
  */
 #if defined(DATAKIOSLAVE)
-class DataProtocol : public KIO::SlaveBase {
+class DataProtocol : public TDEIO::SlaveBase {
 #elif defined(TESTKIO)
 class DataProtocol : public TestSlave {
 #else
diff --git a/kio/kio/dataslave.cpp b/kio/kio/dataslave.cpp
index d16ecc0d4..528368ba5 100644
--- a/kio/kio/dataslave.cpp
+++ b/kio/kio/dataslave.cpp
@@ -28,7 +28,7 @@
 
 #include <tqtimer.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 #define KIO_DATA_POLL_INTERVAL 0
 
@@ -198,12 +198,12 @@ void DataSlave::virtual_hook( int id, void* data ) {
       return;
     }
     default:
-      KIO::Slave::virtual_hook( id, data );
+      TDEIO::Slave::virtual_hook( id, data );
   }
 }
 
 DISPATCH_IMPL1(mimeType, const TQString &, s)
-DISPATCH_IMPL1(totalSize, KIO::filesize_t, size)
+DISPATCH_IMPL1(totalSize, TDEIO::filesize_t, size)
 DISPATCH_IMPL(sendMetaData)
 DISPATCH_IMPL1(data, const TQByteArray &, ba)
 
diff --git a/kio/kio/dataslave.h b/kio/kio/dataslave.h
index 71eae6cd3..3567f3faf 100644
--- a/kio/kio/dataslave.h
+++ b/kio/kio/dataslave.h
@@ -35,7 +35,7 @@ class TQTimer;
 #define DISPATCH_DECL1(type, paramtype, param) \
 	void dispatch_##type(paramtype param);
 
-namespace KIO {
+namespace TDEIO {
 
     /**
      * This class provides a high performance implementation for the data
@@ -46,7 +46,7 @@ namespace KIO {
      * detail of KIO and subject to change without notice.
      * @author Leo Savernik
      */
-    class DataSlave : public KIO::Slave {
+    class DataSlave : public TDEIO::Slave {
 	Q_OBJECT
     public:
 	DataSlave();
@@ -90,7 +90,7 @@ namespace KIO {
 	struct QueueStruct {
 	  QueueType type;
 	  TQString s;
-	  KIO::filesize_t size;
+	  TDEIO::filesize_t size;
 	  TQByteArray ba;
 
 	  QueueStruct() {}
@@ -100,7 +100,7 @@ namespace KIO {
 	DispatchQueue dispatchQueue;
 
 	DISPATCH_DECL1(mimeType, const TQString &, s)
-	DISPATCH_DECL1(totalSize, KIO::filesize_t, size)
+	DISPATCH_DECL1(totalSize, TDEIO::filesize_t, size)
 	DISPATCH_DECL(sendMetaData)
 	DISPATCH_DECL1(data, const TQByteArray &, ba)
 	DISPATCH_DECL(finished)
diff --git a/kio/kio/davjob.cpp b/kio/kio/davjob.cpp
index 1f3b208a6..f1ba2d2d4 100644
--- a/kio/kio/davjob.cpp
+++ b/kio/kio/davjob.cpp
@@ -40,7 +40,7 @@
 
 #define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
-using namespace KIO;
+using namespace TDEIO;
 
 class DavJob::DavJobPrivate
 {
@@ -50,7 +50,7 @@ public:
 };
 
 DavJob::DavJob( const KURL& url, int method, const TQString& request, bool showProgressInfo )
-  : TransferJob( url, KIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), showProgressInfo )
+  : TransferJob( url, TDEIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), showProgressInfo )
 {
   d = new DavJobPrivate;
   // We couldn't set the args when calling the parent constructor,
@@ -86,10 +86,10 @@ void DavJob::slotFinished()
 		istream >> s_url;
 		istream >> s_method;
 		// PROPFIND
-		if ( (s_cmd == 7) && (s_method == (int)KIO::DAV_PROPFIND) ) {
+		if ( (s_cmd == 7) && (s_method == (int)TDEIO::DAV_PROPFIND) ) {
 			m_packedArgs.truncate(0);
 			TQDataStream stream( m_packedArgs, IO_WriteOnly );
-			stream << (int)7 << m_redirectionURL << (int)KIO::DAV_PROPFIND;
+			stream << (int)7 << m_redirectionURL << (int)TDEIO::DAV_PROPFIND;
 		}
   } else if ( ! m_response.setContent( d->str_response, true ) ) {
 		// An error occurred parsing the XML response
@@ -114,20 +114,20 @@ void DavJob::slotFinished()
 /* Convenience methods */
 
 // KDE 4: Make it const TQString &
-DavJob* KIO::davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo )
+DavJob* TDEIO::davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo )
 {
-  DavJob *job = new DavJob( url, (int) KIO::DAV_PROPFIND, properties.toString(), showProgressInfo );
+  DavJob *job = new DavJob( url, (int) TDEIO::DAV_PROPFIND, properties.toString(), showProgressInfo );
   job->addMetaData( "davDepth", depth );
   return job;
 }
 
 
-DavJob* KIO::davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo )
+DavJob* TDEIO::davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo )
 {
-  return new DavJob( url, (int) KIO::DAV_PROPPATCH, properties.toString(), showProgressInfo );
+  return new DavJob( url, (int) TDEIO::DAV_PROPPATCH, properties.toString(), showProgressInfo );
 }
 
-DavJob* KIO::davSearch( const KURL& url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo )
+DavJob* TDEIO::davSearch( const KURL& url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo )
 {
   TQDomDocument doc;
   TQDomElement searchrequest = doc.createElementNS( "DAV:", "searchrequest" );
@@ -136,7 +136,7 @@ DavJob* KIO::davSearch( const KURL& url, const TQString& nsURI, const TQString&
   searchelement.appendChild( text );
   searchrequest.appendChild( searchelement );
   doc.appendChild( searchrequest );
-  return new DavJob( url, KIO::DAV_SEARCH, doc.toString(), showProgressInfo );
+  return new DavJob( url, TDEIO::DAV_SEARCH, doc.toString(), showProgressInfo );
 }
 
 #include "davjob.moc"
diff --git a/kio/kio/davjob.h b/kio/kio/davjob.h
index 98d0fe702..3232f9e00 100644
--- a/kio/kio/davjob.h
+++ b/kio/kio/davjob.h
@@ -39,7 +39,7 @@
 class Observer;
 class TQTimer;
 
-namespace KIO {
+namespace TDEIO {
 
     class Slave;
     class SlaveInterface;
@@ -49,9 +49,9 @@ namespace KIO {
      * Data is sent to the slave on request of the slave ( dataReq).
      * If data coming from the slave can not be handled, the
      * reading of data from the slave should be suspended.
-     * @see KIO::davPropFind()
-     * @see KIO::davPropPatch()
-     * @see KIO::davSearch()
+     * @see TDEIO::davPropFind()
+     * @see TDEIO::davPropPatch()
+     * @see TDEIO::davSearch()
      * @since 3.1
      */
     class KIO_EXPORT DavJob : public TransferJob {
@@ -59,8 +59,8 @@ namespace KIO {
 
     public:
         /**
-	 * Use KIO::davPropFind(), KIO::davPropPatch() and
-	 * KIO::davSearch() to create a new DavJob.
+	 * Use TDEIO::davPropFind(), TDEIO::davPropPatch() and
+	 * TDEIO::davSearch() to create a new DavJob.
 	 */
         DavJob(const KURL& url, int method,
                     const TQString& request, bool showProgressInfo);
diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp
index 3f16f565f..72bec0cfc 100644
--- a/kio/kio/defaultprogress.cpp
+++ b/kio/kio/defaultprogress.cpp
@@ -42,7 +42,7 @@
 #include "jobclasses.h"
 #include "defaultprogress.h"
 
-namespace KIO {
+namespace TDEIO {
 
 class DefaultProgress::DefaultProgressPrivate
 {
@@ -184,7 +184,7 @@ DefaultProgress::~DefaultProgress()
   delete d;
 }
 
-void DefaultProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size )
+void DefaultProgress::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size )
 {
   // size is measured in bytes
   if ( m_iTotalSize == size )
@@ -195,7 +195,7 @@ void DefaultProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size )
 }
 
 
-void DefaultProgress::slotTotalFiles( KIO::Job*, unsigned long files )
+void DefaultProgress::slotTotalFiles( TDEIO::Job*, unsigned long files )
 {
   if ( m_iTotalFiles == files )
       return;
@@ -204,7 +204,7 @@ void DefaultProgress::slotTotalFiles( KIO::Job*, unsigned long files )
 }
 
 
-void DefaultProgress::slotTotalDirs( KIO::Job*, unsigned long dirs )
+void DefaultProgress::slotTotalDirs( TDEIO::Job*, unsigned long dirs )
 {
   if ( m_iTotalDirs == dirs )
       return;
@@ -232,18 +232,18 @@ void DefaultProgress::showTotals()
 
 //static
 TQString DefaultProgress::makePercentString( unsigned long percent,
-                                            KIO::filesize_t totalSize,
+                                            TDEIO::filesize_t totalSize,
                                             unsigned long totalFiles )
 {
   if ( totalSize )
-      return i18n( "%1 % of %2 " ).arg( TQString::number(percent) , KIO::convertSize( totalSize ) );
+      return i18n( "%1 % of %2 " ).arg( TQString::number(percent) , TDEIO::convertSize( totalSize ) );
   else if ( totalFiles )
       return i18n( "%1 % of 1 file", "%1 % of %n files", totalFiles ).arg( percent );
   else
       return i18n( "%1 %" ).arg( percent );
 }
 
-void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent )
+void DefaultProgress::slotPercent( TDEIO::Job*, unsigned long percent )
 {
   TQString caption = makePercentString( percent, m_iTotalSize, m_iTotalFiles );
   m_pProgressBar->setValue( percent );
@@ -270,26 +270,26 @@ void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent )
 }
 
 
-void DefaultProgress::slotInfoMessage( KIO::Job*, const TQString & msg )
+void DefaultProgress::slotInfoMessage( TDEIO::Job*, const TQString & msg )
 {
   speedLabel->setText( msg );
   speedLabel->setAlignment( speedLabel->alignment() & ~TQt::WordBreak );
 }
 
 
-void DefaultProgress::slotProcessedSize( KIO::Job*, KIO::filesize_t bytes ) {
+void DefaultProgress::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t bytes ) {
   if ( m_iProcessedSize == bytes )
     return;
   m_iProcessedSize = bytes;
 
   TQString tmp = i18n( "%1 of %2 complete")
-                .arg( KIO::convertSize(bytes) )
-                .arg( KIO::convertSize(m_iTotalSize));
+                .arg( TDEIO::convertSize(bytes) )
+                .arg( TDEIO::convertSize(m_iTotalSize));
   sizeLabel->setText( tmp );
 }
 
 
-void DefaultProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs )
+void DefaultProgress::slotProcessedDirs( TDEIO::Job*, unsigned long dirs )
 {
   if ( m_iProcessedDirs == dirs )
     return;
@@ -303,7 +303,7 @@ void DefaultProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs )
 }
 
 
-void DefaultProgress::slotProcessedFiles( KIO::Job*, unsigned long files )
+void DefaultProgress::slotProcessedFiles( TDEIO::Job*, unsigned long files )
 {
   if ( m_iProcessedFiles == files )
     return;
@@ -319,18 +319,18 @@ void DefaultProgress::slotProcessedFiles( KIO::Job*, unsigned long files )
 }
 
 
-void DefaultProgress::slotSpeed( KIO::Job*, unsigned long speed )
+void DefaultProgress::slotSpeed( TDEIO::Job*, unsigned long speed )
 {
   if ( speed == 0 ) {
     speedLabel->setText( i18n( "Stalled") );
   } else {
-    speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( KIO::convertSize( speed ))
-        .arg( KIO::convertSeconds( KIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, speed ))) );
+    speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( TDEIO::convertSize( speed ))
+        .arg( TDEIO::convertSeconds( TDEIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, speed ))) );
   }
 }
 
 
-void DefaultProgress::slotCopying( KIO::Job*, const KURL& from, const KURL& to )
+void DefaultProgress::slotCopying( TDEIO::Job*, const KURL& from, const KURL& to )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Copy File(s) Progress"));
@@ -344,7 +344,7 @@ void DefaultProgress::slotCopying( KIO::Job*, const KURL& from, const KURL& to )
 }
 
 
-void DefaultProgress::slotMoving( KIO::Job*, const KURL& from, const KURL& to )
+void DefaultProgress::slotMoving( TDEIO::Job*, const KURL& from, const KURL& to )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Move File(s) Progress"));
@@ -358,7 +358,7 @@ void DefaultProgress::slotMoving( KIO::Job*, const KURL& from, const KURL& to )
 }
 
 
-void DefaultProgress::slotCreatingDir( KIO::Job*, const KURL& dir )
+void DefaultProgress::slotCreatingDir( TDEIO::Job*, const KURL& dir )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Creating Folder"));
@@ -370,7 +370,7 @@ void DefaultProgress::slotCreatingDir( KIO::Job*, const KURL& dir )
 }
 
 
-void DefaultProgress::slotDeleting( KIO::Job*, const KURL& url )
+void DefaultProgress::slotDeleting( TDEIO::Job*, const KURL& url )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Delete File(s) Progress"));
@@ -381,7 +381,7 @@ void DefaultProgress::slotDeleting( KIO::Job*, const KURL& url )
   setDestVisible( false );
 }
 
-void DefaultProgress::slotTransferring( KIO::Job*, const KURL& url )
+void DefaultProgress::slotTransferring( TDEIO::Job*, const KURL& url )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Loading Progress"));
@@ -391,31 +391,31 @@ void DefaultProgress::slotTransferring( KIO::Job*, const KURL& url )
   setDestVisible( false );
 }
 
-void DefaultProgress::slotStating( KIO::Job*, const KURL& url )
+void DefaultProgress::slotStating( TDEIO::Job*, const KURL& url )
 {
   setCaption(i18n("Examining File Progress"));
   sourceEdit->setText(url.prettyURL());
   setDestVisible( false );
 }
 
-void DefaultProgress::slotMounting( KIO::Job*, const TQString & dev, const TQString & point )
+void DefaultProgress::slotMounting( TDEIO::Job*, const TQString & dev, const TQString & point )
 {
   setCaption(i18n("Mounting %1").arg(dev));
   sourceEdit->setText(point);
   setDestVisible( false );
 }
 
-void DefaultProgress::slotUnmounting( KIO::Job*, const TQString & point )
+void DefaultProgress::slotUnmounting( TDEIO::Job*, const TQString & point )
 {
   setCaption(i18n("Unmounting"));
   sourceEdit->setText(point);
   setDestVisible( false );
 }
 
-void DefaultProgress::slotCanResume( KIO::Job*, KIO::filesize_t resume )
+void DefaultProgress::slotCanResume( TDEIO::Job*, TDEIO::filesize_t resume )
 {
   if ( resume ) {
-    resumeLabel->setText( i18n("Resuming from %1").arg(KIO::number(resume)) );
+    resumeLabel->setText( i18n("Resuming from %1").arg(TDEIO::number(resume)) );
   } else {
     resumeLabel->setText( i18n("Not resumable") );
   }
@@ -453,7 +453,7 @@ void DefaultProgress::slotClean() {
       int s = d->startTime.elapsed();
       if (!s)
         s = 1;
-      speedLabel->setText(i18n("%1/s (done)").arg(KIO::convertSize(1000 * m_iTotalSize / s)));
+      speedLabel->setText(i18n("%1/s (done)").arg(TDEIO::convertSize(1000 * m_iTotalSize / s)));
     }
     setOnlyClean(false);
   }
diff --git a/kio/kio/defaultprogress.h b/kio/kio/defaultprogress.h
index 8dca499bd..68d405b24 100644
--- a/kio/kio/defaultprogress.h
+++ b/kio/kio/defaultprogress.h
@@ -28,7 +28,7 @@
 
 class KLineEdit;
 
-namespace KIO {
+namespace TDEIO {
 
 /*
  * A default implementation of the progress dialog ProgressBase.
@@ -58,59 +58,59 @@ public:
 
   /// Shared with uiserver.cpp
   static TQString makePercentString( unsigned long percent,
-                                    KIO::filesize_t totalSize,
+                                    TDEIO::filesize_t totalSize,
                                     unsigned long totalFiles );
 
 public slots:
-  virtual void slotTotalSize( KIO::Job *job, KIO::filesize_t size );
-  virtual void slotTotalFiles( KIO::Job *job, unsigned long files );
-  virtual void slotTotalDirs( KIO::Job *job, unsigned long dirs );
+  virtual void slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size );
+  virtual void slotTotalFiles( TDEIO::Job *job, unsigned long files );
+  virtual void slotTotalDirs( TDEIO::Job *job, unsigned long dirs );
 
-  virtual void slotProcessedSize( KIO::Job *job, KIO::filesize_t bytes );
-  virtual void slotProcessedFiles( KIO::Job *job, unsigned long files );
-  virtual void slotProcessedDirs( KIO::Job *job, unsigned long dirs );
+  virtual void slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t bytes );
+  virtual void slotProcessedFiles( TDEIO::Job *job, unsigned long files );
+  virtual void slotProcessedDirs( TDEIO::Job *job, unsigned long dirs );
 
-  virtual void slotSpeed( KIO::Job *job, unsigned long speed );
-  virtual void slotPercent( KIO::Job *job, unsigned long percent );
+  virtual void slotSpeed( TDEIO::Job *job, unsigned long speed );
+  virtual void slotPercent( TDEIO::Job *job, unsigned long percent );
   /**
    * Called to set an information message.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param msg the message to set
    */
-  virtual void slotInfoMessage( KIO::Job *job, const TQString & msg );
+  virtual void slotInfoMessage( TDEIO::Job *job, const TQString & msg );
 
-  virtual void slotCopying( KIO::Job* job, const KURL& src, const KURL& dest );
-  virtual void slotMoving( KIO::Job* job, const KURL& src, const KURL& dest );
-  virtual void slotDeleting( KIO::Job* job, const KURL& url );
+  virtual void slotCopying( TDEIO::Job* job, const KURL& src, const KURL& dest );
+  virtual void slotMoving( TDEIO::Job* job, const KURL& src, const KURL& dest );
+  virtual void slotDeleting( TDEIO::Job* job, const KURL& url );
   /**
    * Called when the job is transferring.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param url the url to transfer
    * @since 3.1
    */
-  void slotTransferring( KIO::Job* job, const KURL& url );
-  virtual void slotCreatingDir( KIO::Job* job, const KURL& dir );
+  void slotTransferring( TDEIO::Job* job, const KURL& url );
+  virtual void slotCreatingDir( TDEIO::Job* job, const KURL& dir );
   /**
    * Called when the job is requesting a stat.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dir the dir to stat
    * @since 3.1
    */
-  virtual void slotStating( KIO::Job* job, const KURL& dir );
+  virtual void slotStating( TDEIO::Job* job, const KURL& dir );
   /**
    * Called when the job is mounting.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dev the device to mount
    * @param point the mount point
    */
-  virtual void slotMounting( KIO::Job* job, const TQString & dev, const TQString & point );
+  virtual void slotMounting( TDEIO::Job* job, const TQString & dev, const TQString & point );
   /**
    * Called when the job is unmounting.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param point the mount point
    */
-  virtual void slotUnmounting( KIO::Job* job, const TQString & point );
-  virtual void slotCanResume( KIO::Job* job, KIO::filesize_t from);
+  virtual void slotUnmounting( TDEIO::Job* job, const TQString & point );
+  virtual void slotCanResume( TDEIO::Job* job, TDEIO::filesize_t from);
 
   /**
    * Called when the job is cleaned.
@@ -136,11 +136,11 @@ protected:
 
   KProgress* m_pProgressBar;
 
-  KIO::filesize_t m_iTotalSize;
+  TDEIO::filesize_t m_iTotalSize;
   unsigned long m_iTotalFiles;
   unsigned long m_iTotalDirs;
 
-  KIO::filesize_t m_iProcessedSize;
+  TDEIO::filesize_t m_iProcessedSize;
   unsigned long m_iProcessedDirs;
   unsigned long m_iProcessedFiles;
 
diff --git a/kio/kio/forwardingslavebase.cpp b/kio/kio/forwardingslavebase.cpp
index 17f12900a..53121986d 100644
--- a/kio/kio/forwardingslavebase.cpp
+++ b/kio/kio/forwardingslavebase.cpp
@@ -27,7 +27,7 @@
 
 #include "forwardingslavebase.h"
 
-namespace KIO
+namespace TDEIO
 {
 
 class ForwardingSlaveBasePrivate
@@ -63,7 +63,7 @@ bool ForwardingSlaveBase::internalRewriteURL(const KURL &url, KURL &newURL)
     return result;
 }
 
-void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
+void ForwardingSlaveBase::prepareUDSEntry(TDEIO::UDSEntry &entry,
                                           bool listing) const
 {
     kdDebug() << "ForwardingSlaveBase::prepareUDSEntry: listing=="
@@ -73,8 +73,8 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
     TQString name;
     KURL url;
 
-    KIO::UDSEntry::iterator it = entry.begin();
-    KIO::UDSEntry::iterator end = entry.end();
+    TDEIO::UDSEntry::iterator it = entry.begin();
+    TDEIO::UDSEntry::iterator end = entry.end();
 
     for(; it!=end; ++it)
     {
@@ -82,11 +82,11 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
 
         switch( (*it).m_uds )
         {
-        case KIO::UDS_NAME:
+        case TDEIO::UDS_NAME:
             name = (*it).m_str;
             kdDebug() << "Name = " << name << endl;
 	    break;
-        case KIO::UDS_URL:
+        case TDEIO::UDS_URL:
             url_found = true;
             url = (*it).m_str;
 	    if (listing)
@@ -108,8 +108,8 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
             new_url.addPath( name );
         }
 
-        KIO::UDSAtom atom;
-        atom.m_uds = KIO::UDS_LOCAL_PATH;
+        TDEIO::UDSAtom atom;
+        atom.m_uds = TDEIO::UDS_LOCAL_PATH;
         atom.m_long = 0;
         atom.m_str = new_url.path();
         entry.append(atom);
@@ -123,7 +123,7 @@ void ForwardingSlaveBase::get(const KURL &url)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::TransferJob *job = KIO::get(new_url, false, false);
+        TDEIO::TransferJob *job = TDEIO::get(new_url, false, false);
         connectTransferJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -138,7 +138,7 @@ void ForwardingSlaveBase::put(const KURL &url, int permissions,
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::TransferJob *job = KIO::put(new_url, permissions, overwrite,
+        TDEIO::TransferJob *job = TDEIO::put(new_url, permissions, overwrite,
                                          resume, false);
         connectTransferJob(job);
 
@@ -153,7 +153,7 @@ void ForwardingSlaveBase::stat(const KURL &url)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::SimpleJob *job = KIO::stat(new_url, false);
+        TDEIO::SimpleJob *job = TDEIO::stat(new_url, false);
         connectSimpleJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -167,7 +167,7 @@ void ForwardingSlaveBase::mimetype(const KURL &url)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::TransferJob *job = KIO::mimetype(new_url, false);
+        TDEIO::TransferJob *job = TDEIO::mimetype(new_url, false);
         connectTransferJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -181,7 +181,7 @@ void ForwardingSlaveBase::listDir(const KURL &url)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::ListJob *job = KIO::listDir(new_url, false);
+        TDEIO::ListJob *job = TDEIO::listDir(new_url, false);
         connectListJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -195,7 +195,7 @@ void ForwardingSlaveBase::mkdir(const KURL &url, int permissions)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::SimpleJob *job = KIO::mkdir(new_url, permissions);
+        TDEIO::SimpleJob *job = TDEIO::mkdir(new_url, permissions);
         connectSimpleJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -210,7 +210,7 @@ void ForwardingSlaveBase::rename(const KURL &src, const KURL &dest,
     KURL new_src, new_dest;
     if ( internalRewriteURL(src, new_src) && internalRewriteURL(dest, new_dest) )
     {
-        KIO::Job *job = KIO::rename(new_src, new_dest, overwrite);
+        TDEIO::Job *job = TDEIO::rename(new_src, new_dest, overwrite);
         connectJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -225,7 +225,7 @@ void ForwardingSlaveBase::symlink(const TQString &target, const KURL &dest,
     KURL new_dest;
     if ( internalRewriteURL(dest, new_dest) )
     {
-        KIO::SimpleJob *job = KIO::symlink(target, new_dest, overwrite, false);
+        TDEIO::SimpleJob *job = TDEIO::symlink(target, new_dest, overwrite, false);
         connectSimpleJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -239,7 +239,7 @@ void ForwardingSlaveBase::chmod(const KURL &url, int permissions)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::SimpleJob *job = KIO::chmod(new_url, permissions);
+        TDEIO::SimpleJob *job = TDEIO::chmod(new_url, permissions);
         connectSimpleJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -254,7 +254,7 @@ void ForwardingSlaveBase::copy(const KURL &src, const KURL &dest,
     KURL new_src, new_dest;
     if ( internalRewriteURL(src, new_src) && internalRewriteURL(dest, new_dest) )
     {
-        KIO::Job *job = KIO::file_copy(new_src, new_dest, permissions,
+        TDEIO::Job *job = TDEIO::file_copy(new_src, new_dest, permissions,
                                        overwrite, false);
         connectJob(job);
 
@@ -271,12 +271,12 @@ void ForwardingSlaveBase::del(const KURL &url, bool isfile)
     {
         if (isfile)
         {
-            KIO::DeleteJob *job = KIO::del(new_url, false, false);
+            TDEIO::DeleteJob *job = TDEIO::del(new_url, false, false);
             connectJob(job);
         }
         else
         {
-            KIO::SimpleJob *job = KIO::rmdir(new_url);
+            TDEIO::SimpleJob *job = TDEIO::rmdir(new_url);
             connectSimpleJob(job);
         }
 
@@ -291,7 +291,7 @@ void ForwardingSlaveBase::localURL(const KURL& remoteURL)
     KURL new_url;
     if ( internalRewriteURL(remoteURL, new_url) )
     {
-        KIO::LocalURLJob *job = KIO::localURL(new_url);
+        TDEIO::LocalURLJob *job = TDEIO::localURL(new_url);
         connectLocalURLJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -305,7 +305,7 @@ void ForwardingSlaveBase::localURL(const KURL& remoteURL)
 
 //////////////////////////////////////////////////////////////////////////////
 
-void ForwardingSlaveBase::connectJob(KIO::Job *job)
+void ForwardingSlaveBase::connectJob(TDEIO::Job *job)
 {
     // We will forward the warning message, no need to let the job
     // display it itself
@@ -320,57 +320,57 @@ void ForwardingSlaveBase::connectJob(KIO::Job *job)
         kdDebug() << it.key() << " = " << it.data() << endl;
 #endif
 
-    connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-             this, TQT_SLOT( slotResult(KIO::Job *) ) );
-    connect( job, TQT_SIGNAL( warning(KIO::Job *, const TQString &) ),
-             this, TQT_SLOT( slotWarning(KIO::Job *, const TQString &) ) );
-    connect( job, TQT_SIGNAL( infoMessage(KIO::Job *, const TQString &) ),
-             this, TQT_SLOT( slotInfoMessage(KIO::Job *, const TQString &) ) );
-    connect( job, TQT_SIGNAL( totalSize(KIO::Job *, KIO::filesize_t) ),
-             this, TQT_SLOT( slotTotalSize(KIO::Job *, KIO::filesize_t) ) );
-    connect( job, TQT_SIGNAL( processedSize(KIO::Job *, KIO::filesize_t) ),
-             this, TQT_SLOT( slotProcessedSize(KIO::Job *, KIO::filesize_t) ) );
-    connect( job, TQT_SIGNAL( speed(KIO::Job *, unsigned long) ),
-             this, TQT_SLOT( slotSpeed(KIO::Job *, unsigned long) ) );
+    connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+             this, TQT_SLOT( slotResult(TDEIO::Job *) ) );
+    connect( job, TQT_SIGNAL( warning(TDEIO::Job *, const TQString &) ),
+             this, TQT_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) );
+    connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ),
+             this, TQT_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) );
+    connect( job, TQT_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ),
+             this, TQT_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) );
+    connect( job, TQT_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ),
+             this, TQT_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) );
+    connect( job, TQT_SIGNAL( speed(TDEIO::Job *, unsigned long) ),
+             this, TQT_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) );
 }
 
-void ForwardingSlaveBase::connectSimpleJob(KIO::SimpleJob *job)
+void ForwardingSlaveBase::connectSimpleJob(TDEIO::SimpleJob *job)
 {
     connectJob(job);
-    connect( job, TQT_SIGNAL( redirection(KIO::Job *, const KURL &) ),
-             this, TQT_SLOT( slotRedirection(KIO::Job *, const KURL &) ) );
+    connect( job, TQT_SIGNAL( redirection(TDEIO::Job *, const KURL &) ),
+             this, TQT_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) );
 }
 
-void ForwardingSlaveBase::connectListJob(KIO::ListJob *job)
+void ForwardingSlaveBase::connectListJob(TDEIO::ListJob *job)
 {
     connectSimpleJob(job);
-    connect( job, TQT_SIGNAL( entries(KIO::Job *, const KIO::UDSEntryList &) ),
-             this, TQT_SLOT( slotEntries(KIO::Job *, const KIO::UDSEntryList &) ) );
+    connect( job, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ),
+             this, TQT_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) );
 }
 
-void ForwardingSlaveBase::connectTransferJob(KIO::TransferJob *job)
+void ForwardingSlaveBase::connectTransferJob(TDEIO::TransferJob *job)
 {
     connectSimpleJob(job);
-    connect( job, TQT_SIGNAL( data(KIO::Job *, const TQByteArray &) ),
-             this, TQT_SLOT( slotData(KIO::Job *, const TQByteArray &) ) );
-    connect( job, TQT_SIGNAL( dataReq(KIO::Job *, TQByteArray &) ),
-             this, TQT_SLOT( slotDataReq(KIO::Job *, TQByteArray &) ) );
-    connect( job, TQT_SIGNAL( mimetype(KIO::Job *, const TQString &) ),
-             this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &) ) );
-    connect( job, TQT_SIGNAL( canResume(KIO::Job *, KIO::filesize_t) ),
-             this, TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t) ) );
+    connect( job, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
+             this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
+    connect( job, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
+             this, TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) );
+    connect( job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ),
+             this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) );
+    connect( job, TQT_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ),
+             this, TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) );
 }
 
-void ForwardingSlaveBase::connectLocalURLJob(KIO::LocalURLJob *job)
+void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job)
 {
     connectJob(job);
-    connect( job, TQT_SIGNAL( localURL(KIO::Job *, const KURL&, bool) ),
-             this, TQT_SLOT( slotLocalURL(KIO::Job *, const KURL&, bool) ) );
+    connect( job, TQT_SIGNAL( localURL(TDEIO::Job *, const KURL&, bool) ),
+             this, TQT_SLOT( slotLocalURL(TDEIO::Job *, const KURL&, bool) ) );
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-void ForwardingSlaveBase::slotResult(KIO::Job *job)
+void ForwardingSlaveBase::slotResult(TDEIO::Job *job)
 {
     if ( job->error() != 0)
     {
@@ -378,10 +378,10 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job)
     }
     else
     {
-        KIO::StatJob *stat_job = dynamic_cast<KIO::StatJob *>(job);
+        TDEIO::StatJob *stat_job = dynamic_cast<TDEIO::StatJob *>(job);
         if ( stat_job!=0L )
         {
-            KIO::UDSEntry entry = stat_job->statResult();
+            TDEIO::UDSEntry entry = stat_job->statResult();
 	    prepareUDSEntry(entry);
             statEntry( entry );
         }
@@ -391,32 +391,32 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job)
     tqApp->eventLoop()->exitLoop();
 }
 
-void ForwardingSlaveBase::slotWarning(KIO::Job* /*job*/, const TQString &msg)
+void ForwardingSlaveBase::slotWarning(TDEIO::Job* /*job*/, const TQString &msg)
 {
     warning(msg);
 }
 
-void ForwardingSlaveBase::slotInfoMessage(KIO::Job* /*job*/, const TQString &msg)
+void ForwardingSlaveBase::slotInfoMessage(TDEIO::Job* /*job*/, const TQString &msg)
 {
     infoMessage(msg);
 }
 
-void ForwardingSlaveBase::slotTotalSize(KIO::Job* /*job*/, KIO::filesize_t size)
+void ForwardingSlaveBase::slotTotalSize(TDEIO::Job* /*job*/, TDEIO::filesize_t size)
 {
     totalSize(size);
 }
 
-void ForwardingSlaveBase::slotProcessedSize(KIO::Job* /*job*/, KIO::filesize_t size)
+void ForwardingSlaveBase::slotProcessedSize(TDEIO::Job* /*job*/, TDEIO::filesize_t size)
 {
     processedSize(size);
 }
 
-void ForwardingSlaveBase::slotSpeed(KIO::Job* /*job*/, unsigned long bytesPerSecond)
+void ForwardingSlaveBase::slotSpeed(TDEIO::Job* /*job*/, unsigned long bytesPerSecond)
 {
     speed(bytesPerSecond);
 }
 
-void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url)
+void ForwardingSlaveBase::slotRedirection(TDEIO::Job *job, const KURL &url)
 {
     redirection(url);
 
@@ -427,13 +427,13 @@ void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url)
     tqApp->eventLoop()->exitLoop();
 }
 
-void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/,
-                                      const KIO::UDSEntryList &entries)
+void ForwardingSlaveBase::slotEntries(TDEIO::Job* /*job*/,
+                                      const TDEIO::UDSEntryList &entries)
 {
-    KIO::UDSEntryList final_entries = entries;
+    TDEIO::UDSEntryList final_entries = entries;
 
-    KIO::UDSEntryList::iterator it = final_entries.begin();
-    KIO::UDSEntryList::iterator end = final_entries.end();
+    TDEIO::UDSEntryList::iterator it = final_entries.begin();
+    TDEIO::UDSEntryList::iterator end = final_entries.end();
 
     for(; it!=end; ++it)
     {
@@ -443,28 +443,28 @@ void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/,
     listEntries( final_entries );
 }
 
-void ForwardingSlaveBase::slotData(KIO::Job* /*job*/, const TQByteArray &d)
+void ForwardingSlaveBase::slotData(TDEIO::Job* /*job*/, const TQByteArray &d)
 {
     data(d);
 }
 
-void ForwardingSlaveBase::slotDataReq(KIO::Job* /*job*/, TQByteArray &data)
+void ForwardingSlaveBase::slotDataReq(TDEIO::Job* /*job*/, TQByteArray &data)
 {
     dataReq();
     readData(data);
 }
 
-void ForwardingSlaveBase::slotMimetype (KIO::Job* /*job*/, const TQString &type)
+void ForwardingSlaveBase::slotMimetype (TDEIO::Job* /*job*/, const TQString &type)
 {
     mimeType(type);
 }
 
-void ForwardingSlaveBase::slotCanResume (KIO::Job* /*job*/, KIO::filesize_t offset)
+void ForwardingSlaveBase::slotCanResume (TDEIO::Job* /*job*/, TDEIO::filesize_t offset)
 {
     canResume(offset);
 }
 
-void ForwardingSlaveBase::slotLocalURL(KIO::Job *, const KURL& url, bool)
+void ForwardingSlaveBase::slotLocalURL(TDEIO::Job *, const KURL& url, bool)
 {
     SlaveBase::localURL(url);
 }
diff --git a/kio/kio/forwardingslavebase.h b/kio/kio/forwardingslavebase.h
index 1e6d303ee..49d01f4e2 100644
--- a/kio/kio/forwardingslavebase.h
+++ b/kio/kio/forwardingslavebase.h
@@ -25,7 +25,7 @@
 
 #include <tqobject.h>
 
-namespace KIO
+namespace TDEIO
 {
 
 class ForwardingSlaveBasePrivate;
@@ -56,7 +56,7 @@ class ForwardingSlaveBasePrivate;
  *         if ( is_special )
  *         {
  *             // Handle the URL ourselves
- *             KIO::UDSEntry entry;
+ *             TDEIO::UDSEntry entry;
  *             // Fill entry with UDSAtom instances
  *             statEntry(entry);
  *             finished();
@@ -146,7 +146,7 @@ protected:
      * @param listing indicate if this entry it created during a listDir
      *                operation
      */
-    virtual void prepareUDSEntry(KIO::UDSEntry &entry,
+    virtual void prepareUDSEntry(TDEIO::UDSEntry &entry,
                                  bool listing=false) const;
     
     /**
@@ -175,28 +175,28 @@ private:
     void connectLocalURLJob(LocalURLJob *job);
 
 private slots:
-    // KIO::Job
-    void slotResult(KIO::Job *job);
-    void slotWarning(KIO::Job *job, const TQString &msg);
-    void slotInfoMessage(KIO::Job *job, const TQString &msg);
-    void slotTotalSize(KIO::Job *job, KIO::filesize_t size);
-    void slotProcessedSize(KIO::Job *job, KIO::filesize_t size);
-    void slotSpeed(KIO::Job *job, unsigned long bytesPerSecond);
-
-    // KIO::SimpleJob subclasses
-    void slotRedirection(KIO::Job *job, const KURL &url);
-
-    // KIO::ListJob
-    void slotEntries(KIO::Job *job, const KIO::UDSEntryList &entries);
-
-    // KIO::TransferJob
-    void slotData(KIO::Job *job, const TQByteArray &data);
-    void slotDataReq(KIO::Job *job, TQByteArray &data);
-    void slotMimetype (KIO::Job *job, const TQString &type);
-    void slotCanResume (KIO::Job *job, KIO::filesize_t offset);
-
-    // KIO::LocalURLJob
-    void slotLocalURL(KIO::Job *, const KURL&, bool);
+    // TDEIO::Job
+    void slotResult(TDEIO::Job *job);
+    void slotWarning(TDEIO::Job *job, const TQString &msg);
+    void slotInfoMessage(TDEIO::Job *job, const TQString &msg);
+    void slotTotalSize(TDEIO::Job *job, TDEIO::filesize_t size);
+    void slotProcessedSize(TDEIO::Job *job, TDEIO::filesize_t size);
+    void slotSpeed(TDEIO::Job *job, unsigned long bytesPerSecond);
+
+    // TDEIO::SimpleJob subclasses
+    void slotRedirection(TDEIO::Job *job, const KURL &url);
+
+    // TDEIO::ListJob
+    void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &entries);
+
+    // TDEIO::TransferJob
+    void slotData(TDEIO::Job *job, const TQByteArray &data);
+    void slotDataReq(TDEIO::Job *job, TQByteArray &data);
+    void slotMimetype (TDEIO::Job *job, const TQString &type);
+    void slotCanResume (TDEIO::Job *job, TDEIO::filesize_t offset);
+
+    // TDEIO::LocalURLJob
+    void slotLocalURL(TDEIO::Job *, const KURL&, bool);
 };
 
 }
diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp
index 63ba82921..36706a6cf 100644
--- a/kio/kio/global.cpp
+++ b/kio/kio/global.cpp
@@ -42,7 +42,7 @@
 #include <volmgt.h>
 #endif
 
-KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size )
+KIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size )
 {
     if ( size >= 1024 )
         return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")";
@@ -50,7 +50,7 @@ KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size )
 	return convertSize( size );
 }
 
-KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size )
+KIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size )
 {
     double fsize = size;
     TQString s;
@@ -88,20 +88,20 @@ KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size )
     return s;
 }
 
-KIO_EXPORT TQString KIO::convertSizeFromKB( KIO::filesize_t kbSize )
+KIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize )
 {
     return convertSize(kbSize * 1024);
 }
 
-KIO_EXPORT TQString KIO::number( KIO::filesize_t size )
+KIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size )
 {
     char charbuf[256];
     sprintf(charbuf, "%lld", size);
     return TQString::fromLatin1(charbuf);
 }
 
-KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSize,
-                                                        KIO::filesize_t processedSize, KIO::filesize_t speed )
+KIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize,
+                                                        TDEIO::filesize_t processedSize, TDEIO::filesize_t speed )
 {
   if ( (speed != 0) && (totalSize != 0) )
     return ( totalSize - processedSize ) / speed;
@@ -109,7 +109,7 @@ KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSiz
     return 0;
 }
 
-KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds )
+KIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds )
 {
   unsigned int days  = seconds / 86400;
   unsigned int hours = (seconds - (days * 86400)) / 3600;
@@ -124,12 +124,12 @@ KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds )
     return timeStr;
 }
 
-KIO_EXPORT TQTime KIO::calculateRemaining( KIO::filesize_t totalSize, KIO::filesize_t processedSize, KIO::filesize_t speed )
+KIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed )
 {
   TQTime remainingTime;
 
   if ( speed != 0 ) {
-    KIO::filesize_t secs;
+    TDEIO::filesize_t secs;
     if ( totalSize == 0 ) {
       secs = 0;
     } else {
@@ -147,7 +147,7 @@ KIO_EXPORT TQTime KIO::calculateRemaining( KIO::filesize_t totalSize, KIO::files
   return remainingTime;
 }
 
-KIO_EXPORT TQString KIO::itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize)
+KIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize)
 {
     TQString text = items == 0 ? i18n( "No Items" ) : i18n( "One Item", "%n Items", items );
     text += " - ";
@@ -155,14 +155,14 @@ KIO_EXPORT TQString KIO::itemsSummaryString(uint items, uint files, uint dirs, K
     if ( showSize && files > 0 )
     {
         text += " ";
-        text += i18n("(%1 Total)").arg(KIO::convertSize( size ) );
+        text += i18n("(%1 Total)").arg(TDEIO::convertSize( size ) );
     }
     text += " - ";
     text += dirs == 0 ? i18n( "No Folders" ) : i18n("One Folder", "%n Folders", dirs);
     return text;
 }
 
-KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str )
+KIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str )
 {
   TQString str( _str );
 
@@ -177,7 +177,7 @@ KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str )
   return str;
 }
 
-KIO_EXPORT TQString KIO::decodeFileName( const TQString & _str )
+KIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str )
 {
   TQString str;
 
@@ -205,210 +205,210 @@ KIO_EXPORT TQString KIO::decodeFileName( const TQString & _str )
   return str;
 }
 
-KIO_EXPORT TQString KIO::Job::errorString() const
+KIO_EXPORT TQString TDEIO::Job::errorString() const
 {
-  return KIO::buildErrorString(m_error, m_errorText);
+  return TDEIO::buildErrorString(m_error, m_errorText);
 }
 
-KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorText)
+KIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText)
 {
   TQString result;
 
   switch( errorCode )
     {
-    case  KIO::ERR_CANNOT_OPEN_FOR_READING:
+    case  TDEIO::ERR_CANNOT_OPEN_FOR_READING:
       result = i18n( "Could not read %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_OPEN_FOR_WRITING:
+    case  TDEIO::ERR_CANNOT_OPEN_FOR_WRITING:
       result = i18n( "Could not write to %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_LAUNCH_PROCESS:
+    case  TDEIO::ERR_CANNOT_LAUNCH_PROCESS:
       result = i18n( "Could not start process %1." ).arg( errorText );
       break;
-    case  KIO::ERR_INTERNAL:
+    case  TDEIO::ERR_INTERNAL:
       result = i18n( "Internal Error\nPlease send a full bug report at http://bugs.kde.org\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_MALFORMED_URL:
+    case  TDEIO::ERR_MALFORMED_URL:
       result = i18n( "Malformed URL %1." ).arg( errorText );
       break;
-    case  KIO::ERR_UNSUPPORTED_PROTOCOL:
+    case  TDEIO::ERR_UNSUPPORTED_PROTOCOL:
       result = i18n( "The protocol %1 is not supported." ).arg( errorText );
       break;
-    case  KIO::ERR_NO_SOURCE_PROTOCOL:
+    case  TDEIO::ERR_NO_SOURCE_PROTOCOL:
       result = i18n( "The protocol %1 is only a filter protocol.").arg( errorText );
       break;
-    case  KIO::ERR_UNSUPPORTED_ACTION:
+    case  TDEIO::ERR_UNSUPPORTED_ACTION:
       result = errorText;
 //       result = i18n( "Unsupported action %1" ).arg( errorText );
       break;
-    case  KIO::ERR_IS_DIRECTORY:
+    case  TDEIO::ERR_IS_DIRECTORY:
       result = i18n( "%1 is a folder, but a file was expected." ).arg( errorText );
       break;
-    case  KIO::ERR_IS_FILE:
+    case  TDEIO::ERR_IS_FILE:
       result = i18n( "%1 is a file, but a folder was expected." ).arg( errorText );
       break;
-    case  KIO::ERR_DOES_NOT_EXIST:
+    case  TDEIO::ERR_DOES_NOT_EXIST:
       result = i18n( "The file or folder %1 does not exist." ).arg( errorText );
       break;
-    case  KIO::ERR_FILE_ALREADY_EXIST:
+    case  TDEIO::ERR_FILE_ALREADY_EXIST:
       result = i18n( "A file named %1 already exists." ).arg( errorText );
       break;
-    case  KIO::ERR_DIR_ALREADY_EXIST:
+    case  TDEIO::ERR_DIR_ALREADY_EXIST:
       result = i18n( "A folder named %1 already exists." ).arg( errorText );
       break;
-    case  KIO::ERR_UNKNOWN_HOST:
+    case  TDEIO::ERR_UNKNOWN_HOST:
       result = errorText.isEmpty() ? i18n( "No hostname specified." ) : i18n( "Unknown host %1" ).arg( errorText );
       break;
-    case  KIO::ERR_ACCESS_DENIED:
+    case  TDEIO::ERR_ACCESS_DENIED:
       result = i18n( "Access denied to %1." ).arg( errorText );
       break;
-    case  KIO::ERR_WRITE_ACCESS_DENIED:
+    case  TDEIO::ERR_WRITE_ACCESS_DENIED:
       result = i18n( "Access denied.\nCould not write to %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_ENTER_DIRECTORY:
+    case  TDEIO::ERR_CANNOT_ENTER_DIRECTORY:
       result = i18n( "Could not enter folder %1." ).arg( errorText );
       break;
-    case  KIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
+    case  TDEIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
       result = i18n( "The protocol %1 does not implement a folder service." ).arg( errorText );
       break;
-    case  KIO::ERR_CYCLIC_LINK:
+    case  TDEIO::ERR_CYCLIC_LINK:
       result = i18n( "Found a cyclic link in %1." ).arg( errorText );
       break;
-    case  KIO::ERR_USER_CANCELED:
+    case  TDEIO::ERR_USER_CANCELED:
       // Do nothing in this case. The user doesn't need to be told what he just did.
       break;
-    case  KIO::ERR_CYCLIC_COPY:
+    case  TDEIO::ERR_CYCLIC_COPY:
       result = i18n( "Found a cyclic link while copying %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_CREATE_SOCKET:
+    case  TDEIO::ERR_COULD_NOT_CREATE_SOCKET:
       result = i18n( "Could not create socket for accessing %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_CONNECT:
+    case  TDEIO::ERR_COULD_NOT_CONNECT:
       result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::fromLatin1("localhost") : errorText );
       break;
-    case  KIO::ERR_CONNECTION_BROKEN:
+    case  TDEIO::ERR_CONNECTION_BROKEN:
       result = i18n( "Connection to host %1 is broken." ).arg( errorText );
       break;
-    case  KIO::ERR_NOT_FILTER_PROTOCOL:
+    case  TDEIO::ERR_NOT_FILTER_PROTOCOL:
       result = i18n( "The protocol %1 is not a filter protocol." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_MOUNT:
+    case  TDEIO::ERR_COULD_NOT_MOUNT:
       result = i18n( "Could not mount device.\nThe reported error was:\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_UNMOUNT:
+    case  TDEIO::ERR_COULD_NOT_UNMOUNT:
       result = i18n( "Could not unmount device.\nThe reported error was:\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_READ:
+    case  TDEIO::ERR_COULD_NOT_READ:
       result = i18n( "Could not read file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_WRITE:
+    case  TDEIO::ERR_COULD_NOT_WRITE:
       result = i18n( "Could not write to file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_BIND:
+    case  TDEIO::ERR_COULD_NOT_BIND:
       result = i18n( "Could not bind %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_LISTEN:
+    case  TDEIO::ERR_COULD_NOT_LISTEN:
       result = i18n( "Could not listen %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_ACCEPT:
+    case  TDEIO::ERR_COULD_NOT_ACCEPT:
       result = i18n( "Could not accept %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_LOGIN:
+    case  TDEIO::ERR_COULD_NOT_LOGIN:
       result = errorText;
       break;
-    case  KIO::ERR_COULD_NOT_STAT:
+    case  TDEIO::ERR_COULD_NOT_STAT:
       result = i18n( "Could not access %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_CLOSEDIR:
+    case  TDEIO::ERR_COULD_NOT_CLOSEDIR:
       result = i18n( "Could not terminate listing %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_MKDIR:
+    case  TDEIO::ERR_COULD_NOT_MKDIR:
       result = i18n( "Could not make folder %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_RMDIR:
+    case  TDEIO::ERR_COULD_NOT_RMDIR:
       result = i18n( "Could not remove folder %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_RESUME:
+    case  TDEIO::ERR_CANNOT_RESUME:
       result = i18n( "Could not resume file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_RENAME:
+    case  TDEIO::ERR_CANNOT_RENAME:
       result = i18n( "Could not rename file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_CHMOD:
+    case  TDEIO::ERR_CANNOT_CHMOD:
       result = i18n( "Could not change permissions for %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_DELETE:
+    case  TDEIO::ERR_CANNOT_DELETE:
       result = i18n( "Could not delete file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_SLAVE_DIED:
+    case  TDEIO::ERR_SLAVE_DIED:
       result = i18n( "The process for the %1 protocol died unexpectedly." ).arg( errorText );
       break;
-    case  KIO::ERR_OUT_OF_MEMORY:
+    case  TDEIO::ERR_OUT_OF_MEMORY:
       result = i18n( "Error. Out of memory.\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_UNKNOWN_PROXY_HOST:
+    case  TDEIO::ERR_UNKNOWN_PROXY_HOST:
       result = i18n( "Unknown proxy host\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_AUTHENTICATE:
+    case  TDEIO::ERR_COULD_NOT_AUTHENTICATE:
       result = i18n( "Authorization failed, %1 authentication not supported" ).arg( errorText );
       break;
-    case  KIO::ERR_ABORTED:
+    case  TDEIO::ERR_ABORTED:
       result = i18n( "User canceled action\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_INTERNAL_SERVER:
+    case  TDEIO::ERR_INTERNAL_SERVER:
       result = i18n( "Internal error in server\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_SERVER_TIMEOUT:
+    case  TDEIO::ERR_SERVER_TIMEOUT:
       result = i18n( "Timeout on server\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_UNKNOWN:
+    case  TDEIO::ERR_UNKNOWN:
       result = i18n( "Unknown error\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_UNKNOWN_INTERRUPT:
+    case  TDEIO::ERR_UNKNOWN_INTERRUPT:
       result = i18n( "Unknown interrupt\n%1" ).arg( errorText );
       break;
 /*
-    case  KIO::ERR_CHECKSUM_MISMATCH:
+    case  TDEIO::ERR_CHECKSUM_MISMATCH:
       if (errorText)
         result = i18n( "Warning: MD5 Checksum for %1 does not match checksum returned from server" ).arg(errorText);
       else
         result = i18n( "Warning: MD5 Checksum for %1 does not match checksum returned from server" ).arg("document");
       break;
 */
-    case KIO::ERR_CANNOT_DELETE_ORIGINAL:
+    case TDEIO::ERR_CANNOT_DELETE_ORIGINAL:
       result = i18n( "Could not delete original file %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_CANNOT_DELETE_PARTIAL:
+    case TDEIO::ERR_CANNOT_DELETE_PARTIAL:
       result = i18n( "Could not delete partial file %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_CANNOT_RENAME_ORIGINAL:
+    case TDEIO::ERR_CANNOT_RENAME_ORIGINAL:
       result = i18n( "Could not rename original file %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_CANNOT_RENAME_PARTIAL:
+    case TDEIO::ERR_CANNOT_RENAME_PARTIAL:
       result = i18n( "Could not rename partial file %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_CANNOT_SYMLINK:
+    case TDEIO::ERR_CANNOT_SYMLINK:
       result = i18n( "Could not create symlink %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_NO_CONTENT:
+    case TDEIO::ERR_NO_CONTENT:
       result = errorText;
       break;
-    case KIO::ERR_DISK_FULL:
+    case TDEIO::ERR_DISK_FULL:
       result = i18n( "Could not write file %1.\nDisk full." ).arg( errorText );
       break;
-    case KIO::ERR_IDENTICAL_FILES:
+    case TDEIO::ERR_IDENTICAL_FILES:
       result = i18n( "The source and destination are the same file.\n%1" ).arg( errorText );
       break;
-    case KIO::ERR_SLAVE_DEFINED:
+    case TDEIO::ERR_SLAVE_DEFINED:
       result = errorText;
       break;
-    case KIO::ERR_UPGRADE_REQUIRED:
+    case TDEIO::ERR_UPGRADE_REQUIRED:
       result = i18n( "%1 is required by the server, but is not available." ).arg(errorText);
       break;
-    case KIO::ERR_POST_DENIED:
+    case TDEIO::ERR_POST_DENIED:
       result = i18n( "Access to restricted port in POST denied.");
       break;
-    case KIO::ERR_OFFLINE_MODE:
+    case TDEIO::ERR_OFFLINE_MODE:
       result = i18n( "Could not access %1.\nOffline mode active.").arg( errorText ); 
       break;
     default:
@@ -419,7 +419,7 @@ KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorTe
   return result;
 }
 
-KIO_EXPORT TQString KIO::unsupportedActionErrorString(const TQString &protocol, int cmd) {
+KIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) {
   switch (cmd) {
     case CMD_CONNECT:
       return i18n("Opening connections is not supported with the protocol %1." ).arg(protocol);
@@ -458,7 +458,7 @@ KIO_EXPORT TQString KIO::unsupportedActionErrorString(const TQString &protocol,
   }/*end switch*/
 }
 
-KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/,
+KIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/,
                                             int method /*= -1*/ ) const
 {
   TQString errorName, techName, description, ret2;
@@ -508,7 +508,7 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0
   return ret;
 }
 
-KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorText,
+KIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText,
                                const KURL *reqUrl /*= 0L*/, int /*method = -1*/ )
 {
   TQString url, host, protocol, datetime, domain, path, dir, filename;
@@ -612,7 +612,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
   TQString sNetwork = i18n( "Check your network connection status." );
 
   switch( errorCode ) {
-    case  KIO::ERR_CANNOT_OPEN_FOR_READING:
+    case  TDEIO::ERR_CANNOT_OPEN_FOR_READING:
       errorName = i18n( "Cannot Open Resource For Reading" );
       description = i18n( "This means that the contents of the requested file "
         "or folder <strong>%1</strong> could not be retrieved, as read "
@@ -622,7 +622,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sQuerylock << sSysadmin;
       break;
 
-    case  KIO::ERR_CANNOT_OPEN_FOR_WRITING:
+    case  TDEIO::ERR_CANNOT_OPEN_FOR_WRITING:
       errorName = i18n( "Cannot Open Resource For Writing" );
       description = i18n( "This means that the file, <strong>%1</strong>, could "
         "not be written to as requested, because access with permission to "
@@ -631,7 +631,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sQuerylock << sSysadmin;
       break;
 
-    case  KIO::ERR_CANNOT_LAUNCH_PROCESS:
+    case  TDEIO::ERR_CANNOT_LAUNCH_PROCESS:
       errorName = i18n( "Cannot Initiate the %1 Protocol" ).arg( protocol );
       techName = i18n( "Unable to Launch Process" );
       description = i18n( "The program on your computer which provides access "
@@ -644,7 +644,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_INTERNAL:
+    case  TDEIO::ERR_INTERNAL:
       errorName = i18n( "Internal Error" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol has reported an internal error." )
@@ -653,7 +653,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_MALFORMED_URL:
+    case  TDEIO::ERR_MALFORMED_URL:
       errorName = i18n( "Improperly Formatted URL" );
       description = i18n( "The <strong>U</strong>niform <strong>R</strong>esource "
         "<strong>L</strong>ocator (URL) that you entered was not properly "
@@ -663,7 +663,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTypo;
       break;
 
-    case  KIO::ERR_UNSUPPORTED_PROTOCOL:
+    case  TDEIO::ERR_UNSUPPORTED_PROTOCOL:
       errorName = i18n( "Unsupported Protocol %1" ).arg( protocol );
       description = i18n( "The protocol <strong>%1</strong> is not supported "
         "by the TDE programs currently installed on this computer." )
@@ -679,7 +679,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_NO_SOURCE_PROTOCOL:
+    case  TDEIO::ERR_NO_SOURCE_PROTOCOL:
       errorName = i18n( "URL Does Not Refer to a Resource." );
       techName = i18n( "Protocol is a Filter Protocol" );
       description = i18n( "The <strong>U</strong>niform <strong>R</strong>esource "
@@ -692,7 +692,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTypo;
       break;
 
-    case  KIO::ERR_UNSUPPORTED_ACTION:
+    case  TDEIO::ERR_UNSUPPORTED_ACTION:
       errorName = i18n( "Unsupported Action: %1" ).arg( errorText );
       description = i18n( "The requested action is not supported by the TDE "
         "program which is implementing the <strong>%1</strong> protocol." )
@@ -704,7 +704,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "outcome." );
       break;
 
-    case  KIO::ERR_IS_DIRECTORY:
+    case  TDEIO::ERR_IS_DIRECTORY:
       errorName = i18n( "File Expected" );
       description = i18n( "The request expected a file, however the "
         "folder <strong>%1</strong> was found instead." ).arg( dir );
@@ -712,7 +712,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_IS_FILE:
+    case  TDEIO::ERR_IS_FILE:
       errorName = i18n( "Folder Expected" );
       description = i18n( "The request expected a folder, however "
         "the file <strong>%1</strong> was found instead." ).arg( filename );
@@ -720,7 +720,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_DOES_NOT_EXIST:
+    case  TDEIO::ERR_DOES_NOT_EXIST:
       errorName = i18n( "File or Folder Does Not Exist" );
       description = i18n( "The specified file or folder <strong>%1</strong> "
         "does not exist." ).arg( dir );
@@ -728,7 +728,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_FILE_ALREADY_EXIST:
+    case  TDEIO::ERR_FILE_ALREADY_EXIST:
       errorName = i18n( "File Already Exists" );
       description = i18n( "The requested file could not be created because a "
         "file with the same name already exists." );
@@ -738,7 +738,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << i18n( "Choose an alternate filename for the new file." );
       break;
 
-    case  KIO::ERR_DIR_ALREADY_EXIST:
+    case  TDEIO::ERR_DIR_ALREADY_EXIST:
       errorName = i18n( "Folder Already Exists" );
       description = i18n( "The requested folder could not be created because "
         "a folder with the same name already exists." );
@@ -748,7 +748,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << i18n( "Choose an alternate name for the new folder." );
       break;
 
-    case  KIO::ERR_UNKNOWN_HOST:
+    case  TDEIO::ERR_UNKNOWN_HOST:
       errorName = i18n( "Unknown Host" );
       description = i18n( "An unknown host error indicates that the server with "
         "the requested name, <strong>%1</strong>, could not be "
@@ -759,7 +759,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_ACCESS_DENIED:
+    case  TDEIO::ERR_ACCESS_DENIED:
       errorName = i18n( "Access Denied" );
       description = i18n( "Access was denied to the specified resource, "
         "<strong>%1</strong>." ).arg( url );
@@ -772,7 +772,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       if ( !isSlaveNetwork ) solutions << sServeradmin;
       break;
 
-    case  KIO::ERR_WRITE_ACCESS_DENIED:
+    case  TDEIO::ERR_WRITE_ACCESS_DENIED:
       errorName = i18n( "Write Access Denied" );
       description = i18n( "This means that an attempt to write to the file "
         "<strong>%1</strong> was rejected." ).arg( filename );
@@ -780,7 +780,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sQuerylock << sSysadmin;
       break;
 
-    case  KIO::ERR_CANNOT_ENTER_DIRECTORY:
+    case  TDEIO::ERR_CANNOT_ENTER_DIRECTORY:
       errorName = i18n( "Unable to Enter Folder" );
       description = i18n( "This means that an attempt to enter (in other words, "
         "to open) the requested folder <strong>%1</strong> was rejected." )
@@ -789,7 +789,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sQuerylock << sSysadmin;
       break;
 
-    case  KIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
+    case  TDEIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
       errorName = i18n( "Folder Listing Unavailable" );
       techName = i18n( "Protocol %1 is not a Filesystem" ).arg( protocol );
       description = i18n( "This means that a request was made which requires "
@@ -799,7 +799,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_CYCLIC_LINK:
+    case  TDEIO::ERR_CYCLIC_LINK:
       errorName = i18n( "Cyclic Link Detected" );
       description = i18n( "UNIX environments are commonly able to link a file or "
         "folder to a separate name and/or location. TDE detected a link or "
@@ -809,7 +809,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "cause an infinite loop, and try again." ) << sSysadmin;
       break;
 
-    case  KIO::ERR_USER_CANCELED:
+    case  TDEIO::ERR_USER_CANCELED:
       // Do nothing in this case. The user doesn't need to be told what he just did.
       // rodda: However, if we have been called, an application is about to display
       // this information anyway. If we don't return sensible information, the
@@ -820,7 +820,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << i18n( "Retry the request." );
       break;
 
-    case  KIO::ERR_CYCLIC_COPY:
+    case  TDEIO::ERR_CYCLIC_COPY:
       errorName = i18n( "Cyclic Link Detected During Copy" );
       description = i18n( "UNIX environments are commonly able to link a file or "
         "folder to a separate name and/or location. During the requested copy "
@@ -831,7 +831,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "cause an infinite loop, and try again." ) << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_CREATE_SOCKET:
+    case  TDEIO::ERR_COULD_NOT_CREATE_SOCKET:
       errorName = i18n( "Could Not Create Network Connection" );
       techName = i18n( "Could Not Create Socket" );
       description = i18n( "This is a fairly technical error in which a required "
@@ -841,7 +841,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_CONNECT:
+    case  TDEIO::ERR_COULD_NOT_CONNECT:
       errorName = i18n( "Connection to Server Refused" );
       description = i18n( "The server <strong>%1</strong> refused to allow this "
         "computer to make a connection." ).arg( host );
@@ -855,7 +855,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTryagain << sServeradmin << sSysadmin;
       break;
 
-    case  KIO::ERR_CONNECTION_BROKEN:
+    case  TDEIO::ERR_CONNECTION_BROKEN:
       errorName = i18n( "Connection to Server Closed Unexpectedly" );
       description = i18n( "Although a connection was established to "
         "<strong>%1</strong>, the connection was closed at an unexpected point "
@@ -865,7 +865,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTryagain << sServeradmin << sSysadmin;
       break;
 
-    case  KIO::ERR_NOT_FILTER_PROTOCOL:
+    case  TDEIO::ERR_NOT_FILTER_PROTOCOL:
       errorName = i18n( "URL Resource Invalid" );
       techName = i18n( "Protocol %1 is not a Filter Protocol" ).arg( protocol );
       description = i18n( "The <strong>U</strong>niform <strong>R</strong>esource "
@@ -880,7 +880,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTypo << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_MOUNT:
+    case  TDEIO::ERR_COULD_NOT_MOUNT:
       errorName = i18n( "Unable to Initialize Input/Output Device" );
       techName = i18n( "Could Not Mount Device" );
       description = i18n( "The requested device could not be initialized "
@@ -899,7 +899,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "on.; and try again." ) << sAccess << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_UNMOUNT:
+    case  TDEIO::ERR_COULD_NOT_UNMOUNT:
       errorName = i18n( "Unable to Uninitialize Input/Output Device" );
       techName = i18n( "Could Not Unmount Device" );
       description = i18n( "The requested device could not be uninitialized "
@@ -917,7 +917,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "and try again." ) << sAccess << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_READ:
+    case  TDEIO::ERR_COULD_NOT_READ:
       errorName = i18n( "Cannot Read From Resource" );
       description = i18n( "This means that although the resource, "
         "<strong>%1</strong>, was able to be opened, an error occurred while "
@@ -930,7 +930,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_WRITE:
+    case  TDEIO::ERR_COULD_NOT_WRITE:
       errorName = i18n( "Cannot Write to Resource" );
       description = i18n( "This means that although the resource, <strong>%1</strong>"
         ", was able to be opened, an error occurred while writing to the resource." )
@@ -943,7 +943,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_BIND:
+    case  TDEIO::ERR_COULD_NOT_BIND:
       errorName = i18n( "Could Not Listen for Network Connections" );
       techName = i18n( "Could Not Bind" );
       description = i18n( "This is a fairly technical error in which a required "
@@ -954,7 +954,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_LISTEN:
+    case  TDEIO::ERR_COULD_NOT_LISTEN:
       errorName = i18n( "Could Not Listen for Network Connections" );
       techName = i18n( "Could Not Listen" );
       description = i18n( "This is a fairly technical error in which a required "
@@ -965,7 +965,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_ACCEPT:
+    case  TDEIO::ERR_COULD_NOT_ACCEPT:
       errorName = i18n( "Could Not Accept Network Connection" );
       description = i18n( "This is a fairly technical error in which an error "
         "occurred while attempting to accept an incoming network connection." );
@@ -975,7 +975,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_LOGIN:
+    case  TDEIO::ERR_COULD_NOT_LOGIN:
       errorName = i18n( "Could Not Login: %1" ).arg( errorText );
       description = i18n( "An attempt to login to perform the requested "
         "operation was unsuccessful." );
@@ -987,7 +987,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "are entered correctly." ) << sServeradmin << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_STAT:
+    case  TDEIO::ERR_COULD_NOT_STAT:
       errorName = i18n( "Could Not Determine Resource Status" );
       techName = i18n( "Could Not Stat Resource" );
       description = i18n( "An attempt to determine information about the status "
@@ -999,13 +999,13 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "are entered correctly." ) << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_CLOSEDIR:
+    case  TDEIO::ERR_COULD_NOT_CLOSEDIR:
       //result = i18n( "Could not terminate listing %1" ).arg( errorText );
       errorName = i18n( "Could Not Cancel Listing" );
       techName = i18n( "FIXME: Document this" );
       break;
 
-    case  KIO::ERR_COULD_NOT_MKDIR:
+    case  TDEIO::ERR_COULD_NOT_MKDIR:
       errorName = i18n( "Could Not Create Folder" );
       description = i18n( "An attempt to create the requested folder failed." );
       causes << cAccess << i18n( "The location where the folder was to be created "
@@ -1014,7 +1014,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << i18n( "Retry the request." ) << sAccess;
       break;
 
-    case  KIO::ERR_COULD_NOT_RMDIR:
+    case  TDEIO::ERR_COULD_NOT_RMDIR:
       errorName = i18n( "Could Not Remove Folder" );
       description = i18n( "An attempt to remove the specified folder, "
         "<strong>%1</strong>, failed." ).arg( dir );
@@ -1026,7 +1026,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "again." ) << sAccess;
       break;
 
-    case  KIO::ERR_CANNOT_RESUME:
+    case  TDEIO::ERR_CANNOT_RESUME:
       errorName = i18n( "Could Not Resume File Transfer" );
       description = i18n( "The specified request asked that the transfer of "
         "file <strong>%1</strong> be resumed at a certain point of the "
@@ -1037,7 +1037,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "transfer." );
       break;
 
-    case  KIO::ERR_CANNOT_RENAME:
+    case  TDEIO::ERR_CANNOT_RENAME:
       errorName = i18n( "Could Not Rename Resource" );
       description = i18n( "An attempt to rename the specified resource "
         "<strong>%1</strong> failed." ).arg( url );
@@ -1046,7 +1046,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sExists;
       break;
 
-    case  KIO::ERR_CANNOT_CHMOD:
+    case  TDEIO::ERR_CANNOT_CHMOD:
       errorName = i18n( "Could Not Alter Permissions of Resource" );
       description = i18n( "An attempt to alter the permissions on the specified "
         "resource <strong>%1</strong> failed." ).arg( url );
@@ -1054,7 +1054,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sExists;
       break;
 
-    case  KIO::ERR_CANNOT_DELETE:
+    case  TDEIO::ERR_CANNOT_DELETE:
       errorName = i18n( "Could Not Delete Resource" );
       description = i18n( "An attempt to delete the specified resource "
         "<strong>%1</strong> failed." ).arg( url );
@@ -1062,7 +1062,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sExists;
       break;
 
-    case  KIO::ERR_SLAVE_DIED:
+    case  TDEIO::ERR_SLAVE_DIED:
       errorName = i18n( "Unexpected Program Termination" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol has unexpectedly terminated." )
@@ -1071,7 +1071,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_OUT_OF_MEMORY:
+    case  TDEIO::ERR_OUT_OF_MEMORY:
       errorName = i18n( "Out of Memory" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol could not obtain the memory "
@@ -1080,7 +1080,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_UNKNOWN_PROXY_HOST:
+    case  TDEIO::ERR_UNKNOWN_PROXY_HOST:
       errorName = i18n( "Unknown Proxy Host" );
       description = i18n( "While retrieving information about the specified "
         "proxy host, <strong>%1</strong>, an Unknown Host error was encountered. "
@@ -1094,7 +1094,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_AUTHENTICATE:
+    case  TDEIO::ERR_COULD_NOT_AUTHENTICATE:
       errorName = i18n( "Authentication Failed: Method %1 Not Supported" )
          .arg( errorText );
       description = i18n( "Although you may have supplied the correct "
@@ -1106,14 +1106,14 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "authentication method." ) << sSysadmin;
       break;
 
-    case  KIO::ERR_ABORTED:
+    case  TDEIO::ERR_ABORTED:
       errorName = i18n( "Request Aborted" );
       description = i18n( "The request was not completed because it was "
         "aborted." );
       solutions << i18n( "Retry the request." );
       break;
 
-    case  KIO::ERR_INTERNAL_SERVER:
+    case  TDEIO::ERR_INTERNAL_SERVER:
       errorName = i18n( "Internal Error in Server" );
       description = i18n( "The program on the server which provides access "
         "to the <strong>%1</strong> protocol has reported an internal error: "
@@ -1127,7 +1127,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "submit the bug report directly to them." );
       break;
 
-    case  KIO::ERR_SERVER_TIMEOUT:
+    case  TDEIO::ERR_SERVER_TIMEOUT:
       errorName = i18n( "Timeout Error" );
       description = i18n( "Although contact was made with the server, a "
         "response was not received within the amount of time allocated for "
@@ -1145,7 +1145,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTryagain << sServeradmin;
       break;
 
-    case  KIO::ERR_UNKNOWN:
+    case  TDEIO::ERR_UNKNOWN:
       errorName = i18n( "Unknown Error" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol has reported an unknown error: "
@@ -1154,7 +1154,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_UNKNOWN_INTERRUPT:
+    case  TDEIO::ERR_UNKNOWN_INTERRUPT:
       errorName = i18n( "Unknown Interruption" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol has reported an interruption of "
@@ -1163,7 +1163,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case KIO::ERR_CANNOT_DELETE_ORIGINAL:
+    case TDEIO::ERR_CANNOT_DELETE_ORIGINAL:
       errorName = i18n( "Could Not Delete Original File" );
       description = i18n( "The requested operation required the deleting of "
         "the original file, most likely at the end of a file move operation. "
@@ -1173,7 +1173,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_CANNOT_DELETE_PARTIAL:
+    case TDEIO::ERR_CANNOT_DELETE_PARTIAL:
       errorName = i18n( "Could Not Delete Temporary File" );
       description = i18n( "The requested operation required the creation of "
         "a temporary file in which to save the new file while being "
@@ -1183,7 +1183,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_CANNOT_RENAME_ORIGINAL:
+    case TDEIO::ERR_CANNOT_RENAME_ORIGINAL:
       errorName = i18n( "Could Not Rename Original File" );
       description = i18n( "The requested operation required the renaming of "
         "the original file <strong>%1</strong>, however it could not be "
@@ -1192,7 +1192,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_CANNOT_RENAME_PARTIAL:
+    case TDEIO::ERR_CANNOT_RENAME_PARTIAL:
       errorName = i18n( "Could Not Rename Temporary File" );
       description = i18n( "The requested operation required the creation of "
         "a temporary file <strong>%1</strong>, however it could not be "
@@ -1201,7 +1201,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_CANNOT_SYMLINK:
+    case TDEIO::ERR_CANNOT_SYMLINK:
       errorName = i18n( "Could Not Create Link" );
       techName = i18n( "Could Not Create Symbolic Link" );
       description = i18n( "The requested symbolic link %1 could not be created." )
@@ -1210,12 +1210,12 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_NO_CONTENT:
+    case TDEIO::ERR_NO_CONTENT:
       errorName = i18n( "No Content" );
       description = errorText;
       break;
 
-    case KIO::ERR_DISK_FULL:
+    case TDEIO::ERR_DISK_FULL:
       errorName = i18n( "Disk Full" );
       description = i18n( "The requested file <strong>%1</strong> could not be "
         "written to as there is inadequate disk space." ).arg( errorText );
@@ -1225,7 +1225,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << sSysadmin;
       break;
 
-    case KIO::ERR_IDENTICAL_FILES:
+    case TDEIO::ERR_IDENTICAL_FILES:
       errorName = i18n( "Source and Destination Files Identical" );
       description = i18n( "The operation could not be completed because the "
         "source and destination files are the same file." );
@@ -1233,7 +1233,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       break;
 
     // We assume that the slave has all the details
-    case KIO::ERR_SLAVE_DEFINED:
+    case TDEIO::ERR_SLAVE_DEFINED:
       errorName = TQString::null;
       description = errorText;
       break;
@@ -1368,7 +1368,7 @@ extern "C" void endvfsent( );
 
 #endif /* HAVE_GETMNTINFO */
 
-TQString KIO::findDeviceMountPoint( const TQString& filename )
+TQString TDEIO::findDeviceMountPoint( const TQString& filename )
 {
     TQString result;
 
@@ -1909,13 +1909,13 @@ static TQString get_mount_info(const TQString& filename,
 
 #else //!Q_OS_UNIX
 //dummy
-TQString KIO::findDeviceMountPoint( const TQString& filename )
+TQString TDEIO::findDeviceMountPoint( const TQString& filename )
 {
 	return TQString::null;
 }
 #endif
 
-TQString KIO::findPathMountPoint(const TQString& filename)
+TQString TDEIO::findPathMountPoint(const TQString& filename)
 {
 #ifdef Q_OS_UNIX
   MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
@@ -1926,7 +1926,7 @@ TQString KIO::findPathMountPoint(const TQString& filename)
 #endif 
 }
 
-bool KIO::manually_mounted(const TQString& filename)
+bool TDEIO::manually_mounted(const TQString& filename)
 {
 #ifdef Q_OS_UNIX
   MountState isautofs = Unseen, isslow = Unseen, ismanual = Unseen;
@@ -1938,7 +1938,7 @@ bool KIO::manually_mounted(const TQString& filename)
 #endif 
 }
 
-bool KIO::probably_slow_mounted(const TQString& filename)
+bool TDEIO::probably_slow_mounted(const TQString& filename)
 {
 #ifdef Q_OS_UNIX
   MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
@@ -1950,7 +1950,7 @@ bool KIO::probably_slow_mounted(const TQString& filename)
 #endif 
 }
 
-bool KIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag)
+bool TDEIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag)
 {
 #ifdef Q_OS_UNIX
   MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
@@ -1973,36 +1973,36 @@ bool KIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag)
   return false;
 }
 
-KIO::CacheControl KIO::parseCacheControl(const TQString &cacheControl)
+TDEIO::CacheControl TDEIO::parseCacheControl(const TQString &cacheControl)
 {
   TQString tmp = cacheControl.lower();
 
   if (tmp == "cacheonly")
-     return KIO::CC_CacheOnly;
+     return TDEIO::CC_CacheOnly;
   if (tmp == "cache")
-     return KIO::CC_Cache;
+     return TDEIO::CC_Cache;
   if (tmp == "verify")
-     return KIO::CC_Verify;
+     return TDEIO::CC_Verify;
   if (tmp == "refresh")
-     return KIO::CC_Refresh;
+     return TDEIO::CC_Refresh;
   if (tmp == "reload")
-     return KIO::CC_Reload;
+     return TDEIO::CC_Reload;
 
   kdDebug() << "unrecognized Cache control option:"<<cacheControl<<endl;
-  return KIO::CC_Verify;
+  return TDEIO::CC_Verify;
 }
 
-TQString KIO::getCacheControlString(KIO::CacheControl cacheControl)
+TQString TDEIO::getCacheControlString(TDEIO::CacheControl cacheControl)
 {
-    if (cacheControl == KIO::CC_CacheOnly)
+    if (cacheControl == TDEIO::CC_CacheOnly)
 	return "CacheOnly";
-    if (cacheControl == KIO::CC_Cache)
+    if (cacheControl == TDEIO::CC_Cache)
 	return "Cache";
-    if (cacheControl == KIO::CC_Verify)
+    if (cacheControl == TDEIO::CC_Verify)
 	return "Verify";
-    if (cacheControl == KIO::CC_Refresh)
+    if (cacheControl == TDEIO::CC_Refresh)
 	return "Refresh";
-    if (cacheControl == KIO::CC_Reload)
+    if (cacheControl == TDEIO::CC_Reload)
 	return "Reload";
     kdDebug() << "unrecognized Cache control enum value:"<<cacheControl<<endl;
     return TQString::null;
diff --git a/kio/kio/global.h b/kio/kio/global.h
index 6b0408c04..0091c4801 100644
--- a/kio/kio/global.h
+++ b/kio/kio/global.h
@@ -31,7 +31,7 @@
  * @short A namespace for KIO globals
  *
  */
-namespace KIO
+namespace TDEIO
 {
   /// 64-bit file offset
   typedef TQ_LLONG fileoffset_t;
@@ -44,7 +44,7 @@ namespace KIO
    * @param  size  size in bytes
    * @return converted size as a string - e.g. 123.4 kB , 12.0 MB
    */
-  KIO_EXPORT TQString convertSize( KIO::filesize_t size );
+  KIO_EXPORT TQString convertSize( TDEIO::filesize_t size );
 
   /**
    * Converts @p size from bytes to a string representation with includes
@@ -53,7 +53,7 @@ namespace KIO
    * @param  size  size in bytes
    * @return converted size as a string - e.g. 1.4 KB (1495 B), 45 B
    */
-  KIO_EXPORT TQString convertSizeWithBytes( KIO::filesize_t size );
+  KIO_EXPORT TQString convertSizeWithBytes( TDEIO::filesize_t size );
   /**
    * Converts a size to a string representation
    * Not unlike TQString::number(...)
@@ -61,7 +61,7 @@ namespace KIO
    * @param size size in bytes
    * @return  converted size as a string - e.g. 123456789
    */
-  KIO_EXPORT TQString number( KIO::filesize_t size );
+  KIO_EXPORT TQString number( TDEIO::filesize_t size );
 
   /**
    * Converts size from kilo-bytes to the string representation.
@@ -69,7 +69,7 @@ namespace KIO
    * @param  kbSize  size in kilo-bytes
    * @return converted size as a string - e.g. 123.4 kB , 12.0 MB
    */
-   KIO_EXPORT TQString convertSizeFromKB( KIO::filesize_t kbSize );
+   KIO_EXPORT TQString convertSizeFromKB( TDEIO::filesize_t kbSize );
 
   /**
    * Calculates remaining time in seconds from total size, processed size and speed.
@@ -81,8 +81,8 @@ namespace KIO
    *
    * @since 3.4
    */
-  KIO_EXPORT unsigned int calculateRemainingSeconds( KIO::filesize_t totalSize,
-                                                     KIO::filesize_t processedSize, KIO::filesize_t speed );
+  KIO_EXPORT unsigned int calculateRemainingSeconds( TDEIO::filesize_t totalSize,
+                                                     TDEIO::filesize_t processedSize, TDEIO::filesize_t speed );
 
   /**
    * Convert @p seconds to a string representing number of days, hours, minutes and seconds
@@ -103,7 +103,7 @@ namespace KIO
    * @param  speed          speed in bytes per second
    * @return calculated remaining time
    */
-  KIO_EXPORT TQTime calculateRemaining( KIO::filesize_t totalSize, KIO::filesize_t processedSize, KIO::filesize_t speed ) KDE_DEPRECATED;
+  KIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED;
 
   /**
    * Helper for showing information about a set of files and directories
@@ -114,12 +114,12 @@ namespace KIO
    * @param showSize whether to show the size in the result
    * @return the summary string
    */
-  KIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize);
+  KIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize);
 
   /**
    * Encodes (from the text displayed to the real filename)
    * This translates % into %% and / into %2f
-   * Used by KIO::link, for instance.
+   * Used by TDEIO::link, for instance.
    * @param str the file name to encode
    * @return the encoded file name
    */
@@ -401,7 +401,7 @@ namespace KIO
    * @return the cache control value
    * @see getCacheControlString()
    */
-  KIO_EXPORT KIO::CacheControl parseCacheControl(const TQString &cacheControl);
+  KIO_EXPORT TDEIO::CacheControl parseCacheControl(const TQString &cacheControl);
 
   /**
    * Returns a string representation of the given cache control method.
@@ -410,7 +410,7 @@ namespace KIO
    * @return the string representation
    * @see parseCacheControl()
    */
-  KIO_EXPORT TQString getCacheControlString(KIO::CacheControl cacheControl);
+  KIO_EXPORT TQString getCacheControlString(TDEIO::CacheControl cacheControl);
 
   /**
    * Returns the mount point where @p device is mounted
diff --git a/kio/kio/http_slave_defaults.h b/kio/kio/http_slave_defaults.h
index 715efcfdb..e3247e39b 100644
--- a/kio/kio/http_slave_defaults.h
+++ b/kio/kio/http_slave_defaults.h
@@ -27,7 +27,7 @@
 #define DEFAULT_MAX_CACHE_AGE           60*60*24*14     // 14 DAYS
 #define DEFAULT_CACHE_EXPIRE            3*60            // 3 MINS
 #define DEFAULT_CLEAN_CACHE_INTERVAL    30*60           // 30 MINS
-#define DEFAULT_CACHE_CONTROL           KIO::CC_Refresh // Verify with remote
+#define DEFAULT_CACHE_CONTROL           TDEIO::CC_Refresh // Verify with remote
 #define CACHE_REVISION                  "7\n"           // Cache version
 
 // DEFAULT USER AGENT KEY - ENABLES OS NAME
diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp
index 3bbb72432..01bb2c60d 100644
--- a/kio/kio/job.cpp
+++ b/kio/kio/job.cpp
@@ -78,8 +78,8 @@ extern "C" {
 #include <fixx11h.h>
 #endif
 
-using namespace KIO;
-template class TQPtrList<KIO::Job>;
+using namespace TDEIO;
+template class TQPtrList<TDEIO::Job>;
 
 //this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX
 #define REPORT_TIMEOUT 200
@@ -102,7 +102,7 @@ public:
     // (requires a new ctor, and moving the ctor code to some init()).
     Job* m_parentJob;
     int m_extraFlags;
-    KIO::filesize_t m_processedSize;
+    TDEIO::filesize_t m_processedSize;
     unsigned long m_userTimestamp;
 };
 
@@ -118,16 +118,16 @@ Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0)
         addMetaData("progress-id", TQString::number(m_progressId));
         //kdDebug(7007) << "Created job " << this << " with progress info -- m_progressId=" << m_progressId << endl;
         // Connect global progress info signals
-        connect( this, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
-        connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString & ) ),
-                 Observer::self(), TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString & ) ) );
-        connect( this, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
-                 Observer::self(), TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
-        connect( this, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
-                 Observer::self(), TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
-        connect( this, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
+        connect( this, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+        connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ),
+                 Observer::self(), TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) );
+        connect( this, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 Observer::self(), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( this, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 Observer::self(), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( this, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
     }
     // Don't exit while this job is running
     if (kapp)
@@ -149,12 +149,12 @@ int& Job::extraFlags()
     return d->m_extraFlags;
 }
 
-void Job::setProcessedSize(KIO::filesize_t size)
+void Job::setProcessedSize(TDEIO::filesize_t size)
 {
     d->m_processedSize = size;
 }
 
-KIO::filesize_t Job::getProcessedSize()
+TDEIO::filesize_t Job::getProcessedSize()
 {
     return d->m_processedSize;
 }
@@ -164,15 +164,15 @@ void Job::addSubjob(Job *job, bool inheritMetaData)
     //kdDebug(7007) << "addSubjob(" << job << ") this = " << this << endl;
     subjobs.append(job);
 
-    connect( job, TQT_SIGNAL(result(KIO::Job*)),
-             TQT_SLOT(slotResult(KIO::Job*)) );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
+             TQT_SLOT(slotResult(TDEIO::Job*)) );
 
     // Forward information from that subjob.
-    connect( job, TQT_SIGNAL(speed( KIO::Job*, unsigned long )),
-             TQT_SLOT(slotSpeed(KIO::Job*, unsigned long)) );
+    connect( job, TQT_SIGNAL(speed( TDEIO::Job*, unsigned long )),
+             TQT_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) );
 
-    connect( job, TQT_SIGNAL(infoMessage( KIO::Job*, const TQString & )),
-             TQT_SLOT(slotInfoMessage(KIO::Job*, const TQString &)) );
+    connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )),
+             TQT_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) );
 
     if (inheritMetaData)
        job->mergeMetaData(m_outgoingMetaData);
@@ -197,7 +197,7 @@ void Job::removeSubjob( Job *job, bool mergeMetaData, bool emitResultIfLast )
         emitResult();
 }
 
-void Job::emitPercent( KIO::filesize_t processedSize, KIO::filesize_t totalSize )
+void Job::emitPercent( TDEIO::filesize_t processedSize, TDEIO::filesize_t totalSize )
 {
   // calculate percents
   unsigned long ipercent = m_percent;
@@ -269,13 +269,13 @@ void Job::slotResult( Job *job )
     removeSubjob(job);
 }
 
-void Job::slotSpeed( KIO::Job*, unsigned long speed )
+void Job::slotSpeed( TDEIO::Job*, unsigned long speed )
 {
   //kdDebug(7007) << "Job::slotSpeed " << speed << endl;
   emitSpeed( speed );
 }
 
-void Job::slotInfoMessage( KIO::Job*, const TQString & msg )
+void Job::slotInfoMessage( TDEIO::Job*, const TQString & msg )
 {
   emit infoMessage( this, msg );
 }
@@ -352,7 +352,7 @@ bool Job::isInteractive() const
 void Job::setWindow(TQWidget *window)
 {
   m_window = window;
-  KIO::Scheduler::registerWindow(window);
+  TDEIO::Scheduler::registerWindow(window);
 }
 
 TQWidget *Job::window() const
@@ -397,7 +397,7 @@ TQString Job::queryMetaData(const TQString &key)
     return m_incomingMetaData[key];
 }
 
-void Job::setMetaData( const KIO::MetaData &_metaData)
+void Job::setMetaData( const TDEIO::MetaData &_metaData)
 {
     m_outgoingMetaData = _metaData;
 }
@@ -512,11 +512,11 @@ void SimpleJob::start(Slave *slave)
 
     if ((extraFlags() & EF_TransferJobDataSent) == 0)
     {
-        connect( m_slave, TQT_SIGNAL( totalSize( KIO::filesize_t ) ),
-                 TQT_SLOT( slotTotalSize( KIO::filesize_t ) ) );
+        connect( m_slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+                 TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
 
-        connect( m_slave, TQT_SIGNAL( processedSize( KIO::filesize_t ) ),
-                 TQT_SLOT( slotProcessedSize( KIO::filesize_t ) ) );
+        connect( m_slave, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ),
+                 TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) );
 
         connect( m_slave, TQT_SIGNAL( speed( unsigned long ) ),
                  TQT_SLOT( slotSpeed( unsigned long ) ) );
@@ -525,8 +525,8 @@ void SimpleJob::start(Slave *slave)
     connect( slave, TQT_SIGNAL( needProgressId() ),
              TQT_SLOT( slotNeedProgressId() ) );
 
-    connect( slave, TQT_SIGNAL(metaData( const KIO::MetaData& ) ),
-             TQT_SLOT( slotMetaData( const KIO::MetaData& ) ) );
+    connect( slave, TQT_SIGNAL(metaData( const TDEIO::MetaData& ) ),
+             TQT_SLOT( slotMetaData( const TDEIO::MetaData& ) ) );
 
     if (m_window)
     {
@@ -648,7 +648,7 @@ void SimpleJob::slotNeedProgressId()
     m_slave->setProgressId( m_progressId );
 }
 
-void SimpleJob::slotTotalSize( KIO::filesize_t size )
+void SimpleJob::slotTotalSize( TDEIO::filesize_t size )
 {
     if (size > m_totalSize)
     {
@@ -657,9 +657,9 @@ void SimpleJob::slotTotalSize( KIO::filesize_t size )
     }
 }
 
-void SimpleJob::slotProcessedSize( KIO::filesize_t size )
+void SimpleJob::slotProcessedSize( TDEIO::filesize_t size )
 {
-    //kdDebug(7007) << "SimpleJob::slotProcessedSize " << KIO::number(size) << endl;
+    //kdDebug(7007) << "SimpleJob::slotProcessedSize " << TDEIO::number(size) << endl;
     setProcessedSize(size);
     emit processedSize( this, size );
     if ( size > m_totalSize ) {
@@ -674,7 +674,7 @@ void SimpleJob::slotSpeed( unsigned long speed )
     emitSpeed( speed );
 }
 
-void SimpleJob::slotMetaData( const KIO::MetaData &_metaData)
+void SimpleJob::slotMetaData( const TDEIO::MetaData &_metaData)
 {
     m_incomingMetaData += _metaData;
 }
@@ -748,48 +748,48 @@ void MkdirJob::slotFinished()
     }
 }
 
-SimpleJob *KIO::mkdir( const KURL& url, int permissions )
+SimpleJob *TDEIO::mkdir( const KURL& url, int permissions )
 {
     //kdDebug(7007) << "mkdir " << url << endl;
     KIO_ARGS << url << permissions;
     return new MkdirJob(url, CMD_MKDIR, packedArgs, false);
 }
 
-SimpleJob *KIO::rmdir( const KURL& url )
+SimpleJob *TDEIO::rmdir( const KURL& url )
 {
     //kdDebug(7007) << "rmdir " << url << endl;
     KIO_ARGS << url << TQ_INT8(false); // isFile is false
     return new SimpleJob(url, CMD_DEL, packedArgs, false);
 }
 
-SimpleJob *KIO::chmod( const KURL& url, int permissions )
+SimpleJob *TDEIO::chmod( const KURL& url, int permissions )
 {
     //kdDebug(7007) << "chmod " << url << endl;
     KIO_ARGS << url << permissions;
     return new SimpleJob(url, CMD_CHMOD, packedArgs, false);
 }
 
-SimpleJob *KIO::rename( const KURL& src, const KURL & dest, bool overwrite )
+SimpleJob *TDEIO::rename( const KURL& src, const KURL & dest, bool overwrite )
 {
     //kdDebug(7007) << "rename " << src << " " << dest << endl;
     KIO_ARGS << src << dest << (TQ_INT8) overwrite;
     return new SimpleJob(src, CMD_RENAME, packedArgs, false);
 }
 
-SimpleJob *KIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo )
+SimpleJob *TDEIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo )
 {
     //kdDebug(7007) << "symlink target=" << target << " " << dest << endl;
     KIO_ARGS << target << dest << (TQ_INT8) overwrite;
     return new SimpleJob(dest, CMD_SYMLINK, packedArgs, showProgressInfo);
 }
 
-SimpleJob *KIO::special(const KURL& url, const TQByteArray & data, bool showProgressInfo)
+SimpleJob *TDEIO::special(const KURL& url, const TQByteArray & data, bool showProgressInfo)
 {
     //kdDebug(7007) << "special " << url << endl;
     return new SimpleJob(url, CMD_SPECIAL, data, showProgressInfo);
 }
 
-SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo )
+SimpleJob *TDEIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo )
 {
     KIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 )
              << TQString::fromLatin1(fstype) << dev << point;
@@ -799,7 +799,7 @@ SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const T
     return job;
 }
 
-SimpleJob *KIO::unmount( const TQString& point, bool showProgressInfo )
+SimpleJob *TDEIO::unmount( const TQString& point, bool showProgressInfo )
 {
     KIO_ARGS << int(2) << point;
     SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo );
@@ -837,7 +837,7 @@ void LocalURLJob::slotFinished()
     SimpleJob::slotFinished();
 }
 
-LocalURLJob *KIO::localURL( const KURL& remoteUrl )
+LocalURLJob *TDEIO::localURL( const KURL& remoteUrl )
 {
     KIO_ARGS << remoteUrl;
     return new LocalURLJob(remoteUrl, CMD_LOCALURL, packedArgs, false);
@@ -858,15 +858,15 @@ void StatJob::start(Slave *slave)
     m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" );
     m_outgoingMetaData.replace( "details", TQString::number(m_details) );
 
-    connect( slave, TQT_SIGNAL( statEntry( const KIO::UDSEntry& ) ),
-             TQT_SLOT( slotStatEntry( const KIO::UDSEntry & ) ) );
+    connect( slave, TQT_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ),
+             TQT_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) );
     connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
              TQT_SLOT( slotRedirection(const KURL &) ) );
 
     SimpleJob::start(slave);
 }
 
-void StatJob::slotStatEntry( const KIO::UDSEntry & entry )
+void StatJob::slotStatEntry( const TDEIO::UDSEntry & entry )
 {
     //kdDebug(7007) << "StatJob::slotStatEntry" << endl;
     m_statResult = entry;
@@ -912,18 +912,18 @@ void StatJob::slotFinished()
     }
 }
 
-void StatJob::slotMetaData( const KIO::MetaData &_metaData) {
+void StatJob::slotMetaData( const TDEIO::MetaData &_metaData) {
     SimpleJob::slotMetaData(_metaData);
     storeSSLSessionFromJob(m_redirectionURL);
 }
 
-StatJob *KIO::stat(const KURL& url, bool showProgressInfo)
+StatJob *TDEIO::stat(const KURL& url, bool showProgressInfo)
 {
     // Assume sideIsSource. Gets are more common than puts.
     return stat( url, true, 2, showProgressInfo );
 }
 
-StatJob *KIO::stat(const KURL& url, bool sideIsSource, short int details, bool showProgressInfo)
+StatJob *TDEIO::stat(const KURL& url, bool sideIsSource, short int details, bool showProgressInfo)
 {
     kdDebug(7007) << "stat " << url << endl;
     KIO_ARGS << url;
@@ -935,7 +935,7 @@ StatJob *KIO::stat(const KURL& url, bool sideIsSource, short int details, bool s
     return job;
 }
 
-SimpleJob *KIO::http_update_cache( const KURL& url, bool no_cache, time_t expireDate)
+SimpleJob *TDEIO::http_update_cache( const KURL& url, bool no_cache, time_t expireDate)
 {
     assert( (url.protocol() == "http") || (url.protocol() == "https") );
     // Send http update_cache command (2)
@@ -1074,7 +1074,7 @@ void TransferJob::sendAsyncData(const TQByteArray &dataForSlave)
        m_slave->send( MSG_DATA, dataForSlave );
        if (extraFlags() & EF_TransferJobDataSent)
        {
-           KIO::filesize_t size = getProcessedSize()+dataForSlave.size();
+           TDEIO::filesize_t size = getProcessedSize()+dataForSlave.size();
            setProcessedSize(size);
            emit processedSize( this, size );
            if ( size > m_totalSize ) {
@@ -1181,8 +1181,8 @@ void TransferJob::start(Slave *slave)
     connect( slave, TQT_SIGNAL( needSubURLData() ),
              TQT_SLOT( slotNeedSubURLData() ) );
 
-    connect( slave, TQT_SIGNAL(canResume( KIO::filesize_t ) ),
-             TQT_SLOT( slotCanResume( KIO::filesize_t ) ) );
+    connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ),
+             TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
 
     if (slave->suspended())
     {
@@ -1199,14 +1199,14 @@ void TransferJob::start(Slave *slave)
 void TransferJob::slotNeedSubURLData()
 {
     // Job needs data from subURL.
-    m_subJob = KIO::get( m_subUrl, false, false);
+    m_subJob = TDEIO::get( m_subUrl, false, false);
     suspend(); // Put job on hold until we have some data.
-    connect(m_subJob, TQT_SIGNAL( data(KIO::Job*,const TQByteArray &)),
-            TQT_SLOT( slotSubURLData(KIO::Job*,const TQByteArray &)));
+    connect(m_subJob, TQT_SIGNAL( data(TDEIO::Job*,const TQByteArray &)),
+            TQT_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &)));
     addSubjob(m_subJob);
 }
 
-void TransferJob::slotSubURLData(KIO::Job*, const TQByteArray &data)
+void TransferJob::slotSubURLData(TDEIO::Job*, const TQByteArray &data)
 {
     // The Alternating Bitburg protocol in action again.
     staticData = data;
@@ -1214,7 +1214,7 @@ void TransferJob::slotSubURLData(KIO::Job*, const TQByteArray &data)
     resume(); // Activate ourselves again.
 }
 
-void TransferJob::slotMetaData( const KIO::MetaData &_metaData) {
+void TransferJob::slotMetaData( const TDEIO::MetaData &_metaData) {
     SimpleJob::slotMetaData(_metaData);
     storeSSLSessionFromJob(m_redirectionURL);
 }
@@ -1224,12 +1224,12 @@ void TransferJob::slotErrorPage()
     m_errorPage = true;
 }
 
-void TransferJob::slotCanResume( KIO::filesize_t offset )
+void TransferJob::slotCanResume( TDEIO::filesize_t offset )
 {
     emit canResume(this, offset);
 }
 
-void TransferJob::slotResult( KIO::Job *job)
+void TransferJob::slotResult( TDEIO::Job *job)
 {
    // This can only be our suburl.
    assert(job == m_subJob);
@@ -1251,7 +1251,7 @@ void TransferJob::slotResult( KIO::Job *job)
    removeSubjob( job, false, false ); // Remove job, but don't kill this job.
 }
 
-TransferJob *KIO::get( const KURL& url, bool reload, bool showProgressInfo )
+TransferJob *TDEIO::get( const KURL& url, bool reload, bool showProgressInfo )
 {
     // Send decoded path and encoded query
     KIO_ARGS << url;
@@ -1274,7 +1274,7 @@ public:
 
 };
 
-TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo )
+TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo )
 {
     int _error = 0;
 
@@ -1344,7 +1344,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
     for (int cnt=0; bad_ports[cnt]; ++cnt)
         if (url.port() == bad_ports[cnt])
         {
-            _error = KIO::ERR_POST_DENIED;
+            _error = TDEIO::ERR_POST_DENIED;
             break;
         }
 
@@ -1354,7 +1354,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
 	static TQValueList< int >* overriden_ports = NULL;
 	if( !override_loaded )
 	{
-	    KConfig cfg( "kio_httprc", true );
+	    TDEConfig cfg( "kio_httprc", true );
 	    overriden_ports = new TQValueList< int >;
 	    *overriden_ports = cfg.readIntListEntry( "OverriddenPorts" );
 	    override_loaded = true;
@@ -1368,7 +1368,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
 
     // filter out non https? protocols
     if ((url.protocol() != "http") && (url.protocol() != "https" ))
-        _error = KIO::ERR_POST_DENIED;
+        _error = TDEIO::ERR_POST_DENIED;
 
     bool redirection = false;
     KURL _url(url);
@@ -1379,7 +1379,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
     }
 
     if (!_error && !kapp->authorizeURLAction("open", KURL(), _url))
-        _error = KIO::ERR_ACCESS_DENIED;
+        _error = TDEIO::ERR_ACCESS_DENIED;
 
     // if request is not valid, return an invalid transfer job
     if (_error)
@@ -1411,7 +1411,7 @@ void TransferJob::slotPostRedirection()
 }
 
 
-TransferJob *KIO::put( const KURL& url, int permissions,
+TransferJob *TDEIO::put( const KURL& url, int permissions,
                   bool overwrite, bool resume, bool showProgressInfo )
 {
     KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
@@ -1428,10 +1428,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
     : TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
       m_uploadOffset( 0 )
 {
-    connect( this, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotStoredData( KIO::Job *, const TQByteArray & ) ) );
-    connect( this, TQT_SIGNAL( dataReq( KIO::Job *, TQByteArray & ) ),
-             TQT_SLOT( slotStoredDataReq( KIO::Job *, TQByteArray & ) ) );
+    connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQT_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
+             TQT_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) );
 }
 
 void StoredTransferJob::setData( const TQByteArray& arr )
@@ -1441,7 +1441,7 @@ void StoredTransferJob::setData( const TQByteArray& arr )
     m_data = arr;
 }
 
-void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data )
+void StoredTransferJob::slotStoredData( TDEIO::Job *, const TQByteArray &data )
 {
   // check for end-of-data marker:
   if ( data.size() == 0 )
@@ -1451,7 +1451,7 @@ void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data )
   memcpy( m_data.data() + oldSize, data.data(), data.size() );
 }
 
-void StoredTransferJob::slotStoredDataReq( KIO::Job *, TQByteArray &data )
+void StoredTransferJob::slotStoredDataReq( TDEIO::Job *, TQByteArray &data )
 {
   // Inspired from kmail's KMKernel::byteArrayToRemoteFile
   // send the data in 64 KB chunks
@@ -1472,7 +1472,7 @@ void StoredTransferJob::slotStoredDataReq( KIO::Job *, TQByteArray &data )
   }
 }
 
-StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgressInfo )
+StoredTransferJob *TDEIO::storedGet( const KURL& url, bool reload, bool showProgressInfo )
 {
     // Send decoded path and encoded query
     KIO_ARGS << url;
@@ -1482,7 +1482,7 @@ StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgre
     return job;
 }
 
-StoredTransferJob *KIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions,
+StoredTransferJob *TDEIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions,
                                    bool overwrite, bool resume, bool showProgressInfo )
 {
     KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
@@ -1508,7 +1508,7 @@ void MimetypeJob::start(Slave *slave)
 void MimetypeJob::slotFinished( )
 {
     //kdDebug(7007) << "MimetypeJob::slotFinished()" << endl;
-    if ( m_error == KIO::ERR_IS_DIRECTORY )
+    if ( m_error == TDEIO::ERR_IS_DIRECTORY )
     {
         // It is in fact a directory. This happens when HTTP redirects to FTP.
         // Due to the "protocol doesn't support listing" code in KRun, we
@@ -1540,7 +1540,7 @@ void MimetypeJob::slotFinished( )
     }
 }
 
-MimetypeJob *KIO::mimetype(const KURL& url, bool showProgressInfo )
+MimetypeJob *TDEIO::mimetype(const KURL& url, bool showProgressInfo )
 {
     KIO_ARGS << url;
     MimetypeJob * job = new MimetypeJob(url, CMD_MIMETYPE, packedArgs, showProgressInfo);
@@ -1559,12 +1559,12 @@ DirectCopyJob::DirectCopyJob( const KURL& url, int command,
 
 void DirectCopyJob::start( Slave* slave )
 {
-    connect( slave, TQT_SIGNAL(canResume( KIO::filesize_t ) ),
-             TQT_SLOT( slotCanResume( KIO::filesize_t ) ) );
+    connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ),
+             TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
     SimpleJob::start(slave);
 }
 
-void DirectCopyJob::slotCanResume( KIO::filesize_t offset )
+void DirectCopyJob::slotCanResume( TDEIO::filesize_t offset )
 {
     emit canResume(this, offset);
 }
@@ -1575,7 +1575,7 @@ void DirectCopyJob::slotCanResume( KIO::filesize_t offset )
 class FileCopyJob::FileCopyJobPrivate
 {
 public:
-    KIO::filesize_t m_sourceSize;
+    TDEIO::filesize_t m_sourceSize;
     time_t m_modificationTime;
     SimpleJob *m_delJob;
 };
@@ -1605,7 +1605,7 @@ FileCopyJob::FileCopyJob( const KURL& src, const KURL& dest, int permissions,
     m_putJob = 0;
     d = new FileCopyJobPrivate;
     d->m_delJob = 0;
-    d->m_sourceSize = (KIO::filesize_t) -1;
+    d->m_sourceSize = (TDEIO::filesize_t) -1;
     d->m_modificationTime = static_cast<time_t>( -1 );
     TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
 }
@@ -1677,10 +1677,10 @@ void FileCopyJob::setSourceSize( off_t size )
        m_totalSize = size;
 }
 
-void FileCopyJob::setSourceSize64( KIO::filesize_t size )
+void FileCopyJob::setSourceSize64( TDEIO::filesize_t size )
 {
     d->m_sourceSize = size;
-    if (size != (KIO::filesize_t) -1)
+    if (size != (TDEIO::filesize_t) -1)
        m_totalSize = size;
 }
 
@@ -1701,8 +1701,8 @@ void FileCopyJob::startCopyJob(const KURL &slave_url)
     m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false);
     addSubjob( m_copyJob );
     connectSubjob( m_copyJob );
-    connect( m_copyJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)),
-             TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t)));
+    connect( m_copyJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+             TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
 }
 
 void FileCopyJob::startRenameJob(const KURL &slave_url)
@@ -1715,18 +1715,18 @@ void FileCopyJob::startRenameJob(const KURL &slave_url)
 
 void FileCopyJob::connectSubjob( SimpleJob * job )
 {
-    connect( job, TQT_SIGNAL(totalSize( KIO::Job*, KIO::filesize_t )),
-             this, TQT_SLOT( slotTotalSize(KIO::Job*, KIO::filesize_t)) );
+    connect( job, TQT_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )),
+             this, TQT_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) );
 
-    connect( job, TQT_SIGNAL(processedSize( KIO::Job*, KIO::filesize_t )),
-             this, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t)) );
+    connect( job, TQT_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )),
+             this, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) );
 
-    connect( job, TQT_SIGNAL(percent( KIO::Job*, unsigned long )),
-             this, TQT_SLOT( slotPercent(KIO::Job*, unsigned long)) );
+    connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )),
+             this, TQT_SLOT( slotPercent(TDEIO::Job*, unsigned long)) );
 
 }
 
-void FileCopyJob::slotProcessedSize( KIO::Job *, KIO::filesize_t size )
+void FileCopyJob::slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t size )
 {
     setProcessedSize(size);
     emit processedSize( this, size );
@@ -1736,7 +1736,7 @@ void FileCopyJob::slotProcessedSize( KIO::Job *, KIO::filesize_t size )
     emitPercent( size, m_totalSize );
 }
 
-void FileCopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size )
+void FileCopyJob::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size )
 {
     if (size > m_totalSize)
     {
@@ -1745,7 +1745,7 @@ void FileCopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size )
     }
 }
 
-void FileCopyJob::slotPercent( KIO::Job*, unsigned long pct )
+void FileCopyJob::slotPercent( TDEIO::Job*, unsigned long pct )
 {
     if ( pct > m_percent )
     {
@@ -1770,18 +1770,18 @@ void FileCopyJob::startDataPump()
 
     // The first thing the put job will tell us is whether we can
     // resume or not (this is always emitted)
-    connect( m_putJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)),
-             TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t)));
-    connect( m_putJob, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray&)),
-             TQT_SLOT( slotDataReq(KIO::Job *, TQByteArray&)));
+    connect( m_putJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+             TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
+    connect( m_putJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)),
+             TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&)));
     addSubjob( m_putJob );
 }
 
-void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
+void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset )
 {
     if ( job == m_putJob || job == m_copyJob )
     {
-        //kdDebug(7007) << "FileCopyJob::slotCanResume from PUT job. offset=" << KIO::number(offset) << endl;
+        //kdDebug(7007) << "FileCopyJob::slotCanResume from PUT job. offset=" << TDEIO::number(offset) << endl;
         if (offset)
         {
             RenameDlg_Result res = R_RESUME;
@@ -1789,7 +1789,7 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
             if (!KProtocolManager::autoResume() && !m_overwrite)
             {
                 TQString newPath;
-                KIO::Job* job = ( !m_progressId && parentJob() ) ? parentJob() : this;
+                TDEIO::Job* job = ( !m_progressId && parentJob() ) ? parentJob() : this;
                 // Ask confirmation about resuming previous transfer
                 res = Observer::self()->open_RenameDlg(
                       job, i18n("File Already Exists"),
@@ -1822,18 +1822,18 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
             m_getJob->addMetaData( "errorPage", "false" );
             m_getJob->addMetaData( "AllowCompressedPage", "false" );
             // Set size in subjob. This helps if the slave doesn't emit totalSize.
-            if ( d->m_sourceSize != (KIO::filesize_t)-1 )
+            if ( d->m_sourceSize != (TDEIO::filesize_t)-1 )
                 m_getJob->slotTotalSize( d->m_sourceSize );
             if (offset)
             {
                 //kdDebug(7007) << "Setting metadata for resume to " << (unsigned long) offset << endl;
 		// TODO KDE4: rename to seek or offset and document it
 		// This isn't used only for resuming, but potentially also for extracting (#72302).
-                m_getJob->addMetaData( "resume", KIO::number(offset) );
+                m_getJob->addMetaData( "resume", TDEIO::number(offset) );
 
                 // Might or might not get emitted
-                connect( m_getJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)),
-                         TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t)));
+                connect( m_getJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+                         TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
             }
             m_putJob->slave()->setOffset( offset );
 
@@ -1842,10 +1842,10 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
             connectSubjob( m_getJob ); // Progress info depends on get
             m_getJob->resume(); // Order a beer
 
-            connect( m_getJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)),
-                     TQT_SLOT( slotData(KIO::Job*,const TQByteArray&)) );
-            connect( m_getJob, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&) ),
-                     TQT_SLOT(slotMimetype(KIO::Job*,const TQString&)) );
+            connect( m_getJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+                     TQT_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) );
+            connect( m_getJob, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ),
+                     TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) );
         }
         else // copyjob
         {
@@ -1865,7 +1865,7 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
                         << " m_getJob=" << m_getJob << " m_putJob=" << m_putJob << endl;
 }
 
-void FileCopyJob::slotData( KIO::Job * , const TQByteArray &data)
+void FileCopyJob::slotData( TDEIO::Job * , const TQByteArray &data)
 {
    //kdDebug(7007) << "FileCopyJob::slotData" << endl;
    //kdDebug(7007) << " data size : " << data.size() << endl;
@@ -1885,7 +1885,7 @@ void FileCopyJob::slotData( KIO::Job * , const TQByteArray &data)
    }
 }
 
-void FileCopyJob::slotDataReq( KIO::Job * , TQByteArray &data)
+void FileCopyJob::slotDataReq( TDEIO::Job * , TQByteArray &data)
 {
    //kdDebug(7007) << "FileCopyJob::slotDataReq" << endl;
    if (!m_resumeAnswerSent && !m_getJob)
@@ -1906,12 +1906,12 @@ void FileCopyJob::slotDataReq( KIO::Job * , TQByteArray &data)
    m_buffer = TQByteArray();
 }
 
-void FileCopyJob::slotMimetype( KIO::Job*, const TQString& type )
+void FileCopyJob::slotMimetype( TDEIO::Job*, const TQString& type )
 {
     emit mimetype( this, type );
 }
 
-void FileCopyJob::slotResult( KIO::Job *job)
+void FileCopyJob::slotResult( TDEIO::Job *job)
 {
    //kdDebug(7007) << "FileCopyJob this=" << this << " ::slotResult(" << job << ")" << endl;
    // Did job have an error ?
@@ -1994,19 +1994,19 @@ void FileCopyJob::slotResult( KIO::Job *job)
    removeSubjob(job);
 }
 
-FileCopyJob *KIO::file_copy( const KURL& src, const KURL& dest, int permissions,
+FileCopyJob *TDEIO::file_copy( const KURL& src, const KURL& dest, int permissions,
                              bool overwrite, bool resume, bool showProgressInfo)
 {
    return new FileCopyJob( src, dest, permissions, false, overwrite, resume, showProgressInfo );
 }
 
-FileCopyJob *KIO::file_move( const KURL& src, const KURL& dest, int permissions,
+FileCopyJob *TDEIO::file_move( const KURL& src, const KURL& dest, int permissions,
                              bool overwrite, bool resume, bool showProgressInfo)
 {
    return new FileCopyJob( src, dest, permissions, true, overwrite, resume, showProgressInfo );
 }
 
-SimpleJob *KIO::file_delete( const KURL& src, bool showProgressInfo)
+SimpleJob *TDEIO::file_delete( const KURL& src, bool showProgressInfo)
 {
     KIO_ARGS << src << TQ_INT8(true); // isFile
     return new SimpleJob(src, CMD_DEL, packedArgs, showProgressInfo );
@@ -2025,7 +2025,7 @@ ListJob::ListJob(const KURL& u, bool showProgressInfo, bool _recursive, TQString
     stream << u;
 }
 
-void ListJob::slotListEntries( const KIO::UDSEntryList& list )
+void ListJob::slotListEntries( const TDEIO::UDSEntryList& list )
 {
     // Emit progress info (takes care of emit processedSize and percent)
     m_processedEntries += list.count();
@@ -2074,10 +2074,10 @@ void ListJob::slotListEntries( const KIO::UDSEntryList& list )
                                                prefix + filename + "/",
                                                includeHidden);
                     Scheduler::scheduleJob(job);
-                    connect(job, TQT_SIGNAL(entries( KIO::Job *,
-                                                 const KIO::UDSEntryList& )),
-                            TQT_SLOT( gotEntries( KIO::Job*,
-                                              const KIO::UDSEntryList& )));
+                    connect(job, TQT_SIGNAL(entries( TDEIO::Job *,
+                                                 const TDEIO::UDSEntryList& )),
+                            TQT_SLOT( gotEntries( TDEIO::Job*,
+                                              const TDEIO::UDSEntryList& )));
                     addSubjob(job);
                 }
             }
@@ -2117,13 +2117,13 @@ void ListJob::slotListEntries( const KIO::UDSEntryList& list )
     }
 }
 
-void ListJob::gotEntries(KIO::Job *, const KIO::UDSEntryList& list )
+void ListJob::gotEntries(TDEIO::Job *, const TDEIO::UDSEntryList& list )
 {
     // Forward entries received by subjob - faking we received them ourselves
     emit entries(this, list);
 }
 
-void ListJob::slotResult( KIO::Job * job )
+void ListJob::slotResult( TDEIO::Job * job )
 {
     // If we can't list a subdir, the result is still ok
     // This is why we override Job::slotResult() - to skip error checking
@@ -2146,7 +2146,7 @@ void ListJob::slotRedirection( const KURL & url )
 void ListJob::slotFinished()
 {
     // Support for listing archives as directories
-    if ( m_error == KIO::ERR_IS_FILE && m_url.isLocalFile() ) {
+    if ( m_error == TDEIO::ERR_IS_FILE && m_url.isLocalFile() ) {
         KMimeType::Ptr ptr = KMimeType::findByURL( m_url, 0, true, true );
         if ( ptr ) {
             TQString proto = ptr->property("X-TDE-LocalProtocol").toString();
@@ -2178,18 +2178,18 @@ void ListJob::slotFinished()
     }
 }
 
-void ListJob::slotMetaData( const KIO::MetaData &_metaData) {
+void ListJob::slotMetaData( const TDEIO::MetaData &_metaData) {
     SimpleJob::slotMetaData(_metaData);
     storeSSLSessionFromJob(m_redirectionURL);
 }
 
-ListJob *KIO::listDir( const KURL& url, bool showProgressInfo, bool includeHidden )
+ListJob *TDEIO::listDir( const KURL& url, bool showProgressInfo, bool includeHidden )
 {
     ListJob * job = new ListJob(url, showProgressInfo,false,TQString::null,includeHidden);
     return job;
 }
 
-ListJob *KIO::listRecursive( const KURL& url, bool showProgressInfo, bool includeHidden )
+ListJob *TDEIO::listRecursive( const KURL& url, bool showProgressInfo, bool includeHidden )
 {
     ListJob * job = new ListJob(url, showProgressInfo, true,TQString::null,includeHidden);
     return job;
@@ -2212,10 +2212,10 @@ void ListJob::start(Slave *slave)
         TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) );
         return;
     }
-    connect( slave, TQT_SIGNAL( listEntries( const KIO::UDSEntryList& )),
-             TQT_SLOT( slotListEntries( const KIO::UDSEntryList& )));
-    connect( slave, TQT_SIGNAL( totalSize( KIO::filesize_t ) ),
-             TQT_SLOT( slotTotalSize( KIO::filesize_t ) ) );
+    connect( slave, TQT_SIGNAL( listEntries( const TDEIO::UDSEntryList& )),
+             TQT_SLOT( slotListEntries( const TDEIO::UDSEntryList& )));
+    connect( slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+             TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
     connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
              TQT_SLOT( slotRedirection(const KURL &) ) );
 
@@ -2260,11 +2260,11 @@ CopyJob::CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool a
     d->m_globalDestinationState = destinationState;
 
     if ( showProgressInfo ) {
-        connect( this, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
+        connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
 
-        connect( this, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+        connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
     }
     TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
     /**
@@ -2301,7 +2301,7 @@ void CopyJob::slotStart()
     m_reportTimer->start(REPORT_TIMEOUT,false);
 
     // Stat the dest
-    KIO::Job * job = KIO::stat( m_dest, false, 2, false );
+    TDEIO::Job * job = TDEIO::stat( m_dest, false, 2, false );
     //kdDebug(7007) << "CopyJob:stating the dest " << m_dest << endl;
     addSubjob(job);
 }
@@ -2328,7 +2328,7 @@ void CopyJob::slotResultStating( Job *job )
             info.permissions = (mode_t) -1;
             info.mtime = (time_t) -1;
             info.ctime = (time_t) -1;
-            info.size = (KIO::filesize_t)-1;
+            info.size = (TDEIO::filesize_t)-1;
             info.uSource = srcurl;
             info.uDest = m_dest;
             // Append filename or dirname to destination URL, if allowed
@@ -2525,7 +2525,7 @@ void CopyJob::slotReport()
     }
 }
 
-void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
+void CopyJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list)
 {
     UDSEntryListConstIterator it = list.begin();
     UDSEntryListConstIterator end = list.end();
@@ -2535,7 +2535,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
         info.permissions = -1;
         info.mtime = (time_t) -1;
         info.ctime = (time_t) -1;
-        info.size = (KIO::filesize_t)-1;
+        info.size = (TDEIO::filesize_t)-1;
         TQString displayName;
         KURL url;
         TQString localPath;
@@ -2562,7 +2562,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
                     info.permissions = ((*it2).m_long);
                     break;
                 case UDS_SIZE:
-                    info.size = (KIO::filesize_t)((*it2).m_long);
+                    info.size = (TDEIO::filesize_t)((*it2).m_long);
                     m_totalSize += info.size;
                     break;
                 case UDS_MODIFICATION_TIME:
@@ -2627,7 +2627,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
                 // Otherwise, we end up with e.g. dest=..../Desktop/ itself.
                 // (This can happen when dropping a link to a webpage with no path)
                 if ( destFileName.isEmpty() )
-                    destFileName = KIO::encodeFileName( info.uSource.prettyURL() );
+                    destFileName = TDEIO::encodeFileName( info.uSource.prettyURL() );
 
                 //kdDebug(7007) << " adding destFileName=" << destFileName << endl;
                 info.uDest.addPath( destFileName );
@@ -2682,7 +2682,7 @@ void CopyJob::statCurrentSrc()
             info.permissions = -1;
             info.mtime = (time_t) -1;
             info.ctime = (time_t) -1;
-            info.size = (KIO::filesize_t)-1;
+            info.size = (TDEIO::filesize_t)-1;
             info.uSource = m_currentSrcURL;
             info.uDest = m_currentDest;
             // Append filename or dirname to destination URL, if allowed
@@ -2703,7 +2703,7 @@ void CopyJob::statCurrentSrc()
                     // Different protocols, we'll create a .desktop file
                     // We have to change the extension anyway, so while we're at it,
                     // name the file like the URL
-                    info.uDest.addPath( KIO::encodeFileName( m_currentSrcURL.prettyURL() )+".desktop" );
+                    info.uDest.addPath( TDEIO::encodeFileName( m_currentSrcURL.prettyURL() )+".desktop" );
                 }
             }
             files.append( info ); // Files and any symlinks
@@ -2750,8 +2750,8 @@ void CopyJob::statCurrentSrc()
         }
 
         // Stat the next src url
-        Job * job = KIO::stat( m_currentSrcURL, true, 2, false );
-        //kdDebug(7007) << "KIO::stat on " << m_currentSrcURL << endl;
+        Job * job = TDEIO::stat( m_currentSrcURL, true, 2, false );
+        //kdDebug(7007) << "TDEIO::stat on " << m_currentSrcURL << endl;
         state = STATE_STATING;
         addSubjob(job);
         m_currentDestURL=m_dest;
@@ -2790,7 +2790,7 @@ void CopyJob::startRenameJob( const KURL& slave_url )
     info.permissions = -1;
     info.mtime = (time_t) -1;
     info.ctime = (time_t) -1;
-    info.size = (KIO::filesize_t)-1;
+    info.size = (TDEIO::filesize_t)-1;
     info.uSource = m_currentSrcURL;
     info.uDest = dest;
     TQValueList<CopyInfo> files;
@@ -2811,10 +2811,10 @@ void CopyJob::startListing( const KURL & src )
     d->m_bURLDirty = true;
     ListJob * newjob = listRecursive( src, false );
     newjob->setUnrestricted(true);
-    connect(newjob, TQT_SIGNAL(entries( KIO::Job *,
-                                    const KIO::UDSEntryList& )),
-            TQT_SLOT( slotEntries( KIO::Job*,
-                               const KIO::UDSEntryList& )));
+    connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *,
+                                    const TDEIO::UDSEntryList& )),
+            TQT_SLOT( slotEntries( TDEIO::Job*,
+                               const TDEIO::UDSEntryList& )));
     addSubjob( newjob );
 }
 
@@ -2888,9 +2888,9 @@ void CopyJob::slotResultCreatingDirs( Job * job )
 
                     // We need to stat the existing dir, to get its last-modification time
                     KURL existingDest( (*it).uDest );
-                    SimpleJob * newJob = KIO::stat( existingDest, false, 2, false );
+                    SimpleJob * newJob = TDEIO::stat( existingDest, false, 2, false );
                     Scheduler::scheduleJob(newJob);
-                    kdDebug(7007) << "KIO::stat for resolving conflict on " << existingDest << endl;
+                    kdDebug(7007) << "TDEIO::stat for resolving conflict on " << existingDest << endl;
                     state = STATE_CONFLICT_CREATING_DIRS;
                     addSubjob(newJob);
                     return; // Don't move to next dir yet !
@@ -2919,7 +2919,7 @@ void CopyJob::slotResultCreatingDirs( Job * job )
     createNextDir();
 }
 
-void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job )
+void CopyJob::slotResultConflictCreatingDirs( TDEIO::Job * job )
 {
     // We come here after a conflict has been detected and we've stated the existing dir
 
@@ -2928,11 +2928,11 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job )
     // Its modification time:
     time_t destmtime = (time_t)-1;
     time_t destctime = (time_t)-1;
-    KIO::filesize_t destsize = 0;
+    TDEIO::filesize_t destsize = 0;
     TQString linkDest;
 
-    UDSEntry entry = ((KIO::StatJob*)job)->statResult();
-    KIO::UDSEntry::ConstIterator it2 = entry.begin();
+    UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+    TDEIO::UDSEntry::ConstIterator it2 = entry.begin();
     for( ; it2 != entry.end(); it2++ ) {
         switch ((*it2).m_uds) {
             case UDS_MODIFICATION_TIME:
@@ -3082,7 +3082,7 @@ void CopyJob::createNextDir()
     {
         // Create the directory - with default permissions so that we can put files into it
         // TODO : change permissions once all is finished; but for stuff coming from CDROM it sucks...
-        KIO::SimpleJob *newjob = KIO::mkdir( udir, -1 );
+        TDEIO::SimpleJob *newjob = TDEIO::mkdir( udir, -1 );
         Scheduler::scheduleJob(newjob);
 
         m_currentDestURL = udir;
@@ -3132,16 +3132,16 @@ void CopyJob::slotResultCopyingFiles( Job * job )
                 assert ( subjobs.isEmpty() );
                 // We need to stat the existing file, to get its last-modification time
                 KURL existingFile( (*it).uDest );
-                SimpleJob * newJob = KIO::stat( existingFile, false, 2, false );
+                SimpleJob * newJob = TDEIO::stat( existingFile, false, 2, false );
                 Scheduler::scheduleJob(newJob);
-                kdDebug(7007) << "KIO::stat for resolving conflict on " << existingFile << endl;
+                kdDebug(7007) << "TDEIO::stat for resolving conflict on " << existingFile << endl;
                 state = STATE_CONFLICT_COPYING_FILES;
                 addSubjob(newJob);
                 return; // Don't move to next file yet !
             }
             else
             {
-                if ( m_bCurrentOperationIsLink && ::tqqt_cast<KIO::DeleteJob*>( job ) )
+                if ( m_bCurrentOperationIsLink && ::tqqt_cast<TDEIO::DeleteJob*>( job ) )
                 {
                     // Very special case, see a few lines below
                     // We are deleting the source of a symlink we successfully moved... ignore error
@@ -3158,14 +3158,14 @@ void CopyJob::slotResultCopyingFiles( Job * job )
     {
         // Special case for moving links. That operation needs two jobs, unlike others.
         if ( m_bCurrentOperationIsLink && m_mode == Move
-             && !::tqqt_cast<KIO::DeleteJob *>( job ) // Deleting source not already done
+             && !::tqqt_cast<TDEIO::DeleteJob *>( job ) // Deleting source not already done
              )
         {
             subjobs.remove( job );
             assert ( subjobs.isEmpty() );
             // The only problem with this trick is that the error handling for this del operation
             // is not going to be right... see 'Very special case' above.
-            KIO::Job * newjob = KIO::del( (*it).uSource, false /*don't shred*/, false /*no GUI*/ );
+            TDEIO::Job * newjob = TDEIO::del( (*it).uSource, false /*don't shred*/, false /*no GUI*/ );
             addSubjob( newjob );
             return; // Don't move to next file yet !
         }
@@ -3195,7 +3195,7 @@ void CopyJob::slotResultCopyingFiles( Job * job )
     copyNextFile();
 }
 
-void CopyJob::slotResultConflictCopyingFiles( KIO::Job * job )
+void CopyJob::slotResultConflictCopyingFiles( TDEIO::Job * job )
 {
     // We come here after a conflict has been detected and we've stated the existing file
     // The file we were trying to create:
@@ -3214,10 +3214,10 @@ void CopyJob::slotResultConflictCopyingFiles( KIO::Job * job )
         // Its modification time:
         time_t destmtime = (time_t)-1;
         time_t destctime = (time_t)-1;
-        KIO::filesize_t destsize = 0;
+        TDEIO::filesize_t destsize = 0;
         TQString linkDest;
-        UDSEntry entry = ((KIO::StatJob*)job)->statResult();
-        KIO::UDSEntry::ConstIterator it2 = entry.begin();
+        UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+        TDEIO::UDSEntry::ConstIterator it2 = entry.begin();
         for( ; it2 != entry.end(); it2++ ) {
             switch ((*it2).m_uds) {
                 case UDS_MODIFICATION_TIME:
@@ -3364,7 +3364,7 @@ void CopyJob::copyNextFile()
             bOverwrite = shouldOverwrite( destFile );
 
         m_bCurrentOperationIsLink = false;
-        KIO::Job * newjob = 0L;
+        TDEIO::Job * newjob = 0L;
         if ( m_mode == Link )
         {
             //kdDebug(7007) << "Linking" << endl;
@@ -3376,7 +3376,7 @@ void CopyJob::copyNextFile()
                 ((*it).uSource.pass() == (*it).uDest.pass()) )
             {
                 // This is the case of creating a real symlink
-                KIO::SimpleJob *newJob = KIO::symlink( (*it).uSource.path(), (*it).uDest, bOverwrite, false /*no GUI*/ );
+                TDEIO::SimpleJob *newJob = TDEIO::symlink( (*it).uSource.path(), (*it).uDest, bOverwrite, false /*no GUI*/ );
                 newjob = newJob;
                 Scheduler::scheduleJob(newJob);
                 //kdDebug(7007) << "CopyJob::copyNextFile : Linking target=" << (*it).uSource.path() << " link=" << (*it).uDest << endl;
@@ -3476,7 +3476,7 @@ void CopyJob::copyNextFile()
                   ((*it).uSource.pass() == (*it).uDest.pass()))
             // Copying a symlink - only on the same protocol/host/etc. (#5601, downloading an FTP file through its link),
         {
-            KIO::SimpleJob *newJob = KIO::symlink( (*it).linkDest, (*it).uDest, bOverwrite, false /*no GUI*/ );
+            TDEIO::SimpleJob *newJob = TDEIO::symlink( (*it).linkDest, (*it).uDest, bOverwrite, false /*no GUI*/ );
             Scheduler::scheduleJob(newJob);
             newjob = newJob;
             //kdDebug(7007) << "CopyJob::copyNextFile : Linking target=" << (*it).linkDest << " link=" << (*it).uDest << endl;
@@ -3489,7 +3489,7 @@ void CopyJob::copyNextFile()
             // NOTE: if we are moving stuff, the deletion of the source will be done in slotResultCopyingFiles
         } else if (m_mode == Move) // Moving a file
         {
-            KIO::FileCopyJob * moveJob = KIO::file_move( (*it).uSource, (*it).uDest, (*it).permissions, bOverwrite, false, false/*no GUI*/ );
+            TDEIO::FileCopyJob * moveJob = TDEIO::file_move( (*it).uSource, (*it).uDest, (*it).permissions, bOverwrite, false, false/*no GUI*/ );
             moveJob->setSourceSize64( (*it).size );
             newjob = moveJob;
             //kdDebug(7007) << "CopyJob::copyNextFile : Moving " << (*it).uSource << " to " << (*it).uDest << endl;
@@ -3507,7 +3507,7 @@ void CopyJob::copyNextFile()
             int permissions = (*it).permissions;
             if ( d->m_defaultPermissions || ( remoteSource && (*it).uDest.isLocalFile() ) )
                 permissions = -1;
-            KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ );
+            TDEIO::FileCopyJob * copyJob = TDEIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ );
             copyJob->setParentJob( this ); // in case of rename dialog
             copyJob->setSourceSize64( (*it).size );
             copyJob->setModificationTime( (*it).mtime );
@@ -3518,10 +3518,10 @@ void CopyJob::copyNextFile()
             d->m_bURLDirty = true;
         }
         addSubjob(newjob);
-        connect( newjob, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
-                 this, TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
-        connect( newjob, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
-                 this, TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
+        connect( newjob, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 this, TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( newjob, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 this, TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
     }
     else
     {
@@ -3539,7 +3539,7 @@ void CopyJob::deleteNextDir()
         d->m_bURLDirty = true;
         // Take first dir to delete out of list - last ones first !
         KURL::List::Iterator it = dirsToRemove.fromLast();
-        SimpleJob *job = KIO::rmdir( *it );
+        SimpleJob *job = TDEIO::rmdir( *it );
         Scheduler::scheduleJob(job);
         dirsToRemove.remove(it);
         addSubjob( job );
@@ -3604,7 +3604,7 @@ void CopyJob::setNextDirAttribute()
     }
 }
 
-void CopyJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size )
+void CopyJob::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size )
 {
   //kdDebug(7007) << "CopyJob::slotProcessedSize " << data_size << endl;
   m_fileProcessedSize = data_size;
@@ -3621,7 +3621,7 @@ void CopyJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size )
   emitPercent( m_processedSize + m_fileProcessedSize, m_totalSize );
 }
 
-void CopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size )
+void CopyJob::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size )
 {
   //kdDebug(7007) << "slotTotalSize: " << size << endl;
   // Special case for copying a single file
@@ -3753,8 +3753,8 @@ void CopyJob::slotResultRenaming( Job* job )
                 // we lack mtime info for both the src (not stated)
                 // and the dest (stated but this info wasn't stored)
                 // Let's do it for local files, at least
-                KIO::filesize_t sizeSrc = (KIO::filesize_t) -1;
-                KIO::filesize_t sizeDest = (KIO::filesize_t) -1;
+                TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1;
+                TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1;
                 time_t ctimeSrc = (time_t) -1;
                 time_t ctimeDest = (time_t) -1;
                 time_t mtimeSrc = (time_t) -1;
@@ -3799,7 +3799,7 @@ void CopyJob::slotResultRenaming( Job* job )
                     // Set m_dest to the chosen destination
                     // This is only for this src url; the next one will revert to d->m_globalDest
                     m_dest.setPath( newPath );
-                    KIO::Job* job = KIO::stat( m_dest, false, 2, false );
+                    TDEIO::Job* job = TDEIO::stat( m_dest, false, 2, false );
                     state = STATE_STATING;
                     destinationState = DEST_NOT_STATED;
                     addSubjob(job);
@@ -3829,7 +3829,7 @@ void CopyJob::slotResultRenaming( Job* job )
                     break;
                 }
             }
-        } else if ( err != KIO::ERR_UNSUPPORTED_ACTION ) {
+        } else if ( err != TDEIO::ERR_UNSUPPORTED_ACTION ) {
             kdDebug(7007) << "Couldn't rename " << m_currentSrcURL << " to " << dest << ", aborting" << endl;
             m_error = err;
             m_errorText = errText;
@@ -3837,8 +3837,8 @@ void CopyJob::slotResultRenaming( Job* job )
             return;
         }
         kdDebug(7007) << "Couldn't rename " << m_currentSrcURL << " to " << dest << ", reverting to normal way, starting with stat" << endl;
-        //kdDebug(7007) << "KIO::stat on " << m_currentSrcURL << endl;
-        KIO::Job* job = KIO::stat( m_currentSrcURL, true, 2, false );
+        //kdDebug(7007) << "TDEIO::stat on " << m_currentSrcURL << endl;
+        TDEIO::Job* job = TDEIO::stat( m_currentSrcURL, true, 2, false );
         state = STATE_STATING;
         addSubjob(job);
         m_bOnlyRenames = false;
@@ -3906,40 +3906,40 @@ void CopyJob::slotResult( Job *job )
     }
 }
 
-void KIO::CopyJob::setDefaultPermissions( bool b )
+void TDEIO::CopyJob::setDefaultPermissions( bool b )
 {
     d->m_defaultPermissions = b;
 }
 
 // KDE4: remove
-void KIO::CopyJob::setInteractive( bool b )
+void TDEIO::CopyJob::setInteractive( bool b )
 {
     Job::setInteractive( b );
 }
 
-CopyJob *KIO::copy(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::copy(const KURL& src, const KURL& dest, bool showProgressInfo )
 {
-    //kdDebug(7007) << "KIO::copy src=" << src << " dest=" << dest << endl;
+    //kdDebug(7007) << "TDEIO::copy src=" << src << " dest=" << dest << endl;
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, dest, CopyJob::Copy, false, showProgressInfo );
 }
 
-CopyJob *KIO::copyAs(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::copyAs(const KURL& src, const KURL& dest, bool showProgressInfo )
 {
-    //kdDebug(7007) << "KIO::copyAs src=" << src << " dest=" << dest << endl;
+    //kdDebug(7007) << "TDEIO::copyAs src=" << src << " dest=" << dest << endl;
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, dest, CopyJob::Copy, true, showProgressInfo );
 }
 
-CopyJob *KIO::copy( const KURL::List& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::copy( const KURL::List& src, const KURL& dest, bool showProgressInfo )
 {
     //kdDebug(7007) << src << " " << dest << endl;
     return new CopyJob( src, dest, CopyJob::Copy, false, showProgressInfo );
 }
 
-CopyJob *KIO::move(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::move(const KURL& src, const KURL& dest, bool showProgressInfo )
 {
     //kdDebug(7007) << src << " " << dest << endl;
     KURL::List srcList;
@@ -3947,7 +3947,7 @@ CopyJob *KIO::move(const KURL& src, const KURL& dest, bool showProgressInfo )
     return new CopyJob( srcList, dest, CopyJob::Move, false, showProgressInfo );
 }
 
-CopyJob *KIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo )
 {
     //kdDebug(7007) << src << " " << dest << endl;
     KURL::List srcList;
@@ -3955,39 +3955,39 @@ CopyJob *KIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo )
     return new CopyJob( srcList, dest, CopyJob::Move, true, showProgressInfo );
 }
 
-CopyJob *KIO::move( const KURL::List& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::move( const KURL::List& src, const KURL& dest, bool showProgressInfo )
 {
     //kdDebug(7007) << src << " " << dest << endl;
     return new CopyJob( src, dest, CopyJob::Move, false, showProgressInfo );
 }
 
-CopyJob *KIO::link(const KURL& src, const KURL& destDir, bool showProgressInfo )
+CopyJob *TDEIO::link(const KURL& src, const KURL& destDir, bool showProgressInfo )
 {
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo );
 }
 
-CopyJob *KIO::link(const KURL::List& srcList, const KURL& destDir, bool showProgressInfo )
+CopyJob *TDEIO::link(const KURL::List& srcList, const KURL& destDir, bool showProgressInfo )
 {
     return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo );
 }
 
-CopyJob *KIO::linkAs(const KURL& src, const KURL& destDir, bool showProgressInfo )
+CopyJob *TDEIO::linkAs(const KURL& src, const KURL& destDir, bool showProgressInfo )
 {
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo );
 }
 
-CopyJob *KIO::trash(const KURL& src, bool showProgressInfo )
+CopyJob *TDEIO::trash(const KURL& src, bool showProgressInfo )
 {
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, KURL( "trash:/" ), CopyJob::Move, false, showProgressInfo );
 }
 
-CopyJob *KIO::trash(const KURL::List& srcList, bool showProgressInfo )
+CopyJob *TDEIO::trash(const KURL::List& srcList, bool showProgressInfo )
 {
     return new CopyJob( srcList, KURL( "trash:/" ), CopyJob::Move, false, showProgressInfo );
 }
@@ -4001,21 +4001,21 @@ DeleteJob::DeleteJob( const KURL::List& src, bool /*shred*/, bool showProgressIn
 {
   if ( showProgressInfo ) {
 
-     connect( this, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-              Observer::self(), TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
+     connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+              Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
 
-     connect( this, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-              Observer::self(), TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+     connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+              Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
 
      // See slotReport
-     /*connect( this, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ),
-      m_observer, TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) );
+     /*connect( this, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+      m_observer, TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
 
-      connect( this, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ),
-      m_observer, TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) );
+      connect( this, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+      m_observer, TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
 
-      connect( this, TQT_SIGNAL( deleting( KIO::Job*, const KURL& ) ),
-      m_observer, TQT_SLOT( slotDeleting( KIO::Job*, const KURL& ) ) );*/
+      connect( this, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ),
+      m_observer, TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/
 
      m_reportTimer=new TQTimer(this);
      connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport()));
@@ -4065,7 +4065,7 @@ void DeleteJob::slotReport()
 }
 
 
-void DeleteJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
+void DeleteJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list)
 {
    UDSEntryListConstIterator it = list.begin();
    UDSEntryListConstIterator end = list.end();
@@ -4098,7 +4098,7 @@ void DeleteJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
             atomsFound++;
             break;
          case UDS_SIZE:
-            m_totalSize += (KIO::filesize_t)((*it2).m_long);
+            m_totalSize += (TDEIO::filesize_t)((*it2).m_long);
             atomsFound++;
             break;
          default:
@@ -4144,9 +4144,9 @@ void DeleteJob::statNextSrc()
         }
         // Stat it
         state = STATE_STATING;
-        KIO::SimpleJob * job = KIO::stat( m_currentURL, true, 1, false );
+        TDEIO::SimpleJob * job = TDEIO::stat( m_currentURL, true, 1, false );
         Scheduler::scheduleJob(job);
-        //kdDebug(7007) << "KIO::stat (DeleteJob) " << m_currentURL << endl;
+        //kdDebug(7007) << "TDEIO::stat (DeleteJob) " << m_currentURL << endl;
         addSubjob(job);
         //if ( m_progressId ) // Did we get an ID from the observer ?
         //  Observer::self()->slotDeleting( this, *it ); // show asap
@@ -4192,7 +4192,7 @@ void DeleteJob::deleteNextFile()
                 }
             } else
             { // if remote - or if unlink() failed (we'll use the job's error handling in that case)
-                job = KIO::file_delete( *it, false /*no GUI*/);
+                job = TDEIO::file_delete( *it, false /*no GUI*/);
                 Scheduler::scheduleJob(job);
                 m_currentURL=(*it);
             }
@@ -4231,9 +4231,9 @@ void DeleteJob::deleteNextDir()
                 if ( KProtocolInfo::canDeleteRecursive( *it ) ) {
                     // If the ioslave supports recursive deletion of a directory, then
                     // we only need to send a single CMD_DEL command, so we use file_delete :)
-                    job = KIO::file_delete( *it, false /*no gui*/ );
+                    job = TDEIO::file_delete( *it, false /*no gui*/ );
                 } else {
-                    job = KIO::rmdir( *it );
+                    job = TDEIO::rmdir( *it );
                 }
                 Scheduler::scheduleJob(job);
                 dirs.remove(it);
@@ -4260,7 +4260,7 @@ void DeleteJob::deleteNextDir()
     emitResult();
 }
 
-void DeleteJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size )
+void DeleteJob::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size )
 {
    // Note: this is the same implementation as CopyJob::slotProcessedSize but
    // it's different from FileCopyJob::slotProcessedSize - which is why this
@@ -4307,7 +4307,7 @@ void DeleteJob::slotResult( Job *job )
          UDSEntry entry = ((StatJob*)job)->statResult();
          bool bDir = false;
          bool bLink = false;
-         KIO::filesize_t size = (KIO::filesize_t)-1;
+         TDEIO::filesize_t size = (TDEIO::filesize_t)-1;
          UDSEntry::ConstIterator it2 = entry.begin();
          int atomsFound(0);
          for( ; it2 != entry.end(); it2++ )
@@ -4349,10 +4349,10 @@ void DeleteJob::slotResult( Job *job )
                 ListJob *newjob = listRecursive( url, false );
                 newjob->setUnrestricted(true); // No KIOSK restrictions
                 Scheduler::scheduleJob(newjob);
-                connect(newjob, TQT_SIGNAL(entries( KIO::Job *,
-                                                const KIO::UDSEntryList& )),
-                        TQT_SLOT( slotEntries( KIO::Job*,
-                                           const KIO::UDSEntryList& )));
+                connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *,
+                                                const TDEIO::UDSEntryList& )),
+                        TQT_SLOT( slotEntries( TDEIO::Job*,
+                                           const TDEIO::UDSEntryList& )));
                 addSubjob(newjob);
             } else {
                 ++m_currentStat;
@@ -4417,7 +4417,7 @@ void DeleteJob::slotResult( Job *job )
    }
 }
 
-DeleteJob *KIO::del( const KURL& src, bool shred, bool showProgressInfo )
+DeleteJob *TDEIO::del( const KURL& src, bool shred, bool showProgressInfo )
 {
   KURL::List srcList;
   srcList.append( src );
@@ -4425,7 +4425,7 @@ DeleteJob *KIO::del( const KURL& src, bool shred, bool showProgressInfo )
   return job;
 }
 
-DeleteJob *KIO::del( const KURL::List& src, bool shred, bool showProgressInfo )
+DeleteJob *TDEIO::del( const KURL::List& src, bool shred, bool showProgressInfo )
 {
   DeleteJob *job = new DeleteJob( src, shred, showProgressInfo );
   return job;
@@ -4599,7 +4599,7 @@ void MultiGetJob::slotMimetype( const TQString &_mimetype )
   emit mimetype(m_currentEntry->id, _mimetype);
 }
 
-MultiGetJob *KIO::multi_get(long id, const KURL &url, const MetaData &metaData)
+MultiGetJob *TDEIO::multi_get(long id, const KURL &url, const MetaData &metaData)
 {
     MultiGetJob * job = new MultiGetJob( url, false );
     job->get(id, url, metaData);
@@ -4778,7 +4778,7 @@ void Job::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void SimpleJob::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
 
 void MkdirJob::virtual_hook( int id, void* data )
 { SimpleJob::virtual_hook( id, data ); }
diff --git a/kio/kio/job.h b/kio/kio/job.h
index fed6f82ab..03985b637 100644
--- a/kio/kio/job.h
+++ b/kio/kio/job.h
@@ -24,7 +24,7 @@
 
 #include <kio/jobclasses.h>
 
-namespace KIO {
+namespace TDEIO {
 
 
     /**
@@ -80,7 +80,7 @@ namespace KIO {
      * Create or move a symlink.
      * This is the lowlevel operation, similar to file_copy and file_move.
      * It doesn't do any check (other than those the slave does)
-     * and it doesn't show rename and skip dialogs - use KIO::link for that.
+     * and it doesn't show rename and skip dialogs - use TDEIO::link for that.
      * @param target The string that will become the "target" of the link (can be relative)
      * @param dest The symlink to create.
      * @param overwrite whether to automatically overwrite if the dest exists
@@ -215,7 +215,7 @@ namespace KIO {
      *
      * Example:
      * \code
-     *    job = KIO::http_post( url, postData, false );
+     *    job = TDEIO::http_post( url, postData, false );
      *    job->addMetaData("content-type", contentType );
      *    job->addMetaData("referrer", referrerURL);
      * \endcode
diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h
index 9d6624dc0..9858b1ce1 100644
--- a/kio/kio/jobclasses.h
+++ b/kio/kio/jobclasses.h
@@ -39,7 +39,7 @@ class TQTimer;
 
 #define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by kio_trash.
 
-namespace KIO {
+namespace TDEIO {
 
     class Slave;
     class SlaveInterface;
@@ -50,9 +50,9 @@ namespace KIO {
      * For all jobs created in an application, the code looks like
      *
      * \code
-     *   KIO::Job * job = KIO::someoperation( some parameters );
-     *   connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-     *            this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+     *   TDEIO::Job * job = TDEIO::someoperation( some parameters );
+     *   connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+     *            this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
      * \endcode
      *   (other connects, specific to the job)
      *
@@ -62,8 +62,8 @@ namespace KIO {
      *  if ( job->error() )
      *      job->showErrorDialog( this or 0L  );
      * \endcode
-     * @see KIO::Scheduler
-     * @see KIO::Slave
+     * @see TDEIO::Scheduler
+     * @see TDEIO::Slave
      */
     class KIO_EXPORT Job : public TQObject {
         Q_OBJECT
@@ -90,7 +90,7 @@ namespace KIO {
 	 * Returns the error code, if there has been an error.
          * Only call this method from the slot connected to result().
          * @return the error code for this job, 0 if no error.
-         * Error codes are defined in KIO::Error.
+         * Error codes are defined in TDEIO::Error.
          */
         int error() const { return m_error; }
 
@@ -262,7 +262,7 @@ namespace KIO {
 	 * @see addMetaData()
 	 * @see mergeMetaData()
          */
-        void setMetaData( const KIO::MetaData &metaData);
+        void setMetaData( const TDEIO::MetaData &metaData);
 
         /**
          * Add key/value pair to the meta data that is sent to the slave.
@@ -317,7 +317,7 @@ namespace KIO {
          * @see processedSize
          * @since 3.2
          */
-        KIO::filesize_t getProcessedSize();
+        TDEIO::filesize_t getProcessedSize();
 
     signals:
         /**
@@ -325,7 +325,7 @@ namespace KIO {
          * failed...). Use error to know the result.
 	 * @param job the job that emitted this signal
          */
-        void result( KIO::Job *job );
+        void result( TDEIO::Job *job );
 
         /**
          * @deprecated. Don't use !
@@ -334,7 +334,7 @@ namespace KIO {
          * in this case, ERR_USER_CANCELED.
 	 * @param job the job that emitted this signal
          */
-        void canceled( KIO::Job *job );
+        void canceled( TDEIO::Job *job );
 
         /**
          * Emitted to display information about this job, as sent by the slave.
@@ -342,7 +342,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param msg the info message
          */
-        void infoMessage( KIO::Job *job, const TQString & msg );
+        void infoMessage( TDEIO::Job *job, const TQString & msg );
         // KDE4: Separate rich-text string from plain-text string, for different widgets.
 
         /**
@@ -351,7 +351,7 @@ namespace KIO {
          * @param msg the info message
          * @since 3.5
          */
-        void warning( KIO::Job *job, const TQString & msg );
+        void warning( TDEIO::Job *job, const TQString & msg );
         // KDE4: Separate rich-text string from plain-text string, for different widgets.
 
         /**
@@ -360,7 +360,7 @@ namespace KIO {
          * currently unused (in the applications).
 	 * @param job the job that emitted this signal
          */
-        void connected( KIO::Job *job );
+        void connected( TDEIO::Job *job );
 
         /**
          * Progress signal showing the overall progress of the job
@@ -370,7 +370,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param percent the percentage
          */
-        void percent( KIO::Job *job, unsigned long percent );
+        void percent( TDEIO::Job *job, unsigned long percent );
 
         /**
          * Emitted when we know the size of this job (data size for transfers,
@@ -378,7 +378,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param size the total size in bytes
          */
-        void totalSize( KIO::Job *job, KIO::filesize_t size );
+        void totalSize( TDEIO::Job *job, TDEIO::filesize_t size );
 
         /**
          * Regularly emitted to show the progress of this job
@@ -386,14 +386,14 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param size the processed size in bytes
          */
-        void processedSize( KIO::Job *job, KIO::filesize_t size );
+        void processedSize( TDEIO::Job *job, TDEIO::filesize_t size );
 
         /**
          * Emitted to display information about the speed of this job.
 	 * @param job the job that emitted this signal
 	 * @param speed the speed in bytes/s
          */
-        void speed( KIO::Job *job, unsigned long speed );
+        void speed( TDEIO::Job *job, unsigned long speed );
 
     protected slots:
         /**
@@ -404,7 +404,7 @@ namespace KIO {
 	 * @param job the subjob
 	 * @see result()
          */
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
         /**
          * Forward signal from subjob.
@@ -412,14 +412,14 @@ namespace KIO {
 	 * @param speed the speed in bytes/s
 	 * @see speed()
          */
-        void slotSpeed( KIO::Job *job, unsigned long speed );
+        void slotSpeed( TDEIO::Job *job, unsigned long speed );
         /**
          * Forward signal from subjob.
 	 * @param job the subjob
 	 * @param msg the info message
 	 * @see infoMessage()
          */
-        void slotInfoMessage( KIO::Job *job, const TQString &msg );
+        void slotInfoMessage( TDEIO::Job *job, const TQString &msg );
 
         /**
          * Remove speed information.
@@ -465,7 +465,7 @@ namespace KIO {
 	 * @param processedSize the processed size in bytes
 	 * @param totalSize the total size in bytes
          */
-        void emitPercent( KIO::filesize_t processedSize, KIO::filesize_t totalSize );
+        void emitPercent( TDEIO::filesize_t processedSize, TDEIO::filesize_t totalSize );
 
         /**
          * Utility function for inherited jobs.
@@ -485,7 +485,7 @@ namespace KIO {
          * Set the processed size, does not emit processedSize
          * @since 3.2
          */
-        void setProcessedSize(KIO::filesize_t size);
+        void setProcessedSize(TDEIO::filesize_t size);
 
         /**
          * @internal
@@ -525,7 +525,7 @@ namespace KIO {
      * Other jobs are high-level jobs (CopyJob, DeleteJob, FileCopyJob...)
      * that manage subjobs but aren't scheduled directly.
      */
-    class KIO_EXPORT SimpleJob : public KIO::Job {
+    class KIO_EXPORT SimpleJob : public TDEIO::Job {
     Q_OBJECT
 
     public:
@@ -598,7 +598,7 @@ namespace KIO {
          * Can also be called by the parent job, when it knows the size.
 	 * @param data_size the total size
          */
-        void slotTotalSize( KIO::filesize_t data_size );
+        void slotTotalSize( TDEIO::filesize_t data_size );
 
     protected slots:
         /**
@@ -631,7 +631,7 @@ namespace KIO {
 	 * @param data_size the processed size in bytes
 	 * @see processedSize()
          */
-        void slotProcessedSize( KIO::filesize_t data_size );
+        void slotProcessedSize( TDEIO::filesize_t data_size );
         /**
          * Forward signal from the slave.
 	 * @param speed the speed in bytes/s
@@ -644,7 +644,7 @@ namespace KIO {
 	 * @param _metaData the meta data
 	 * @see metaData()
          */
-        virtual void slotMetaData( const KIO::MetaData &_metaData);
+        virtual void slotMetaData( const TDEIO::MetaData &_metaData);
 
     public slots:
         /**
@@ -666,7 +666,7 @@ namespace KIO {
         KURL m_url;
         KURL m_subUrl;
         int m_command;
-        KIO::filesize_t m_totalSize;
+        TDEIO::filesize_t m_totalSize;
     protected:
 	virtual void virtual_hook( int id, void* data );
 	/*
@@ -683,7 +683,7 @@ namespace KIO {
 
     /**
      * A KIO job that retrieves information about a file or directory.
-     * @see KIO::stat()
+     * @see TDEIO::stat()
      */
     class KIO_EXPORT StatJob : public SimpleJob {
 
@@ -691,7 +691,7 @@ namespace KIO {
 
     public:
         /**
-	 * Do not use this constructor to create a StatJob, use KIO::stat() instead.
+	 * Do not use this constructor to create a StatJob, use TDEIO::stat() instead.
 	 * @param url the url of the file or directory to check
 	 * @param command the command to issue
 	 * @param packedArgs the arguments
@@ -742,7 +742,7 @@ namespace KIO {
 	 * @param job the job that is redirected
 	 * @param url the new url
          */
-        void redirection( KIO::Job *job, const KURL &url );
+        void redirection( TDEIO::Job *job, const KURL &url );
 
         /**
          * Signals a permanent redirection.
@@ -752,13 +752,13 @@ namespace KIO {
 	 * @param toUrl the new URL
 	 * @since 3.1
          */
-        void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
+        void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
 
     protected slots:
-        void slotStatEntry( const KIO::UDSEntry & entry );
+        void slotStatEntry( const TDEIO::UDSEntry & entry );
         void slotRedirection( const KURL &url);
         virtual void slotFinished();
-        virtual void slotMetaData( const KIO::MetaData &_metaData);
+        virtual void slotMetaData( const TDEIO::MetaData &_metaData);
 
     protected:
         UDSEntry m_statResult;
@@ -774,7 +774,7 @@ namespace KIO {
 
     /**
      * A KIO job that creates a directory
-     * @see KIO::mkdir()
+     * @see TDEIO::mkdir()
      * @since 3.3
      */
     class KIO_EXPORT MkdirJob : public SimpleJob {
@@ -783,7 +783,7 @@ namespace KIO {
 
     public:
         /**
-	 * Do not use this constructor to create a MkdirJob, use KIO::mkdir() instead.
+	 * Do not use this constructor to create a MkdirJob, use TDEIO::mkdir() instead.
 	 * @param url the url of the file or directory to check
 	 * @param command the command to issue
 	 * @param packedArgs the arguments
@@ -807,7 +807,7 @@ namespace KIO {
 	 * @param job the job that is redirected
 	 * @param url the new url
          */
-        void redirection( KIO::Job *job, const KURL &url );
+        void redirection( TDEIO::Job *job, const KURL &url );
 
         /**
          * Signals a permanent redirection.
@@ -816,7 +816,7 @@ namespace KIO {
 	 * @param fromUrl the original URL
 	 * @param toUrl the new URL
          */
-        void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
+        void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
 
     protected slots:
         void slotRedirection( const KURL &url);
@@ -841,7 +841,7 @@ namespace KIO {
 
     public:
         /**
-         * Do not create a DirectCopyJob. Use KIO::copy() or KIO::file_copy() instead.
+         * Do not create a DirectCopyJob. Use TDEIO::copy() or TDEIO::file_copy() instead.
          */
         DirectCopyJob(const KURL& url, int command, const TQByteArray &packedArgs,
                       bool showProgressInfo);
@@ -859,10 +859,10 @@ namespace KIO {
          * Emitted if the job found an existing partial file
          * and supports resuming. Used by FileCopyJob.
          */
-        void canResume( KIO::Job *job, KIO::filesize_t offset );
+        void canResume( TDEIO::Job *job, TDEIO::filesize_t offset );
 
     private slots:
-        void slotCanResume( KIO::filesize_t offset );
+        void slotCanResume( TDEIO::filesize_t offset );
     };
 
 
@@ -877,7 +877,7 @@ namespace KIO {
 
     public:
        /**
-	* Do not create a TransferJob. Use KIO::get() or KIO::put()
+	* Do not create a TransferJob. Use TDEIO::get() or TDEIO::put()
 	* instead.
 	* @param url the url to get or put
 	* @param command the command to issue
@@ -902,7 +902,7 @@ namespace KIO {
          * Called when m_subJob finishes.
 	 * @param job the job that finished
          */
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
         /**
          * Flow control. Suspend data processing from the slave.
@@ -974,7 +974,7 @@ namespace KIO {
          * should not be certain of data.size() == 0 ever happening (e.g. in case
          * of an error), so you should rely on result() instead.
          */
-        void data( KIO::Job *job, const TQByteArray &data );
+        void data( TDEIO::Job *job, const TQByteArray &data );
 
         /**
          * Request for data.
@@ -987,7 +987,7 @@ namespace KIO {
          * @param data buffer to fill with data to send to the
          * slave. An empty buffer indicates end of data. (EOD)
          */
-        void dataReq( KIO::Job *job, TQByteArray &data );
+        void dataReq( TDEIO::Job *job, TQByteArray &data );
 
         /**
          * Signals a redirection.
@@ -996,7 +996,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param url the new URL
          */
-        void redirection( KIO::Job *job, const KURL &url );
+        void redirection( TDEIO::Job *job, const KURL &url );
 
         /**
          * Signals a permanent redirection.
@@ -1006,14 +1006,14 @@ namespace KIO {
 	 * @param toUrl the new URL
 	 * @since 3.1
          */
-        void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
+        void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
 
         /**
          * Mimetype determined.
 	 * @param job the job that emitted this signal
 	 * @param type the mime type
          */
-        void mimetype( KIO::Job *job, const TQString &type );
+        void mimetype( TDEIO::Job *job, const TQString &type );
 
         /**
          * @internal
@@ -1022,7 +1022,7 @@ namespace KIO {
          * and emitted by the "get" job if it supports resuming to
          * the given offset - in this case @p offset is unused)
          */
-        void canResume( KIO::Job *job, KIO::filesize_t offset );
+        void canResume( TDEIO::Job *job, TDEIO::filesize_t offset );
 
 
     protected slots:
@@ -1032,10 +1032,10 @@ namespace KIO {
         virtual void slotDataReq();
         virtual void slotMimetype( const TQString &mimetype );
         virtual void slotNeedSubURLData();
-        virtual void slotSubURLData(KIO::Job*, const TQByteArray &);
-        virtual void slotMetaData( const KIO::MetaData &_metaData);
+        virtual void slotSubURLData(TDEIO::Job*, const TQByteArray &);
+        virtual void slotMetaData( const TDEIO::MetaData &_metaData);
         void slotErrorPage();
-        void slotCanResume( KIO::filesize_t offset );
+        void slotCanResume( TDEIO::filesize_t offset );
         void slotPostRedirection();
 
     protected:
@@ -1057,14 +1057,14 @@ namespace KIO {
      * also stores a TQByteArray with the data, making it simpler to use than the
      * standard TransferJob.
      *
-     * For KIO::storedGet it puts the data into the member TQByteArray, so the user
+     * For TDEIO::storedGet it puts the data into the member TQByteArray, so the user
      * of this class can get hold of the whole data at once by calling data()
      * when the result signal is emitted.
      * You should only use StoredTransferJob to download data if you cannot
      * process the data by chunks while it's being downloaded, since storing
      * everything in a TQByteArray can potentially require a lot of memory.
      *
-     * For KIO::storedPut the user of this class simply provides the bytearray from
+     * For TDEIO::storedPut the user of this class simply provides the bytearray from
      * the start, and the job takes care of uploading it.
      * You should only use StoredTransferJob to upload data if you cannot
      * provide the in chunks while it's being uploaded, since storing
@@ -1072,7 +1072,7 @@ namespace KIO {
      *
      * @since 3.3
      */
-    class KIO_EXPORT StoredTransferJob : public KIO::TransferJob {
+    class KIO_EXPORT StoredTransferJob : public TDEIO::TransferJob {
         Q_OBJECT
 
     public:
@@ -1092,7 +1092,7 @@ namespace KIO {
 
         /**
          * Set data to be uploaded. This is for put jobs.
-         * Automatically called by KIO::storedPut(const TQByteArray &, ...),
+         * Automatically called by TDEIO::storedPut(const TQByteArray &, ...),
          * do not call this yourself.
          */
         void setData( const TQByteArray& arr );
@@ -1104,8 +1104,8 @@ namespace KIO {
         TQByteArray data() const { return m_data; }
 
     private slots:
-        void slotStoredData( KIO::Job *job, const TQByteArray &data );
-        void slotStoredDataReq( KIO::Job *job, TQByteArray &data );
+        void slotStoredData( TDEIO::Job *job, const TQByteArray &data );
+        void slotStoredDataReq( TDEIO::Job *job, TQByteArray &data );
     private:
         TQByteArray m_data;
         int m_uploadOffset;
@@ -1114,15 +1114,15 @@ namespace KIO {
     /**
      * The MultiGetJob is a TransferJob that allows you to get
      * several files from a single server. Don't create directly,
-     * but use KIO::multi_get() instead.
-     * @see KIO::multi_get()
+     * but use TDEIO::multi_get() instead.
+     * @see TDEIO::multi_get()
      */
     class KIO_EXPORT MultiGetJob : public TransferJob {
     Q_OBJECT
 
     public:
         /**
-	 * Do not create a MultiGetJob directly, use KIO::multi_get()
+	 * Do not create a MultiGetJob directly, use TDEIO::multi_get()
 	 * instead.
 	 *
 	 * @param url the first url to get
@@ -1166,7 +1166,7 @@ namespace KIO {
         /**
          * File transfer completed.
          *
-         * When all files have been processed, result(KIO::Job *) gets
+         * When all files have been processed, result(TDEIO::Job *) gets
          * emitted.
 	 * @param id the id of the request
          */
@@ -1202,15 +1202,15 @@ namespace KIO {
     /**
      * A MimetypeJob is a TransferJob that  allows you to get
      * the mime type of an URL. Don't create directly,
-     * but use KIO::mimetype() instead.
-     * @see KIO::mimetype()
+     * but use TDEIO::mimetype() instead.
+     * @see TDEIO::mimetype()
      */
     class KIO_EXPORT MimetypeJob : public TransferJob {
     Q_OBJECT
 
     public:
        /**
-	* Do not create a MimetypeJob directly. Use KIO::mimetype()
+	* Do not create a MimetypeJob directly. Use TDEIO::mimetype()
 	* instead.
 	* @param url the url to get
 	* @param command the command to issue
@@ -1244,16 +1244,16 @@ namespace KIO {
 
     /**
      * The FileCopyJob copies data from one place to another.
-     * @see KIO::file_copy()
-     * @see KIO::file_move()
+     * @see TDEIO::file_copy()
+     * @see TDEIO::file_move()
      */
     class KIO_EXPORT FileCopyJob : public Job {
     Q_OBJECT
 
     public:
 	/**
-	* Do not create a FileCopyJob directly. Use KIO::file_move()
-	* or KIO::file_copy() instead.
+	* Do not create a FileCopyJob directly. Use TDEIO::file_move()
+	* or TDEIO::file_copy() instead.
 	* @param src the source URL
 	* @param dest the destination URL
 	* @param permissions the permissions of the resulting resource
@@ -1272,7 +1272,7 @@ namespace KIO {
 	 * @param size the size of the source file
 	 * @since 3.2
          */
-        void setSourceSize64(KIO::filesize_t size);
+        void setSourceSize64(TDEIO::filesize_t size);
 
         /**
          * Sets the modification time of the file
@@ -1310,45 +1310,45 @@ namespace KIO {
          *
          * @since 3.5.7
          */
-        void mimetype( KIO::Job *job, const TQString &type );
+        void mimetype( TDEIO::Job *job, const TQString &type );
 
     public slots:
         void slotStart();
-        void slotData( KIO::Job *, const TQByteArray &data);
-        void slotDataReq( KIO::Job *, TQByteArray &data);
-        void slotMimetype( KIO::Job *, const TQString& type );
+        void slotData( TDEIO::Job *, const TQByteArray &data);
+        void slotDataReq( TDEIO::Job *, TQByteArray &data);
+        void slotMimetype( TDEIO::Job *, const TQString& type );
 
     protected slots:
         /**
          * Called whenever a subjob finishes.
 	 * @param job the job that emitted this signal
          */
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
         /**
          * Forward signal from subjob
 	 * @param job the job that emitted this signal
 	 * @param size the processed size in bytes
          */
-        void slotProcessedSize( KIO::Job *job, KIO::filesize_t size );
+        void slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t size );
         /**
          * Forward signal from subjob
 	 * @param job the job that emitted this signal
 	 * @param size the total size
          */
-        void slotTotalSize( KIO::Job *job, KIO::filesize_t size );
+        void slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size );
         /**
          * Forward signal from subjob
 	 * @param job the job that emitted this signal
 	 * @param pct the percentage
          */
-        void slotPercent( KIO::Job *job, unsigned long pct );
+        void slotPercent( TDEIO::Job *job, unsigned long pct );
         /**
          * Forward signal from subjob
 	 * @param job the job that emitted this signal
 	 * @param offset the offset to resume from
          */
-        void slotCanResume( KIO::Job *job, KIO::filesize_t offset );
+        void slotCanResume( TDEIO::Job *job, TDEIO::filesize_t offset );
 
     protected:
         void startCopyJob();
@@ -1374,7 +1374,7 @@ namespace KIO {
         SimpleJob *m_copyJob;
         TransferJob *m_getJob;
         TransferJob *m_putJob;
-        KIO::filesize_t m_totalSize;
+        TDEIO::filesize_t m_totalSize;
     protected:
 	virtual void virtual_hook( int id, void* data );
     private:
@@ -1384,18 +1384,18 @@ namespace KIO {
 
     /**
      * A ListJob is allows you to get the get the content of a directory.
-     * Don't create the job directly, but use KIO::listRecursive() or
-     * KIO::listDir() instead.
-     * @see KIO::listRecursive()
-     * @see KIO::listDir()
+     * Don't create the job directly, but use TDEIO::listRecursive() or
+     * TDEIO::listDir() instead.
+     * @see TDEIO::listRecursive()
+     * @see TDEIO::listDir()
      */
     class KIO_EXPORT ListJob : public SimpleJob {
     Q_OBJECT
 
     public:
        /**
-	* Do not create a ListJob directly. Use KIO::listDir() or
-	* KIO::listRecursive() instead.
+	* Do not create a ListJob directly. Use TDEIO::listDir() or
+	* TDEIO::listRecursive() instead.
 	* @param url the url of the directory
 	* @param showProgressInfo true to show progress information to the user
 	* @param recursive true to get the data recursively from child directories,
@@ -1439,7 +1439,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param list the list of UDSEntries
          */
-        void entries( KIO::Job *job, const KIO::UDSEntryList& list);
+        void entries( TDEIO::Job *job, const TDEIO::UDSEntryList& list);
 
         /**
          * Signals a redirection.
@@ -1448,7 +1448,7 @@ namespace KIO {
 	 * @param job the job that is redirected
 	 * @param url the new url
          */
-        void redirection( KIO::Job *job, const KURL &url );
+        void redirection( TDEIO::Job *job, const KURL &url );
 
         /**
          * Signals a permanent redirection.
@@ -1458,15 +1458,15 @@ namespace KIO {
 	 * @param toUrl the new URL
 	 * @since 3.1
          */
-        void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
+        void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
 
     protected slots:
         virtual void slotFinished( );
-        virtual void slotMetaData( const KIO::MetaData &_metaData);
-        virtual void slotResult( KIO::Job *job );
-        void slotListEntries( const KIO::UDSEntryList& list );
+        virtual void slotMetaData( const TDEIO::MetaData &_metaData);
+        virtual void slotResult( TDEIO::Job *job );
+        void slotListEntries( const TDEIO::UDSEntryList& list );
         void slotRedirection( const KURL &url );
-        void gotEntries( KIO::Job * subjob, const KIO::UDSEntryList& list );
+        void gotEntries( TDEIO::Job * subjob, const TDEIO::UDSEntryList& list );
 
     private:
         bool recursive;
@@ -1490,20 +1490,20 @@ namespace KIO {
         //mode_t type;
         time_t ctime;
         time_t mtime;
-        KIO::filesize_t size; // 0 for dirs
+        TDEIO::filesize_t size; // 0 for dirs
     };
 
     /**
      * CopyJob is used to move, copy or symlink files and directories.
-     * Don't create the job directly, but use KIO::copy(),
-     * KIO::move(), KIO::link() and friends.
+     * Don't create the job directly, but use TDEIO::copy(),
+     * TDEIO::move(), TDEIO::link() and friends.
      *
-     * @see KIO::copy()
-     * @see KIO::copyAs()
-     * @see KIO::move()
-     * @see KIO::moveAs()
-     * @see KIO::link()
-     * @see KIO::linkAs()
+     * @see TDEIO::copy()
+     * @see TDEIO::copyAs()
+     * @see TDEIO::move()
+     * @see TDEIO::moveAs()
+     * @see TDEIO::link()
+     * @see TDEIO::linkAs()
      */
     class KIO_EXPORT CopyJob : public Job {
     Q_OBJECT
@@ -1515,21 +1515,21 @@ namespace KIO {
         enum CopyMode{ Copy, Move, Link };
 
 	/**
-	 * Do not create a CopyJob directly. Use KIO::copy(),
-	 * KIO::move(), KIO::link() and friends instead.
+	 * Do not create a CopyJob directly. Use TDEIO::copy(),
+	 * TDEIO::move(), TDEIO::link() and friends instead.
 	 *
 	 * @param src the list of source URLs
 	 * @param dest the destination URL
 	 * @param mode specifies whether the job should copy, move or link
-	 * @param asMethod if true, behaves like KIO::copyAs(),
-	 * KIO::moveAs() or KIO::linkAs()
+	 * @param asMethod if true, behaves like TDEIO::copyAs(),
+	 * TDEIO::moveAs() or TDEIO::linkAs()
 	 * @param showProgressInfo true to show progress information to the user
-	 * @see KIO::copy()
-	 * @see KIO::copyAs()
-	 * @see KIO::move()
-	 * @see KIO::moveAs()
-	 * @see KIO::link()
-	 * @see KIO::linkAs()
+	 * @see TDEIO::copy()
+	 * @see TDEIO::copyAs()
+	 * @see TDEIO::move()
+	 * @see TDEIO::moveAs()
+	 * @see TDEIO::link()
+	 * @see TDEIO::linkAs()
 	 */
         CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool asMethod, bool showProgressInfo );
 
@@ -1579,13 +1579,13 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param files the total number of files
 	 */
-        void totalFiles( KIO::Job *job, unsigned long files );
+        void totalFiles( TDEIO::Job *job, unsigned long files );
         /**
 	 * Emitted when the toal number of direcotries is known.
 	 * @param job the job that emitted this signal
 	 * @param dirs the total number of directories
 	 */
-        void totalDirs( KIO::Job *job, unsigned long dirs );
+        void totalDirs( TDEIO::Job *job, unsigned long dirs );
 
         /**
 	 * Emitted when it is known which files / directories are going
@@ -1594,20 +1594,20 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param files a list of items that are about to be created.
 	 */
-        void aboutToCreate( KIO::Job *job, const TQValueList<KIO::CopyInfo> &files);
+        void aboutToCreate( TDEIO::Job *job, const TQValueList<TDEIO::CopyInfo> &files);
 
         /**
 	 * Sends the number of processed files.
 	 * @param job the job that emitted this signal
 	 * @param files the number of processed files
 	 */
-        void processedFiles( KIO::Job *job, unsigned long files );
+        void processedFiles( TDEIO::Job *job, unsigned long files );
         /**
 	 * Sends the number of processed directories.
 	 * @param job the job that emitted this signal
 	 * @param dirs the number of processed dirs
 	 */
-        void processedDirs( KIO::Job *job, unsigned long dirs );
+        void processedDirs( TDEIO::Job *job, unsigned long dirs );
 
         /**
          * The job is copying a file or directory.
@@ -1616,7 +1616,7 @@ namespace KIO {
 	 *             being copied
 	 * @param to the destination of the current operation
          */
-        void copying( KIO::Job *job, const KURL& from, const KURL& to );
+        void copying( TDEIO::Job *job, const KURL& from, const KURL& to );
         /**
          * The job is creating a symbolic link.
 	 * @param job the job that emitted this signal
@@ -1624,7 +1624,7 @@ namespace KIO {
 	 *             being linked
 	 * @param to the destination of the current operation
          */
-        void linking( KIO::Job *job, const TQString& target, const KURL& to );
+        void linking( TDEIO::Job *job, const TQString& target, const KURL& to );
         /**
          * The job is moving a file or directory.
 	 * @param job the job that emitted this signal
@@ -1632,20 +1632,20 @@ namespace KIO {
 	 *             being moved
 	 * @param to the destination of the current operation
          */
-        void moving( KIO::Job *job, const KURL& from, const KURL& to );
+        void moving( TDEIO::Job *job, const KURL& from, const KURL& to );
         /**
          * The job is creating the directory @p dir.
 	 * @param job the job that emitted this signal
 	 * @param dir the directory that is currently being created
          */
-        void creatingDir( KIO::Job *job, const KURL& dir );
+        void creatingDir( TDEIO::Job *job, const KURL& dir );
         /**
          * The user chose to rename @p from to @p to.
 	 * @param job the job that emitted this signal
 	 * @param from the original name
 	 * @param to the new name
          */
-        void renamed( KIO::Job *job, const KURL& from, const KURL& to );
+        void renamed( TDEIO::Job *job, const KURL& from, const KURL& to );
 
         /**
          * The job emits this signal when copying or moving a file or directory successfully finished.
@@ -1659,7 +1659,7 @@ namespace KIO {
          * @param renamed indicates that the destination URL was created using a
          * rename operation (i.e. fast directory moving). true if is has been renamed
          */
-        void copyingDone( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed );
+        void copyingDone( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed );
         /**
          * The job is copying or moving a symbolic link, that points to target.
          * The new link is created in @p to. The existing one is/was in @p from.
@@ -1669,26 +1669,26 @@ namespace KIO {
 	 * @param target the target
          * @param to the destination URL
          */
-        void copyingLinkDone( KIO::Job *job, const KURL &from, const TQString& target, const KURL& to );
+        void copyingLinkDone( TDEIO::Job *job, const KURL &from, const TQString& target, const KURL& to );
 
     protected:
         void statCurrentSrc();
         void statNextSrc();
 
         // Those aren't slots but submethods for slotResult.
-        void slotResultStating( KIO::Job * job );
+        void slotResultStating( TDEIO::Job * job );
         void startListing( const KURL & src );
-        void slotResultCreatingDirs( KIO::Job * job );
-        void slotResultConflictCreatingDirs( KIO::Job * job );
+        void slotResultCreatingDirs( TDEIO::Job * job );
+        void slotResultConflictCreatingDirs( TDEIO::Job * job );
         void createNextDir();
-        void slotResultCopyingFiles( KIO::Job * job );
-        void slotResultConflictCopyingFiles( KIO::Job * job );
+        void slotResultCopyingFiles( TDEIO::Job * job );
+        void slotResultConflictCopyingFiles( TDEIO::Job * job );
         void copyNextFile();
-        void slotResultDeletingDirs( KIO::Job * job );
+        void slotResultDeletingDirs( TDEIO::Job * job );
         void deleteNextDir();
         void skip( const KURL & sourceURL );
-        void slotResultRenaming( KIO::Job * job );
-        //void slotResultSettingDirAttributes( KIO::Job * job );
+        void slotResultRenaming( TDEIO::Job * job );
+        //void slotResultSettingDirAttributes( TDEIO::Job * job );
         void setNextDirAttribute();
     private:
         void startRenameJob(const KURL &slave_url);
@@ -1698,17 +1698,17 @@ namespace KIO {
 
     protected slots:
         void slotStart();
-        void slotEntries( KIO::Job*, const KIO::UDSEntryList& list );
-        virtual void slotResult( KIO::Job *job );
+        void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& list );
+        virtual void slotResult( TDEIO::Job *job );
         /**
          * Forward signal from subjob
          */
-        void slotProcessedSize( KIO::Job*, KIO::filesize_t data_size );
+        void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size );
         /**
          * Forward signal from subjob
 	 * @param size the total size
          */
-        void slotTotalSize( KIO::Job*, KIO::filesize_t size );
+        void slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size );
 
         void slotReport();
     private:
@@ -1719,9 +1719,9 @@ namespace KIO {
         enum { STATE_STATING, STATE_RENAMING, STATE_LISTING, STATE_CREATING_DIRS,
                STATE_CONFLICT_CREATING_DIRS, STATE_COPYING_FILES, STATE_CONFLICT_COPYING_FILES,
                STATE_DELETING_DIRS, STATE_SETTING_DIR_ATTRIBUTES } state;
-        KIO::filesize_t m_totalSize;
-        KIO::filesize_t m_processedSize;
-        KIO::filesize_t m_fileProcessedSize;
+        TDEIO::filesize_t m_totalSize;
+        TDEIO::filesize_t m_processedSize;
+        TDEIO::filesize_t m_fileProcessedSize;
         int m_processedFiles;
         int m_processedDirs;
         TQValueList<CopyInfo> files;
@@ -1756,22 +1756,22 @@ namespace KIO {
 
     /**
      * A more complex Job to delete files and directories.
-     * Don't create the job directly, but use KIO::del() instead.
+     * Don't create the job directly, but use TDEIO::del() instead.
      *
-     * @see KIO::del()
+     * @see TDEIO::del()
      */
     class KIO_EXPORT DeleteJob : public Job {
     Q_OBJECT
 
     public:
 	/**
-	 * Do not create a DeleteJob directly. Use KIO::del()
+	 * Do not create a DeleteJob directly. Use TDEIO::del()
 	 * instead.
 	 *
 	 * @param src the list of URLs to delete
 	 * @param shred true to shred (make sure that data is not recoverable)a
 	 * @param showProgressInfo true to show progress information to the user
-	 * @see KIO::del()
+	 * @see TDEIO::del()
 	 */
         DeleteJob( const KURL::List& src, bool shred, bool showProgressInfo );
 
@@ -1788,26 +1788,26 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param files the total number of files
 	 */
-        void totalFiles( KIO::Job *job, unsigned long files );
+        void totalFiles( TDEIO::Job *job, unsigned long files );
         /**
 	 * Emitted when the toal number of direcotries is known.
 	 * @param job the job that emitted this signal
 	 * @param dirs the total number of directories
 	 */
-        void totalDirs( KIO::Job *job, unsigned long dirs );
+        void totalDirs( TDEIO::Job *job, unsigned long dirs );
 
         /**
 	 * Sends the number of processed files.
 	 * @param job the job that emitted this signal
 	 * @param files the number of processed files
 	 */
-        void processedFiles( KIO::Job *job, unsigned long files );
+        void processedFiles( TDEIO::Job *job, unsigned long files );
         /**
 	 * Sends the number of processed directories.
 	 * @param job the job that emitted this signal
 	 * @param dirs the number of processed dirs
 	 */
-        void processedDirs( KIO::Job *job, unsigned long dirs );
+        void processedDirs( TDEIO::Job *job, unsigned long dirs );
 
         /**
 	 * Sends the URL of the file that is currently being deleted.
@@ -1815,17 +1815,17 @@ namespace KIO {
 	 * @param file the URL of the file or directory that is being
 	 *        deleted
 	 */
-        void deleting( KIO::Job *job, const KURL& file );
+        void deleting( TDEIO::Job *job, const KURL& file );
 
     protected slots:
         void slotStart();
-        void slotEntries( KIO::Job*, const KIO::UDSEntryList& list );
-        virtual void slotResult( KIO::Job *job );
+        void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& list );
+        virtual void slotResult( TDEIO::Job *job );
 
         /**
          * Forward signal from subjob
          */
-        void slotProcessedSize( KIO::Job*, KIO::filesize_t data_size );
+        void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size );
         void slotReport();
 
     private:
@@ -1836,9 +1836,9 @@ namespace KIO {
     private:
         enum { STATE_STATING, STATE_LISTING,
                STATE_DELETING_FILES, STATE_DELETING_DIRS } state;
-        KIO::filesize_t m_totalSize;
-        KIO::filesize_t m_processedSize;
-        KIO::filesize_t m_fileProcessedSize;
+        TDEIO::filesize_t m_totalSize;
+        TDEIO::filesize_t m_processedSize;
+        TDEIO::filesize_t m_fileProcessedSize;
         int m_processedFiles;
         int m_processedDirs;
         int m_totalFilesDirs;
@@ -1860,7 +1860,7 @@ namespace KIO {
 
     /**
      * A KIO job that finds a local URL
-     * @see KIO::localURL()
+     * @see TDEIO::localURL()
      * @since R14.0.0
      */
     class KIO_EXPORT LocalURLJob : public SimpleJob {
@@ -1869,7 +1869,7 @@ namespace KIO {
 
     public:
         /**
-	 * Do not use this constructor to create a LocalURLJob, use KIO::localURL() instead.
+	 * Do not use this constructor to create a LocalURLJob, use TDEIO::localURL() instead.
 	 * @param url the url of the file or directory to check
 	 * @param command the command to issue
 	 * @param packedArgs the arguments
@@ -1891,7 +1891,7 @@ namespace KIO {
 	 * @param url the local url
 	 * @param isLocal true if the returned URL is local, false if not
          */
-        void localURL( KIO::Job *job, const KURL &url, bool isLocal );
+        void localURL( TDEIO::Job *job, const KURL &url, bool isLocal );
 
     protected slots:
         void slotLocalURL( const KURL &url, bool isLocal );
diff --git a/kio/kio/kautomount.cpp b/kio/kio/kautomount.cpp
index a4782c313..e8b1d2af0 100644
--- a/kio/kio/kautomount.cpp
+++ b/kio/kio/kautomount.cpp
@@ -38,11 +38,11 @@ KAutoMount::KAutoMount( bool _readonly, const TQString& _format, const TQString&
   //kdDebug(7015) << "KAutoMount device=" << _device << " mountpoint=" << _mountpoint << endl;
   m_bShowFilemanagerWindow = _show_filemanager_window;
 
-  KIO::Job* job = KIO::mount( _readonly, _format.ascii(), _device, _mountpoint );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+  TDEIO::Job* job = TDEIO::mount( _readonly, _format.ascii(), _device, _mountpoint );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
-void KAutoMount::slotResult( KIO::Job * job )
+void KAutoMount::slotResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     emit error();
@@ -51,12 +51,12 @@ void KAutoMount::slotResult( KIO::Job * job )
   else
   {
     KURL mountpoint;
-    mountpoint.setPath( KIO::findDeviceMountPoint( m_strDevice ) );
+    mountpoint.setPath( TDEIO::findDeviceMountPoint( m_strDevice ) );
     //kdDebug(7015) << "KAutoMount: m_strDevice=" << m_strDevice << " -> mountpoint=" << mountpoint << endl;
     Q_ASSERT( mountpoint.isValid() );
 
     if ( mountpoint.path().isEmpty() )
-        kdWarning(7015) << m_strDevice << " was correctly mounted, but KIO::findDeviceMountPoint didn't find it. "
+        kdWarning(7015) << m_strDevice << " was correctly mounted, but TDEIO::findDeviceMountPoint didn't find it. "
                         << "This looks like a bug, please report it on http://bugs.kde.org, together with your /etc/fstab line" << endl;
     else if ( m_bShowFilemanagerWindow )
       KRun::runURL( mountpoint, "inode/directory" );
@@ -80,11 +80,11 @@ void KAutoMount::slotResult( KIO::Job * job )
 KAutoUnmount::KAutoUnmount( const TQString & _mountpoint, const TQString & _desktopFile )
   : m_desktopFile( _desktopFile ), m_mountpoint( _mountpoint )
 {
-  KIO::Job * job = KIO::unmount( m_mountpoint );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+  TDEIO::Job * job = TDEIO::unmount( m_mountpoint );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
-void KAutoUnmount::slotResult( KIO::Job * job )
+void KAutoUnmount::slotResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     emit error();
diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h
index c5aa30583..68eecdbbd 100644
--- a/kio/kio/kautomount.h
+++ b/kio/kio/kautomount.h
@@ -30,14 +30,14 @@
 
 #ifdef Q_OS_UNIX
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
 /**
  * This class implements synchronous mounting of devices,
  * as well as showing a file-manager window after mounting a device, optionally.
- * It is a wrapper around the asychronous KIO::special() call for mount,
+ * It is a wrapper around the asychronous TDEIO::special() call for mount,
  * used by KMimeType.
  *
  * @short This class implements synchronous mounting of devices.
@@ -68,7 +68,7 @@ signals:
   void error();
 
 protected slots:
-  void slotResult( KIO::Job * );
+  void slotResult( TDEIO::Job * );
 
 protected:
   TQString m_strDevice;
@@ -82,7 +82,7 @@ private:
 
 /**
  * This class implements synchronous unmounting of devices,
- * It is a wrapper around the asychronous KIO::special() call for unmount,
+ * It is a wrapper around the asychronous TDEIO::special() call for unmount,
  * used by KMimeType.
  *
  * @short This class implements synchronous unmounting of devices,
@@ -107,7 +107,7 @@ signals:
   void error();
 
 protected slots:
-  void slotResult( KIO::Job * );
+  void slotResult( TDEIO::Job * );
 private:
   TQString m_desktopFile;
   TQString m_mountpoint;
diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp
index b6905b3a3..90cfca041 100644
--- a/kio/kio/kdirlister.cpp
+++ b/kio/kio/kdirlister.cpp
@@ -224,8 +224,8 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u,
       if ( lister->d->url == _url )
         lister->d->rootFileItem = 0;
 
-      KIO::ListJob* job = KIO::listDir( _url, false /* no default GUI */ );
-      jobs.insert( job, TQValueList<KIO::UDSEntry>() );
+      TDEIO::ListJob* job = TDEIO::listDir( _url, false /* no default GUI */ );
+      jobs.insert( job, TQValueList<TDEIO::UDSEntry>() );
 
       lister->jobStarted( job );
       lister->connectJob( job );
@@ -233,12 +233,12 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u,
       if ( lister->d->window )
         job->setWindow( lister->d->window );
 
-      connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList & ) ),
-               this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList & ) ) );
-      connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-               this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-      connect( job, TQT_SIGNAL( redirection( KIO::Job *, const KURL & ) ),
-               this, TQT_SLOT( slotRedirection( KIO::Job *, const KURL & ) ) );
+      connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ),
+               this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) );
+      connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+      connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ),
+               this, TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) );
 
       emit lister->started( _url );
 
@@ -253,7 +253,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u,
 
     urlsCurrentlyListed[urlStr]->append( lister );
 
-    KIO::ListJob *job = jobForUrl( urlStr );
+    TDEIO::ListJob *job = jobForUrl( urlStr );
     Q_ASSERT( job );
 
     lister->jobStarted( job );
@@ -322,7 +322,7 @@ void KDirListerCache::stop( KDirLister *lister )
       bool ret = listers->removeRef( lister );
       Q_ASSERT( ret );
       
-      KIO::ListJob *job = jobForUrl( url );
+      TDEIO::ListJob *job = jobForUrl( url );
       if ( job )
         lister->jobDone( job );
 
@@ -388,7 +388,7 @@ void KDirListerCache::stop( KDirLister *lister, const KURL& _u )
   holders->append( lister );
 
 
-  KIO::ListJob *job = jobForUrl( urlStr );
+  TDEIO::ListJob *job = jobForUrl( urlStr );
   if ( job )
     lister->jobDone( job );
 
@@ -472,7 +472,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not
       itemsInUse.remove( urlStr );
 
       // this job is a running update
-      KIO::ListJob *job = jobForUrl( urlStr );
+      TDEIO::ListJob *job = jobForUrl( urlStr );
       if ( job )
       {
         lister->jobDone( job );
@@ -499,7 +499,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not
         // Generally keep a watch, except when it would prevent
         // unmounting a removable device (#37780)
         const bool isLocal = item->url.isLocalFile();
-        const bool isManuallyMounted = isLocal && KIO::manually_mounted( item->url.path() );
+        const bool isManuallyMounted = isLocal && TDEIO::manually_mounted( item->url.path() );
         bool containsManuallyMounted = false;
         if ( !isManuallyMounted && item->lstItems && isLocal ) 
         {
@@ -509,7 +509,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not
           // of the time this is just a stat per subdir)
           KFileItemListIterator kit( *item->lstItems );
           for ( ; kit.current() && !containsManuallyMounted; ++kit )
-            if ( (*kit)->isDir() && KIO::manually_mounted( (*kit)->url().path() ) )
+            if ( (*kit)->isDir() && TDEIO::manually_mounted( (*kit)->url().path() ) )
               containsManuallyMounted = true;
         }
 
@@ -554,7 +554,7 @@ void KDirListerCache::updateDirectory( const KURL& _dir )
   // restart the job for _dir if it is running already
   bool killed = false;
   TQWidget *window = 0;
-  KIO::ListJob *job = jobForUrl( urlStr );
+  TDEIO::ListJob *job = jobForUrl( urlStr );
   if ( job )
   {
      window = job->window();
@@ -577,13 +577,13 @@ void KDirListerCache::updateDirectory( const KURL& _dir )
 
   Q_ASSERT( !listers || (listers && killed) );
 
-  job = KIO::listDir( _dir, false /* no default GUI */ );
-  jobs.insert( job, TQValueList<KIO::UDSEntry>() );
+  job = TDEIO::listDir( _dir, false /* no default GUI */ );
+  jobs.insert( job, TQValueList<TDEIO::UDSEntry>() );
 
-  connect( job, TQT_SIGNAL(entries( KIO::Job *, const KIO::UDSEntryList & )),
-           this, TQT_SLOT(slotUpdateEntries( KIO::Job *, const KIO::UDSEntryList & )) );
-  connect( job, TQT_SIGNAL(result( KIO::Job * )),
-           this, TQT_SLOT(slotUpdateResult( KIO::Job * )) );
+  connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )),
+           this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) );
+  connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
+           this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) );
 
   kdDebug(7004) << k_funcinfo << "update started in " << _dir << endl;
 
@@ -930,9 +930,9 @@ void KDirListerCache::slotFileDeleted( const TQString& _file )
   FilesRemoved( u );
 }
 
-void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entries )
+void KDirListerCache::slotEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &entries )
 {
-  KURL url = joburl( static_cast<KIO::ListJob *>(job) );
+  KURL url = joburl( static_cast<TDEIO::ListJob *>(job) );
   url.adjustPath(-1);
   TQString urlStr = url.url();
 
@@ -954,17 +954,17 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri
   static const TQString& dot = TDEGlobal::staticQString(".");
   static const TQString& dotdot = TDEGlobal::staticQString("..");
 
-  KIO::UDSEntryListConstIterator it = entries.begin();
-  KIO::UDSEntryListConstIterator end = entries.end();
+  TDEIO::UDSEntryListConstIterator it = entries.begin();
+  TDEIO::UDSEntryListConstIterator end = entries.end();
 
   for ( ; it != end; ++it )
   {
     TQString name;
 
     // find out about the name
-    KIO::UDSEntry::ConstIterator entit = (*it).begin();
+    TDEIO::UDSEntry::ConstIterator entit = (*it).begin();
     for( ; entit != (*it).end(); ++entit )
-      if ( (*entit).m_uds == KIO::UDS_NAME )
+      if ( (*entit).m_uds == TDEIO::UDS_NAME )
       {
         name = (*entit).m_str;
         break;
@@ -1000,10 +1000,10 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri
     kdl->emitItems();
 }
 
-void KDirListerCache::slotResult( KIO::Job *j )
+void KDirListerCache::slotResult( TDEIO::Job *j )
 {
   Q_ASSERT( j );
-  KIO::ListJob *job = static_cast<KIO::ListJob *>( j );
+  TDEIO::ListJob *job = static_cast<TDEIO::ListJob *>( j );
   jobs.remove( job );
 
   KURL jobUrl = joburl( job );
@@ -1067,10 +1067,10 @@ void KDirListerCache::slotResult( KIO::Job *j )
 #endif
 }
 
-void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url )
+void KDirListerCache::slotRedirection( TDEIO::Job *j, const KURL& url )
 {
   Q_ASSERT( j );
-  KIO::ListJob *job = static_cast<KIO::ListJob *>( j );
+  TDEIO::ListJob *job = static_cast<TDEIO::ListJob *>( j );
 
   KURL oldUrl = job->url();  // here we really need the old url!
   KURL newUrl = url;
@@ -1175,7 +1175,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url )
 
     // get the job if one's running for newUrl already (can be a list-job or an update-job), but
     // do not return this 'job', which would happen because of the use of redirectionURL()
-    KIO::ListJob *oldJob = jobForUrl( newUrl.url(), job );
+    TDEIO::ListJob *oldJob = jobForUrl( newUrl.url(), job );
 
     // listers of newUrl with oldJob: forget about the oldJob and use the already running one
     // which will be converted to an updateJob
@@ -1305,10 +1305,10 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url )
   // make the job an update job
   job->disconnect( this );
     
-  connect( job, TQT_SIGNAL(entries( KIO::Job *, const KIO::UDSEntryList & )),
-           this, TQT_SLOT(slotUpdateEntries( KIO::Job *, const KIO::UDSEntryList & )) );
-  connect( job, TQT_SIGNAL(result( KIO::Job * )),
-           this, TQT_SLOT(slotUpdateResult( KIO::Job * )) );
+  connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )),
+           this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) );
+  connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
+           this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) );
 
   // FIXME: autoUpdate-Counts!!
 
@@ -1385,7 +1385,7 @@ void KDirListerCache::emitRedirections( const KURL &oldUrl, const KURL &url )
   TQString oldUrlStr = oldUrl.url(-1);
   TQString urlStr = url.url(-1);
 
-  KIO::ListJob *job = jobForUrl( oldUrlStr );
+  TDEIO::ListJob *job = jobForUrl( oldUrlStr );
   if ( job )
     killJob( job );
 
@@ -1454,15 +1454,15 @@ void KDirListerCache::removeDirFromCache( const KURL& dir )
   }
 }
 
-void KDirListerCache::slotUpdateEntries( KIO::Job* job, const KIO::UDSEntryList& list )
+void KDirListerCache::slotUpdateEntries( TDEIO::Job* job, const TDEIO::UDSEntryList& list )
 {
-  jobs[static_cast<KIO::ListJob*>(job)] += list;
+  jobs[static_cast<TDEIO::ListJob*>(job)] += list;
 }
 
-void KDirListerCache::slotUpdateResult( KIO::Job * j )
+void KDirListerCache::slotUpdateResult( TDEIO::Job * j )
 {
   Q_ASSERT( j );
-  KIO::ListJob *job = static_cast<KIO::ListJob *>( j );
+  TDEIO::ListJob *job = static_cast<TDEIO::ListJob *>( j );
 
   KURL jobUrl = joburl( job );
   jobUrl.adjustPath(-1);  // need remove trailing slashes again, in case of redirections
@@ -1544,8 +1544,8 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j )
 
   KFileItem *item = 0, *tmp;
 
-  TQValueList<KIO::UDSEntry> buf = jobs[job];
-  TQValueListIterator<KIO::UDSEntry> it = buf.begin();
+  TQValueList<TDEIO::UDSEntry> buf = jobs[job];
+  TQValueListIterator<TDEIO::UDSEntry> it = buf.begin();
   for ( ; it != buf.end(); ++it )
   {
     // Form the complete url
@@ -1641,10 +1641,10 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j )
 
 // private
 
-KIO::ListJob *KDirListerCache::jobForUrl( const TQString& url, KIO::ListJob *not_job )
+TDEIO::ListJob *KDirListerCache::jobForUrl( const TQString& url, TDEIO::ListJob *not_job )
 {
-  KIO::ListJob *job;
-  TQMap< KIO::ListJob *, TQValueList<KIO::UDSEntry> >::Iterator it = jobs.begin();
+  TDEIO::ListJob *job;
+  TQMap< TDEIO::ListJob *, TQValueList<TDEIO::UDSEntry> >::Iterator it = jobs.begin();
   while ( it != jobs.end() )
   {
     job = it.key();
@@ -1655,7 +1655,7 @@ KIO::ListJob *KDirListerCache::jobForUrl( const TQString& url, KIO::ListJob *not
   return 0;
 }
 
-const KURL& KDirListerCache::joburl( KIO::ListJob *job )
+const KURL& KDirListerCache::joburl( TDEIO::ListJob *job )
 {
   if ( job->redirectionURL().isValid() )
      return job->redirectionURL();
@@ -1663,7 +1663,7 @@ const KURL& KDirListerCache::joburl( KIO::ListJob *job )
      return job->url();
 }
 
-void KDirListerCache::killJob( KIO::ListJob *job )
+void KDirListerCache::killJob( TDEIO::ListJob *job )
 {
   jobs.remove( job );
   job->disconnect( this );
@@ -1806,7 +1806,7 @@ void KDirListerCache::printDebug()
     kdDebug(7004) << "   " << it2.currentKey() << "  " << it2.current()->count() << " listers: " << list << endl;
   }
 
-  TQMap< KIO::ListJob *, TQValueList<KIO::UDSEntry> >::Iterator jit = jobs.begin();
+  TQMap< TDEIO::ListJob *, TQValueList<TDEIO::UDSEntry> >::Iterator jit = jobs.begin();
   kdDebug(7004) << "Jobs: " << endl;
   for ( ; jit != jobs.end() ; ++jit )
     kdDebug(7004) << "   " << jit.key() << " listing " << joburl( jit.key() ).prettyURL() << ": " << (*jit).count() << " entries." << endl;
@@ -1867,9 +1867,9 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload )
   // If a local path is available, monitor that instead of the given remote URL...
   KURL realURL = _url;
   if (!realURL.isLocalFile()) {
-      KIO::LocalURLJob* localURLJob = KIO::localURL(_url);
+      TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(_url);
       if (localURLJob) {
-          connect(localURLJob, TQT_SIGNAL(localURL(KIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(KIO::Job*, const KURL&, bool)));
+          connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::Job*, const KURL&, bool)));
           connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
           d->localURLSlotFired = false;
           while (!d->localURLSlotFired) {
@@ -1885,7 +1885,7 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload )
   return s_pCache->listDir( this, realURL, _keep, _reload );
 }
 
-void KDirLister::slotLocalURL(KIO::Job *job, const KURL& url, bool isLocal) {
+void KDirLister::slotLocalURL(TDEIO::Job *job, const KURL& url, bool isLocal) {
   d->localURLSlotFired = true;
   d->localURLResultURL = url;
   d->localURLResultIsLocal = isLocal;
@@ -2248,7 +2248,7 @@ bool KDirLister::validURL( const KURL& _url ) const
   return s_pCache->validURL( this, _url );
 }
 
-void KDirLister::handleError( KIO::Job *job )
+void KDirLister::handleError( TDEIO::Job *job )
 {
   if ( d->autoErrorHandling )
     job->showErrorDialog( d->errorParent );
@@ -2382,20 +2382,20 @@ void KDirLister::emitDeleteItem( KFileItem *item )
 
 // ================ private slots ================ //
 
-void KDirLister::slotInfoMessage( KIO::Job *, const TQString& message )
+void KDirLister::slotInfoMessage( TDEIO::Job *, const TQString& message )
 {
   emit infoMessage( message );
 }
 
-void KDirLister::slotPercent( KIO::Job *job, unsigned long pcnt )
+void KDirLister::slotPercent( TDEIO::Job *job, unsigned long pcnt )
 {
-  d->jobData[static_cast<KIO::ListJob *>(job)].percent = pcnt;
+  d->jobData[static_cast<TDEIO::ListJob *>(job)].percent = pcnt;
 
   int result = 0;
 
-  KIO::filesize_t size = 0;
+  TDEIO::filesize_t size = 0;
 
-  TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
+  TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
   while ( dataIt != d->jobData.end() )
   {
     result += (*dataIt).percent * (*dataIt).totalSize;
@@ -2410,12 +2410,12 @@ void KDirLister::slotPercent( KIO::Job *job, unsigned long pcnt )
   emit percent( result );
 }
 
-void KDirLister::slotTotalSize( KIO::Job *job, KIO::filesize_t size )
+void KDirLister::slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size )
 {
-  d->jobData[static_cast<KIO::ListJob *>(job)].totalSize = size;
+  d->jobData[static_cast<TDEIO::ListJob *>(job)].totalSize = size;
 
-  KIO::filesize_t result = 0;
-  TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
+  TDEIO::filesize_t result = 0;
+  TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
   while ( dataIt != d->jobData.end() )
   {
     result += (*dataIt).totalSize;
@@ -2425,12 +2425,12 @@ void KDirLister::slotTotalSize( KIO::Job *job, KIO::filesize_t size )
   emit totalSize( result );
 }
 
-void KDirLister::slotProcessedSize( KIO::Job *job, KIO::filesize_t size )
+void KDirLister::slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t size )
 {
-  d->jobData[static_cast<KIO::ListJob *>(job)].processedSize = size;
+  d->jobData[static_cast<TDEIO::ListJob *>(job)].processedSize = size;
 
-  KIO::filesize_t result = 0;
-  TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
+  TDEIO::filesize_t result = 0;
+  TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
   while ( dataIt != d->jobData.end() )
   {
     result += (*dataIt).processedSize;
@@ -2440,12 +2440,12 @@ void KDirLister::slotProcessedSize( KIO::Job *job, KIO::filesize_t size )
   emit processedSize( result );
 }
 
-void KDirLister::slotSpeed( KIO::Job *job, unsigned long spd )
+void KDirLister::slotSpeed( TDEIO::Job *job, unsigned long spd )
 {
-  d->jobData[static_cast<KIO::ListJob *>(job)].speed = spd;
+  d->jobData[static_cast<TDEIO::ListJob *>(job)].speed = spd;
 
   int result = 0;
-  TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
+  TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
   while ( dataIt != d->jobData.end() )
   {
     result += (*dataIt).speed;
@@ -2460,12 +2460,12 @@ uint KDirLister::numJobs()
   return d->jobData.count();
 }
 
-void KDirLister::jobDone( KIO::ListJob *job )
+void KDirLister::jobDone( TDEIO::ListJob *job )
 {
   d->jobData.remove( job );
 }
 
-void KDirLister::jobStarted( KIO::ListJob *job )
+void KDirLister::jobStarted( TDEIO::ListJob *job )
 {
   KDirListerPrivate::JobData jobData;
   jobData.speed = 0;
@@ -2477,18 +2477,18 @@ void KDirLister::jobStarted( KIO::ListJob *job )
   d->complete = false;
 }
 
-void KDirLister::connectJob( KIO::ListJob *job )
+void KDirLister::connectJob( TDEIO::ListJob *job )
 {
-  connect( job, TQT_SIGNAL(infoMessage( KIO::Job *, const TQString& )),
-           this, TQT_SLOT(slotInfoMessage( KIO::Job *, const TQString& )) );
-  connect( job, TQT_SIGNAL(percent( KIO::Job *, unsigned long )),
-           this, TQT_SLOT(slotPercent( KIO::Job *, unsigned long )) );
-  connect( job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t )),
-           this, TQT_SLOT(slotTotalSize( KIO::Job *, KIO::filesize_t )) );
-  connect( job, TQT_SIGNAL(processedSize( KIO::Job *, KIO::filesize_t )),
-           this, TQT_SLOT(slotProcessedSize( KIO::Job *, KIO::filesize_t )) );
-  connect( job, TQT_SIGNAL(speed( KIO::Job *, unsigned long )),
-           this, TQT_SLOT(slotSpeed( KIO::Job *, unsigned long )) );
+  connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )),
+           this, TQT_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) );
+  connect( job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long )),
+           this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long )) );
+  connect( job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )),
+           this, TQT_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) );
+  connect( job, TQT_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )),
+           this, TQT_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) );
+  connect( job, TQT_SIGNAL(speed( TDEIO::Job *, unsigned long )),
+           this, TQT_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) );
 }
 
 void KDirLister::setMainWindow( TQWidget *window )
diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h
index 2271b2a70..87aa6c694 100644
--- a/kio/kio/kdirlister.h
+++ b/kio/kio/kdirlister.h
@@ -29,7 +29,7 @@
 
 #include <kurl.h>
 
-namespace KIO { class Job; class ListJob; }
+namespace TDEIO { class Job; class ListJob; }
 
 /**
  * The dir lister deals with the kiojob used to list and update a directory
@@ -520,13 +520,13 @@ signals:
    * Emitted when we know the size of the jobs.
    * @param size the total size in bytes
    */
-  void totalSize( KIO::filesize_t size );
+  void totalSize( TDEIO::filesize_t size );
 
   /**
    * Regularly emitted to show the progress of this KDirLister.
    * @param size the processed size in bytes
    */
-  void processedSize( KIO::filesize_t size );
+  void processedSize( TDEIO::filesize_t size );
 
   /**
    * Emitted to display information about the speed of the jobs.
@@ -598,24 +598,24 @@ protected:
   virtual bool validURL( const KURL& ) const;
 
   /** Reimplement to customize error handling */
-  virtual void handleError( KIO::Job * );
+  virtual void handleError( TDEIO::Job * );
 
 protected:
   virtual void virtual_hook( int id, void *data );
 
 private slots:
-  void slotInfoMessage( KIO::Job *, const TQString& );
-  void slotPercent( KIO::Job *, unsigned long );
-  void slotTotalSize( KIO::Job *, KIO::filesize_t );
-  void slotProcessedSize( KIO::Job *, KIO::filesize_t );
-  void slotSpeed( KIO::Job *, unsigned long );
-  void slotLocalURL( KIO::Job *, const KURL&, bool );
+  void slotInfoMessage( TDEIO::Job *, const TQString& );
+  void slotPercent( TDEIO::Job *, unsigned long );
+  void slotTotalSize( TDEIO::Job *, TDEIO::filesize_t );
+  void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t );
+  void slotSpeed( TDEIO::Job *, unsigned long );
+  void slotLocalURL( TDEIO::Job *, const KURL&, bool );
   void slotLocalURLKIODestroyed( );
 
 private:
-  void jobStarted( KIO::ListJob * );
-  void connectJob( KIO::ListJob * );
-  void jobDone( KIO::ListJob * );
+  void jobStarted( TDEIO::ListJob * );
+  void connectJob( TDEIO::ListJob * );
+  void jobDone( TDEIO::ListJob * );
 
   uint numJobs();
 
diff --git a/kio/kio/kdirlister_p.h b/kio/kio/kdirlister_p.h
index 047c83148..47bd4d452 100644
--- a/kio/kio/kdirlister_p.h
+++ b/kio/kio/kdirlister_p.h
@@ -34,7 +34,7 @@
 
 class TQTimer;
 class KDirLister;
-namespace KIO { class Job; class ListJob; }
+namespace TDEIO { class Job; class ListJob; }
 
 
 class KDirLister::KDirListerPrivate
@@ -90,10 +90,10 @@ public:
 
   struct JobData {
     long unsigned int percent, speed;
-    KIO::filesize_t processedSize, totalSize;
+    TDEIO::filesize_t processedSize, totalSize;
   };
 
-  TQMap<KIO::ListJob *, JobData> jobData;
+  TQMap<TDEIO::ListJob *, JobData> jobData;
 
   // file item for the root itself (".")
   KFileItem *rootFileItem;
@@ -195,18 +195,18 @@ private slots:
 
   void slotFileDirtyDelayed();
 
-  void slotEntries( KIO::Job *job, const KIO::UDSEntryList &entries );
-  void slotResult( KIO::Job *j );
-  void slotRedirection( KIO::Job *job, const KURL &url );
+  void slotEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &entries );
+  void slotResult( TDEIO::Job *j );
+  void slotRedirection( TDEIO::Job *job, const KURL &url );
 
-  void slotUpdateEntries( KIO::Job *job, const KIO::UDSEntryList &entries );
-  void slotUpdateResult( KIO::Job *job );
+  void slotUpdateEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &entries );
+  void slotUpdateResult( TDEIO::Job *job );
 
 private:
-  KIO::ListJob *jobForUrl( const TQString& url, KIO::ListJob *not_job = 0 );
-  const KURL& joburl( KIO::ListJob *job );
+  TDEIO::ListJob *jobForUrl( const TQString& url, TDEIO::ListJob *not_job = 0 );
+  const KURL& joburl( TDEIO::ListJob *job );
 
-  void killJob( KIO::ListJob *job );
+  void killJob( TDEIO::ListJob *job );
 
   // check if _url is held by some lister and return true,
   // otherwise schedule a delayed update and return false
@@ -324,7 +324,7 @@ private:
   };
 
   static const unsigned short MAX_JOBS_PER_LISTER;
-  TQMap<KIO::ListJob *, KIO::UDSEntryList> jobs;
+  TQMap<TDEIO::ListJob *, TDEIO::UDSEntryList> jobs;
 
   // an item is a complete directory
   TQDict<DirItem> itemsInUse;
diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp
index 580de16cc..1ea5805f3 100644
--- a/kio/kio/kdirwatch.cpp
+++ b/kio/kio/kdirwatch.cpp
@@ -109,7 +109,7 @@
 
 #include "kdirwatch.h"
 #include "kdirwatch_p.h"
-#include "global.h" //  KIO::probably_slow_mounted
+#include "global.h" //  TDEIO::probably_slow_mounted
 
 #define NO_NOTIFY (time_t) 0
 
@@ -226,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate()
   delayRemove = false;
   m_ref = 0;
 
-  KConfigGroup config(TDEGlobal::config(), TQCString("DirWatch"));
+  TDEConfigGroup config(TDEGlobal::config(), TQCString("DirWatch"));
   m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000);
   m_PollInterval = config.readNumEntry("PollInterval", 500);
 
@@ -744,7 +744,7 @@ bool KDirWatchPrivate::useINotify( Entry* e )
 bool KDirWatchPrivate::useStat(Entry* e)
 {
   if ( e->path.startsWith("/media/") || (e->path == "/media")
-       || (KIO::probably_slow_mounted(e->path)) )
+       || (TDEIO::probably_slow_mounted(e->path)) )
     useFreq(e, m_nfsPollInterval);
   else
     useFreq(e, m_PollInterval);
diff --git a/kio/kio/kemailsettings.cpp b/kio/kio/kemailsettings.cpp
index 2f1ffe7a0..f8ad9f7dd 100644
--- a/kio/kio/kemailsettings.cpp
+++ b/kio/kio/kemailsettings.cpp
@@ -36,7 +36,7 @@ class KEMailSettingsPrivate {
 public:
     KEMailSettingsPrivate() : m_pConfig( 0 ) {}
     ~KEMailSettingsPrivate() { delete m_pConfig; }
-	KConfig *m_pConfig;
+	TDEConfig *m_pConfig;
 	TQStringList profiles;
 	TQString m_sDefaultProfile, m_sCurrentProfile;
 };
@@ -242,7 +242,7 @@ KEMailSettings::KEMailSettings()
 	p = new KEMailSettingsPrivate();
 	p->m_sCurrentProfile=TQString::null;
 
-	p->m_pConfig = new KConfig("emaildefaults");
+	p->m_pConfig = new TDEConfig("emaildefaults");
 
 	TQStringList groups = p->m_pConfig->groupList();
 	for (TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it) {
diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp
index 50ee1a5d2..fa08ae961 100644
--- a/kio/kio/kfileitem.cpp
+++ b/kio/kio/kfileitem.cpp
@@ -58,7 +58,7 @@ class KFileItem::KFileItemPrivate {
 		TQString iconName;
 };
 
-KFileItem::KFileItem( const KIO::UDSEntry& _entry, const KURL& _url,
+KFileItem::KFileItem( const TDEIO::UDSEntry& _entry, const KURL& _url,
                       bool _determineMimeTypeOnDemand, bool _urlIsDirectory ) :
   m_entry( _entry ),
   m_url( _url ),
@@ -80,7 +80,7 @@ KFileItem::KFileItem( mode_t _mode, mode_t _permissions, const KURL& _url, bool
   m_entry(), // warning !
   m_url( _url ),
   m_strName( _url.fileName() ),
-  m_strText( KIO::decodeFileName( m_strName ) ),
+  m_strText( TDEIO::decodeFileName( m_strName ) ),
   m_pMimeType( 0 ),
   m_fileMode ( _mode ),
   m_permissions( _permissions ),
@@ -97,7 +97,7 @@ KFileItem::KFileItem( mode_t _mode, mode_t _permissions, const KURL& _url, bool
 KFileItem::KFileItem( const KURL &url, const TQString &mimeType, mode_t mode )
 :  m_url( url ),
   m_strName( url.fileName() ),
-  m_strText( KIO::decodeFileName( m_strName ) ),
+  m_strText( TDEIO::decodeFileName( m_strName ) ),
   m_pMimeType( 0 ),
   m_fileMode( mode ),
   m_permissions( KFileItem::Unknown ),
@@ -134,7 +134,7 @@ KFileItem::~KFileItem()
 void KFileItem::init( bool _determineMimeTypeOnDemand )
 {
   m_access = TQString::null;
-  m_size = (KIO::filesize_t) -1;
+  m_size = (TDEIO::filesize_t) -1;
   //  metaInfo = KFileMetaInfo();
   for ( int i = 0; i < NumFlags; i++ )
       m_time[i] = (time_t) -1;
@@ -195,63 +195,63 @@ void KFileItem::init( bool _determineMimeTypeOnDemand )
 
 void KFileItem::readUDSEntry( bool _urlIsDirectory )
 {
-  // extract the mode and the filename from the KIO::UDS Entry
+  // extract the mode and the filename from the TDEIO::UDS Entry
   bool UDS_URL_seen = false;
 
   if (&m_entry == NULL) return;
 
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it ) {
     switch ((*it).m_uds) {
 
-      case KIO::UDS_FILE_TYPE:
+      case TDEIO::UDS_FILE_TYPE:
         m_fileMode = (mode_t)((*it).m_long);
         break;
 
-      case KIO::UDS_ACCESS:
+      case TDEIO::UDS_ACCESS:
         m_permissions = (mode_t)((*it).m_long);
         break;
 
-      case KIO::UDS_USER:
+      case TDEIO::UDS_USER:
         m_user = ((*it).m_str);
         break;
 
-      case KIO::UDS_GROUP:
+      case TDEIO::UDS_GROUP:
         m_group = ((*it).m_str);
         break;
 
-      case KIO::UDS_NAME:
+      case TDEIO::UDS_NAME:
         m_strName = (*it).m_str;
-        m_strText = KIO::decodeFileName( m_strName );
+        m_strText = TDEIO::decodeFileName( m_strName );
         break;
 
-      case KIO::UDS_URL:
+      case TDEIO::UDS_URL:
         UDS_URL_seen = true;
         m_url = KURL((*it).m_str);
         if ( m_url.isLocalFile() )
            m_bIsLocalURL = true;
         break;
 
-      case KIO::UDS_MIME_TYPE:
+      case TDEIO::UDS_MIME_TYPE:
         m_pMimeType = KMimeType::mimeType((*it).m_str);
         m_bMimeTypeKnown = true;
         break;
 
-      case KIO::UDS_GUESSED_MIME_TYPE:
+      case TDEIO::UDS_GUESSED_MIME_TYPE:
         m_guessedMimeType = (*it).m_str;
         break;
 
-      case KIO::UDS_LINK_DEST:
+      case TDEIO::UDS_LINK_DEST:
         m_bLink = !(*it).m_str.isEmpty(); // we don't store the link dest
         break;
 
-      case KIO::UDS_ICON_NAME:
+      case TDEIO::UDS_ICON_NAME:
         if ( !d )
           d = new KFileItemPrivate();
         d->iconName = (*it).m_str;
         break;
 
-      case KIO::UDS_HIDDEN:
+      case TDEIO::UDS_HIDDEN:
         if ( (*it).m_long )
           m_hidden = Hidden;
         else
@@ -280,7 +280,7 @@ void KFileItem::refresh()
   // Everything could have changed...
   // Clearing m_entry makes it possible to detect changes in the size of the file,
   // the time information, etc.
-  m_entry = KIO::UDSEntry();
+  m_entry = TDEIO::UDSEntry();
   init( false );
 }
 
@@ -299,19 +299,19 @@ void KFileItem::setURL( const KURL &url )
 void KFileItem::setName( const TQString& name )
 {
   m_strName = name;
-  m_strText = KIO::decodeFileName( m_strName );
+  m_strText = TDEIO::decodeFileName( m_strName );
 }
 
 TQString KFileItem::linkDest() const
 {
   if (&m_entry == NULL) return TQString::null;
 
-  // Extract it from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  // Extract it from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it )
-    if ( (*it).m_uds == KIO::UDS_LINK_DEST )
+    if ( (*it).m_uds == TDEIO::UDS_LINK_DEST )
       return (*it).m_str;
-  // If not in the KIO::UDSEntry, or if UDSEntry empty, use readlink() [if local URL]
+  // If not in the TDEIO::UDSEntry, or if UDSEntry empty, use readlink() [if local URL]
   if ( m_bIsLocalURL )
   {
     char buf[1000];
@@ -335,33 +335,33 @@ TQString KFileItem::localPath() const
   {
     if (&m_entry == NULL) return TQString::null;
 
-    // Extract the local path from the KIO::UDSEntry
-    KIO::UDSEntry::ConstIterator it = m_entry.begin();
-    const KIO::UDSEntry::ConstIterator end = m_entry.end();
+    // Extract the local path from the TDEIO::UDSEntry
+    TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
+    const TDEIO::UDSEntry::ConstIterator end = m_entry.end();
     for( ; it != end; ++it )
-      if ( (*it).m_uds == KIO::UDS_LOCAL_PATH )
+      if ( (*it).m_uds == TDEIO::UDS_LOCAL_PATH )
         return (*it).m_str;
   }
 
   return TQString::null;
 }
 
-KIO::filesize_t KFileItem::size(bool &exists) const
+TDEIO::filesize_t KFileItem::size(bool &exists) const
 {
   exists = true;
-  if ( m_size != (KIO::filesize_t) -1 )
+  if ( m_size != (TDEIO::filesize_t) -1 )
     return m_size;
 
   if (&m_entry == NULL) return 0L;
 
-  // Extract it from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  // Extract it from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it )
-    if ( (*it).m_uds == KIO::UDS_SIZE ) {
+    if ( (*it).m_uds == TDEIO::UDS_SIZE ) {
       m_size = (*it).m_long;
       return m_size;
     }
-  // If not in the KIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL]
+  // If not in the TDEIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL]
   if ( m_bIsLocalURL )
   {
     KDE_struct_stat buf;
@@ -375,9 +375,9 @@ KIO::filesize_t KFileItem::size(bool &exists) const
 bool KFileItem::hasExtendedACL() const
 {
   if (&m_entry == NULL) return false;
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); it++ )
-    if ( (*it).m_uds == KIO::UDS_EXTENDED_ACL ) {
+    if ( (*it).m_uds == TDEIO::UDS_EXTENDED_ACL ) {
       return true;
     }
   return false;
@@ -388,10 +388,10 @@ KACL KFileItem::ACL() const
   if ( hasExtendedACL() ) {
     if (&m_entry == NULL) return KACL( m_permissions );
 
-    // Extract it from the KIO::UDSEntry
-    KIO::UDSEntry::ConstIterator it = m_entry.begin();
+    // Extract it from the TDEIO::UDSEntry
+    TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
     for( ; it != m_entry.end(); ++it )
-      if ( (*it).m_uds == KIO::UDS_ACL_STRING )
+      if ( (*it).m_uds == TDEIO::UDS_ACL_STRING )
         return KACL((*it).m_str);
   }
   // create one from the basic permissions
@@ -402,15 +402,15 @@ KACL KFileItem::defaultACL() const
 {
   if (&m_entry == NULL) return KACL();
 
-  // Extract it from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  // Extract it from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it )
-    if ( (*it).m_uds == KIO::UDS_DEFAULT_ACL_STRING )
+    if ( (*it).m_uds == TDEIO::UDS_DEFAULT_ACL_STRING )
       return KACL((*it).m_str);
   return KACL();
 }
 
-KIO::filesize_t KFileItem::size() const
+TDEIO::filesize_t KFileItem::size() const
 {
   bool exists;
   return size(exists);
@@ -427,13 +427,13 @@ time_t KFileItem::time( unsigned int which, bool &hasTime ) const
   unsigned int mappedWhich = 0;
 
   switch( which ) {
-    case KIO::UDS_MODIFICATION_TIME:
+    case TDEIO::UDS_MODIFICATION_TIME:
       mappedWhich = Modification;
       break;
-    case KIO::UDS_ACCESS_TIME:
+    case TDEIO::UDS_ACCESS_TIME:
       mappedWhich = Access;
       break;
-    case KIO::UDS_CREATION_TIME:
+    case TDEIO::UDS_CREATION_TIME:
       mappedWhich = Creation;
       break;
   }
@@ -443,29 +443,29 @@ time_t KFileItem::time( unsigned int which, bool &hasTime ) const
 
   if (&m_entry == NULL) return static_cast<time_t>(0);
 
-  // Extract it from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  // Extract it from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it )
     if ( (*it).m_uds == which ) {
       m_time[mappedWhich] = static_cast<time_t>((*it).m_long);
       return m_time[mappedWhich];
     }
 
-  // If not in the KIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL]
+  // If not in the TDEIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL]
   if ( m_bIsLocalURL )
   {
     KDE_struct_stat buf;
     if ( KDE_stat( TQFile::encodeName(m_url.path(-1)), &buf ) == 0 )
     {
-	if(which == KIO::UDS_CREATION_TIME) {
+	if(which == TDEIO::UDS_CREATION_TIME) {
 	    // We can't determine creation time for local files
 	    hasTime = false;
             m_time[mappedWhich] = static_cast<time_t>(0);
 	    return m_time[mappedWhich];
 	}
-        m_time[mappedWhich] = (which == KIO::UDS_MODIFICATION_TIME) ?
+        m_time[mappedWhich] = (which == TDEIO::UDS_MODIFICATION_TIME) ?
                                buf.st_mtime :
-                               /* which == KIO::UDS_ACCESS_TIME)*/
+                               /* which == TDEIO::UDS_ACCESS_TIME)*/
 			       buf.st_atime;
         return m_time[mappedWhich];
     }
@@ -843,9 +843,9 @@ TQString KFileItem::getStatusBarInfo()
   else if ( S_ISREG( m_fileMode ) )
   {
       bool hasSize;
-      KIO::filesize_t sizeValue = size(hasSize);
+      TDEIO::filesize_t sizeValue = size(hasSize);
       if(hasSize)
-        text += TQString(" (%1)  ").arg( KIO::convertSize( sizeValue ) );
+        text += TQString(" (%1)  ").arg( TDEIO::convertSize( sizeValue ) );
       text += mimeComment();
   }
   else if ( S_ISDIR ( m_fileMode ) )
@@ -887,12 +887,12 @@ TQString KFileItem::getToolTipText(int maxcount)
 
   if ( !S_ISDIR ( m_fileMode ) ) {
     bool hasSize;
-    KIO::filesize_t sizeValue = size(hasSize);
+    TDEIO::filesize_t sizeValue = size(hasSize);
     if(hasSize)
       tip += start + i18n("Size:") + mid +
-             KIO::convertSizeWithBytes(sizeValue) + end;
+             TDEIO::convertSizeWithBytes(sizeValue) + end;
   }
-  TQString timeStr = timeString( KIO::UDS_MODIFICATION_TIME);
+  TQString timeStr = timeString( TDEIO::UDS_MODIFICATION_TIME);
   if(!timeStr.isEmpty())
     tip += start + i18n("Modified:") + mid +
            timeStr + end;
@@ -966,7 +966,7 @@ bool KFileItem::cmp( const KFileItem & item )
              && m_hidden == item.m_hidden
              && size(hasSize1) == item.size(hasSize2)
 	     && hasSize1 == hasSize2
-             && time(KIO::UDS_MODIFICATION_TIME, hasTime1) == item.time(KIO::UDS_MODIFICATION_TIME, hasTime2)
+             && time(TDEIO::UDS_MODIFICATION_TIME, hasTime1) == item.time(TDEIO::UDS_MODIFICATION_TIME, hasTime2)
 	     && hasTime1 == hasTime2
              && (!d || !item.d || d->iconName == item.d->iconName) );
 
@@ -1014,7 +1014,7 @@ void KFileItem::assign( const KFileItem & item )
     }
 }
 
-void KFileItem::setUDSEntry( const KIO::UDSEntry& _entry, const KURL& _url,
+void KFileItem::setUDSEntry( const TDEIO::UDSEntry& _entry, const KURL& _url,
     bool _determineMimeTypeOnDemand, bool _urlIsDirectory )
 {
   m_entry = _entry;
diff --git a/kio/kio/kfileitem.h b/kio/kio/kfileitem.h
index cf6344669..5e75ac16f 100644
--- a/kio/kio/kfileitem.h
+++ b/kio/kio/kfileitem.h
@@ -34,7 +34,7 @@
 
 /**
  * A KFileItem is a generic class to handle a file, local or remote.
- * In particular, it makes it easier to handle the result of KIO::listDir
+ * In particular, it makes it easier to handle the result of TDEIO::listDir
  * (UDSEntry isn't very friendly to use).
  * It includes many file attributes such as mimetype, icon, text, mode, link...
  */
@@ -45,7 +45,7 @@ public:
 
   /**
    * Creates an item representing a file, from a UDSEntry.
-   * This is the preferred constructor when using KIO::listDir().
+   * This is the preferred constructor when using TDEIO::listDir().
    *
    * @param _entry the KIO entry used to get the file, contains info about it
    * @param _url the file url
@@ -54,7 +54,7 @@ public:
    * @param _urlIsDirectory specifies if the url is just the directory of the
    *       fileitem and the filename from the UDSEntry should be used.
    */
-  KFileItem( const KIO::UDSEntry& _entry, const KURL& _url,
+  KFileItem( const TDEIO::UDSEntry& _entry, const KURL& _url,
              bool _determineMimeTypeOnDemand = false,
              bool _urlIsDirectory = false );
 
@@ -239,14 +239,14 @@ public:
    * Returns the size of the file, if known.
    * @return the file size, or 0 if not known
    */
-  KIO::filesize_t size() const;
+  TDEIO::filesize_t size() const;
 
   /**
    * Returns the size of the file, if known, and sets @p hasSize to false if not known
    * @param @hasSize This is set to true if the size is known, and false if not known
    * @return the file size, or 0 if not known
    */ 
-  KIO::filesize_t size(bool &hasSize) const;
+  TDEIO::filesize_t size(bool &hasSize) const;
   
   //FIXME KDE4 deprecate this in favor of time(unsigned int which, bool &hasSize)
   /**
@@ -273,7 +273,7 @@ public:
    * @returns a formatted string of the requested time, TQString::null if time is not known
    * @see time
    */
-  TQString timeString( unsigned int which = KIO::UDS_MODIFICATION_TIME ) const;
+  TQString timeString( unsigned int which = TDEIO::UDS_MODIFICATION_TIME ) const;
 
   /**
    * Returns true if the file is a local file.
@@ -396,7 +396,7 @@ public:
    * by position.
    * @return the UDS entry
    */
-  const KIO::UDSEntry & entry() const { return m_entry; }
+  const TDEIO::UDSEntry & entry() const { return m_entry; }
 
   /**
    * Used when updating a directory. marked == seen when refreshing.
@@ -536,7 +536,7 @@ public:
    *        fileitem and the filename from the UDSEntry should be used.
    * @since 3.4.1
    */
-  void setUDSEntry( const KIO::UDSEntry& entry, const KURL& url,
+  void setUDSEntry( const TDEIO::UDSEntry& entry, const KURL& url,
                     bool determineMimeTypeOnDemand = false,
                     bool urlIsDirectory = false );
 
@@ -576,7 +576,7 @@ private:
   /**
    * We keep a copy of the UDSEntry since we need it for getStatusBarInfo
    */
-  KIO::UDSEntry m_entry;
+  TDEIO::UDSEntry m_entry;
   /**
    * The url of the file
    */
@@ -643,7 +643,7 @@ private:
 
   enum { Modification = 0, Access = 1, Creation = 2, NumFlags = 3 };
   mutable time_t m_time[3];
-  mutable KIO::filesize_t m_size;
+  mutable TDEIO::filesize_t m_size;
 
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp
index c345ef89e..0ccbb577b 100644
--- a/kio/kio/kfilemetainfo.cpp
+++ b/kio/kio/kfilemetainfo.cpp
@@ -1626,12 +1626,12 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle
             else if (unit() == KFileMimeTypeInfo::Bytes)
             {
                 // convertSize already adds the correct suffix
-                return KIO::convertSize(value.toInt());
+                return TDEIO::convertSize(value.toInt());
             }
             else if (unit() == KFileMimeTypeInfo::KiloBytes)
             {
                 // convertSizeFromKB already adds the correct suffix
-                return KIO::convertSizeFromKB(value.toInt());
+                return TDEIO::convertSizeFromKB(value.toInt());
             }
             else
                 s = TDEGlobal::locale()->formatNumber( value.toInt() , 0);
@@ -1643,9 +1643,9 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle
 
 	case TQVariant::ULongLong :
             if ( unit() == KFileMimeTypeInfo::Bytes )
-                return KIO::convertSize( value.toULongLong() );
+                return TDEIO::convertSize( value.toULongLong() );
             else if ( unit() == KFileMimeTypeInfo::KiloBytes )
-                return KIO::convertSizeFromKB( value.toULongLong() );
+                return TDEIO::convertSizeFromKB( value.toULongLong() );
             else
                 s = TDEGlobal::locale()->formatNumber( value.toULongLong(), 0 );
             break;
diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp
index 75622bf7d..cdbaa8ea3 100644
--- a/kio/kio/kimageio.cpp
+++ b/kio/kio/kimageio.cpp
@@ -37,7 +37,7 @@ KImageIOFormat::KImageIOFormat( const TQString &path)
    bLibLoaded = false;
    mReadFunc = 0;
    mWriteFunc = 0;
-   KConfig config(path, true, false);
+   TDEConfig config(path, true, false);
 
    config.setGroup("Image Format");
    mType = config.readEntry("Type");
diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp
index 37867cd23..397fbc9e9 100644
--- a/kio/kio/kmimetype.cpp
+++ b/kio/kio/kmimetype.cpp
@@ -533,8 +533,8 @@ TQString KMimeType::favIconForURL( const KURL& url )
     static bool check = true;
     if ( check ) {
         check = false;
-        KConfig *config = TDEGlobal::config();
-        KConfigGroupSaver cs( config, "HTML Settings" );
+        TDEConfig *config = TDEGlobal::config();
+        TDEConfigGroupSaver cs( config, "HTML Settings" );
         useFavIcons = config->readBoolEntry( "EnableFavicon", true );
     }
 
@@ -717,7 +717,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
     TQString dev = cfg.readEntry( "Dev" );
     if ( !icon.isEmpty() && !unmount_icon.isEmpty() && !dev.isEmpty() )
     {
-      TQString mp = KIO::findDeviceMountPoint( dev );
+      TQString mp = TDEIO::findDeviceMountPoint( dev );
       // Is the device not mounted ?
       if ( mp.isNull() )
         return unmount_icon;
@@ -831,7 +831,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf
     return retval;
   }
 
-  TQString mp = KIO::findDeviceMountPoint( dev );
+  TQString mp = TDEIO::findDeviceMountPoint( dev );
   // Is the device already mounted ?
   if ( !mp.isNull() )
   {
@@ -933,7 +933,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::builtinServices( co
     }
     else
     {
-      TQString mp = KIO::findDeviceMountPoint( dev );
+      TQString mp = TDEIO::findDeviceMountPoint( dev );
       // not mounted ?
       if ( mp.isEmpty() )
       {
@@ -968,12 +968,12 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices
   return userDefinedServices( path, cfg, bLocalFiles );
 }
 
-TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, KConfig& cfg, bool bLocalFiles )
+TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, TDEConfig& cfg, bool bLocalFiles )
 {
  return userDefinedServices( path, cfg, bLocalFiles, KURL::List() );
 }
 
-TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, KConfig& cfg, bool bLocalFiles, const KURL::List & file_list )
+TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, TDEConfig& cfg, bool bLocalFiles, const KURL::List & file_list )
 {
   TQValueList<Service> result;
 
@@ -1114,7 +1114,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT
       KMessageBoxWrapper::error( 0, tmp );
       return;
     }
-    TQString mp = KIO::findDeviceMountPoint( dev );
+    TQString mp = TDEIO::findDeviceMountPoint( dev );
 
     if ( _service.m_type == ST_MOUNT )
     {
diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h
index b5ffdc9df..1d53f3713 100644
--- a/kio/kio/kmimetype.h
+++ b/kio/kio/kmimetype.h
@@ -561,11 +561,11 @@ public:
   static TQValueList<Service> userDefinedServices( const TQString& path, bool bLocalFiles );
 
   /**
-   * Overload of userDefinedServices for speed purposes: it takes a KConfig* so that
+   * Overload of userDefinedServices for speed purposes: it takes a TDEConfig* so that
    * the caller can check things in the file without having it parsed twice.
    * @since 3.4
    */
-  static TQValueList<Service> userDefinedServices( const TQString& path, KConfig& config, bool bLocalFiles );
+  static TQValueList<Service> userDefinedServices( const TQString& path, TDEConfig& config, bool bLocalFiles );
 
   /**
    * Overload of userDefinedServices but also allows you to pass a list of urls for this file.
@@ -573,7 +573,7 @@ public:
    * the X-TDE-GetActionMenu extension.
    * @since 3.5
    */
-  static TQValueList<Service> userDefinedServices( const TQString& path, KConfig& config, bool bLocalFiles,  const KURL::List & file_list);
+  static TQValueList<Service> userDefinedServices( const TQString& path, TDEConfig& config, bool bLocalFiles,  const KURL::List & file_list);
 
   /**
    * @param path is the path of the desktop entry.
diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp
index 0cb010913..b22bbd8dc 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/kio/kio/kmimetypechooser.cpp
@@ -261,7 +261,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog(
                                   this, "chooser" );
   setMainWidget(m_chooser);
 
-  KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog");
+  TDEConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog");
   TQSize defaultSize( 400, 300 );
   resize( group.readSizeEntry("size", &defaultSize) );
 }
@@ -280,7 +280,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog(
                                   this, "chooser" );
   setMainWidget(m_chooser);
 
-  KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog");
+  TDEConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog");
   TQSize defaultSize( 400, 300 );
   resize( group.readSizeEntry("size", &defaultSize) );
 }
@@ -288,7 +288,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog(
 
 KMimeTypeChooserDialog::~KMimeTypeChooserDialog()
 {
-  KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog");
+  TDEConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog");
   group.writeEntry("size", size());
 }
 
diff --git a/kio/kio/knfsshare.cpp b/kio/kio/knfsshare.cpp
index f0fdfce6d..394120009 100644
--- a/kio/kio/knfsshare.cpp
+++ b/kio/kio/knfsshare.cpp
@@ -52,7 +52,7 @@ KNFSSharePrivate::KNFSSharePrivate()
  * @return wether an 'exports' file was found.
  **/
 bool KNFSSharePrivate::findExportsFile() {
-  KConfig config("knfsshare");
+  TDEConfig config("knfsshare");
   config.setGroup("General");
   exportsFile = config.readPathEntry("exportsFile");
 
diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
index 252bdbfbd..a4f8169f5 100644
--- a/kio/kio/kprotocolmanager.cpp
+++ b/kio/kio/kprotocolmanager.cpp
@@ -44,8 +44,8 @@ public:
 
    ~KProtocolManagerPrivate();
 
-   KConfig *config;
-   KConfig *http_config;
+   TDEConfig *config;
+   TDEConfig *http_config;
    bool init_busy;
    KURL url;
    TQString protocol;
@@ -80,29 +80,29 @@ void KProtocolManager::reparseConfiguration()
   kpmpksd.destructObject();
 
   // Force the slave config to re-read its config...
-  KIO::SlaveConfig::self()->reset ();
+  TDEIO::SlaveConfig::self()->reset ();
 }
 
-KConfig *KProtocolManager::config()
+TDEConfig *KProtocolManager::config()
 {
   if (!d)
      d = new KProtocolManagerPrivate;
 
   if (!d->config)
   {
-     d->config = new KConfig("kioslaverc", true, false);
+     d->config = new TDEConfig("kioslaverc", true, false);
   }
   return d->config;
 }
 
-KConfig *KProtocolManager::http_config()
+TDEConfig *KProtocolManager::http_config()
 {
   if (!d)
      d = new KProtocolManagerPrivate;
 
   if (!d->http_config)
   {
-     d->http_config = new KConfig("kio_httprc", false, false);
+     d->http_config = new TDEConfig("kio_httprc", false, false);
   }
   return d->http_config;
 }
@@ -111,7 +111,7 @@ KConfig *KProtocolManager::http_config()
 
 int KProtocolManager::readTimeout()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ReadTimeout", DEFAULT_READ_TIMEOUT );
   return QMAX(MIN_TIMEOUT_VALUE, val);
@@ -119,7 +119,7 @@ int KProtocolManager::readTimeout()
 
 int KProtocolManager::connectTimeout()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ConnectTimeout", DEFAULT_CONNECT_TIMEOUT );
   return QMAX(MIN_TIMEOUT_VALUE, val);
@@ -127,7 +127,7 @@ int KProtocolManager::connectTimeout()
 
 int KProtocolManager::proxyConnectTimeout()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ProxyConnectTimeout", DEFAULT_PROXY_CONNECT_TIMEOUT );
   return QMAX(MIN_TIMEOUT_VALUE, val);
@@ -135,7 +135,7 @@ int KProtocolManager::proxyConnectTimeout()
 
 int KProtocolManager::responseTimeout()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ResponseTimeout", DEFAULT_RESPONSE_TIMEOUT );
   return QMAX(MIN_TIMEOUT_VALUE, val);
@@ -150,21 +150,21 @@ bool KProtocolManager::useProxy()
 
 bool KProtocolManager::useReverseProxy()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return cfg->readBoolEntry("ReversedException", false);
 }
 
 KProtocolManager::ProxyType KProtocolManager::proxyType()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return static_cast<ProxyType>(cfg->readNumEntry( "ProxyType" ));
 }
 
 KProtocolManager::ProxyAuthMode KProtocolManager::proxyAuthMode()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return static_cast<ProxyAuthMode>(cfg->readNumEntry( "AuthMode" ));
 }
@@ -173,40 +173,40 @@ KProtocolManager::ProxyAuthMode KProtocolManager::proxyAuthMode()
 
 bool KProtocolManager::useCache()
 {
-  KConfig *cfg = http_config();
+  TDEConfig *cfg = http_config();
   return cfg->readBoolEntry( "UseCache", true );
 }
 
-KIO::CacheControl KProtocolManager::cacheControl()
+TDEIO::CacheControl KProtocolManager::cacheControl()
 {
-  KConfig *cfg = http_config();
+  TDEConfig *cfg = http_config();
   TQString tmp = cfg->readEntry("cache");
   if (tmp.isEmpty())
     return DEFAULT_CACHE_CONTROL;
-  return KIO::parseCacheControl(tmp);
+  return TDEIO::parseCacheControl(tmp);
 }
 
 TQString KProtocolManager::cacheDir()
 {
-  KConfig *cfg = http_config();
+  TDEConfig *cfg = http_config();
   return cfg->readPathEntry("CacheDir", TDEGlobal::dirs()->saveLocation("cache","http"));
 }
 
 int KProtocolManager::maxCacheAge()
 {
-  KConfig *cfg = http_config();
+  TDEConfig *cfg = http_config();
   return cfg->readNumEntry( "MaxCacheAge", DEFAULT_MAX_CACHE_AGE ); // 14 days
 }
 
 int KProtocolManager::maxCacheSize()
 {
-  KConfig *cfg = http_config();
+  TDEConfig *cfg = http_config();
   return cfg->readNumEntry( "MaxCacheSize", DEFAULT_MAX_CACHE_SIZE ); // 5 MB
 }
 
 TQString KProtocolManager::noProxyForRaw()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
 
   return cfg->readEntry( "NoProxyFor" );
@@ -230,7 +230,7 @@ TQString KProtocolManager::proxyFor( const TQString& protocol )
   else if (scheme == "webdavs")
     scheme = "https";
 
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return cfg->readEntry( scheme + "Proxy" );
 }
@@ -417,11 +417,11 @@ TQString KProtocolManager::slaveProtocol(const KURL &url, TQString &proxy)
 
 TQString KProtocolManager::userAgentForHost( const TQString& hostname )
 {
-  TQString sendUserAgent = KIO::SlaveConfig::self()->configData("http", hostname.lower(), "SendUserAgent").lower();
+  TQString sendUserAgent = TDEIO::SlaveConfig::self()->configData("http", hostname.lower(), "SendUserAgent").lower();
   if (sendUserAgent == "false")
      return TQString::null;
 
-  TQString useragent = KIO::SlaveConfig::self()->configData("http", hostname.lower(), "UserAgent");
+  TQString useragent = TDEIO::SlaveConfig::self()->configData("http", hostname.lower(), "UserAgent");
 
   // Return the default user-agent if none is specified
   // for the requested host.
@@ -433,7 +433,7 @@ TQString KProtocolManager::userAgentForHost( const TQString& hostname )
 
 TQString KProtocolManager::defaultUserAgent( )
 {
-  TQString modifiers = KIO::SlaveConfig::self()->configData("http", TQString::null, "UserAgentKeys");
+  TQString modifiers = TDEIO::SlaveConfig::self()->configData("http", TQString::null, "UserAgentKeys");
   return defaultUserAgent(modifiers);
 }
 
@@ -492,14 +492,14 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers )
 
 bool KProtocolManager::markPartial()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readBoolEntry( "MarkPartial", true );
 }
 
 int KProtocolManager::minimumKeepSize()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readNumEntry( "MinimumKeepSize",
                             DEFAULT_MINIMUM_KEEP_SIZE ); // 5000 byte
@@ -507,28 +507,28 @@ int KProtocolManager::minimumKeepSize()
 
 bool KProtocolManager::autoResume()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readBoolEntry( "AutoResume", false );
 }
 
 bool KProtocolManager::persistentConnections()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readBoolEntry( "PersistentConnections", true );
 }
 
 bool KProtocolManager::persistentProxyConnection()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readBoolEntry( "PersistentProxyConnection", false );
 }
 
 TQString KProtocolManager::proxyConfigScript()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return cfg->readEntry( "Proxy Config Script" );
 }
diff --git a/kio/kio/kprotocolmanager.h b/kio/kio/kprotocolmanager.h
index ec59342af..e1d425ebd 100644
--- a/kio/kio/kprotocolmanager.h
+++ b/kio/kio/kprotocolmanager.h
@@ -28,7 +28,7 @@
 /** @deprecated Use KProtocolManager::defaultUserAgent() instead. */
 #define DEFAULT_USERAGENT_STRING ""
 
-class KConfig;
+class TDEConfig;
 
 /**
  * Provides information about I/O (Internet, etc.) settings chosen/set
@@ -311,7 +311,7 @@ public:
    * Returns the Cache control directive to be used.
    * @return the cache control value
    */
-  static KIO::CacheControl cacheControl();
+  static TDEIO::CacheControl cacheControl();
 
 
 /*============================ DOWNLOAD CONFIG ==============================*/
@@ -382,8 +382,8 @@ public:
    * @internal
    * (Shared with SlaveConfig)
    */
-  static KConfig *config();
+  static TDEConfig *config();
 private:
-  static KConfig *http_config();
+  static TDEConfig *http_config();
 };
 #endif
diff --git a/kio/kio/kremoteencoding.h b/kio/kio/kremoteencoding.h
index 35191d8e5..6f5eea5fd 100644
--- a/kio/kio/kremoteencoding.h
+++ b/kio/kio/kremoteencoding.h
@@ -31,11 +31,11 @@ class KRemoteEncodingPrivate;
  * Certain protocols do not specify an appropriate encoding for decoding
  * their 8-bit data into proper Unicode forms. Therefore, ioslaves should
  * use this class in order to convert those forms into QStrings before
- * creating the respective KIO::UDSEntry. The same is true for decoding
+ * creating the respective TDEIO::UDSEntry. The same is true for decoding
  * URLs to its components.
  *
- * Each KIO::SlaveBase has one object of this kind, even if it is not necessary.
- * It can be accessed through KIO::SlaveBase::remoteEncoding.
+ * Each TDEIO::SlaveBase has one object of this kind, even if it is not necessary.
+ * It can be accessed through TDEIO::SlaveBase::remoteEncoding.
  *
  * @short A class for handling remote filenames
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
index 2f6e9861a..f99f636db 100644
--- a/kio/kio/krun.cpp
+++ b/kio/kio/krun.cpp
@@ -476,7 +476,7 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
 */
 
   if (_service.terminal()) {
-    KConfigGroupSaver gs(TDEGlobal::config(), "General");
+    TDEConfigGroupSaver gs(TDEGlobal::config(), "General");
     TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole");
     if (terminal == "konsole")
       terminal += " -caption=%c %i %m";
@@ -727,7 +727,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
       if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" )
       {
         // Maybe we can resolve to a local URL?
-        KURL localURL = KIO::NetAccess::mostLocalURL( url, 0 );
+        KURL localURL = TDEIO::NetAccess::mostLocalURL( url, 0 );
         if ( localURL != url ) {
           *it = localURL;
           kdDebug(7010) << "Changed to " << localURL << endl;
@@ -1003,7 +1003,7 @@ void KRun::init()
   }
   if ( !kapp->authorizeURLAction( "open", KURL(), m_strURL))
   {
-    TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, m_strURL.prettyURL());
+    TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, m_strURL.prettyURL());
     d->m_showingError = true;
     KMessageBoxWrapper::error( d->m_window, msg );
     d->m_showingError = false;
@@ -1119,10 +1119,10 @@ void KRun::init()
   kdDebug(7010) << "Testing directory (stating)" << endl;
 
   // It may be a directory or a file, let's stat
-  KIO::StatJob *job = KIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo );
+  TDEIO::StatJob *job = TDEIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo );
   job->setWindow (d->m_window);
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           this, TQT_SLOT( slotStatResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
   m_job = job;
   kdDebug(7010) << " Job " << job << " is about stating " << m_strURL.url() << endl;
 }
@@ -1168,12 +1168,12 @@ void KRun::scanFile()
   }
   kdDebug(7010) << this << " Scanning file " << m_strURL.url() << endl;
 
-  KIO::TransferJob *job = KIO::get( m_strURL, false /*reload*/, m_bProgressInfo );
+  TDEIO::TransferJob *job = TDEIO::get( m_strURL, false /*reload*/, m_bProgressInfo );
   job->setWindow (d->m_window);
-  connect(job, TQT_SIGNAL( result(KIO::Job *)),
-          this, TQT_SLOT( slotScanFinished(KIO::Job *)));
-  connect(job, TQT_SIGNAL( mimetype(KIO::Job *, const TQString &)),
-          this, TQT_SLOT( slotScanMimeType(KIO::Job *, const TQString &)));
+  connect(job, TQT_SIGNAL( result(TDEIO::Job *)),
+          this, TQT_SLOT( slotScanFinished(TDEIO::Job *)));
+  connect(job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &)),
+          this, TQT_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &)));
   m_job = job;
   kdDebug(7010) << " Job " << job << " is about getting from " << m_strURL.url() << endl;
 }
@@ -1217,7 +1217,7 @@ void KRun::slotTimeout()
   }
 }
 
-void KRun::slotStatResult( KIO::Job * job )
+void KRun::slotStatResult( TDEIO::Job * job )
 {
   m_job = 0L;
   if (job->error())
@@ -1237,24 +1237,24 @@ void KRun::slotStatResult( KIO::Job * job )
   } else {
 
     kdDebug(7010) << "Finished" << endl;
-    if(!dynamic_cast<KIO::StatJob*>(job))
+    if(!dynamic_cast<TDEIO::StatJob*>(job))
         kdFatal() << "job is a " << typeid(*job).name() << " should be a StatJob" << endl;
 
     TQString knownMimeType;
-    KIO::UDSEntry entry = ((KIO::StatJob*)job)->statResult();
-    KIO::UDSEntry::ConstIterator it = entry.begin();
+    TDEIO::UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+    TDEIO::UDSEntry::ConstIterator it = entry.begin();
     for( ; it != entry.end(); it++ ) {
         switch( (*it).m_uds ) {
-        case KIO::UDS_FILE_TYPE:
+        case TDEIO::UDS_FILE_TYPE:
             if ( S_ISDIR( (mode_t)((*it).m_long) ) )
                 m_bIsDirectory = true; // it's a dir
             else
                 m_bScanFile = true; // it's a file
             break;
-        case KIO::UDS_MIME_TYPE: // mimetype already known? (e.g. print:/manager)
+        case TDEIO::UDS_MIME_TYPE: // mimetype already known? (e.g. print:/manager)
             knownMimeType = (*it).m_str;
             break;
-        case KIO::UDS_LOCAL_PATH:
+        case TDEIO::UDS_LOCAL_PATH:
             d->m_localPath = (*it).m_str;
             break;
         default:
@@ -1277,7 +1277,7 @@ void KRun::slotStatResult( KIO::Job * job )
   }
 }
 
-void KRun::slotScanMimeType( KIO::Job *, const TQString &mimetype )
+void KRun::slotScanMimeType( TDEIO::Job *, const TQString &mimetype )
 {
   if ( mimetype.isEmpty() )
     kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't find a mimetype! Probably a kioslave bug." << endl;
@@ -1285,7 +1285,7 @@ void KRun::slotScanMimeType( KIO::Job *, const TQString &mimetype )
   m_job = 0;
 }
 
-void KRun::slotScanFinished( KIO::Job *job )
+void KRun::slotScanFinished( TDEIO::Job *job )
 {
   m_job = 0;
   if (job->error())
@@ -1352,19 +1352,19 @@ void KRun::foundMimeType( const TQString& type )
     // We don't know if this is a file or a directory. Let's test this first.
     // (For instance a tar.gz is a directory contained inside a file)
     // It may be a directory or a file, let's stat
-    KIO::StatJob *job = KIO::stat( m_strURL, m_bProgressInfo );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             this, TQT_SLOT( slotStatResult( KIO::Job * ) ) );
+    TDEIO::StatJob *job = TDEIO::stat( m_strURL, m_bProgressInfo );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
     m_job = job;
 
     return;
   }
 */
-  KIO::TransferJob *job = ::tqqt_cast<KIO::TransferJob *>( m_job );
+  TDEIO::TransferJob *job = ::tqqt_cast<TDEIO::TransferJob *>( m_job );
   if ( job )
   {
      job->putOnHold();
-     KIO::Scheduler::publishSlaveOnHold();
+     TDEIO::Scheduler::publishSlaveOnHold();
      m_job = 0;
   }
 
@@ -1440,7 +1440,7 @@ void KRun::abort()
 void KRun::setEnableExternalBrowser(bool b)
 {
    if (b)
-      d->m_externalBrowser = KConfigGroup(TDEGlobal::config(), "General").readEntry("BrowserApplication");
+      d->m_externalBrowser = TDEConfigGroup(TDEGlobal::config(), "General").readEntry("BrowserApplication");
    else
       d->m_externalBrowser = TQString::null;
 }
diff --git a/kio/kio/krun.h b/kio/kio/krun.h
index 9e4bf8c44..44bff6dee 100644
--- a/kio/kio/krun.h
+++ b/kio/kio/krun.h
@@ -32,7 +32,7 @@
 
 class TDEProcess;
 class KService;
-namespace KIO {
+namespace TDEIO {
    class Job;
    class StatJob;
 }
@@ -77,7 +77,7 @@ public:
    *
    * @param showProgressInfo
    *        Whether to show progress information when determining the
-   *        type of the file (i.e. when using KIO::stat and KIO::mimetype)
+   *        type of the file (i.e. when using TDEIO::stat and TDEIO::mimetype)
    *        Before you set this to false to avoid a dialog box, think about
    *        a very slow FTP server...
    *        It is always better to provide progress info in such cases.
@@ -104,7 +104,7 @@ public:
    *
    * @param showProgressInfo
    *        Whether to show progress information when determining the
-   *        type of the file (i.e. when using KIO::stat and KIO::mimetype)
+   *        type of the file (i.e. when using TDEIO::stat and TDEIO::mimetype)
    *        Before you set this to false to avoid a dialog box, think about
    *        a very slow FTP server...
    *        It is always better to provide progress info in such cases.
@@ -401,9 +401,9 @@ signals:
 
 protected slots:
   void slotTimeout();
-  void slotScanFinished( KIO::Job * );
-  void slotScanMimeType( KIO::Job *, const TQString &type );
-  virtual void slotStatResult( KIO::Job * );
+  void slotScanFinished( TDEIO::Job * );
+  void slotScanMimeType( TDEIO::Job *, const TQString &type );
+  virtual void slotStatResult( TDEIO::Job * );
 
 protected:
   virtual void init();
@@ -424,7 +424,7 @@ protected:
   bool m_bAutoDelete;
   bool m_bProgressInfo;
   bool m_bFinished;
-  KIO::Job * m_job;
+  TDEIO::Job * m_job;
   TQTimer m_timer;
 
   /**
diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp
index 9324f964d..a5216981f 100644
--- a/kio/kio/kservice.cpp
+++ b/kio/kio/kservice.cpp
@@ -474,7 +474,7 @@ int KService::initialPreferenceForMimeType( const TQString& mimeType ) const
   return 0;
 }
 
-class KServiceReadProperty : public KConfigBase
+class KServiceReadProperty : public TDEConfigBase
 {
 public:
    KServiceReadProperty(const TQString &_key, const TQCString &_value)
@@ -570,7 +570,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const
     }
   }
 
-  // Then we use a homebuild class based on KConfigBase to convert the TQString.
+  // Then we use a homebuild class based on TDEConfigBase to convert the TQString.
   // For some often used property types we do the conversion ourselves.
   TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name );
   if ( (it == m_mapProps.end()) || (!it.data().isValid()))
diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp
index af69e1765..e85991f82 100644
--- a/kio/kio/kservicegroup.cpp
+++ b/kio/kio/kservicegroup.cpp
@@ -128,7 +128,7 @@ int KServiceGroup::childCount()
 {
   if (m_childCount == -1)
   {
-     KConfig global("kdeglobals");
+     TDEConfig global("kdeglobals");
      global.setGroup("KDE");
      bool showUnimportant = global.readBoolEntry("showUnimportant", true);
 
diff --git a/kio/kio/kshred.h b/kio/kio/kshred.h
index c38c610ed..c7669122a 100644
--- a/kio/kio/kshred.h
+++ b/kio/kio/kshred.h
@@ -112,7 +112,7 @@ class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
          * Shows progress of the shredding.
 	 * @param bytes the number of bytes written to the file
          */
-        void processedSize(KIO::filesize_t bytes);
+        void processedSize(TDEIO::filesize_t bytes);
 
         /**
          * Shows a message in the progress dialog
@@ -139,7 +139,7 @@ class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
 	/**
 	 * @internal for the size of the file
 	 */
-        KIO::filesize_t fileSize;
+        TDEIO::filesize_t fileSize;
 
 	/**
 	 * @internal for keeping track of progress
diff --git a/kio/kio/ktrader.cpp b/kio/kio/ktrader.cpp
index dbe096075..585c6a499 100644
--- a/kio/kio/ktrader.cpp
+++ b/kio/kio/ktrader.cpp
@@ -29,7 +29,7 @@
 
 template class KStaticDeleter<KTrader>;
 
-using namespace KIO;
+using namespace TDEIO;
 
 class KTraderSorter
 {
@@ -118,10 +118,10 @@ KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString&
   ParseTreeBase::Ptr prefs;
 
   if ( !_constraint.isEmpty() )
-    constr = KIO::parseConstraints( _constraint );
+    constr = TDEIO::parseConstraints( _constraint );
 
   if ( !_preferences.isEmpty() )
-    prefs = KIO::parsePreferences( _preferences );
+    prefs = TDEIO::parsePreferences( _preferences );
 
   KServiceTypeProfile::OfferList lst;
   KTrader::OfferList ret;
diff --git a/kio/kio/ktraderparse.cpp b/kio/kio/ktraderparse.cpp
index 64d9e449f..627791c00 100644
--- a/kio/kio/ktraderparse.cpp
+++ b/kio/kio/ktraderparse.cpp
@@ -30,12 +30,12 @@ extern "C"
 #include "ktraderparsetree.h"
 #include <kdebug.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 static ParseTreeBase::Ptr *pTree = 0;
 static const char* sCode = 0;
 
-ParseTreeBase::Ptr KIO::parseConstraints( const TQString& _constr )
+ParseTreeBase::Ptr TDEIO::parseConstraints( const TQString& _constr )
 {
   TQCString str = _constr.utf8();
   sCode = str.data();
@@ -45,7 +45,7 @@ ParseTreeBase::Ptr KIO::parseConstraints( const TQString& _constr )
   return *pTree;
 }
 
-ParseTreeBase::Ptr KIO::parsePreferences( const TQString& _prefs )
+ParseTreeBase::Ptr TDEIO::parsePreferences( const TQString& _prefs )
 {
   TQCString str = _prefs.utf8();
   sCode = str.data();
diff --git a/kio/kio/ktraderparsetree.cpp b/kio/kio/ktraderparsetree.cpp
index 711ec5356..0a04b7918 100644
--- a/kio/kio/ktraderparsetree.cpp
+++ b/kio/kio/ktraderparsetree.cpp
@@ -19,7 +19,7 @@
 
 #include "ktraderparsetree.h"
 
-namespace KIO {
+namespace TDEIO {
 
 bool ParseTreeOR::eval( ParseContext *_context ) const
 {
diff --git a/kio/kio/ktraderparsetree.h b/kio/kio/ktraderparsetree.h
index 3af4273d0..8cc466abd 100644
--- a/kio/kio/ktraderparsetree.h
+++ b/kio/kio/ktraderparsetree.h
@@ -31,7 +31,7 @@
 
 #include "ktrader.h"
 
-namespace KIO {
+namespace TDEIO {
 
 class ParseTreeBase;
 
diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h
index cff151cb7..0084129bf 100644
--- a/kio/kio/kurifilter.h
+++ b/kio/kio/kurifilter.h
@@ -39,7 +39,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -410,7 +410,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp
index 0443e0fce..2dc4185cc 100644
--- a/kio/kio/kurlcompletion.cpp
+++ b/kio/kio/kurlcompletion.cpp
@@ -459,7 +459,7 @@ public:
 	bool replace_home;
 	bool complete_url; // if true completing a URL (i.e. 'prepend' is a URL), otherwise a path
 
-	KIO::ListJob *list_job; // kio job to list directories
+	TDEIO::ListJob *list_job; // kio job to list directories
 
 	TQString prepend; // text to prepend to listed items
 	TQString compl_text; // text to pass on to KCompletion
@@ -519,8 +519,8 @@ void KURLCompletion::init()
 	d->mode = KURLCompletion::FileCompletion;
 
 	// Read settings
-	KConfig *c = TDEGlobal::config();
-	KConfigGroupSaver cgs( c, "URLCompletion" );
+	TDEConfig *c = TDEGlobal::config();
+	TDEConfigGroupSaver cgs( c, "URLCompletion" );
 
 	d->url_auto_completion = c->readBoolEntry("alwaysAutoComplete", true);
 	d->popup_append_slash = c->readBoolEntry("popupAppendSlash", true);
@@ -1226,12 +1226,12 @@ void KURLCompletion::listURLs(
  *
  * Receive files listed by KIO and call addMatches()
  */
-void KURLCompletion::slotEntries(KIO::Job*, const KIO::UDSEntryList& entries)
+void KURLCompletion::slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList& entries)
 {
 	TQStringList matches;
 
-	KIO::UDSEntryListConstIterator it = entries.begin();
-	KIO::UDSEntryListConstIterator end = entries.end();
+	TDEIO::UDSEntryListConstIterator it = entries.begin();
+	TDEIO::UDSEntryListConstIterator end = entries.end();
 
 	TQString filter = d->list_urls_filter;
 
@@ -1245,21 +1245,21 @@ void KURLCompletion::slotEntries(KIO::Job*, const KIO::UDSEntryList& entries)
 		bool is_exe = false;
 		bool is_dir = false;
 
-		KIO::UDSEntry e = *it;
-		KIO::UDSEntry::ConstIterator it_2 = e.begin();
+		TDEIO::UDSEntry e = *it;
+		TDEIO::UDSEntry::ConstIterator it_2 = e.begin();
 
 		for( ; it_2 != e.end(); it_2++ ) {
 			switch ( (*it_2).m_uds ) {
-				case KIO::UDS_NAME:
+				case TDEIO::UDS_NAME:
 					name = (*it_2).m_str;
 					break;
-				case KIO::UDS_ACCESS:
+				case TDEIO::UDS_ACCESS:
 					is_exe = ((*it_2).m_long & MODE_EXE) != 0;
 					break;
-				case KIO::UDS_FILE_TYPE:
+				case TDEIO::UDS_FILE_TYPE:
 					is_dir = ((*it_2).m_long & S_IFDIR) != 0;
 					break;
-				case KIO::UDS_URL:
+				case TDEIO::UDS_URL:
 					url = (*it_2).m_str;
 					break;
 			}
@@ -1301,7 +1301,7 @@ void KURLCompletion::slotEntries(KIO::Job*, const KIO::UDSEntryList& entries)
  * Start a new list job if there are still urls in
  * d->list_urls, otherwise call finished()
  */
-void KURLCompletion::slotIOFinished( KIO::Job * job )
+void KURLCompletion::slotIOFinished( TDEIO::Job * job )
 {
 //	kdDebug() << "slotIOFinished() " << endl;
 
@@ -1322,18 +1322,18 @@ void KURLCompletion::slotIOFinished( KIO::Job * job )
 
 //		kdDebug() << "Start KIO: " << kurl->prettyURL() << endl;
 
-		d->list_job = KIO::listDir( *kurl, false );
+		d->list_job = TDEIO::listDir( *kurl, false );
 		d->list_job->addMetaData("no-auth-prompt", "true");
 
 		assert( d->list_job );
 
 		connect( d->list_job,
-				TQT_SIGNAL(result(KIO::Job*)),
-				TQT_SLOT(slotIOFinished(KIO::Job*)) );
+				TQT_SIGNAL(result(TDEIO::Job*)),
+				TQT_SLOT(slotIOFinished(TDEIO::Job*)) );
 
 		connect( d->list_job,
-				TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)),
-				TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList&)) );
+				TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+				TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) );
 
 		delete kurl;
 	}
diff --git a/kio/kio/kurlcompletion.h b/kio/kio/kurlcompletion.h
index 2e042c3bc..62eda9f8d 100644
--- a/kio/kio/kurlcompletion.h
+++ b/kio/kio/kurlcompletion.h
@@ -176,8 +176,8 @@ protected:
 	virtual void customEvent( TQCustomEvent *e );
 
 protected slots:
-	void slotEntries( KIO::Job *, const KIO::UDSEntryList& );
-	void slotIOFinished( KIO::Job * );
+	void slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& );
+	void slotIOFinished( TDEIO::Job * );
 
 private:
 
diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp
index fe07c3ad1..efc4cbae3 100644
--- a/kio/kio/kuserprofile.cpp
+++ b/kio/kio/kuserprofile.cpp
@@ -53,7 +53,7 @@ void KServiceTypeProfile::initStatic()
   profileDeleter.setObject(s_lstProfiles, new KServiceTypeProfileList);
   s_lstProfiles->setAutoDelete( true );
 
-  KConfig config( "profilerc", true, false);
+  TDEConfig config( "profilerc", true, false);
 
   static const TQString & defaultGroup = TDEGlobal::staticQString("<default>");
 
diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp
index 3998584e3..545c841b0 100644
--- a/kio/kio/metainfojob.cpp
+++ b/kio/kio/metainfojob.cpp
@@ -31,9 +31,9 @@
 
 #include "metainfojob.moc"
 
-using namespace KIO;
+using namespace TDEIO;
 
-struct KIO::MetaInfoJobPrivate
+struct TDEIO::MetaInfoJobPrivate
 {
     KFileItemList          items;       // all the items we got
     KFileItemListIterator* currentItem; // argh! No default constructor
@@ -42,7 +42,7 @@ struct KIO::MetaInfoJobPrivate
 };
 
 MetaInfoJob::MetaInfoJob(const KFileItemList &items, bool deleteItems)
-    : KIO::Job(false /* no GUI */)
+    : TDEIO::Job(false /* no GUI */)
 {
     d               = new MetaInfoJobPrivate;
     d->deleteItems  = deleteItems;
@@ -113,7 +113,7 @@ void MetaInfoJob::determineNextFile()
     getMetaInfo();
 }
 
-void MetaInfoJob::slotResult( KIO::Job *job )
+void MetaInfoJob::slotResult( TDEIO::Job *job )
 {
     subjobs.remove(job);
     Q_ASSERT(subjobs.isEmpty()); // We should have only one job at a time ...
@@ -129,17 +129,17 @@ void MetaInfoJob::getMetaInfo()
     URL.setProtocol("metainfo");
     URL.setPath(d->currentItem->current()->url().path());
 
-    KIO::TransferJob* job = KIO::get(URL, false, false);
+    TDEIO::TransferJob* job = TDEIO::get(URL, false, false);
     addSubjob(job);
 
-    connect(job,  TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-            this, TQT_SLOT(slotMetaInfo(KIO::Job *, const TQByteArray &)));
+    connect(job,  TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+            this, TQT_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &)));
 
     job->addMetaData("mimeType", d->currentItem->current()->mimetype());
 }
 
 
-void MetaInfoJob::slotMetaInfo(KIO::Job*, const TQByteArray &data)
+void MetaInfoJob::slotMetaInfo(TDEIO::Job*, const TQByteArray &data)
 {
     KFileMetaInfo info;
     TQDataStream s(data, IO_ReadOnly);
@@ -169,12 +169,12 @@ TQStringList MetaInfoJob::supportedMimeTypes()
     return result;
 }
 
-KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KFileItemList &items)
+KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KFileItemList &items)
 {
     return new MetaInfoJob(items, false);
 }
 
-KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KURL::List &items)
+KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KURL::List &items)
 {
     KFileItemList fileItems;
     for (KURL::List::ConstIterator it = items.begin(); it != items.end(); ++it)
diff --git a/kio/kio/metainfojob.h b/kio/kio/metainfojob.h
index 3b96713fb..0f7d485b3 100644
--- a/kio/kio/metainfojob.h
+++ b/kio/kio/metainfojob.h
@@ -25,14 +25,14 @@
 #include <kio/job.h>
 #include <kfileitem.h>
 
-namespace KIO {
+namespace TDEIO {
     /**
      * MetaInfoJob is a KIO Job to retrieve meta information from files.
      * 
      * @short KIO Job to retrieve meta information from files.
      * @since 3.1
      */
-    class KIO_EXPORT MetaInfoJob : public KIO::Job
+    class KIO_EXPORT MetaInfoJob : public TDEIO::Job
     {
         Q_OBJECT
     public:
@@ -85,11 +85,11 @@ namespace KIO {
         void getMetaInfo();
 
     protected slots:
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
     private slots:
         void start();
-        void slotMetaInfo(KIO::Job *, const TQByteArray &);
+        void slotMetaInfo(TDEIO::Job *, const TQByteArray &);
 
     private:
         void determineNextFile();
diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp
index a7ddb3987..11c20be49 100644
--- a/kio/kio/netaccess.cpp
+++ b/kio/kio/netaccess.cpp
@@ -43,7 +43,7 @@
 
 #include "kio/netaccess.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 TQString * NetAccess::lastErrorMsg;
 int NetAccess::lastErrorCode = 0;
@@ -190,12 +190,12 @@ bool NetAccess::exists( const KURL & url, bool source, TQWidget* window )
   return kioNet.statInternal( url, 0 /*no details*/, source, window );
 }
 
-bool NetAccess::stat( const KURL & url, KIO::UDSEntry & entry )
+bool NetAccess::stat( const KURL & url, TDEIO::UDSEntry & entry )
 {
   return NetAccess::stat( url, entry, 0 );
 }
 
-bool NetAccess::stat( const KURL & url, KIO::UDSEntry & entry, TQWidget* window )
+bool NetAccess::stat( const KURL & url, TDEIO::UDSEntry & entry, TQWidget* window )
 {
   NetAccess kioNet;
   bool ret = kioNet.statInternal( url, 2 /*all details*/, true /*source*/, window );
@@ -211,7 +211,7 @@ KURL NetAccess::mostLocalURL(const KURL & url, TQWidget* window)
     return url;
   }
 
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
   if (!stat(url, entry, window))
   {
     return url;
@@ -219,12 +219,12 @@ KURL NetAccess::mostLocalURL(const KURL & url, TQWidget* window)
 
   TQString path;
 
-  // Extract the local path from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = entry.begin();
-  const KIO::UDSEntry::ConstIterator end = entry.end();
+  // Extract the local path from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = entry.begin();
+  const TDEIO::UDSEntry::ConstIterator end = entry.end();
   for ( ; it != end; ++it )
   {
-    if ( (*it).m_uds == KIO::UDS_LOCAL_PATH )
+    if ( (*it).m_uds == TDEIO::UDS_LOCAL_PATH )
     {
       path = (*it).m_str;
       break;
@@ -305,13 +305,13 @@ bool NetAccess::filecopyInternal(const KURL& src, const KURL& target, int permis
 {
   bJobOK = true; // success unless further error occurs
 
-  KIO::Scheduler::checkSlaveOnHold(true);
-  KIO::Job * job = move
-                   ? KIO::file_move( src, target, permissions, overwrite, resume )
-                   : KIO::file_copy( src, target, permissions, overwrite, resume );
+  TDEIO::Scheduler::checkSlaveOnHold(true);
+  TDEIO::Job * job = move
+                   ? TDEIO::file_move( src, target, permissions, overwrite, resume )
+                   : TDEIO::file_copy( src, target, permissions, overwrite, resume );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
 
   enter_loop();
   return bJobOK;
@@ -322,12 +322,12 @@ bool NetAccess::dircopyInternal(const KURL::List& src, const KURL& target,
 {
   bJobOK = true; // success unless further error occurs
 
-  KIO::Job * job = move
-                   ? KIO::move( src, target )
-                   : KIO::copy( src, target );
+  TDEIO::Job * job = move
+                   ? TDEIO::move( src, target )
+                   : TDEIO::copy( src, target );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
 
   enter_loop();
   return bJobOK;
@@ -337,12 +337,12 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source,
                               TQWidget* window )
 {
   bJobOK = true; // success unless further error occurs
-  KIO::StatJob * job = KIO::stat( url, !url.isLocalFile() && !url.url().startsWith("beagle:?") );
+  TDEIO::StatJob * job = TDEIO::stat( url, !url.isLocalFile() && !url.url().startsWith("beagle:?") );
   job->setWindow (window);
   job->setDetails( details );
   job->setSide( source );
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
   enter_loop();
   return bJobOK;
 }
@@ -350,10 +350,10 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source,
 bool NetAccess::delInternal( const KURL & url, TQWidget* window )
 {
   bJobOK = true; // success unless further error occurs
-  KIO::Job * job = KIO::del( url );
+  TDEIO::Job * job = TDEIO::del( url );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
   enter_loop();
   return bJobOK;
 }
@@ -362,10 +362,10 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions,
                                TQWidget* window )
 {
   bJobOK = true; // success unless further error occurs
-  KIO::Job * job = KIO::mkdir( url, permissions );
+  TDEIO::Job * job = TDEIO::mkdir( url, permissions );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
   enter_loop();
   return bJobOK;
 }
@@ -374,17 +374,17 @@ TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window )
 {
   bJobOK = true; // success unless further error occurs
   m_mimetype = TQString::fromLatin1("unknown");
-  KIO::Job * job = KIO::mimetype( url );
+  TDEIO::Job * job = TDEIO::mimetype( url );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
-  connect( job, TQT_SIGNAL( mimetype (KIO::Job *, const TQString &) ),
-           this, TQT_SLOT( slotMimetype (KIO::Job *, const TQString &) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
+  connect( job, TQT_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ),
+           this, TQT_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) );
   enter_loop();
   return m_mimetype;
 }
 
-void NetAccess::slotMimetype( KIO::Job *, const TQString & type  )
+void NetAccess::slotMimetype( TDEIO::Job *, const TQString & type  )
 {
   m_mimetype = type;
 }
@@ -412,13 +412,13 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman
 
     stream << int('X') << tempPathUrl << command;
 
-    KIO::Job * job = KIO::special( tempPathUrl, packedArgs, true );
+    TDEIO::Job * job = TDEIO::special( tempPathUrl, packedArgs, true );
     job->setWindow( window );
-    connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-             this, TQT_SLOT( slotResult (KIO::Job *) ) );
+    connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+             this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
     enter_loop();
 
-    // since the KIO::special does not provide feedback we need to download the result
+    // since the TDEIO::special does not provide feedback we need to download the result
     if( NetAccess::download( tempPathUrl, target, window ) )
     {
       TQFile resultFile( target );
@@ -459,21 +459,21 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray*
       }
   }
 
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
 
   TQMetaObject *meta = job->metaObject();
 
-  static const char dataSignal[] = "data(KIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)";
+  static const char dataSignal[] = "data(TDEIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)";
   if ( meta->findSignal( dataSignal ) != -1 ) {
-      connect( job, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)),
-               this, TQT_SLOT(slotData(KIO::Job*,const TQByteArray&)) );
+      connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+               this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );
   }
 
-  static const char redirSignal[] = "redirection(KIO::Job*,const KURL&)";
+  static const char redirSignal[] = "redirection(TDEIO::Job*,const KURL&)";
   if ( meta->findSignal( redirSignal ) != -1 ) {
-      connect( job, TQT_SIGNAL(redirection(KIO::Job*,const KURL&)),
-               this, TQT_SLOT(slotRedirection(KIO::Job*, const KURL&)) );
+      connect( job, TQT_SIGNAL(redirection(TDEIO::Job*,const KURL&)),
+               this, TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) );
   }
 
   enter_loop();
@@ -499,7 +499,7 @@ void NetAccess::enter_loop()
   tqt_leave_modal(&dummy);
 }
 
-void NetAccess::slotResult( KIO::Job * job )
+void NetAccess::slotResult( TDEIO::Job * job )
 {
   lastErrorCode = job->error();
   bJobOK = !job->error();
@@ -509,8 +509,8 @@ void NetAccess::slotResult( KIO::Job * job )
       lastErrorMsg = new TQString;
     *lastErrorMsg = job->errorString();
   }
-  if ( job->isA("KIO::StatJob") )
-    m_entry = static_cast<KIO::StatJob *>(job)->statResult();
+  if ( job->isA("TDEIO::StatJob") )
+    m_entry = static_cast<TDEIO::StatJob *>(job)->statResult();
 
   if ( m_metaData )
     *m_metaData = job->metaData();
@@ -518,7 +518,7 @@ void NetAccess::slotResult( KIO::Job * job )
   tqApp->exit_loop();
 }
 
-void NetAccess::slotData( KIO::Job*, const TQByteArray& data )
+void NetAccess::slotData( TDEIO::Job*, const TQByteArray& data )
 {
   if ( data.isEmpty() )
     return;
@@ -528,7 +528,7 @@ void NetAccess::slotData( KIO::Job*, const TQByteArray& data )
   std::memcpy( m_data.data() + offset, data.data(), data.size() );
 }
 
-void NetAccess::slotRedirection( KIO::Job*, const KURL& url )
+void NetAccess::slotRedirection( TDEIO::Job*, const KURL& url )
 {
   m_url = url;
 }
diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h
index 110c18053..ba8988dfc 100644
--- a/kio/kio/netaccess.h
+++ b/kio/kio/netaccess.h
@@ -32,7 +32,7 @@ class TQWidget;
 class KURL;
 template<typename T, typename K> class TQMap;
 
-namespace KIO {
+namespace TDEIO {
 
   class Job;
 
@@ -40,9 +40,9 @@ namespace KIO {
    * Net Transparency.
    *
    * NetAccess allows you to do simple file operation (load, save,
-   * copy, delete...) without working with KIO::Job directly.
-   * Whereas a KIO::Job is asynchronous, meaning that the
-   * developer has to connect slots for it, KIO::NetAccess provides
+   * copy, delete...) without working with TDEIO::Job directly.
+   * Whereas a TDEIO::Job is asynchronous, meaning that the
+   * developer has to connect slots for it, TDEIO::NetAccess provides
    * synchronous downloads and uploads, as well as temporary file
    * creation and removal. The functions appear to be blocking,
    * but the Qt event loop continues running while the operations
@@ -83,12 +83,12 @@ public:
      *
      * \code
      * TQString tmpFile;
-     * if( KIO::NetAccess::download( u, tmpFile, window ) )
+     * if( TDEIO::NetAccess::download( u, tmpFile, window ) )
      * {
      *   loadFile( tmpFile );
-     *   KIO::NetAccess::removeTempFile( tmpFile );
+     *   TDEIO::NetAccess::removeTempFile( tmpFile );
      * } else {
-     *   KMessageBox::error(this, KIO::NetAccess::lastErrorString() );
+     *   KMessageBox::error(this, TDEIO::NetAccess::lastErrorString() );
      * }
      * \endcode
      *
@@ -123,7 +123,7 @@ public:
 
     /**
      * Removes the specified file if and only if it was created
-     * by KIO::NetAccess as a temporary file for a former download.
+     * by TDEIO::NetAccess as a temporary file for a former download.
      *
      * Note: This means that if you created your temporary with KTempFile,
      * use KTempFile::unlink() or KTempFile::setAutoDelete() to have
@@ -165,7 +165,7 @@ public:
      * Overwrite is false, so this will fail if @p target exists.
      *
      * This one takes two URLs and is a direct equivalent
-     * of KIO::file_copy (not KIO::copy!).
+     * of TDEIO::file_copy (not TDEIO::copy!).
      * It will be renamed file_copy in KDE4, so better use file_copy.
      *
      * @param src URL Referencing the file to upload.
@@ -188,13 +188,13 @@ public:
     // KDE4: merge with above
 
     /**
-     * Full-fledged equivalent of KIO::file_copy
+     * Full-fledged equivalent of TDEIO::file_copy
      */
     static bool file_copy( const KURL& src, const KURL& dest, int permissions=-1,
                             bool overwrite=false, bool resume=false, TQWidget* window = 0L );
 
     /**
-     * Full-fledged equivalent of KIO::file_move.
+     * Full-fledged equivalent of TDEIO::file_move.
      * Moves or renames *one file*.
      * @since 3.2
      */
@@ -207,7 +207,7 @@ public:
      * Overwrite is false, so this will fail if @p target exists.
      *
      * This one takes two URLs and is a direct equivalent
-     * of KIO::copy!.
+     * of TDEIO::copy!.
      * This means that it can copy files and directories alike
      * (it should have been named copy()).
      *
@@ -234,14 +234,14 @@ public:
     static bool dircopy( const KURL::List& src, const KURL& target, TQWidget* window = 0L );
 
     /**
-     * Full-fledged equivalent of KIO::move.
+     * Full-fledged equivalent of TDEIO::move.
      * Moves or renames one file or directory.
      * @since 3.2
      */
     static bool move( const KURL& src, const KURL& target, TQWidget* window = 0L );
 
     /**
-     * Full-fledged equivalent of KIO::move.
+     * Full-fledged equivalent of TDEIO::move.
      * Moves or renames a list of files or directories.
      * @since 3.2
      */
@@ -253,7 +253,7 @@ public:
      * @param url the URL we are testing
      * @param source if true, we want to read from that URL.
      *               If false, we want to write to it.
-     * IMPORTANT: see documentation for KIO::stat for more details about this.
+     * IMPORTANT: see documentation for TDEIO::stat for more details about this.
      * @param window main window associated with this job. This is used to
      *               automatically cache and discard authentication information
      *               as needed. If NULL, authentication information will be
@@ -284,7 +284,7 @@ public:
     /**
      * Tests whether a URL exists and return information on it.
      *
-     * This is a convenience function for KIO::stat
+     * This is a convenience function for TDEIO::stat
      * (it saves creating a slot and testing for the job result).
      *
      * @param url The URL we are testing.
@@ -297,17 +297,17 @@ public:
      *               again be prompted for passwords as needed.
      * @return true if successful, false for failure
      */
-    static bool stat(const KURL& url, KIO::UDSEntry & entry, TQWidget* window);
+    static bool stat(const KURL& url, TDEIO::UDSEntry & entry, TQWidget* window);
 
     /**
      * @deprecated. Use the function above instead.
      */
-    static bool stat(const KURL& url, KIO::UDSEntry & entry) KDE_DEPRECATED;
+    static bool stat(const KURL& url, TDEIO::UDSEntry & entry) KDE_DEPRECATED;
 
     /**
      * Tries to map a local URL for the given URL.
      *
-     * This is a convenience function for KIO::stat + parsing the
+     * This is a convenience function for TDEIO::stat + parsing the
      * resulting UDSEntry.
      *
      * @param url The URL we are testing.
@@ -325,7 +325,7 @@ public:
     /**
      * Deletes a file or a directory in a synchronous way.
      *
-     * This is a convenience function for KIO::del
+     * This is a convenience function for TDEIO::del
      * (it saves creating a slot and testing for the job result).
      *
      * @param url The file or directory to delete.
@@ -349,7 +349,7 @@ public:
     /**
      * Creates a directory in a synchronous way.
      *
-     * This is a convenience function for @p KIO::mkdir
+     * This is a convenience function for @p TDEIO::mkdir
      * (it saves creating a slot and testing for the job result).
      *
      * @param url The directory to create.
@@ -397,7 +397,7 @@ public:
      * and after the function returns it will contain all the data fetched by this job.
      *
      * <code>
-     * KIO::Job *job = KIO::get( url, false, false );
+     * TDEIO::Job *job = TDEIO::get( url, false, false );
      * TQMap<TQString, TQString> metaData;
      * metaData.insert( "PropagateHttpHeader", "true" );
      * if ( NetAccess::synchronousRun( job, 0, &data, &url, &metaData ) ) {
@@ -435,7 +435,7 @@ public:
      *
      * Determines the mimetype of a given URL.
      *
-     * This is a convenience function for KIO::mimetype.  You
+     * This is a convenience function for TDEIO::mimetype.  You
      * should call this only when really necessary.
      * KMimeType::findByURL can determine extension a lot faster, but
      * less reliably for remote files. Only when findByURL() returns
@@ -514,10 +514,10 @@ private:
     friend class I_like_this_class;
 
 private slots:
-    void slotResult( KIO::Job * job );
-    void slotMimetype( KIO::Job * job, const TQString & type );
-    void slotData( KIO::Job*, const TQByteArray& );
-    void slotRedirection( KIO::Job*, const KURL& );
+    void slotResult( TDEIO::Job * job );
+    void slotMimetype( TDEIO::Job * job, const TQString & type );
+    void slotData( TDEIO::Job*, const TQByteArray& );
+    void slotRedirection( TDEIO::Job*, const KURL& );
 
 private:
     UDSEntry m_entry;
diff --git a/kio/kio/observer.cpp b/kio/kio/observer.cpp
index 599703f9b..347db9df9 100644
--- a/kio/kio/observer.cpp
+++ b/kio/kio/observer.cpp
@@ -41,15 +41,15 @@
 #include <ksslcertchain.h>
 #include <klocale.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
-template class TQIntDict<KIO::Job>;
+template class TQIntDict<TDEIO::Job>;
 
 Observer * Observer::s_pObserver = 0L;
 
 const int KDEBUG_OBSERVER = 7007; // Should be 7028
 
-Observer::Observer() : DCOPObject("KIO::Observer")
+Observer::Observer() : DCOPObject("TDEIO::Observer")
 {
     // Register app as able to receive DCOP messages
     if (kapp && !kapp->dcopClient()->isAttached())
@@ -78,7 +78,7 @@ Observer::Observer() : DCOPObject("KIO::Observer")
     m_uiserver = new UIServer_stub( "kio_uiserver", "UIServer" );
 }
 
-int Observer::newJob( KIO::Job * job, bool showProgress )
+int Observer::newJob( TDEIO::Job * job, bool showProgress )
 {
     // Tell the UI Server about this new job, and give it the application id
     // at the same time
@@ -98,7 +98,7 @@ void Observer::jobFinished( int progressId )
 
 void Observer::killJob( int progressId )
 {
-    KIO::Job * job = m_dctJobs[ progressId ];
+    TDEIO::Job * job = m_dctJobs[ progressId ];
     if (!job)
     {
         kdWarning() << "Can't find job to kill ! There is no job with progressId=" << progressId << " in this process" << endl;
@@ -109,111 +109,111 @@ void Observer::killJob( int progressId )
 
 MetaData Observer::metadata( int progressId )
 {
-    KIO::Job * job = m_dctJobs[ progressId ];
+    TDEIO::Job * job = m_dctJobs[ progressId ];
     assert(job);
     return job->metaData();
 }
 
-void Observer::slotTotalSize( KIO::Job* job, KIO::filesize_t size )
+void Observer::slotTotalSize( TDEIO::Job* job, TDEIO::filesize_t size )
 {
-  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalSize " << job << " " << KIO::number(size) << endl;
+  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalSize " << job << " " << TDEIO::number(size) << endl;
   m_uiserver->totalSize64( job->progressId(), size );
 }
 
-void Observer::slotTotalFiles( KIO::Job* job, unsigned long files )
+void Observer::slotTotalFiles( TDEIO::Job* job, unsigned long files )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalFiles " << job << " " << files << endl;
   m_uiserver->totalFiles( job->progressId(), files );
 }
 
-void Observer::slotTotalDirs( KIO::Job* job, unsigned long dirs )
+void Observer::slotTotalDirs( TDEIO::Job* job, unsigned long dirs )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalDirs " << job << " " << dirs << endl;
   m_uiserver->totalDirs( job->progressId(), dirs );
 }
 
-void Observer::slotProcessedSize( KIO::Job* job, KIO::filesize_t size )
+void Observer::slotProcessedSize( TDEIO::Job* job, TDEIO::filesize_t size )
 {
-  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedSize " << job << " " << job->progressId() << " " << KIO::number(size) << endl;
+  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedSize " << job << " " << job->progressId() << " " << TDEIO::number(size) << endl;
   m_uiserver->processedSize64( job->progressId(), size );
 }
 
-void Observer::slotProcessedFiles( KIO::Job* job, unsigned long files )
+void Observer::slotProcessedFiles( TDEIO::Job* job, unsigned long files )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedFiles " << job << " " << files << endl;
   m_uiserver->processedFiles( job->progressId(), files );
 }
 
-void Observer::slotProcessedDirs( KIO::Job* job, unsigned long dirs )
+void Observer::slotProcessedDirs( TDEIO::Job* job, unsigned long dirs )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedDirs " << job << " " << dirs << endl;
   m_uiserver->processedDirs( job->progressId(), dirs );
 }
 
-void Observer::slotSpeed( KIO::Job* job, unsigned long speed )
+void Observer::slotSpeed( TDEIO::Job* job, unsigned long speed )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotSpeed " << job << " " << speed << endl;
   m_uiserver->speed( job->progressId(), speed );
 }
 
-void Observer::slotPercent( KIO::Job* job, unsigned long percent )
+void Observer::slotPercent( TDEIO::Job* job, unsigned long percent )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotPercent " << job << " " << percent << endl;
   m_uiserver->percent( job->progressId(), percent );
 }
 
-void Observer::slotInfoMessage( KIO::Job* job, const TQString & msg )
+void Observer::slotInfoMessage( TDEIO::Job* job, const TQString & msg )
 {
   m_uiserver->infoMessage( job->progressId(), msg );
 }
 
-void Observer::slotCopying( KIO::Job* job, const KURL& from, const KURL& to )
+void Observer::slotCopying( TDEIO::Job* job, const KURL& from, const KURL& to )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCopying " << job << " " << from.url() << " " << to.url() << endl;
   m_uiserver->copying( job->progressId(), from, to );
 }
 
-void Observer::slotMoving( KIO::Job* job, const KURL& from, const KURL& to )
+void Observer::slotMoving( TDEIO::Job* job, const KURL& from, const KURL& to )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotMoving " << job << " " << from.url() << " " << to.url() << endl;
   m_uiserver->moving( job->progressId(), from, to );
 }
 
-void Observer::slotDeleting( KIO::Job* job, const KURL& url )
+void Observer::slotDeleting( TDEIO::Job* job, const KURL& url )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotDeleting " << job << " " << url.url() << endl;
   m_uiserver->deleting( job->progressId(), url );
 }
 
-void Observer::slotTransferring( KIO::Job* job, const KURL& url )
+void Observer::slotTransferring( TDEIO::Job* job, const KURL& url )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTransferring " << job << " " << url.url() << endl;
   m_uiserver->transferring( job->progressId(), url );
 }
 
-void Observer::slotCreatingDir( KIO::Job* job, const KURL& dir )
+void Observer::slotCreatingDir( TDEIO::Job* job, const KURL& dir )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCreatingDir " << job << " " << dir.url() << endl;
   m_uiserver->creatingDir( job->progressId(), dir );
 }
 
-void Observer::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
+void Observer::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset )
 {
-  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCanResume " << job << " " << KIO::number(offset) << endl;
+  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCanResume " << job << " " << TDEIO::number(offset) << endl;
   m_uiserver->canResume64( job->progressId(), offset );
 }
 
-void Observer::stating( KIO::Job* job, const KURL& url )
+void Observer::stating( TDEIO::Job* job, const KURL& url )
 {
   m_uiserver->stating( job->progressId(), url );
 }
 
-void Observer::mounting( KIO::Job* job, const TQString & dev, const TQString & point )
+void Observer::mounting( TDEIO::Job* job, const TQString & dev, const TQString & point )
 {
   m_uiserver->mounting( job->progressId(), dev, point );
 }
 
-void Observer::unmounting( KIO::Job* job, const TQString & point )
+void Observer::unmounting( TDEIO::Job* job, const TQString & point )
 {
   m_uiserver->unmounting( job->progressId(), point );
 }
@@ -235,11 +235,11 @@ bool Observer::openPassDlg( const TQString& prompt, TQString& user,
    return result;
 }
 
-bool Observer::openPassDlg( KIO::AuthInfo& info )
+bool Observer::openPassDlg( TDEIO::AuthInfo& info )
 {
     kdDebug(KDEBUG_OBSERVER) << "Observer::openPassDlg: User= " << info.username
                              << ", Message= " << info.prompt << endl;
-    int result = KIO::PasswordDialog::getNameAndPassword( info.username, info.password,
+    int result = TDEIO::PasswordDialog::getNameAndPassword( info.username, info.password,
                                                           &info.keepPassword, info.prompt,
                                                           info.readOnly, info.caption,
                                                           info.comment, info.commentLabel );
@@ -264,39 +264,39 @@ int Observer::messageBox( int progressId, int type, const TQString &text,
 {
     kdDebug() << "Observer::messageBox " << type << " " << text << " - " << caption << endl;
     int result = -1;
-    KConfig *config = new KConfig("kioslaverc");
+    TDEConfig *config = new TDEConfig("kioslaverc");
     KMessageBox::setDontShowAskAgainConfig(config);
 
     switch (type) {
-        case KIO::SlaveBase::QuestionYesNo:
+        case TDEIO::SlaveBase::QuestionYesNo:
             result = KMessageBox::questionYesNo( 0L, // parent ?
                                                text, caption, buttonYes, buttonNo, dontAskAgainName );
             break;
-        case KIO::SlaveBase::WarningYesNo:
+        case TDEIO::SlaveBase::WarningYesNo:
             result = KMessageBox::warningYesNo( 0L, // parent ?
                                               text, caption, buttonYes, buttonNo, dontAskAgainName );
             break;
-        case KIO::SlaveBase::WarningContinueCancel:
+        case TDEIO::SlaveBase::WarningContinueCancel:
             result = KMessageBox::warningContinueCancel( 0L, // parent ?
                                               text, caption, buttonYes, dontAskAgainName );
             break;
-        case KIO::SlaveBase::WarningYesNoCancel:
+        case TDEIO::SlaveBase::WarningYesNoCancel:
             result = KMessageBox::warningYesNoCancel( 0L, // parent ?
                                               text, caption, buttonYes, buttonNo, dontAskAgainName );
             break;
-        case KIO::SlaveBase::Information:
+        case TDEIO::SlaveBase::Information:
             KMessageBox::information( 0L, // parent ?
                                       text, caption, dontAskAgainName );
             result = 1; // whatever
             break;
-        case KIO::SlaveBase::SSLMessageBox:
+        case TDEIO::SlaveBase::SSLMessageBox:
         {
             TQCString observerAppId = caption.utf8(); // hack, see slaveinterface.cpp
-            // Contact the object "KIO::Observer" in the application <appId>
+            // Contact the object "TDEIO::Observer" in the application <appId>
             // Yes, this could be the same application we are, but not necessarily.
-            Observer_stub observer( observerAppId, "KIO::Observer" );
+            Observer_stub observer( observerAppId, "TDEIO::Observer" );
 
-            KIO::MetaData meta = observer.metadata( progressId );
+            TDEIO::MetaData meta = observer.metadata( progressId );
             KSSLInfoDlg *kid = new KSSLInfoDlg(meta["ssl_in_use"].upper()=="TRUE", 0L /*parent?*/, 0L, true);
             KSSLCertificate *x = KSSLCertificate::fromString(meta["ssl_peer_certificate"].local8Bit());
             if (x) {
@@ -367,12 +367,12 @@ int Observer::messageBox( int progressId, int type, const TQString &text,
 #endif
 }
 
-RenameDlg_Result Observer::open_RenameDlg( KIO::Job* job,
+RenameDlg_Result Observer::open_RenameDlg( TDEIO::Job* job,
                                            const TQString & caption,
                                            const TQString& src, const TQString & dest,
                                            RenameDlg_Mode mode, TQString& newDest,
-                                           KIO::filesize_t sizeSrc,
-                                           KIO::filesize_t sizeDest,
+                                           TDEIO::filesize_t sizeSrc,
+                                           TDEIO::filesize_t sizeDest,
                                            time_t ctimeSrc,
                                            time_t ctimeDest,
                                            time_t mtimeSrc,
@@ -387,7 +387,7 @@ RenameDlg_Result Observer::open_RenameDlg( KIO::Job* job,
     m_uiserver->setJobVisible( job->progressId(), false );
   // We now do it in process => KDE4: move this code out of Observer (back to job.cpp), so that
   // opening the rename dialog doesn't start uiserver for nothing if progressId=0 (e.g. F2 in konq)
-  RenameDlg_Result res = KIO::open_RenameDlg( caption, src, dest, mode,
+  RenameDlg_Result res = TDEIO::open_RenameDlg( caption, src, dest, mode,
                                                newDest, sizeSrc, sizeDest,
                                                ctimeSrc, ctimeDest, mtimeSrc,
                                                mtimeDest );
@@ -396,7 +396,7 @@ RenameDlg_Result Observer::open_RenameDlg( KIO::Job* job,
   return res;
 }
 
-SkipDlg_Result Observer::open_SkipDlg( KIO::Job* job,
+SkipDlg_Result Observer::open_SkipDlg( TDEIO::Job* job,
                                        bool _multi,
                                        const TQString& _error_text )
 {
@@ -404,8 +404,8 @@ SkipDlg_Result Observer::open_SkipDlg( KIO::Job* job,
   // Hide existing dialog box if any
   if (job && job->progressId())
       m_uiserver->setJobVisible( job->progressId(), false );
-  // We now do it in process. So this method is a useless wrapper around KIO::open_RenameDlg.
-  SkipDlg_Result res = KIO::open_SkipDlg( _multi, _error_text );
+  // We now do it in process. So this method is a useless wrapper around TDEIO::open_RenameDlg.
+  SkipDlg_Result res = TDEIO::open_SkipDlg( _multi, _error_text );
   if (job && job->progressId())
       m_uiserver->setJobVisible( job->progressId(), true );
   return res;
diff --git a/kio/kio/observer.h b/kio/kio/observer.h
index 94b8cede9..8c20e6f92 100644
--- a/kio/kio/observer.h
+++ b/kio/kio/observer.h
@@ -32,12 +32,12 @@
 class UIServer_stub;
 class KURL;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
 /**
- * Observer for KIO::Job progress information.
+ * Observer for TDEIO::Job progress information.
  *
  * This class, of which there is always only one instance,
  * "observes" what jobs do and forwards this information
@@ -47,9 +47,9 @@ namespace KIO {
  * kill method when the user presses Cancel.
  *
  * Usually jobs are automatically registered by the
- * KIO::Scheduler, so you do not have to care about that.
+ * TDEIO::Scheduler, so you do not have to care about that.
  *
- * @short Observer for KIO::Job progress information
+ * @short Observer for TDEIO::Job progress information
  * @author David Faure <faure@kde.org>
  */
 class KIO_EXPORT Observer : public TQObject, public DCOPObject {
@@ -75,7 +75,7 @@ public:
    * @param showProgress true to show progress, false otherwise
    * @return the progress ID assigned by the UI Server to the Job.
    */
-  int newJob( KIO::Job * job, bool showProgress );
+  int newJob( TDEIO::Job * job, bool showProgress );
 
   /**
    * Called by the job destructor, to tell the UI Server that
@@ -85,7 +85,7 @@ public:
   void jobFinished( int progressId );
 
   /**
-   * @deprecated use KIO::AutoInfo
+   * @deprecated use TDEIO::AutoInfo
    */
   bool openPassDlg( const TQString& prompt, TQString& user, TQString& pass,
                     bool readOnly );
@@ -95,10 +95,10 @@ public:
    * @param info the authentication information
    * @return true if successful ("ok" clicked), false otherwise
    */
-  bool openPassDlg( KIO::AuthInfo& info );
+  bool openPassDlg( TDEIO::AuthInfo& info );
 
   /**
-   * Popup a message box. See KIO::SlaveBase.
+   * Popup a message box. See TDEIO::SlaveBase.
    * This doesn't use DCOP anymore, it shows the dialog in the application's process.
    * Otherwise, other apps would block when trying to communicate with UIServer.
    * @param progressId the progress ID of the job, as returned by newJob()
@@ -112,7 +112,7 @@ public:
                          const TQString &buttonYes, const TQString &buttonNo );
 
   /**
-   * Popup a message box. See KIO::SlaveBase.
+   * Popup a message box. See TDEIO::SlaveBase.
    * This doesn't use DCOP anymore, it shows the dialog in the application's process.
    * Otherwise, other apps would block when trying to communicate with UIServer.
    * @param progressId the progress ID of the job, as returned by newJob()
@@ -132,13 +132,13 @@ public:
    * @internal
    * See renamedlg.h
    */
-  KIO::RenameDlg_Result open_RenameDlg( KIO::Job * job,
+  TDEIO::RenameDlg_Result open_RenameDlg( TDEIO::Job * job,
                                         const TQString & caption,
                                         const TQString& src, const TQString & dest,
-                                        KIO::RenameDlg_Mode mode,
+                                        TDEIO::RenameDlg_Mode mode,
                                         TQString& newDest,
-                                        KIO::filesize_t sizeSrc = (KIO::filesize_t) -1,
-                                        KIO::filesize_t sizeDest = (KIO::filesize_t) -1,
+                                        TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1,
+                                        TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1,
                                         time_t ctimeSrc = (time_t) -1,
                                         time_t ctimeDest = (time_t) -1,
                                         time_t mtimeSrc = (time_t) -1,
@@ -149,7 +149,7 @@ public:
    * @internal
    * See skipdlg.h
    */
-  KIO::SkipDlg_Result open_SkipDlg( KIO::Job * job,
+  TDEIO::SkipDlg_Result open_SkipDlg( TDEIO::Job * job,
                                     bool multi,
                                     const TQString & error_text );
 
@@ -164,7 +164,7 @@ k_dcop:
    * Called by the UI Server (using DCOP) to get all the metadata of the job
    * @param progressId the progress IDof the job, as returned by newJob()
    */
-  KIO::MetaData metadata( int progressId );
+  TDEIO::MetaData metadata( int progressId );
 
 protected:
 
@@ -174,35 +174,35 @@ protected:
 
   UIServer_stub * m_uiserver;
 
-  TQIntDict< KIO::Job > m_dctJobs;
+  TQIntDict< TDEIO::Job > m_dctJobs;
 
 public slots:
 
-  void slotTotalSize( KIO::Job*, KIO::filesize_t size );
-  void slotTotalFiles( KIO::Job*, unsigned long files );
-  void slotTotalDirs( KIO::Job*, unsigned long dirs );
+  void slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size );
+  void slotTotalFiles( TDEIO::Job*, unsigned long files );
+  void slotTotalDirs( TDEIO::Job*, unsigned long dirs );
 
-  void slotProcessedSize( KIO::Job*, KIO::filesize_t size );
-  void slotProcessedFiles( KIO::Job*, unsigned long files );
-  void slotProcessedDirs( KIO::Job*, unsigned long dirs );
+  void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t size );
+  void slotProcessedFiles( TDEIO::Job*, unsigned long files );
+  void slotProcessedDirs( TDEIO::Job*, unsigned long dirs );
 
-  void slotSpeed( KIO::Job*, unsigned long speed );
-  void slotPercent( KIO::Job*, unsigned long percent );
-  void slotInfoMessage( KIO::Job*, const TQString & msg );
+  void slotSpeed( TDEIO::Job*, unsigned long speed );
+  void slotPercent( TDEIO::Job*, unsigned long percent );
+  void slotInfoMessage( TDEIO::Job*, const TQString & msg );
 
-  void slotCopying( KIO::Job*, const KURL& from, const KURL& to );
-  void slotMoving( KIO::Job*, const KURL& from, const KURL& to );
-  void slotDeleting( KIO::Job*, const KURL& url );
+  void slotCopying( TDEIO::Job*, const KURL& from, const KURL& to );
+  void slotMoving( TDEIO::Job*, const KURL& from, const KURL& to );
+  void slotDeleting( TDEIO::Job*, const KURL& url );
   /// @since 3.1
-  void slotTransferring( KIO::Job*, const KURL& url );
-  void slotCreatingDir( KIO::Job*, const KURL& dir );
+  void slotTransferring( TDEIO::Job*, const KURL& url );
+  void slotCreatingDir( TDEIO::Job*, const KURL& dir );
   // currently unused
-  void slotCanResume( KIO::Job*, KIO::filesize_t offset );
+  void slotCanResume( TDEIO::Job*, TDEIO::filesize_t offset );
 
 public:
-  void stating( KIO::Job*, const KURL& url );
-  void mounting( KIO::Job*, const TQString & dev, const TQString & point );
-  void unmounting( KIO::Job*, const TQString & point );
+  void stating( TDEIO::Job*, const KURL& url );
+  void mounting( TDEIO::Job*, const TQString & dev, const TQString & point );
+  void unmounting( TDEIO::Job*, const TQString & point );
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp
index 28d32d377..1b5679028 100644
--- a/kio/kio/passdlg.cpp
+++ b/kio/kio/passdlg.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 struct PasswordDialog::PasswordDialogPrivate
 {
@@ -74,8 +74,8 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
     d->nRow = 0;
     d->keepCheckBox = 0;
 
-    KConfig* cfg = TDEGlobal::config();
-    KConfigGroupSaver saver( cfg, "Passwords" );
+    TDEConfig* cfg = TDEGlobal::config();
+    TDEConfigGroupSaver saver( cfg, "Passwords" );
 
     d->layout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint());
     d->layout->addColSpacing(1, 5);
diff --git a/kio/kio/passdlg.h b/kio/kio/passdlg.h
index bbd811328..b071ddef0 100644
--- a/kio/kio/passdlg.h
+++ b/kio/kio/passdlg.h
@@ -24,7 +24,7 @@
 
 class TQGridLayout;
 
-namespace KIO {
+namespace TDEIO {
 
 /**
  * A dialog for requesting a login and a password from the end user.
diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp
index f39aa0746..55102c5ed 100644
--- a/kio/kio/paste.cpp
+++ b/kio/kio/paste.cpp
@@ -54,10 +54,10 @@ static KURL getNewFileName( const KURL &u, const TQString& text )
   KURL myurl(u);
   myurl.addPath( file );
 
-  if (KIO::NetAccess::exists(myurl, false, 0))
+  if (TDEIO::NetAccess::exists(myurl, false, 0))
   {
       kdDebug(7007) << "Paste will overwrite file.  Prompting..." << endl;
-      KIO::RenameDlg_Result res = KIO::R_OVERWRITE;
+      TDEIO::RenameDlg_Result res = TDEIO::R_OVERWRITE;
 
       TQString newPath;
       // Ask confirmation about resuming previous transfer
@@ -65,13 +65,13 @@ static KURL getNewFileName( const KURL &u, const TQString& text )
                           0L, i18n("File Already Exists"),
                           u.pathOrURL(),
                           myurl.pathOrURL(),
-                          (KIO::RenameDlg_Mode) (KIO::M_OVERWRITE | KIO::M_SINGLE), newPath);
+                          (TDEIO::RenameDlg_Mode) (TDEIO::M_OVERWRITE | TDEIO::M_SINGLE), newPath);
 
-      if ( res == KIO::R_RENAME )
+      if ( res == TDEIO::R_RENAME )
       {
           myurl = newPath;
       }
-      else if ( res == KIO::R_CANCEL )
+      else if ( res == TDEIO::R_CANCEL )
       {
           return KURL();
       }
@@ -81,7 +81,7 @@ static KURL getNewFileName( const KURL &u, const TQString& text )
 }
 
 // The finaly step: write _data to tempfile and move it to neW_url
-static KIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray& _data )
+static TDEIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray& _data )
 {
      KTempFile tempFile;
      tempFile.dataStream()->writeRawBytes( _data.data(), _data.size() );
@@ -90,11 +90,11 @@ static KIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray& _
      KURL orig_url;
      orig_url.setPath(tempFile.name());
 
-     return KIO::move( orig_url, new_url );
+     return TDEIO::move( orig_url, new_url );
 }
 
 #ifndef QT_NO_MIMECLIPBOARD
-static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
+static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
                                      const TQValueVector<TQCString>& formats,
                                      const TQString& text,
                                      TQWidget* widget,
@@ -113,7 +113,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
     TQString dialogText( text );
     if ( dialogText.isEmpty() )
         dialogText = i18n( "Filename for clipboard content:" );
-    KIO::PasteDialog dlg( TQString::null, dialogText, TQString::null, formatLabels, widget, clipboard );
+    TDEIO::PasteDialog dlg( TQString::null, dialogText, TQString::null, formatLabels, widget, clipboard );
 
     if ( dlg.exec() != KDialogBase::Accepted )
         return 0;
@@ -143,7 +143,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
 #endif
 
 // KDE4: remove
-KIO_EXPORT bool KIO::isClipboardEmpty()
+KIO_EXPORT bool TDEIO::isClipboardEmpty()
 {
 #ifndef QT_NO_MIMECLIPBOARD
   TQMimeSource *data = TQApplication::clipboard()->data();
@@ -161,7 +161,7 @@ KIO_EXPORT bool KIO::isClipboardEmpty()
 
 #ifndef QT_NO_MIMECLIPBOARD
 // The main method for dropping
-KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
+TDEIO::CopyJob* TDEIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
                                     const TQString& dialogText, TQWidget* widget, bool clipboard )
 {
   TQByteArray ba;
@@ -207,7 +207,7 @@ KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
 #endif
 
 // The main method for pasting
-KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move )
+KIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move )
 {
   if ( !dest_url.isValid() ) {
     KMessageBox::error( 0L, i18n( "Malformed URL\n%1" ).arg( dest_url.url() ) );
@@ -225,11 +225,11 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move )
       return 0;
     }
 
-    KIO::Job *res = 0;
+    TDEIO::Job *res = 0;
     if ( move )
-      res = KIO::move( urls, dest_url );
+      res = TDEIO::move( urls, dest_url );
     else
-      res = KIO::copy( urls, dest_url );
+      res = TDEIO::copy( urls, dest_url );
 
     // If moving, erase the clipboard contents, the original files don't exist anymore
     if ( move )
@@ -256,10 +256,10 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move )
 }
 
 
-KIO_EXPORT void KIO::pasteData( const KURL& u, const TQByteArray& _data )
+KIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data )
 {
     KURL new_url = getNewFileName( u, TQString::null );
-    // We could use KIO::put here, but that would require a class
+    // We could use TDEIO::put here, but that would require a class
     // for the slotData call. With NetAccess, we can do a synchronous call.
 
     if (new_url.isEmpty())
@@ -270,15 +270,15 @@ KIO_EXPORT void KIO::pasteData( const KURL& u, const TQByteArray& _data )
     tempFile.dataStream()->writeRawBytes( _data.data(), _data.size() );
     tempFile.close();
 
-    (void) KIO::NetAccess::upload( tempFile.name(), new_url, 0 );
+    (void) TDEIO::NetAccess::upload( tempFile.name(), new_url, 0 );
 }
 
-KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray& _data )
+KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data )
 {
     return pasteDataAsync( u, _data, TQString::null );
 }
 
-KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text )
+KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text )
 {
     KURL new_url = getNewFileName( u, text );
 
@@ -288,7 +288,7 @@ KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray&
     return pasteDataAsyncTo( new_url, _data );
 }
 
-KIO_EXPORT TQString KIO::pasteActionText()
+KIO_EXPORT TQString TDEIO::pasteActionText()
 {
     TQMimeSource *data = TQApplication::clipboard()->data();
     KURL::List urls;
diff --git a/kio/kio/paste.h b/kio/kio/paste.h
index 3fad2c8b6..36befcd65 100644
--- a/kio/kio/paste.h
+++ b/kio/kio/paste.h
@@ -27,7 +27,7 @@ class TQMimeSource;
 
 // KDE4 TODO pass a parent widget to all methods that will display a message box
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class CopyJob;
 
diff --git a/kio/kio/pastedialog.cpp b/kio/kio/pastedialog.cpp
index 480eaaba8..0252baff1 100644
--- a/kio/kio/pastedialog.cpp
+++ b/kio/kio/pastedialog.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 #include <tqclipboard.h>
 
-KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label,
+TDEIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label,
                                const TQString &value, const TQStringList& items,
                                TQWidget *parent,
                                bool clipboard )
@@ -66,17 +66,17 @@ KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label,
                  this, TQT_SLOT( slotClipboardDataChanged() ) );
 }
 
-void KIO::PasteDialog::slotClipboardDataChanged()
+void TDEIO::PasteDialog::slotClipboardDataChanged()
 {
     m_clipboardChanged = true;
 }
 
-TQString KIO::PasteDialog::lineEditText() const
+TQString TDEIO::PasteDialog::lineEditText() const
 {
     return m_lineEdit->text();
 }
 
-int KIO::PasteDialog::comboItem() const
+int TDEIO::PasteDialog::comboItem() const
 {
     return m_comboBox->currentItem();
 }
diff --git a/kio/kio/pastedialog.h b/kio/kio/pastedialog.h
index 4f8b79b2e..2e7bdfda1 100644
--- a/kio/kio/pastedialog.h
+++ b/kio/kio/pastedialog.h
@@ -25,7 +25,7 @@ class TQComboBox;
 class KLineEdit;
 class TQLabel;
 
-namespace KIO {
+namespace TDEIO {
 
 /**
  * @internal
diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp
index c266947f3..de4800ab1 100644
--- a/kio/kio/previewjob.cpp
+++ b/kio/kio/previewjob.cpp
@@ -53,16 +53,16 @@
 
 #include "previewjob.moc"
 
-namespace KIO { struct PreviewItem; }
-using namespace KIO;
+namespace TDEIO { struct PreviewItem; }
+using namespace TDEIO;
 
-struct KIO::PreviewItem
+struct TDEIO::PreviewItem
 {
     KFileItem *item;
     KService::Ptr plugin;
 };
 
-struct KIO::PreviewJobPrivate
+struct TDEIO::PreviewJobPrivate
 {
     enum { STATE_STATORIG, // if the thumbnail exists
            STATE_GETORIG, // if we create it
@@ -118,7 +118,7 @@ struct KIO::PreviewJobPrivate
 PreviewJob::PreviewJob( const KFileItemList &items, int width, int height,
     int iconSize, int iconAlpha, bool scale, bool save,
     const TQStringList *enabledPlugins, bool deleteItems )
-    : KIO::Job( false /* no GUI */ )
+    : TDEIO::Job( false /* no GUI */ )
 {
     d = new PreviewJobPrivate;
     d->tOrig = 0;
@@ -244,8 +244,8 @@ void PreviewJob::startPreview()
     }
 
   // Read configuration value for the maximum allowed size
-    KConfig * config = TDEGlobal::config();
-    KConfigGroupSaver cgs( config, "PreviewSettings" );
+    TDEConfig * config = TDEGlobal::config();
+    TDEConfigGroupSaver cgs( config, "PreviewSettings" );
     d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
 
     if (bNeedCache)
@@ -306,13 +306,13 @@ void PreviewJob::determineNextFile()
         d->currentItem = d->items.first();
         d->succeeded = false;
         d->items.remove(d->items.begin());
-        KIO::Job *job = KIO::stat( d->currentItem.item->url(), false );
+        TDEIO::Job *job = TDEIO::stat( d->currentItem.item->url(), false );
         job->addMetaData( "no-auth-prompt", "true" );
         addSubjob(job);
     }
 }
 
-void PreviewJob::slotResult( KIO::Job *job )
+void PreviewJob::slotResult( TDEIO::Job *job )
 {
     subjobs.remove( job );
     Q_ASSERT ( subjobs.isEmpty() ); // We should have only one job at a time ...
@@ -326,18 +326,18 @@ void PreviewJob::slotResult( KIO::Job *job )
                 determineNextFile();
                 return;
             }
-            KIO::UDSEntry entry = ((KIO::StatJob*)job)->statResult();
-            KIO::UDSEntry::ConstIterator it = entry.begin();
+            TDEIO::UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+            TDEIO::UDSEntry::ConstIterator it = entry.begin();
             d->tOrig = 0;
             int found = 0;
             for( ; it != entry.end() && found < 2; it++ )
             {
-                if ( (*it).m_uds == KIO::UDS_MODIFICATION_TIME )
+                if ( (*it).m_uds == TDEIO::UDS_MODIFICATION_TIME )
                 {
                     d->tOrig = (time_t)((*it).m_long);
                     found++;
                 }
-                else if ( (*it).m_uds == KIO::UDS_SIZE )
+                else if ( (*it).m_uds == TDEIO::UDS_SIZE )
                     {
                     if ( filesize_t((*it).m_long) > d->maximumSize &&
                          !d->ignoreMaximumSize &&
@@ -372,7 +372,7 @@ void PreviewJob::slotResult( KIO::Job *job )
                 return;
             }
 
-            createThumbnail( static_cast<KIO::FileCopyJob*>(job)->destURL().path() );
+            createThumbnail( static_cast<TDEIO::FileCopyJob*>(job)->destURL().path() );
             return;
         }
         case PreviewJobPrivate::STATE_CREATETHUMB:
@@ -436,7 +436,7 @@ void PreviewJob::getOrCreateThumbnail()
         KURL localURL;
         localURL.setPath( d->tempName = localFile.name() );
         const KURL currentURL = item->url();
-        KIO::Job * job = KIO::file_copy( currentURL, localURL, -1, true,
+        TDEIO::Job * job = TDEIO::file_copy( currentURL, localURL, -1, true,
                                          false, false /* No GUI */ );
         job->addMetaData("thumbnail","1");
         addSubjob(job);
@@ -450,9 +450,9 @@ void PreviewJob::createThumbnail( TQString pixPath )
     KURL thumbURL;
     thumbURL.setProtocol("thumbnail");
     thumbURL.setPath(pixPath);
-    KIO::TransferJob *job = KIO::get(thumbURL, false, false);
+    TDEIO::TransferJob *job = TDEIO::get(thumbURL, false, false);
     addSubjob(job);
-    connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(KIO::Job *, const TQByteArray &)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &)));
     bool save = d->bSave && d->currentItem.plugin->property("CacheThumbnail").toBool();
     job->addMetaData("mimeType", d->currentItem.item->mimetype());
     job->addMetaData("width", TQString().setNum(save ? d->cacheWidth : d->width));
@@ -486,7 +486,7 @@ void PreviewJob::createThumbnail( TQString pixPath )
 #endif
 }
 
-void PreviewJob::slotThumbData(KIO::Job *, const TQByteArray &data)
+void PreviewJob::slotThumbData(TDEIO::Job *, const TQByteArray &data)
 {
     bool save = d->bSave &&
                 d->currentItem.plugin->property("CacheThumbnail").toBool() &&
@@ -573,7 +573,7 @@ void PreviewJob::kill( bool quietly )
     Job::kill( quietly );
 }
 
-PreviewJob *KIO::filePreview( const KFileItemList &items, int width, int height,
+PreviewJob *TDEIO::filePreview( const KFileItemList &items, int width, int height,
     int iconSize, int iconAlpha, bool scale, bool save,
     const TQStringList *enabledPlugins )
 {
@@ -581,7 +581,7 @@ PreviewJob *KIO::filePreview( const KFileItemList &items, int width, int height,
                           scale, save, enabledPlugins);
 }
 
-PreviewJob *KIO::filePreview( const KURL::List &items, int width, int height,
+PreviewJob *TDEIO::filePreview( const KURL::List &items, int width, int height,
     int iconSize, int iconAlpha, bool scale, bool save,
     const TQStringList *enabledPlugins )
 {
@@ -593,5 +593,5 @@ PreviewJob *KIO::filePreview( const KURL::List &items, int width, int height,
 }
 
 void PreviewJob::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
 
diff --git a/kio/kio/previewjob.h b/kio/kio/previewjob.h
index d7686505e..a0a137ff4 100644
--- a/kio/kio/previewjob.h
+++ b/kio/kio/previewjob.h
@@ -29,12 +29,12 @@
 
 class TQPixmap;
 
-namespace KIO {
+namespace TDEIO {
     /*!
      * This class catches a preview (thumbnail) for files.
      * @short KIO Job to get a thumbnail picture
      */
-    class KIO_EXPORT PreviewJob : public KIO::Job
+    class KIO_EXPORT PreviewJob : public TDEIO::Job
     {
         Q_OBJECT
     public:
@@ -117,11 +117,11 @@ namespace KIO {
         void createThumbnail( TQString );
 
     protected slots:
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
     private slots:
         void startPreview();
-        void slotThumbData(KIO::Job *, const TQByteArray &);
+        void slotThumbData(TDEIO::Job *, const TQByteArray &);
 
     private:
         void determineNextFile();
diff --git a/kio/kio/progressbase.cpp b/kio/kio/progressbase.cpp
index f01c00a7a..146f4182e 100644
--- a/kio/kio/progressbase.cpp
+++ b/kio/kio/progressbase.cpp
@@ -19,7 +19,7 @@
 #include "jobclasses.h"
 #include "progressbase.h"
 
-namespace KIO {
+namespace TDEIO {
 
 ProgressBase::ProgressBase( TQWidget *parent )
   : TQWidget( parent )
@@ -34,93 +34,93 @@ ProgressBase::ProgressBase( TQWidget *parent )
 }
 
 
-void ProgressBase::setJob( KIO::Job *job )
+void ProgressBase::setJob( TDEIO::Job *job )
 {
   // first connect all slots
-  connect( job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
 
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
 
-  connect( job, TQT_SIGNAL( canceled( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
 
   // then assign job
   m_pJob = job;
 }
 
 
-void ProgressBase::setJob( KIO::CopyJob *job )
+void ProgressBase::setJob( TDEIO::CopyJob *job )
 {
   // first connect all slots
-  connect( job, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
-	   TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
-	   TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( copying( KIO::Job*, const KURL& , const KURL& ) ),
-	   TQT_SLOT( slotCopying( KIO::Job*, const KURL&, const KURL& ) ) );
-  connect( job, TQT_SIGNAL( moving( KIO::Job*, const KURL& , const KURL& ) ),
-	   TQT_SLOT( slotMoving( KIO::Job*, const KURL&, const KURL& ) ) );
-  connect( job, TQT_SIGNAL( creatingDir( KIO::Job*, const KURL& ) ),
- 	   TQT_SLOT( slotCreatingDir( KIO::Job*, const KURL& ) ) );
-
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
-
-  connect( job, TQT_SIGNAL( canceled( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ),
+	   TQT_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) );
+  connect( job, TQT_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ),
+	   TQT_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) );
+  connect( job, TQT_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ),
+ 	   TQT_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) );
+
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
 
   // then assign job
   m_pJob = job;
 }
 
 
-void ProgressBase::setJob( KIO::DeleteJob *job )
+void ProgressBase::setJob( TDEIO::DeleteJob *job )
 {
   // first connect all slots
-  connect( job, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
-	   TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
-	   TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( deleting( KIO::Job*, const KURL& ) ),
-	   TQT_SLOT( slotDeleting( KIO::Job*, const KURL& ) ) );
-
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
-
-  connect( job, TQT_SIGNAL( canceled( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ),
+	   TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );
+
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
 
   // then assign job
   m_pJob = job;
@@ -150,7 +150,7 @@ void ProgressBase::finished() {
   }
 }
 
-void ProgressBase::slotFinished( KIO::Job* ) {
+void ProgressBase::slotFinished( TDEIO::Job* ) {
   finished();
 }
 
diff --git a/kio/kio/progressbase.h b/kio/kio/progressbase.h
index d9e3d8f96..cbcab06be 100644
--- a/kio/kio/progressbase.h
+++ b/kio/kio/progressbase.h
@@ -24,13 +24,13 @@
 #include <kio/global.h>
 
 class KURL;
-namespace KIO {
+namespace TDEIO {
   class Job;
   class CopyJob;
   class DeleteJob;
 }
 
-namespace KIO
+namespace TDEIO
 {
   enum Progress {
     DEFAULT = 1,
@@ -53,7 +53,7 @@ namespace KIO
 * Custom progress dialog will be used like this :
 * \code
 * // create job
-* CopyJob* job = KIO::copy(...);
+* CopyJob* job = TDEIO::copy(...);
 * // create a dialog
 * MyCustomProgress *customProgress;
 * customProgress = new MyCustomProgress();
@@ -81,20 +81,20 @@ public:
   ~ProgressBase() {}
 
   /**
-   * Assign a KIO::Job to this progress dialog.
+   * Assign a TDEIO::Job to this progress dialog.
    * @param job the job to assign
    */
-  void setJob( KIO::Job *job );
+  void setJob( TDEIO::Job *job );
   /**
-   * Assign a KIO::Job to this progress dialog.
+   * Assign a TDEIO::Job to this progress dialog.
    * @param job the job to assign
    */
-  void setJob( KIO::CopyJob *job );
+  void setJob( TDEIO::CopyJob *job );
   /**
-   * Assign a KIO::Job to this progress dialog.
+   * Assign a TDEIO::Job to this progress dialog.
    * @param job the job to assign
    */
-  void setJob( KIO::DeleteJob *job );
+  void setJob( TDEIO::DeleteJob *job );
 
   // should we stop the job when the dialog is closed ?
   void setStopOnClose( bool stopOnClose ) { m_bStopOnClose = stopOnClose; }
@@ -103,7 +103,7 @@ public:
   // should we delete the dialog or just clean it when the job is finished ?
   /**
    * This controls whether the dialog should be deleted or only cleaned when
-   * the KIO::Job is finished (or canceled).
+   * the TDEIO::Job is finished (or canceled).
    *
    * If your dialog is an embedded widget and not a separate window, you should
    * setOnlyClean(true) in the constructor of your custom dialog.
@@ -143,101 +143,101 @@ public slots:
   // progress slots
   /**
    * Called to set the total size.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param size the total size in bytes
    */
-  virtual void slotTotalSize( KIO::Job* job, KIO::filesize_t size ) {
+  virtual void slotTotalSize( TDEIO::Job* job, TDEIO::filesize_t size ) {
     Q_UNUSED(job);Q_UNUSED(size);}
   /**
    * Called to set the total number of files.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param files the number of files
    */
-  virtual void slotTotalFiles( KIO::Job* job, unsigned long files ) {
+  virtual void slotTotalFiles( TDEIO::Job* job, unsigned long files ) {
     Q_UNUSED(job);Q_UNUSED(files);}
   /**
    * Called to set the total number of directories.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dirs the number of directories
    */
-  virtual void slotTotalDirs( KIO::Job* job, unsigned long dirs ) {
+  virtual void slotTotalDirs( TDEIO::Job* job, unsigned long dirs ) {
     Q_UNUSED(job);Q_UNUSED(dirs);}
 
   /**
    * Called to set the processed size.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param bytes the processed size in bytes
    */
-  virtual void slotProcessedSize( KIO::Job* job, KIO::filesize_t bytes ) {
+  virtual void slotProcessedSize( TDEIO::Job* job, TDEIO::filesize_t bytes ) {
     Q_UNUSED(job);Q_UNUSED(bytes);}
   /**
    * Called to set the number of processed files.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param files the number of files
    */
-  virtual void slotProcessedFiles( KIO::Job* job, unsigned long files ) {
+  virtual void slotProcessedFiles( TDEIO::Job* job, unsigned long files ) {
     Q_UNUSED(job);Q_UNUSED(files);}
   /**
    * Called to set the number of processed directories.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dirs the number of directories
    */
-  virtual void slotProcessedDirs( KIO::Job* job, unsigned long dirs ) {
+  virtual void slotProcessedDirs( TDEIO::Job* job, unsigned long dirs ) {
     Q_UNUSED(job);Q_UNUSED(dirs);}
 
   /**
    * Called to set the speed.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param speed the speed in bytes/second
    */
-  virtual void slotSpeed( KIO::Job* job, unsigned long speed ) {
+  virtual void slotSpeed( TDEIO::Job* job, unsigned long speed ) {
     Q_UNUSED(job);Q_UNUSED(speed);}
 
   /**
    * Called to set the percentage.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param percent the percentage
    */
-  virtual void slotPercent( KIO::Job* job, unsigned long percent ) {
+  virtual void slotPercent( TDEIO::Job* job, unsigned long percent ) {
     Q_UNUSED(job);Q_UNUSED(percent);}
 
   /**
    * Called when the job is copying.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param src the source of the operation
    * @param dest the destination of the operation
    */
-  virtual void slotCopying( KIO::Job* job, const KURL& src, const KURL& dest ) {
+  virtual void slotCopying( TDEIO::Job* job, const KURL& src, const KURL& dest ) {
     Q_UNUSED(job);Q_UNUSED(src);Q_UNUSED(dest);}
   /**
    * Called when the job is moving.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param src the source of the operation
    * @param dest the destination of the operation
    */
-  virtual void slotMoving( KIO::Job* job, const KURL& src, const KURL& dest ) {
+  virtual void slotMoving( TDEIO::Job* job, const KURL& src, const KURL& dest ) {
     Q_UNUSED(job);Q_UNUSED(src);Q_UNUSED(dest);}
   /**
    * Called when the job is deleting.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param url the URL to delete
    */
-  virtual void slotDeleting( KIO::Job* job, const KURL& url) {
+  virtual void slotDeleting( TDEIO::Job* job, const KURL& url) {
     Q_UNUSED(job);Q_UNUSED(url);}
   /**
    * Called when the job is creating a directory.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dir the URL of the directory to create
    */
-  virtual void slotCreatingDir( KIO::Job* job, const KURL& dir ) {
+  virtual void slotCreatingDir( TDEIO::Job* job, const KURL& dir ) {
     Q_UNUSED(job);Q_UNUSED(dir);}
 
   /**
    * Called when the job is resuming..
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param from the position to resume from in bytes
    */
-  virtual void slotCanResume( KIO::Job* job, KIO::filesize_t from) {
+  virtual void slotCanResume( TDEIO::Job* job, TDEIO::filesize_t from) {
     Q_UNUSED(job);Q_UNUSED(from);}
 
 signals:
@@ -247,13 +247,13 @@ signals:
   void stopped();
 
 protected slots:
-  void slotFinished( KIO::Job* );
+  void slotFinished( TDEIO::Job* );
 
 protected:
 
   virtual void closeEvent( TQCloseEvent * );
 
-  KIO::Job* m_pJob;
+  TDEIO::Job* m_pJob;
 
 private:
   bool m_bOnlyClean;
diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp
index 9eb7a2c73..7bba95460 100644
--- a/kio/kio/renamedlg.cpp
+++ b/kio/kio/renamedlg.cpp
@@ -52,7 +52,7 @@
 #include <twin.h>
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 
 class RenameDlg::RenameDlgPrivate
 {
@@ -84,14 +84,14 @@ class RenameDlg::RenameDlgPrivate
 RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
                      const TQString &_src, const TQString &_dest,
                      RenameDlg_Mode _mode,
-                     KIO::filesize_t sizeSrc,
-                     KIO::filesize_t sizeDest,
+                     TDEIO::filesize_t sizeSrc,
+                     TDEIO::filesize_t sizeDest,
                      time_t ctimeSrc,
                      time_t ctimeDest,
                      time_t mtimeSrc,
                      time_t mtimeDest,
                      bool _modal)
-  : TQDialog ( parent, "KIO::RenameDialog" , _modal )
+  : TQDialog ( parent, "TDEIO::RenameDialog" , _modal )
 {
     d = new RenameDlgPrivate( );
     d->modal = _modal;
@@ -243,9 +243,9 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
             gridLayout->addMultiCellWidget( lb1, 1, 3, 0, 0 ); // takes the first column on rows 1-3
 
             int row = 1;
-            if ( sizeDest != (KIO::filesize_t)-1 )
+            if ( sizeDest != (TDEIO::filesize_t)-1 )
             {
-                TQLabel * lb = new TQLabel( i18n("size %1").arg( KIO::convertSize(sizeDest) ), this );
+                TQLabel * lb = new TQLabel( i18n("size %1").arg( TDEIO::convertSize(sizeDest) ), this );
                 gridLayout->addWidget( lb, row, 1 );
                 row++;
 
@@ -279,9 +279,9 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
 
                 row = 6;
 
-                if ( sizeSrc != (KIO::filesize_t)-1 )
+                if ( sizeSrc != (TDEIO::filesize_t)-1 )
                 {
-                    TQLabel * lb = new TQLabel( i18n("size %1").arg( KIO::convertSize(sizeSrc) ), this );
+                    TQLabel * lb = new TQLabel( i18n("size %1").arg( TDEIO::convertSize(sizeSrc) ), this );
                     gridLayout->addWidget( lb, row, 1 );
                     row++;
                 }
@@ -323,7 +323,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
     d->m_pLineEdit = new TQLineEdit( this );
     layout2->addWidget( d->m_pLineEdit );
     TQString fileName = d->dest.fileName();
-    d->m_pLineEdit->setText( KIO::decodeFileName( fileName ) );
+    d->m_pLineEdit->setText( TDEIO::decodeFileName( fileName ) );
     if ( d->bRename || d->bOverwrite )
         connect(d->m_pLineEdit, TQT_SIGNAL(textChanged(const TQString &)),
                 TQT_SLOT(enableRenameButton(const TQString &)));
@@ -391,7 +391,7 @@ RenameDlg::~RenameDlg()
 
 void RenameDlg::enableRenameButton(const TQString &newDest)
 {
-  if ( newDest != KIO::decodeFileName( d->dest.fileName() ) && !newDest.isEmpty() )
+  if ( newDest != TDEIO::decodeFileName( d->dest.fileName() ) && !newDest.isEmpty() )
   {
     d->bRename->setEnabled( true );
     d->bRename->setDefault( true );
@@ -410,7 +410,7 @@ KURL RenameDlg::newDestURL()
 {
   KURL newDest( d->dest );
   TQString fileName = d->m_pLineEdit->text();
-  newDest.setFileName( KIO::encodeFileName( fileName ) );
+  newDest.setFileName( TDEIO::encodeFileName( fileName ) );
   return newDest;
 }
 
@@ -523,7 +523,7 @@ static TQString mime( const KURL& src )
 {
   KMimeType::Ptr type = KMimeType::findByURL( src );
   //if( type->name() == KMimeType::defaultMimeType() ){ // ok no mimetype
-    //    TQString ty = KIO::NetAccess::mimetype(d->src );
+    //    TQString ty = TDEIO::NetAccess::mimetype(d->src );
     // return ty;
     return type->name();
 }
@@ -544,12 +544,12 @@ void RenameDlg::pluginHandling()
 }
 
 
-RenameDlg_Result KIO::open_RenameDlg( const TQString & _caption,
+RenameDlg_Result TDEIO::open_RenameDlg( const TQString & _caption,
                                       const TQString & _src, const TQString & _dest,
                                       RenameDlg_Mode _mode,
                                       TQString& _new,
-                                      KIO::filesize_t sizeSrc,
-                                      KIO::filesize_t sizeDest,
+                                      TDEIO::filesize_t sizeSrc,
+                                      TDEIO::filesize_t sizeDest,
                                       time_t ctimeSrc,
                                       time_t ctimeDest,
                                       time_t mtimeSrc,
diff --git a/kio/kio/renamedlg.h b/kio/kio/renamedlg.h
index 373abf446..b2347539b 100644
--- a/kio/kio/renamedlg.h
+++ b/kio/kio/renamedlg.h
@@ -29,7 +29,7 @@
 
 #include <kio/global.h>
 
-namespace KIO {
+namespace TDEIO {
 
 // KDE4: get rid of M_OVERWRITE_ITSELF, trigger it internally if src==dest
 enum RenameDlg_Mode { M_OVERWRITE = 1, M_OVERWRITE_ITSELF = 2, M_SKIP = 4, M_SINGLE = 8, M_MULTI = 16, M_RESUME = 32, M_NORENAME = 64 };
@@ -69,8 +69,8 @@ public:
              // KDE4: make those KURLs, and use pathOrURL() internally.
              const TQString & src, const TQString & dest,
              RenameDlg_Mode mode,
-             KIO::filesize_t sizeSrc = (KIO::filesize_t) -1,
-             KIO::filesize_t sizeDest = (KIO::filesize_t) -1,
+             TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1,
+             TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1,
              time_t ctimeSrc = (time_t) -1,
              time_t ctimeDest = (time_t) -1,
              time_t mtimeSrc = (time_t) -1,
@@ -116,7 +116,7 @@ private:
   /**
    * \addtogroup renamedlg "RenameDlg related Functions"
    *  @{
-   * \relates KIO::RenameDlg
+   * \relates TDEIO::RenameDlg
    * Construct a modal, parent-less "rename" dialog, and return
    * a result code, as well as the new dest. Much easier to use than the
    * class RenameDlg directly.
@@ -139,8 +139,8 @@ KIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption,
                                  // KDE4: make those KURLs
                                  const TQString& src, const TQString & dest,
                                  RenameDlg_Mode mode, TQString& newDestPath,
-                                 KIO::filesize_t sizeSrc = (KIO::filesize_t) -1,
-                                 KIO::filesize_t sizeDest = (KIO::filesize_t) -1,
+                                 TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1,
+                                 TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1,
                                  time_t ctimeSrc = (time_t) -1,
                                  time_t ctimeDest = (time_t) -1,
                                  time_t mtimeSrc = (time_t) -1,
diff --git a/kio/kio/renamedlgplugin.h b/kio/kio/renamedlgplugin.h
index b4dd8b9fb..ab50e6b6a 100644
--- a/kio/kio/renamedlgplugin.h
+++ b/kio/kio/renamedlgplugin.h
@@ -43,11 +43,11 @@ public:
    * This function will be called by RenameDlg. The params are infos about the files.
    * @return If the plugin want's to display it return true, if not return false
    */
-  virtual bool initialize(KIO::RenameDlg_Mode /*mod*/ ,  const TQString &/*_src*/, const TQString &/*_dest*/,
+  virtual bool initialize(TDEIO::RenameDlg_Mode /*mod*/ ,  const TQString &/*_src*/, const TQString &/*_dest*/,
 		  const TQString &/*mimeSrc*/,
 		  const TQString &/*mimeDest*/,
-		  KIO::filesize_t /*sizeSrc*/,
-		  KIO::filesize_t /*sizeDest*/,
+		  TDEIO::filesize_t /*sizeSrc*/,
+		  TDEIO::filesize_t /*sizeDest*/,
 		  time_t /*ctimeSrc*/,
 		  time_t /*ctimeDest*/,
 		  time_t /*mtimeSrc*/,
diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
index 9b518b1ef..09560cb8b 100644
--- a/kio/kio/scheduler.cpp
+++ b/kio/kio/scheduler.cpp
@@ -40,13 +40,13 @@
 // to the system wide slave pool. (3 minutes)
 #define MAX_SLAVE_IDLE (3*60)
 
-using namespace KIO;
+using namespace TDEIO;
 
-template class TQDict<KIO::Scheduler::ProtocolInfo>;
+template class TQDict<TDEIO::Scheduler::ProtocolInfo>;
 
 Scheduler *Scheduler::instance = 0;
 
-class KIO::SlaveList: public TQPtrList<Slave>
+class TDEIO::SlaveList: public TQPtrList<Slave>
 {
    public:
       SlaveList() { }
@@ -67,7 +67,7 @@ class KIO::SlaveList: public TQPtrList<Slave>
 // We schedule slaves based on (2) but tell the slave about (1) via
 // Slave::setProtocol().
 
-class KIO::Scheduler::JobData
+class TDEIO::Scheduler::JobData
 {
 public:
     JobData() : checkOnHold(false) { }
@@ -78,13 +78,13 @@ public:
     bool checkOnHold;
 };
 
-class KIO::Scheduler::ExtraJobData: public TQPtrDict<KIO::Scheduler::JobData>
+class TDEIO::Scheduler::ExtraJobData: public TQPtrDict<TDEIO::Scheduler::JobData>
 {
 public:
     ExtraJobData() { setAutoDelete(true); }
 };
 
-class KIO::Scheduler::ProtocolInfo
+class TDEIO::Scheduler::ProtocolInfo
 {
 public:
     ProtocolInfo() : maxSlaves(1), skipCount(0)
@@ -99,16 +99,16 @@ public:
     TQString protocol;
 };
 
-class KIO::Scheduler::ProtocolInfoDict : public TQDict<KIO::Scheduler::ProtocolInfo>
+class TDEIO::Scheduler::ProtocolInfoDict : public TQDict<TDEIO::Scheduler::ProtocolInfo>
 {
   public:
     ProtocolInfoDict() { }
 
-    KIO::Scheduler::ProtocolInfo *get( const TQString &protocol);
+    TDEIO::Scheduler::ProtocolInfo *get( const TQString &protocol);
 };
 
-KIO::Scheduler::ProtocolInfo *
-KIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol)
+TDEIO::Scheduler::ProtocolInfo *
+TDEIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol)
 {
     ProtocolInfo *info = find(protocol);
     if (!info)
@@ -124,7 +124,7 @@ KIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol)
 
 
 Scheduler::Scheduler()
-          : DCOPObject( "KIO::Scheduler" ),
+          : DCOPObject( "TDEIO::Scheduler" ),
            TQObject(kapp, "scheduler"),
            slaveTimer(0, "Scheduler::slaveTimer"),
            coSlaveTimer(0, "Scheduler::coSlaveTimer"),
@@ -211,7 +211,7 @@ void Scheduler::_doJob(SimpleJob *job) {
     slaveTimer.start(0, true);
 #ifndef NDEBUG
     if (newJobs.count() > 150)
-	kdDebug() << "WARNING - KIO::Scheduler got more than 150 jobs! This shows a misuse in your app (yes, a job is a TQObject)." << endl;
+	kdDebug() << "WARNING - TDEIO::Scheduler got more than 150 jobs! This shows a misuse in your app (yes, a job is a TQObject)." << endl;
 #endif
 }
 
@@ -272,7 +272,7 @@ void Scheduler::startStep()
     {
        (void) startJobDirect();
     }
-    TQDictIterator<KIO::Scheduler::ProtocolInfo> it(*protInfoDict);
+    TQDictIterator<TDEIO::Scheduler::ProtocolInfo> it(*protInfoDict);
     while(it.current())
     {
        if (startJobScheduled(it.current())) return;
@@ -280,7 +280,7 @@ void Scheduler::startStep()
     }
 }
 
-void Scheduler::setupSlave(KIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const KIO::MetaData *config)
+void Scheduler::setupSlave(TDEIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const TDEIO::MetaData *config)
 {
     TQString host = url.host();
     int port = url.port();
@@ -497,13 +497,13 @@ Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact)
     {
        // Make sure that the job wants to do a GET or a POST, and with no offset
        bool bCanReuse = (job->command() == CMD_GET);
-       KIO::TransferJob * tJob = dynamic_cast<KIO::TransferJob *>(job);
+       TDEIO::TransferJob * tJob = dynamic_cast<TDEIO::TransferJob *>(job);
        if ( tJob )
        {
           bCanReuse = (job->command() == CMD_GET || job->command() == CMD_SPECIAL);
           if ( bCanReuse )
           {
-            KIO::MetaData outgoing = tJob->outgoingMetaData();
+            TDEIO::MetaData outgoing = tJob->outgoingMetaData();
             TQString resume = (!outgoing.contains("resume")) ? TQString() : outgoing["resume"];
             kdDebug(7006) << "Resume metadata is '" << resume << "'" << endl;
             bCanReuse = (resume.isEmpty() || resume == "0");
@@ -541,8 +541,8 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL
    {
       slaveList->append(slave);
       idleSlaves->append(slave);
-      connect(slave, TQT_SIGNAL(slaveDied(KIO::Slave *)),
-                TQT_SLOT(slotSlaveDied(KIO::Slave *)));
+      connect(slave, TQT_SIGNAL(slaveDied(TDEIO::Slave *)),
+                TQT_SLOT(slotSlaveDied(TDEIO::Slave *)));
       connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)),
                 TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool)));
 
@@ -607,7 +607,7 @@ void Scheduler::_jobFinished(SimpleJob *job, Slave *slave)
     }
 }
 
-void Scheduler::slotSlaveDied(KIO::Slave *slave)
+void Scheduler::slotSlaveDied(TDEIO::Slave *slave)
 {
     assert(!slave->isAlive());
     ProtocolInfo *protInfo = protInfoDict->get(slave->slaveProtocol());
@@ -662,7 +662,7 @@ void Scheduler::_scheduleCleanup()
     }
 }
 
-void Scheduler::_putSlaveOnHold(KIO::SimpleJob *job, const KURL &url)
+void Scheduler::_putSlaveOnHold(TDEIO::SimpleJob *job, const KURL &url)
 {
     Slave *slave = job->slave();
     slave->disconnect(job);
@@ -695,7 +695,7 @@ void Scheduler::_removeSlaveOnHold()
 }
 
 Slave *
-Scheduler::_getConnectedSlave(const KURL &url, const KIO::MetaData &config )
+Scheduler::_getConnectedSlave(const KURL &url, const TDEIO::MetaData &config )
 {
     TQString proxy;
     TQString protocol = KProtocolManager::slaveProtocol(url, proxy);
@@ -792,7 +792,7 @@ Scheduler::slotSlaveError(int errorNr, const TQString &errorMsg)
 }
 
 bool
-Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job)
+Scheduler::_assignJobToSlave(TDEIO::Slave *slave, SimpleJob *job)
 {
 //    kdDebug(7006) << "_assignJobToSlave( " << job << ", " << slave << ")" << endl;
     TQString dummy;
@@ -822,7 +822,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job)
 }
 
 bool
-Scheduler::_disconnectSlave(KIO::Slave *slave)
+Scheduler::_disconnectSlave(TDEIO::Slave *slave)
 {
 //    kdDebug(7006) << "_disconnectSlave( " << slave << ")" << endl;
     JobList *list = coSlaves.take(slave);
diff --git a/kio/kio/scheduler.h b/kio/kio/scheduler.h
index 4a4f104ba..9871cd1c2 100644
--- a/kio/kio/scheduler.h
+++ b/kio/kio/scheduler.h
@@ -30,7 +30,7 @@
 
 #include <dcopobject.h>
 
-namespace KIO {
+namespace TDEIO {
 
     class Slave;
     class SlaveList;
@@ -38,7 +38,7 @@ namespace KIO {
     class SessionData;
 
     /**
-     * The KIO::Scheduler manages io-slaves for the application.
+     * The TDEIO::Scheduler manages io-slaves for the application.
      * It also queues jobs and assigns the job to a slave when one
      * becomes available.
      *
@@ -46,12 +46,12 @@ namespace KIO {
      *
      * <h3>1. Direct</h3>
      * This is the default. When you create a job the
-     * KIO::Scheduler will be notified and will find either an existing
+     * TDEIO::Scheduler will be notified and will find either an existing
      * slave that is idle or it will create a new slave for the job.
      *
      * Example:
      * \code
-     *    TransferJob *job = KIO::get(KURL("http://www.kde.org"));
+     *    TransferJob *job = TDEIO::get(KURL("http://www.kde.org"));
      * \endcode
      *
      *
@@ -64,8 +64,8 @@ namespace KIO {
      *
      * Example:
      * \code
-     *    TransferJob *job = KIO::get(KURL("http://www.kde.org"));
-     *    KIO::Scheduler::scheduleJob(job);
+     *    TransferJob *job = TDEIO::get(KURL("http://www.kde.org"));
+     *    TDEIO::Scheduler::scheduleJob(job);
      * \endcode
      *
      * <h3>3. Connection Oriented</h3>
@@ -80,32 +80,32 @@ namespace KIO {
      *
      * Example:
      * \code
-     *    Slave *slave = KIO::Scheduler::getConnectedSlave(
+     *    Slave *slave = TDEIO::Scheduler::getConnectedSlave(
      *            KURL("pop3://bastian:password@mail.kde.org"));
-     *    TransferJob *job1 = KIO::get(
+     *    TransferJob *job1 = TDEIO::get(
      *            KURL("pop3://bastian:password@mail.kde.org/msg1"));
-     *    KIO::Scheduler::assignJobToSlave(slave, job1);
-     *    TransferJob *job2 = KIO::get(
+     *    TDEIO::Scheduler::assignJobToSlave(slave, job1);
+     *    TransferJob *job2 = TDEIO::get(
      *            KURL("pop3://bastian:password@mail.kde.org/msg2"));
-     *    KIO::Scheduler::assignJobToSlave(slave, job2);
-     *    TransferJob *job3 = KIO::get(
+     *    TDEIO::Scheduler::assignJobToSlave(slave, job2);
+     *    TransferJob *job3 = TDEIO::get(
      *            KURL("pop3://bastian:password@mail.kde.org/msg3"));
-     *    KIO::Scheduler::assignJobToSlave(slave, job3);
+     *    TDEIO::Scheduler::assignJobToSlave(slave, job3);
      *
      *    // ... Wait for jobs to finish...
      *
-     *    KIO::Scheduler::disconnectSlave(slave);
+     *    TDEIO::Scheduler::disconnectSlave(slave);
      * \endcode
      *
      * Note that you need to explicitly disconnect the slave when the 
      * connection goes down, so your error handler should contain:
      * \code
-     *    if (error == KIO::ERR_CONNECTION_BROKEN)
-     *        KIO::Scheduler::disconnectSlave(slave);
+     *    if (error == TDEIO::ERR_CONNECTION_BROKEN)
+     *        TDEIO::Scheduler::disconnectSlave(slave);
      * \endcode
      *
-     * @see KIO::Slave
-     * @see KIO::Job
+     * @see TDEIO::Slave
+     * @see TDEIO::Job
      **/
 
     class KIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject {
@@ -150,7 +150,7 @@ namespace KIO {
 	 * @param job the finished job
 	 * @param slave the slave that executed the @p job
          */
-        static void jobFinished(KIO::SimpleJob *job, KIO::Slave *slave)
+        static void jobFinished(TDEIO::SimpleJob *job, TDEIO::Slave *slave)
         { self()->_jobFinished(job, slave); }
 
         /**
@@ -164,7 +164,7 @@ namespace KIO {
 	 * @param job the job that should be stopped
 	 * @param url the URL that is handled by the @p url
          */
-        static void putSlaveOnHold(KIO::SimpleJob *job, const KURL &url)
+        static void putSlaveOnHold(TDEIO::SimpleJob *job, const KURL &url)
         { self()->_putSlaveOnHold(job, url); }
 
         /**
@@ -193,7 +193,7 @@ namespace KIO {
          * @see assignJobToSlave()
          * @see disconnectSlave()
          */
-        static KIO::Slave *getConnectedSlave(const KURL &url, const KIO::MetaData &config = MetaData() )
+        static TDEIO::Slave *getConnectedSlave(const KURL &url, const TDEIO::MetaData &config = MetaData() )
         { return self()->_getConnectedSlave(url, config); }
 
         /*
@@ -212,7 +212,7 @@ namespace KIO {
          * @see slaveConnected()
          * @see slaveError()
          */
-        static bool assignJobToSlave(KIO::Slave *slave, KIO::SimpleJob *job)
+        static bool assignJobToSlave(TDEIO::Slave *slave, TDEIO::SimpleJob *job)
         { return self()->_assignJobToSlave(slave, job); }
 
         /*
@@ -227,7 +227,7 @@ namespace KIO {
          * @see getConnectedSlave
          * @see assignJobToSlave
          */
-        static bool disconnectSlave(KIO::Slave *slave)
+        static bool disconnectSlave(TDEIO::Slave *slave)
         { return self()->_disconnectSlave(slave); }
 
         /**
@@ -236,7 +236,7 @@ namespace KIO {
          * the that was started.
          * Register the mainwindow @p wid with the KIO subsystem
          * Do not call this, it is called automatically from
-         * void KIO::Job::setWindow(TQWidget*).
+         * void TDEIO::Job::setWindow(TQWidget*).
 	 * @param wid the window to register
 	 * @since 3.1
          */
@@ -287,15 +287,15 @@ namespace KIO {
         virtual QCStringList functions();
 
     public slots:
-        void slotSlaveDied(KIO::Slave *slave);
+        void slotSlaveDied(TDEIO::Slave *slave);
         void slotSlaveStatus(pid_t pid, const TQCString &protocol,
                              const TQString &host, bool connected);
     signals:
-        void slaveConnected(KIO::Slave *slave);
-        void slaveError(KIO::Slave *slave, int error, const TQString &errorMsg);
+        void slaveConnected(TDEIO::Slave *slave);
+        void slaveError(TDEIO::Slave *slave, int error, const TQString &errorMsg);
 
     protected:
-        void setupSlave(KIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const KIO::MetaData *config=0);
+        void setupSlave(TDEIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const TDEIO::MetaData *config=0);
         bool startJobScheduled(ProtocolInfo *protInfo);
         bool startJobDirect();
         Scheduler();
@@ -319,13 +319,13 @@ namespace KIO {
         void _doJob(SimpleJob *job);
         void _scheduleJob(SimpleJob *job);
         void _cancelJob(SimpleJob *job);
-        void _jobFinished(KIO::SimpleJob *job, KIO::Slave *slave);
+        void _jobFinished(TDEIO::SimpleJob *job, TDEIO::Slave *slave);
         void _scheduleCleanup();
-        void _putSlaveOnHold(KIO::SimpleJob *job, const KURL &url);
+        void _putSlaveOnHold(TDEIO::SimpleJob *job, const KURL &url);
         void _removeSlaveOnHold();
-        Slave *_getConnectedSlave(const KURL &url, const KIO::MetaData &metaData );
-        bool _assignJobToSlave(KIO::Slave *slave, KIO::SimpleJob *job);
-        bool _disconnectSlave(KIO::Slave *slave);
+        Slave *_getConnectedSlave(const KURL &url, const TDEIO::MetaData &metaData );
+        bool _assignJobToSlave(TDEIO::Slave *slave, TDEIO::SimpleJob *job);
+        bool _disconnectSlave(TDEIO::Slave *slave);
         void _checkSlaveOnHold(bool b);
         void _publishSlaveOnHold();
         void _registerWindow(TQWidget *wid);
diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp
index d3c398fc4..e2517cc73 100644
--- a/kio/kio/sessiondata.cpp
+++ b/kio/kio/sessiondata.cpp
@@ -37,7 +37,7 @@
 #include "sessiondata.h"
 #include "sessiondata.moc"
 
-namespace KIO {
+namespace TDEIO {
 
 /***************************** SessionData::AuthData ************************/
 struct SessionData::AuthData
@@ -264,7 +264,7 @@ void SessionData::reset()
 {
     d->initDone = true;
     // Get Cookie settings...
-    KConfig* cfg = new KConfig("kcookiejarrc", true, false);
+    TDEConfig* cfg = new TDEConfig("kcookiejarrc", true, false);
     cfg->setGroup( "Cookie Policy" );
     d->useCookie = cfg->readBoolEntry( "Cookies", true );
     delete cfg;
diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h
index 80433679c..80b28ace6 100644
--- a/kio/kio/sessiondata.h
+++ b/kio/kio/sessiondata.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <kio/global.h>
 
-namespace KIO  {
+namespace TDEIO  {
 
 class SlaveConfig;
 
@@ -40,7 +40,7 @@ public:
     SessionData();
     ~SessionData();
 
-    virtual void configDataFor( KIO::MetaData &configData, const TQString &proto,
+    virtual void configDataFor( TDEIO::MetaData &configData, const TQString &proto,
                                 const TQString &host );
     virtual void reset();
 
diff --git a/kio/kio/skipdlg.cpp b/kio/kio/skipdlg.cpp
index 0fe7b230b..f4a14a229 100644
--- a/kio/kio/skipdlg.cpp
+++ b/kio/kio/skipdlg.cpp
@@ -36,7 +36,7 @@
 #include <twin.h>
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 
 SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, bool _modal ) :
   KDialog ( parent, "" , _modal )
@@ -132,7 +132,7 @@ void SkipDlg::b2Pressed()
     emit result( this, 2 );
 }
 
-SkipDlg_Result KIO::open_SkipDlg( bool _multi, const TQString& _error_text )
+SkipDlg_Result TDEIO::open_SkipDlg( bool _multi, const TQString& _error_text )
 {
   Q_ASSERT(kapp);
 
diff --git a/kio/kio/skipdlg.h b/kio/kio/skipdlg.h
index dbf583ef0..e1199de97 100644
--- a/kio/kio/skipdlg.h
+++ b/kio/kio/skipdlg.h
@@ -25,7 +25,7 @@
 class TQPushButton;
 class TQWidget;
 
-namespace KIO {
+namespace TDEIO {
 
   enum SkipDlg_Result { S_SKIP = 1, S_AUTO_SKIP = 2, S_CANCEL = 0 };
 
diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp
index 8306c8650..6e834f5fa 100644
--- a/kio/kio/slave.cpp
+++ b/kio/kio/slave.cpp
@@ -59,7 +59,7 @@
 #define _PATH_TMP "/tmp"
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 
 #define SLAVE_CONNECTION_TIMEOUT_MIN	   2
 
@@ -73,7 +73,7 @@ using namespace KIO;
 #define SLAVE_CONNECTION_TIMEOUT_MAX    3600
 #endif
 
-namespace KIO {
+namespace TDEIO {
 
   /**
    * @internal
@@ -87,7 +87,7 @@ namespace KIO {
   };
 }
 
-void Slave::accept(KSocket *socket)
+void Slave::accept(TDESocket *socket)
 {
 #ifndef Q_WS_WIN
     slaveconn.init(socket);
@@ -138,7 +138,7 @@ void Slave::timeout()
    deref();
 }
 
-Slave::Slave(KServerSocket *socket, const TQString &protocol, const TQString &socketname)
+Slave::Slave(TDEServerSocket *socket, const TQString &protocol, const TQString &socketname)
   : SlaveInterface(&slaveconn), serv(socket), contacted(false),
   	d(new SlavePrivate(false))
 {
@@ -152,12 +152,12 @@ Slave::Slave(KServerSocket *socket, const TQString &protocol, const TQString &so
     m_pid = 0;
     m_port = 0;
 #ifndef Q_WS_WIN
-    connect(serv, TQT_SIGNAL(accepted( KSocket* )),
-	    TQT_SLOT(accept(KSocket*) ) );
+    connect(serv, TQT_SIGNAL(accepted( TDESocket* )),
+	    TQT_SLOT(accept(TDESocket*) ) );
 #endif
 }
 
-Slave::Slave(bool /*derived*/, KServerSocket *socket, const TQString &protocol,
+Slave::Slave(bool /*derived*/, TDEServerSocket *socket, const TQString &protocol,
 	const TQString &socketname)
   : SlaveInterface(&slaveconn), serv(socket), contacted(false),
   	d(new SlavePrivate(true))
@@ -174,8 +174,8 @@ Slave::Slave(bool /*derived*/, KServerSocket *socket, const TQString &protocol,
     m_port = 0;
     if (serv != 0) {
 #ifndef Q_WS_WIN
-      connect(serv, TQT_SIGNAL(accepted( KSocket* )),
-        TQT_SLOT(accept(KSocket*) ) );
+      connect(serv, TQT_SIGNAL(accepted( TDESocket* )),
+        TQT_SLOT(accept(TDESocket*) ) );
 #endif
     }
 }
@@ -368,7 +368,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     if ( socketfile.status() != 0 )
     {
 	error_text = i18n("Unable to create io-slave: %1").arg(strerror(errno));
-	error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
+	error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS;
 	return 0;
     }
 
@@ -377,7 +377,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
 #endif
     
 #ifndef Q_WS_WIN
-    KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data());
+    TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data());
 
     Slave *slave = new Slave(kss, protocol, socketfile.name());
 #else
@@ -399,7 +399,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
        if (_name.isEmpty())
        {
           error_text = i18n("Unknown protocol '%1'.").arg(protocol);
-          error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
+          error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS;
           delete slave;
           return 0;
        }
@@ -407,7 +407,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
        if (lib_path.isEmpty())
        {
           error_text = i18n("Can not find io-slave for protocol '%1'.").arg(protocol);
-          error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
+          error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS;
           return 0;
        }
 
@@ -435,7 +435,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     if (!client->call(launcher, launcher, "requestSlave(TQString,TQString,TQString)",
 	    params, replyType, reply)) {
 	error_text = i18n("Cannot talk to klauncher");
-	error = KIO::ERR_SLAVE_DEFINED;
+	error = TDEIO::ERR_SLAVE_DEFINED;
         delete slave;
         return 0;
     }
@@ -446,7 +446,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     if (!pid)
     {
         error_text = i18n("Unable to create io-slave:\nklauncher said: %1").arg(errorStr);
-        error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
+        error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS;
         delete slave;
         return 0;
     }
@@ -479,7 +479,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
 #endif
 
 #ifndef Q_WS_WIN
-    KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data());
+    TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data());
 
     Slave *slave = new Slave(kss, protocol, socketfile.name());
 #else
@@ -513,7 +513,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
 }
 
 void Slave::virtual_hook( int id, void* data ) {
-  KIO::SlaveInterface::virtual_hook( id, data );
+  TDEIO::SlaveInterface::virtual_hook( id, data );
 }
 
 #include "slave.moc"
diff --git a/kio/kio/slave.h b/kio/kio/slave.h
index e5cdc332c..bbede6637 100644
--- a/kio/kio/slave.h
+++ b/kio/kio/slave.h
@@ -32,16 +32,16 @@
 #include "kio/slaveinterface.h"
 #include "kio/connection.h"
 
-class KServerSocket;
-class KSocket;
+class TDEServerSocket;
+class TDESocket;
 
-namespace KIO {
+namespace TDEIO {
 
-    /** Attention developers: If you change the implementation of KIO::Slave,
-    * do *not* use connection() or slaveconn but the respective KIO::Slave
+    /** Attention developers: If you change the implementation of TDEIO::Slave,
+    * do *not* use connection() or slaveconn but the respective TDEIO::Slave
     * accessor methods. Otherwise classes derived from Slave might break. (LS)
     */
-    class KIO_EXPORT Slave : public KIO::SlaveInterface
+    class KIO_EXPORT Slave : public TDEIO::SlaveInterface
     {
 	Q_OBJECT
 	
@@ -53,11 +53,11 @@ namespace KIO {
 	 * @internal
 	 * @since 3.2
 	 */
-	Slave(bool derived, KServerSocket *unixdomain, const TQString &protocol,
+	Slave(bool derived, TDEServerSocket *unixdomain, const TQString &protocol,
 		const TQString &socketname);	// TODO(BIC): Remove in KDE 4
 
     public:
-	Slave(KServerSocket *unixdomain,
+	Slave(TDEServerSocket *unixdomain,
 	      const TQString &protocol, const TQString &socketname);
 
         virtual ~Slave();
@@ -202,7 +202,7 @@ namespace KIO {
         void setConnected(bool c) { contacted = c; }
 
 	/** @deprecated This method is obsolete, use the accessor methods
-	  * within KIO::Slave instead. Old code directly accessing connection()
+	  * within TDEIO::Slave instead. Old code directly accessing connection()
 	  * will not be able to access special protocols.
 	  */
         KDE_DEPRECATED Connection *connection() { return &slaveconn; }	// TODO(BIC): remove before KDE 4
@@ -211,11 +211,11 @@ namespace KIO {
         void deref() { m_refCount--; if (!m_refCount) delete this; }
 
     public slots:
-        void accept(KSocket *socket);
+        void accept(TDESocket *socket);
 	void gotInput();
 	void timeout();
     signals:
-        void slaveDied(KIO::Slave *slave);
+        void slaveDied(TDEIO::Slave *slave);
 
     protected:
         void unlinkSocket();
@@ -227,14 +227,14 @@ namespace KIO {
         int m_port;
         TQString m_user;
         TQString m_passwd;
-	KServerSocket *serv;
+	TDEServerSocket *serv;
 	TQString m_socket;
 	pid_t m_pid;
 	bool contacted;
 	bool dead;
 	time_t contact_started;
 	time_t idle_since;
-	KIO::Connection slaveconn;
+	TDEIO::Connection slaveconn;
 	int m_refCount;
     protected:
 	virtual void virtual_hook( int id, void* data );
diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp
index d2e807077..07d784527 100644
--- a/kio/kio/slavebase.cpp
+++ b/kio/kio/slavebase.cpp
@@ -66,7 +66,7 @@
 #endif
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 
 template class TQPtrList<TQValueList<UDSAtom> >;
 typedef TQValueList<TQCString> AuthKeysList;
@@ -74,9 +74,9 @@ typedef TQMap<TQString,TQCString> AuthKeysMap;
 #define KIO_DATA TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream
 #define KIO_FILESIZE_T(x) (unsigned long)(x & 0xffffffff) << (unsigned long)(x >> 32)
 
-namespace KIO {
+namespace TDEIO {
 
-class SlaveBaseConfig : public KConfigBase
+class SlaveBaseConfig : public TDEConfigBase
 {
 public:
    SlaveBaseConfig(SlaveBase *_slave)
@@ -124,8 +124,8 @@ public:
     KURL onHoldUrl;
 
     struct timeval last_tv;
-    KIO::filesize_t totalSize;
-    KIO::filesize_t sentListEntries;
+    TDEIO::filesize_t totalSize;
+    TDEIO::filesize_t sentListEntries;
     DCOPClient *dcopClient;
     KRemoteEncoding *remotefile;
     time_t timeout;
@@ -341,8 +341,8 @@ void SlaveBase::dispatchLoop()
 
 void SlaveBase::connectSlave(const TQString& path)
 {
-#ifdef Q_OS_UNIX //TODO: KSocket not yet available on WIN32
-    appconn->init(new KSocket(TQFile::encodeName(path).data()));
+#ifdef Q_OS_UNIX //TODO: TDESocket not yet available on WIN32
+    appconn->init(new TDESocket(TQFile::encodeName(path).data()));
     if (!appconn->inited())
     {
         kdDebug(7019) << "SlaveBase: failed to connect to " << path << endl;
@@ -389,7 +389,7 @@ bool SlaveBase::hasMetaData(const TQString &key) {
    return const_cast<const SlaveBase*>(this)->hasMetaData( key );
 }
 
-KConfigBase *SlaveBase::config()
+TDEConfigBase *SlaveBase::config()
 {
    return d->config;
 }
@@ -485,7 +485,7 @@ void SlaveBase::canResume()
     m_pConnection->send( MSG_CANRESUME );
 }
 
-void SlaveBase::totalSize( KIO::filesize_t _bytes )
+void SlaveBase::totalSize( TDEIO::filesize_t _bytes )
 {
     KIO_DATA << KIO_FILESIZE_T(_bytes);
     slaveWriteError = false;
@@ -501,7 +501,7 @@ void SlaveBase::totalSize( KIO::filesize_t _bytes )
     d->sentListEntries=0;
 }
 
-void SlaveBase::processedSize( KIO::filesize_t _bytes )
+void SlaveBase::processedSize( TDEIO::filesize_t _bytes )
 {
     bool           emitSignal=false;
     struct timeval tv;
@@ -872,7 +872,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg )
     else
        stream << info << errorMsg << windowId << s_seqNr << userTimestamp;
 
-    bool callOK = d->dcopClient->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo, TQString, long int, long int, unsigned long int)",
+    bool callOK = d->dcopClient->call( "kded", "kpasswdserver", "queryAuthInfo(TDEIO::AuthInfo, TQString, long int, long int, unsigned long int)",
                                         params, replyType, reply );
 
     if (progressId)
@@ -884,7 +884,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg )
        return false;
     }
 
-    if ( replyType == "KIO::AuthInfo" )
+    if ( replyType == "TDEIO::AuthInfo" )
     {
        TQDataStream stream2( reply, IO_ReadOnly );
        stream2 >> authResult >> s_seqNr;
@@ -892,7 +892,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg )
     else
     {
        kdError(7019) << "DCOP function queryAuthInfo(...) returns "
-                     << replyType << ", expected KIO::AuthInfo" << endl;
+                     << replyType << ", expected TDEIO::AuthInfo" << endl;
        return false;
     }
 
@@ -930,9 +930,9 @@ int SlaveBase::messageBox( const TQString &text, MessageBoxType type, const TQSt
         return 0; // communication failure
 }
 
-bool SlaveBase::canResume( KIO::filesize_t offset )
+bool SlaveBase::canResume( TDEIO::filesize_t offset )
 {
-    kdDebug(7019) << "SlaveBase::canResume offset=" << KIO::number(offset) << endl;
+    kdDebug(7019) << "SlaveBase::canResume offset=" << TDEIO::number(offset) << endl;
     d->needSendCanResume = false;
     KIO_DATA << KIO_FILESIZE_T(offset);
     m_pConnection->send( MSG_RESUME, data );
@@ -1216,14 +1216,14 @@ bool SlaveBase::checkCachedAuthentication( AuthInfo& info )
     TQDataStream stream(params, IO_WriteOnly);
     stream << info << windowId << userTimestamp;
 
-    if ( !d->dcopClient->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int, unsigned long int)",
+    if ( !d->dcopClient->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int, unsigned long int)",
                                params, replyType, reply ) )
     {
        kdWarning(7019) << "Can't communicate with kded_kpasswdserver!" << endl;
        return false;
     }
 
-    if ( replyType == "KIO::AuthInfo" )
+    if ( replyType == "TDEIO::AuthInfo" )
     {
        TQDataStream stream2( reply, IO_ReadOnly );
        stream2 >> authResult;
@@ -1231,7 +1231,7 @@ bool SlaveBase::checkCachedAuthentication( AuthInfo& info )
     else
     {
        kdError(7019) << "DCOP function checkAuthInfo(...) returns "
-                     << replyType << ", expected KIO::AuthInfo" << endl;
+                     << replyType << ", expected TDEIO::AuthInfo" << endl;
        return false;
     }
     if (!authResult.isModified())
@@ -1253,7 +1253,7 @@ bool SlaveBase::cacheAuthentication( const AuthInfo& info )
     TQDataStream stream(params, IO_WriteOnly);
     stream << info << windowId;
 
-    d->dcopClient->send( "kded", "kpasswdserver", "addAuthInfo(KIO::AuthInfo, long int)", params );
+    d->dcopClient->send( "kded", "kpasswdserver", "addAuthInfo(TDEIO::AuthInfo, long int)", params );
 
     return true;
 }
diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h
index b6e48d5b6..332646875 100644
--- a/kio/kio/slavebase.h
+++ b/kio/kio/slavebase.h
@@ -28,7 +28,7 @@
 class DCOPClient;
 class KRemoteEncoding;
 
-namespace KIO {
+namespace TDEIO {
 
 class Connection;
 class SlaveBasePrivate;
@@ -93,7 +93,7 @@ public:
      * Call to signal an error.
      * This also finishes the job, no need to call finished.
      *
-     * If the Error code is KIO::ERR_SLAVE_DEFINED then the
+     * If the Error code is TDEIO::ERR_SLAVE_DEFINED then the
      * _text should contain the complete translated text of
      * of the error message.  This message will be displayed
      * in an KTextBrowser which allows rich text complete
@@ -101,9 +101,9 @@ public:
      * mailer, "exec:/command arg1 arg2" will be forked and
      * all other links will call the default browser.
      *
-     * @see KIO::Error
+     * @see TDEIO::Error
      * @see KTextBrowser
-     * @param _errid the error code from KIO::Error
+     * @param _errid the error code from TDEIO::Error
      * @param _text the rich text error message
      */
     void error( int _errid, const TQString &_text );
@@ -154,7 +154,7 @@ public:
      * In this case, the boolean returns whether we can indeed resume or not
      * (we can't if the protocol doing the get() doesn't support setting an offset)
      */
-    bool canResume( KIO::filesize_t offset );
+    bool canResume( TDEIO::filesize_t offset );
 
     /*
      * Call this at the beginning of get(), if the "resume" metadata was set
@@ -171,13 +171,13 @@ public:
      * of the file
      * Call in listDir too, when you know the total number of items.
      */
-    void totalSize( KIO::filesize_t _bytes );
+    void totalSize( TDEIO::filesize_t _bytes );
     /**
      * Call this during get and copy, once in a while,
      * to give some info about the current state.
      * Don't emit it in listDir, listEntries speaks for itself.
      */
-    void processedSize( KIO::filesize_t _bytes );
+    void processedSize( TDEIO::filesize_t _bytes );
 
     /**
      * Only use this if you can't know in advance the size of the
@@ -317,7 +317,7 @@ public:
      * The application provides the slave with all configuration information
      * relevant for the current protocol and host.
      */
-    KConfigBase* config();
+    TDEConfigBase* config();
 
     /**
      * Returns an object that can translate remote filenames into proper
@@ -621,7 +621,7 @@ public:
      * simple example:
      *
      * \code
-     * KIO::AuthInfo authInfo;
+     * TDEIO::AuthInfo authInfo;
      * if ( openPassDlg( authInfo ) )
      * {
      *    kdDebug() << TQString::fromLatin1("User: ")
@@ -635,7 +635,7 @@ public:
      * comment as follows:
      *
      * \code
-     * KIO::AuthInfo authInfo;
+     * TDEIO::AuthInfo authInfo;
      * authInfo.caption= "Acme Password Dialog";
      * authInfo.username= "Wile E. Coyote";
      * TQString errorMsg = "You entered an incorrect password.";
@@ -661,13 +661,13 @@ public:
      * @return      @p true if user clicks on "OK", @p false otherwsie.
      * @since 3.1
      */
-    bool openPassDlg( KIO::AuthInfo& info, const TQString &errorMsg );
+    bool openPassDlg( TDEIO::AuthInfo& info, const TQString &errorMsg );
 
     /**
      * Same as above function except it does not need error message.
      * BIC: Combine this function with the above for KDE4.
      */
-    bool openPassDlg( KIO::AuthInfo& info );
+    bool openPassDlg( TDEIO::AuthInfo& info );
 
     /**
      * Checks for cached authentication based on parameters
diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp
index 9ce4a86a0..c0ec44779 100644
--- a/kio/kio/slaveconfig.cpp
+++ b/kio/kio/slaveconfig.cpp
@@ -31,9 +31,9 @@
 
 #include "slaveconfig.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
-namespace KIO {
+namespace TDEIO {
 
 class SlaveConfigProtocol
 {
@@ -47,10 +47,10 @@ public:
 public:
   MetaData global;
   TQDict<MetaData> host;
-  KConfig *configFile;
+  TDEConfig *configFile;
 };
 
-static void readConfig(KConfig *config, const TQString & group, MetaData *metaData)
+static void readConfig(TDEConfig *config, const TQString & group, MetaData *metaData)
 {
    *metaData += config->entryMap(group);
 }
@@ -71,7 +71,7 @@ void SlaveConfigPrivate::readGlobalConfig()
 {
    global.clear();
    // Read stuff...
-   KConfig *config = KProtocolManager::config();
+   TDEConfig *config = KProtocolManager::config();
    readConfig(TDEGlobal::config(), "Socks", &global); // Socks settings.
    if ( config )
        readConfig(config, "<default>", &global);
@@ -84,7 +84,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_pro
    {
       TQString filename = KProtocolInfo::config(_protocol);
       scp = new SlaveConfigProtocol;
-      scp->configFile = new KConfig(filename, true, false);
+      scp->configFile = new TDEConfig(filename, true, false);
       protocol.insert(_protocol, scp);
    }
    // Read global stuff...
diff --git a/kio/kio/slaveconfig.h b/kio/kio/slaveconfig.h
index a7ded457d..59abb74ac 100644
--- a/kio/kio/slaveconfig.h
+++ b/kio/kio/slaveconfig.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <kio/global.h>
 
-namespace KIO {
+namespace TDEIO {
 
     class SlaveConfigPrivate;
     /**
diff --git a/kio/kio/slaveinterface.cpp b/kio/kio/slaveinterface.cpp
index 05036cf8a..5ba2f6e86 100644
--- a/kio/kio/slaveinterface.cpp
+++ b/kio/kio/slaveinterface.cpp
@@ -32,10 +32,10 @@
 #include <time.h>
 #include <tqtimer.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 
-TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e )
+TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e )
 {
     // On 32-bit platforms we send UDS_SIZE with UDS_SIZE_LARGE in front
     // of it to carry the 32 msb. We can't send a 64 bit UDS_SIZE because
@@ -44,21 +44,21 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e )
     // environment.
 
     TQ_UINT32 size = 0;
-    KIO::UDSEntry::ConstIterator it = e.begin();
+    TDEIO::UDSEntry::ConstIterator it = e.begin();
     for( ; it != e.end(); ++it )
     {
        size++;
-       if ((*it).m_uds == KIO::UDS_SIZE)
+       if ((*it).m_uds == TDEIO::UDS_SIZE)
           size++;
     }
     s << size;
     it = e.begin();
     for( ; it != e.end(); ++it )
     {
-       if ((*it).m_uds == KIO::UDS_SIZE)
+       if ((*it).m_uds == TDEIO::UDS_SIZE)
        {
-          KIO::UDSAtom a;
-          a.m_uds = KIO::UDS_SIZE_LARGE;
+          TDEIO::UDSAtom a;
+          a.m_uds = TDEIO::UDS_SIZE_LARGE;
           a.m_long = (*it).m_long >> 32;
           s << a;
        }
@@ -67,7 +67,7 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e )
     return s;
 }
 
-TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e )
+TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e )
 {
     e.clear();
     TQ_UINT32 size;
@@ -81,15 +81,15 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e )
     TQ_LLONG msb = 0;
     for(TQ_UINT32 i = 0; i < size; i++)
     {
-       KIO::UDSAtom a;
+       TDEIO::UDSAtom a;
        s >> a;
-       if (a.m_uds == KIO::UDS_SIZE_LARGE)
+       if (a.m_uds == TDEIO::UDS_SIZE_LARGE)
        {
           msb = a.m_long;
        }
        else
        {
-          if (a.m_uds == KIO::UDS_SIZE)
+          if (a.m_uds == TDEIO::UDS_SIZE)
           {
              if (a.m_long < 0)
                 a.m_long += (TQ_LLONG) 1 << 32;
@@ -104,7 +104,7 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e )
 
 static const unsigned int max_nums = 8;
 
-class KIO::SlaveInterfacePrivate
+class TDEIO::SlaveInterfacePrivate
 {
 public:
   SlaveInterfacePrivate() {
@@ -120,9 +120,9 @@ public:
   struct timeval start_time;
   uint nums;
   long times[max_nums];
-  KIO::filesize_t sizes[max_nums];
+  TDEIO::filesize_t sizes[max_nums];
   size_t last_time;
-  KIO::filesize_t filesize, offset;
+  TDEIO::filesize_t filesize, offset;
 
   TQTimer speed_timer;
 };
@@ -146,16 +146,16 @@ SlaveInterface::~SlaveInterface()
     delete d;
 }
 
-static KIO::filesize_t readFilesize_t(TQDataStream &stream)
+static TDEIO::filesize_t readFilesize_t(TQDataStream &stream)
 {
-   KIO::filesize_t result;
+   TDEIO::filesize_t result;
    unsigned long ul;
    stream >> ul;
    result = ul;
    if (stream.atEnd())
       return result;
    stream >> ul;
-   result += ((KIO::filesize_t)ul) << 32;
+   result += ((TDEIO::filesize_t)ul) << 32;
    return result;
 }
 
@@ -199,7 +199,7 @@ void SlaveInterface::calcSpeed()
     d->times[d->nums] = diff;
     d->sizes[d->nums++] = d->filesize - d->offset;
 
-    KIO::filesize_t lspeed = 1000 * (d->sizes[d->nums-1] - d->sizes[0]) / (d->times[d->nums-1] - d->times[0]);
+    TDEIO::filesize_t lspeed = 1000 * (d->sizes[d->nums-1] - d->sizes[0]) / (d->times[d->nums-1] - d->times[0]);
 
 //     kdDebug() << "proceeed " << (long)d->filesize << " " << diff << " " 
 // 	      << long(d->sizes[d->nums-1] - d->sizes[0]) << " " 
@@ -293,7 +293,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata )
 
     case INF_TOTAL_SIZE:
 	{
-	    KIO::filesize_t size = readFilesize_t(stream);
+	    TDEIO::filesize_t size = readFilesize_t(stream);
 	    gettimeofday(&d->start_time, 0);
 	    d->last_time = 0;
 	    d->filesize = d->offset;
@@ -307,7 +307,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata )
 	break;
     case INF_PROCESSED_SIZE:
 	{
-	    KIO::filesize_t size = readFilesize_t(stream);
+	    TDEIO::filesize_t size = readFilesize_t(stream);
 	    emit processedSize( size );
 	    d->filesize = size;
 	}
@@ -423,12 +423,12 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata )
     return true;
 }
 
-void SlaveInterface::setOffset( KIO::filesize_t o)
+void SlaveInterface::setOffset( TDEIO::filesize_t o)
 {
     d->offset = o;
 }
 
-KIO::filesize_t SlaveInterface::offset() const { return d->offset; }
+TDEIO::filesize_t SlaveInterface::offset() const { return d->offset; }
 
 void SlaveInterface::requestNetwork(const TQString &host, const TQString &slaveid)
 {
@@ -510,7 +510,7 @@ void SlaveInterface::messageBox( int type, const TQString &text, const TQString
     TQDataStream stream( packedArgs, IO_WriteOnly );
 
     TQString caption( _caption );
-    if ( type == KIO::SlaveBase::SSLMessageBox )
+    if ( type == TDEIO::SlaveBase::SSLMessageBox )
         caption = TQString::fromUtf8(kapp->dcopClient()->appId()); // hack, see observer.cpp
 
     emit needProgressId();
diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h
index 9d278adfc..79d797e08 100644
--- a/kio/kio/slaveinterface.h
+++ b/kio/kio/slaveinterface.h
@@ -30,7 +30,7 @@
 #include <kio/authinfo.h>
 #include <kdatastream.h>
 
-namespace KIO {
+namespace TDEIO {
 
 class Connection;
 // better there is one ...
@@ -85,7 +85,7 @@ class SlaveInterfacePrivate;
 
 /**
  * There are two classes that specifies the protocol between application
- * (KIO::Job) and kioslave. SlaveInterface is the class to use on the application
+ * (TDEIO::Job) and kioslave. SlaveInterface is the class to use on the application
  * end, SlaveBase is the one to use on the slave end.
  *
  * A call to foo() results in a call to slotFoo() on the other end.
@@ -109,8 +109,8 @@ public:
      */
     void sendResumeAnswer( bool resume );
 
-    void setOffset( KIO::filesize_t offset );
-    KIO::filesize_t offset() const;
+    void setOffset( TDEIO::filesize_t offset );
+    TDEIO::filesize_t offset() const;
 
 signals:
     ///////////
@@ -123,19 +123,19 @@ signals:
     void connected();
     void finished();
     void slaveStatus(pid_t, const TQCString &, const TQString &, bool);
-    void listEntries( const KIO::UDSEntryList& );
-    void statEntry( const KIO::UDSEntry& );
+    void listEntries( const TDEIO::UDSEntryList& );
+    void statEntry( const TDEIO::UDSEntry& );
     void needSubURLData();
     void needProgressId();
 
-    void canResume( KIO::filesize_t ) ;
+    void canResume( TDEIO::filesize_t ) ;
 
     ///////////
     // Info sent by the slave
     //////////
-    void metaData( const KIO::MetaData & );
-    void totalSize( KIO::filesize_t ) ;
-    void processedSize( KIO::filesize_t ) ;
+    void metaData( const TDEIO::MetaData & );
+    void totalSize( TDEIO::filesize_t ) ;
+    void processedSize( TDEIO::filesize_t ) ;
     void redirection( const KURL& ) ;
     void localURL( const KURL&, bool ) ;
 
@@ -172,7 +172,7 @@ protected:
     * using default values:
     *
     * \code
-    * KIO::AuthInfo authInfo;
+    * TDEIO::AuthInfo authInfo;
     * bool result = openPassDlg( authInfo );
     * if ( result )
     * {
@@ -203,7 +203,7 @@ protected:
      * @param       info See AuthInfo.
      * @return      true if user clicks on "OK", false otherwsie.
      */
-    void openPassDlg( KIO::AuthInfo& info );
+    void openPassDlg( TDEIO::AuthInfo& info );
 
    /**
     * @deprecated. Use openPassDlg( AuthInfo& ) instead.
@@ -252,16 +252,16 @@ private:
 
 }
 
-inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a )
+inline TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSAtom &a )
 {
     TQ_INT32 l;
     s >> a.m_uds;
 
-    if ( a.m_uds & KIO::UDS_LONG ) {
+    if ( a.m_uds & TDEIO::UDS_LONG ) {
         s >> l;
         a.m_long = l;
         a.m_str = TQString::null;
-    } else if ( a.m_uds & KIO::UDS_STRING ) {
+    } else if ( a.m_uds & TDEIO::UDS_STRING ) {
         s >> a.m_str;
         a.m_long = 0;
     } else {} // DIE!
@@ -270,13 +270,13 @@ inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a )
     return s;
 }
 
-inline TQDataStream &operator <<(TQDataStream &s, const KIO::UDSAtom &a )
+inline TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSAtom &a )
 {
     s << a.m_uds;
 
-    if ( a.m_uds & KIO::UDS_LONG )
+    if ( a.m_uds & TDEIO::UDS_LONG )
         s << (TQ_INT32) a.m_long;
-    else if ( a.m_uds & KIO::UDS_STRING )
+    else if ( a.m_uds & TDEIO::UDS_STRING )
         s << a.m_str;
     else {} // DIE!
     //    assert( 0 );
@@ -284,7 +284,7 @@ inline TQDataStream &operator <<(TQDataStream &s, const KIO::UDSAtom &a )
     return s;
 }
 
-KIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e );
-KIO_EXPORT TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e );
+KIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e );
+KIO_EXPORT TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e );
 
 #endif
diff --git a/kio/kio/statusbarprogress.cpp b/kio/kio/statusbarprogress.cpp
index 777f96e58..66517ca03 100644
--- a/kio/kio/statusbarprogress.cpp
+++ b/kio/kio/statusbarprogress.cpp
@@ -30,7 +30,7 @@
 #include "jobclasses.h"
 #include "statusbarprogress.h"
 
-namespace KIO {
+namespace TDEIO {
 
 StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button )
   : ProgressBase( parent ) {
@@ -71,7 +71,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button )
 }
 
 
-void StatusbarProgress::setJob( KIO::Job *job )
+void StatusbarProgress::setJob( TDEIO::Job *job )
 {
   ProgressBase::setJob( job );
 
@@ -118,20 +118,20 @@ void StatusbarProgress::slotClean() {
 }
 
 
-void StatusbarProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size ) {
+void StatusbarProgress::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size ) {
   m_iTotalSize = size;  // size is measured in bytes
 }
 
-void StatusbarProgress::slotPercent( KIO::Job*, unsigned long percent ) {
+void StatusbarProgress::slotPercent( TDEIO::Job*, unsigned long percent ) {
   m_pProgressBar->setValue( percent );
 }
 
 
-void StatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) {
+void StatusbarProgress::slotSpeed( TDEIO::Job*, unsigned long speed ) {
   if ( speed == 0 ) { // spped is measured in bytes-per-second
     m_pLabel->setText( i18n( " Stalled ") );
   } else {
-    m_pLabel->setText( i18n( " %1/s ").arg( KIO::convertSize( speed )) );
+    m_pLabel->setText( i18n( " %1/s ").arg( TDEIO::convertSize( speed )) );
   }
 }
 
diff --git a/kio/kio/statusbarprogress.h b/kio/kio/statusbarprogress.h
index 6fb460283..58bd77fa9 100644
--- a/kio/kio/statusbarprogress.h
+++ b/kio/kio/statusbarprogress.h
@@ -27,7 +27,7 @@ class TQPushButton;
 class TQLabel;
 class KProgress;
 
-namespace KIO {
+namespace TDEIO {
 
 class Job;
 
@@ -49,7 +49,7 @@ class Job;
 * statusBar()->insertWidget( statusProgress, statusProgress->width() , 0 );
 * ...
 * // create job and connect it to the progress
-* CopyJob* job = KIO::copy(...);
+* CopyJob* job = TDEIO::copy(...);
 * statusProgress->setJob( job );
 * ...
 * \endcode
@@ -76,20 +76,20 @@ public:
    * Sets the job to monitor.
    * @param job the job to monitor
    */
-  void setJob( KIO::Job *job );
+  void setJob( TDEIO::Job *job );
 
 public slots:
   virtual void slotClean();
-  virtual void slotTotalSize( KIO::Job* job, KIO::filesize_t size );
-  virtual void slotPercent( KIO::Job* job, unsigned long percent );
-  virtual void slotSpeed( KIO::Job* job, unsigned long speed );
+  virtual void slotTotalSize( TDEIO::Job* job, TDEIO::filesize_t size );
+  virtual void slotPercent( TDEIO::Job* job, unsigned long percent );
+  virtual void slotSpeed( TDEIO::Job* job, unsigned long speed );
 
 protected:
   KProgress* m_pProgressBar;
   TQLabel* m_pLabel;
   TQPushButton* m_pButton;
 
-  KIO::filesize_t m_iTotalSize;
+  TDEIO::filesize_t m_iTotalSize;
 
   enum Mode { None, Label, Progress };
 
diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp
index dc556ea23..8d3cc49ff 100644
--- a/kio/kio/tcpslavebase.cpp
+++ b/kio/kio/tcpslavebase.cpp
@@ -60,7 +60,7 @@
 
 #include "kio/tcpslavebase.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 class TCPSlaveBase::TcpSlaveBasePrivate
 {
@@ -327,7 +327,7 @@ bool TCPSlaveBase::connectToHost( const TQString &host,
                                    "WarnOnLeaveSSLMode" );
 
            // Move this setting into KSSL instead
-          KConfig *config = new KConfig("kioslaverc");
+          TDEConfig *config = new TDEConfig("kioslaverc");
           config->setGroup("Notification Messages");
 
           if (!config->readBoolEntry("WarnOnLeaveSSLMode", true)) {
@@ -369,7 +369,7 @@ bool TCPSlaveBase::connectToHost( const TQString &host,
     m_iSock = ks.fd();
 
     // store the IP for later
-    const KSocketAddress *sa = ks.peerAddress();
+    const TDESocketAddress *sa = ks.peerAddress();
     if (sa)
       d->ip = sa->nodeName();
     else
@@ -671,7 +671,7 @@ KSSLCertificateHome::KSSLAuthAction aa;
   // We're almost committed.  If we can read the cert, we'll send it now.
   KSSLPKCS12 *pkcs = KSSLCertificateHome::getCertificateByName(certname);
   if (!pkcs && KSSLCertificateHome::hasCertificateByName(certname)) {           // We need the password
-     KIO::AuthInfo ai;
+     TDEIO::AuthInfo ai;
      bool first = true;
      do {
         ai.prompt = i18n("Enter the certificate password:");
@@ -906,7 +906,7 @@ int TCPSlaveBase::verifyCertificate()
                    arg << theurl << mOutgoingMetaData;
                    arg << metaData("window-id").toInt();
                         d->dcc->call("kio_uiserver", "UIServer",
-                                "showSSLInfoDialog(TQString,KIO::MetaData,int)",
+                                "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                                 data, ignoretype, ignore);
                 }
              } while (result == KMessageBox::Yes);
@@ -1033,7 +1033,7 @@ int TCPSlaveBase::verifyCertificate()
                    arg << theurl << mOutgoingMetaData;
                    arg << metaData("window-id").toInt();
                         d->dcc->call("kio_uiserver", "UIServer",
-                                "showSSLInfoDialog(TQString,KIO::MetaData,int)",
+                                "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                                 data, ignoretype, ignore);
                 }
           } while (result == KMessageBox::Yes);
@@ -1090,7 +1090,7 @@ int TCPSlaveBase::verifyCertificate()
                                                    i18n("C&onnect"),
                                                    "WarnOnEnterSSLMode" );
       // Move this setting into KSSL instead
-      KConfig *config = new KConfig("kioslaverc");
+      TDEConfig *config = new TDEConfig("kioslaverc");
       config->setGroup("Notification Messages");
 
       if (!config->readBoolEntry("WarnOnEnterSSLMode", true)) {
@@ -1117,7 +1117,7 @@ int TCPSlaveBase::verifyCertificate()
           arg << theurl << mOutgoingMetaData;
           arg << metaData("window-id").toInt();
           d->dcc->call("kio_uiserver", "UIServer",
-                       "showSSLInfoDialog(TQString,KIO::MetaData,int)",
+                       "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                        data, ignoretype, ignore);
       }
       } while (result != KMessageBox::No);
diff --git a/kio/kio/tcpslavebase.h b/kio/kio/tcpslavebase.h
index fd148b00d..8a4e436ce 100644
--- a/kio/kio/tcpslavebase.h
+++ b/kio/kio/tcpslavebase.h
@@ -31,7 +31,7 @@
 #include <kio/slavebase.h>
 
 
-namespace KIO {
+namespace TDEIO {
 
 /**
  * There are two classes that specifies the protocol between application (job)
diff --git a/kio/kio/thumbcreator.h b/kio/kio/thumbcreator.h
index 3ad6ca8aa..79d499e7f 100644
--- a/kio/kio/thumbcreator.h
+++ b/kio/kio/thumbcreator.h
@@ -26,7 +26,7 @@ class TQString;
 class TQImage;
 /**
  * This is the baseclass for "thumbnail-plugins" in KDE. Using the class
- * KIO::PreviewJob allows you to generate small images (thumbnails)
+ * TDEIO::PreviewJob allows you to generate small images (thumbnails)
  * for any kind of file, where a "ThumbCreator" is available. Have a look
  * at tdebase/kioslave/thumbnail/ for existing ThumbCreators.
  *
diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp
index 22c539a75..40badcbe0 100644
--- a/kio/kioexec/main.cpp
+++ b/kio/kioexec/main.cpp
@@ -61,11 +61,11 @@ static KCmdLineOptions options[] =
 
 int jobCounter = 0;
 
-TQPtrList<KIO::Job>* jobList = 0L;
+TQPtrList<TDEIO::Job>* jobList = 0L;
 
 KIOExec::KIOExec()
 {
-    jobList = new TQPtrList<KIO::Job>;
+    jobList = new TQPtrList<TDEIO::Job>;
     jobList->setAutoDelete( false ); // jobs autodelete themselves
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@@ -83,7 +83,7 @@ KIOExec::KIOExec()
     {
         KURL url = args->url(i);
         // we need to map system:/ etc to make sure we get this right
-        url = KIO::NetAccess::mostLocalURL( url, 0 );
+        url = TDEIO::NetAccess::mostLocalURL( url, 0 );
 
         //kdDebug() << "url=" << url.url() << " filename=" << url.fileName() << endl;
         // A local file, not an URL ?
@@ -105,7 +105,7 @@ KIOExec::KIOExec()
             else
             // We must fetch the file
             {
-                TQString fileName = KIO::encodeFileName( url.fileName() );
+                TQString fileName = TDEIO::encodeFileName( url.fileName() );
                 if ( !suggestedFileName.isEmpty() )
                     fileName = suggestedFileName;
                 // Build the destination filename, in ~/.trinity/cache-*/krun/
@@ -122,10 +122,10 @@ KIOExec::KIOExec()
                 KURL dest;
                 dest.setPath( tmp );
                 kdDebug() << "Copying " << url.prettyURL() << " to " << dest << endl;
-                KIO::Job *job = KIO::file_copy( url, dest );
+                TDEIO::Job *job = TDEIO::file_copy( url, dest );
                 jobList->append( job );
 
-                connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) );
+                connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) );
             }
         }
     }
@@ -143,16 +143,16 @@ KIOExec::KIOExec()
         slotResult( 0L );
 }
 
-void KIOExec::slotResult( KIO::Job * job )
+void KIOExec::slotResult( TDEIO::Job * job )
 {
     if (job && job->error())
     {
         // That error dialog would be queued, i.e. not immediate...
         //job->showErrorDialog();
-        if ( (job->error() != KIO::ERR_USER_CANCELED) )
+        if ( (job->error() != TDEIO::ERR_USER_CANCELED) )
             KMessageBox::error( 0L, job->errorString() );
 
-        TQString path = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
+        TQString path = static_cast<TDEIO::FileCopyJob*>(job)->destURL().path();
 
         TQValueList<fileInfo>::Iterator it = fileList.begin();
         for(;it != fileList.end(); ++it)
@@ -164,7 +164,7 @@ void KIOExec::slotResult( KIO::Job * job )
         if ( it != fileList.end() )
            fileList.remove( it );
         else
-           kdDebug() <<  static_cast<KIO::FileCopyJob*>(job)->destURL().path() << " not found in list" << endl;
+           kdDebug() <<  static_cast<TDEIO::FileCopyJob*>(job)->destURL().path() << " not found in list" << endl;
     }
 
     counter++;
@@ -246,9 +246,9 @@ void KIOExec::slotRunApp()
                 {
                     kdDebug() << TQString(TQString("src='%1'  dest='%2'").arg(src).arg(dest.url())).ascii() << endl;
                     // Do it the synchronous way.
-                    if ( !KIO::NetAccess::upload( src, dest, 0 ) )
+                    if ( !TDEIO::NetAccess::upload( src, dest, 0 ) )
                     {
-                        KMessageBox::error( 0L, KIO::NetAccess::lastErrorString() );
+                        KMessageBox::error( 0L, TDEIO::NetAccess::lastErrorString() );
                         continue; // don't delete the temp file
                     }
                 }
diff --git a/kio/kioexec/main.h b/kio/kioexec/main.h
index 6a5dee65e..beb6a2297 100644
--- a/kio/kioexec/main.h
+++ b/kio/kioexec/main.h
@@ -6,7 +6,7 @@
 #include <tqstrlist.h>
 #include <tqtimer.h>
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 class KIOExec : public TQObject
 {
@@ -15,7 +15,7 @@ public:
     KIOExec();
 
 public slots:
-    void slotResult( KIO::Job * );
+    void slotResult( TDEIO::Job * );
     void slotRunApp();
 
 protected:
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp
index 0f7b2cc58..7b140c467 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/kio/kpasswdserver/kpasswdserver.cpp
@@ -100,7 +100,7 @@ static TQString makeMapKey( const char* key, int entryNumber )
     return str;
 }
 
-static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const KIO::AuthInfo &info )
+static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const TDEIO::AuthInfo &info )
 {
     if ( !wallet->hasFolder( KWallet::Wallet::PasswordFolder() ) )
         if ( !wallet->createFolder( KWallet::Wallet::PasswordFolder() ) )
@@ -175,14 +175,14 @@ static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const
     return false;
 }
 
-KIO::AuthInfo
-KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId)
+TDEIO::AuthInfo
+KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId)
 {
     return checkAuthInfo(info, windowId, 0);
 }
 
-KIO::AuthInfo
-KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long usertime)
+TDEIO::AuthInfo
+KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long usertime)
 {
     kdDebug(130) << "KPasswdServer::checkAuthInfo: User= " << info.username
               << ", WindowId = " << windowId << endl;
@@ -242,14 +242,14 @@ KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long us
     return copyAuthInfo(result);
 }
 
-KIO::AuthInfo
-KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr)
+TDEIO::AuthInfo
+KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr)
 {
     return queryAuthInfo(info, errorMsg, windowId, seqNr, 0 );
 }
 
-KIO::AuthInfo
-KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr, unsigned long usertime)
+TDEIO::AuthInfo
+KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr, unsigned long usertime)
 {
     kdDebug(130) << "KPasswdServer::queryAuthInfo: User= " << info.username
               << ", Message= " << info.prompt << ", WindowId = " << windowId << endl;
@@ -285,7 +285,7 @@ KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowI
 }
 
 void
-KPasswdServer::addAuthInfo(KIO::AuthInfo info, long windowId)
+KPasswdServer::addAuthInfo(TDEIO::AuthInfo info, long windowId)
 {
     kdDebug(130) << "KPasswdServer::addAuthInfo: User= " << info.username
               << ", RealmValue= " << info.realmValue << ", WindowId = " << windowId << endl;
@@ -316,7 +316,7 @@ KPasswdServer::processRequest()
     if (!request)
        return;
 
-    KIO::AuthInfo &info = request->info;
+    TDEIO::AuthInfo &info = request->info;
 
     kdDebug(130) << "KPasswdServer::processRequest: User= " << info.username
               << ", Message= " << info.prompt << endl;
@@ -366,7 +366,7 @@ KPasswdServer::processRequest()
                     hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins );
             }
 
-            KIO::PasswordDialog dlg( info.prompt, username, info.keepPassword );
+            TDEIO::PasswordDialog dlg( info.prompt, username, info.keepPassword );
             if (info.caption.isEmpty())
                dlg.setPlainCaption( i18n("Authorization Dialog") );
             else
@@ -428,7 +428,7 @@ KPasswdServer::processRequest()
 
     TQDataStream stream2(replyData, IO_WriteOnly);
     stream2 << info << m_seqNr;
-    replyType = "KIO::AuthInfo";
+    replyType = "TDEIO::AuthInfo";
     request->client->endTransaction( request->transaction,
                                      replyType, replyData);
 
@@ -479,11 +479,11 @@ KPasswdServer::processRequest()
            else
            {
                updateAuthExpire(waitRequest->key, result, waitRequest->windowId, false);
-               KIO::AuthInfo info = copyAuthInfo(result);
+               TDEIO::AuthInfo info = copyAuthInfo(result);
                stream2 << info;
            }
 
-           replyType = "KIO::AuthInfo";
+           replyType = "TDEIO::AuthInfo";
            waitRequest->client->endTransaction( waitRequest->transaction,
                                                 replyType, replyData);
 
@@ -497,7 +497,7 @@ KPasswdServer::processRequest()
 
 }
 
-TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info )
+TQString KPasswdServer::createCacheKey( const TDEIO::AuthInfo &info )
 {
     if( !info.url.isValid() ) {
         // Note that a null key will break findAuthInfoItem later on...
@@ -524,10 +524,10 @@ TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info )
     return key;
 }
 
-KIO::AuthInfo
+TDEIO::AuthInfo
 KPasswdServer::copyAuthInfo(const AuthInfo *i)
 {
-    KIO::AuthInfo result;
+    TDEIO::AuthInfo result;
     result.url = i->url;
     result.username = i->username;
     result.password = i->password;
@@ -539,7 +539,7 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i)
 }
 
 const KPasswdServer::AuthInfo *
-KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
+KPasswdServer::findAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info)
 {
    AuthInfoList *authList = m_authDict.find(key);
    if (!authList)
@@ -577,7 +577,7 @@ KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
 }
 
 void
-KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
+KPasswdServer::removeAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info)
 {
    AuthInfoList *authList = m_authDict.find(key);
    if (!authList)
@@ -604,7 +604,7 @@ KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info
 
 
 void
-KPasswdServer::addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled)
+KPasswdServer::addAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info, long windowId, long seqNr, bool canceled)
 {
    AuthInfoList *authList = m_authDict.find(key);
    if (!authList)
diff --git a/kio/kpasswdserver/kpasswdserver.h b/kio/kpasswdserver/kpasswdserver.h
index cf44681bf..46e7191db 100644
--- a/kio/kpasswdserver/kpasswdserver.h
+++ b/kio/kpasswdserver/kpasswdserver.h
@@ -46,11 +46,11 @@ public:
 
 k_dcop:
   // KDE4 merge
-  KIO::AuthInfo checkAuthInfo(KIO::AuthInfo, long, unsigned long);
-  KIO::AuthInfo checkAuthInfo(KIO::AuthInfo, long);
-  KIO::AuthInfo queryAuthInfo(KIO::AuthInfo, TQString, long, long, unsigned long);
-  KIO::AuthInfo queryAuthInfo(KIO::AuthInfo, TQString, long, long);
-  void addAuthInfo(KIO::AuthInfo, long);
+  TDEIO::AuthInfo checkAuthInfo(TDEIO::AuthInfo, long, unsigned long);
+  TDEIO::AuthInfo checkAuthInfo(TDEIO::AuthInfo, long);
+  TDEIO::AuthInfo queryAuthInfo(TDEIO::AuthInfo, TQString, long, long, unsigned long);
+  TDEIO::AuthInfo queryAuthInfo(TDEIO::AuthInfo, TQString, long, long);
+  void addAuthInfo(TDEIO::AuthInfo, long);
 
 public slots:
   void processRequest();
@@ -60,11 +60,11 @@ public slots:
 protected:
   struct AuthInfo;
 
-  TQString createCacheKey( const KIO::AuthInfo &info );
-  const AuthInfo *findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info);
-  void removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info);
-  void addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled);
-  KIO::AuthInfo copyAuthInfo(const AuthInfo *);
+  TQString createCacheKey( const TDEIO::AuthInfo &info );
+  const AuthInfo *findAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info);
+  void removeAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info);
+  void addAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info, long windowId, long seqNr, bool canceled);
+  TDEIO::AuthInfo copyAuthInfo(const AuthInfo *);
   void updateAuthExpire(const TQString &key, const AuthInfo *, long windowId, bool keep);
   int findWalletEntry( const TQMap<TQString,TQString>& map, const TQString& username );
   bool openWallet( WId windowId );
@@ -100,7 +100,7 @@ protected:
      DCOPClient *client;
      DCOPClientTransaction *transaction;
      TQString key;
-     KIO::AuthInfo info;
+     TDEIO::AuthInfo info;
      TQString errorMsg;
      long windowId;
      long seqNr;
diff --git a/kio/kssl/TODO b/kio/kssl/TODO
index f24761473..7e2270575 100644
--- a/kio/kssl/TODO
+++ b/kio/kssl/TODO
@@ -15,7 +15,7 @@
 
 - <keygen> is not working.
 
-- Namespace it all to KIO::SSL:: in KDE4
+- Namespace it all to TDEIO::SSL:: in KDE4
 
 - Remove SSLv2
 
diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc
index e327cd68b..9983edceb 100644
--- a/kio/kssl/kopenssl.cc
+++ b/kio/kssl/kopenssl.cc
@@ -273,12 +273,12 @@ KOpenSSLProxy::KOpenSSLProxy() {
 KLibLoader *ll = KLibLoader::self();
 _ok = false;
 TQStringList libpaths, libnamesc, libnamess;
-KConfig *cfg;
+TDEConfig *cfg;
 
    _cryptoLib = 0L;
    _sslLib = 0L;
 
-   cfg = new KConfig("cryptodefaults", false, false);
+   cfg = new TDEConfig("cryptodefaults", false, false);
    cfg->setGroup("OpenSSL");
    TQString upath = cfg->readPathEntry("Path");
    if (!upath.isEmpty())
diff --git a/kio/kssl/kssl/certkde b/kio/kssl/kssl/certkde
index 2a46393f9..37c924f83 100755
--- a/kio/kssl/kssl/certkde
+++ b/kio/kssl/kssl/certkde
@@ -3,7 +3,7 @@ eval 'exec perl -S $0 ${1+"$@"}'
     if $running_under_some_shell;
 
 ##
-##   Generate the KDE CA list KConfig file
+##   Generate the KDE CA list TDEConfig file
 ##
 
 %CERT = ();
diff --git a/kio/kssl/ksslcertificatehome.cc b/kio/kssl/ksslcertificatehome.cc
index c722e2c6b..39470c5ab 100644
--- a/kio/kssl/ksslcertificatehome.cc
+++ b/kio/kssl/ksslcertificatehome.cc
@@ -186,7 +186,7 @@ KSimpleConfig cfg("ksslauthmap", false);
 
 
 TQString KSSLCertificateHome::getDefaultCertificateName(KSSLAuthAction *aa) {
-KConfig cfg("cryptodefaults", false);
+TDEConfig cfg("cryptodefaults", false);
 
    cfg.setGroup("Auth");
    if (aa) {
diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc
index 26f6114a1..eb91ea9cb 100644
--- a/kio/kssl/ksslsettings.cc
+++ b/kio/kssl/ksslsettings.cc
@@ -96,7 +96,7 @@ public:
 
 KSSLSettings::KSSLSettings(bool readConfig) {
   d = new KSSLSettingsPrivate;
-  m_cfg = new KConfig("cryptodefaults", false, false);
+  m_cfg = new TDEConfig("cryptodefaults", false, false);
 
   if (!TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) {
     //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl;
diff --git a/kio/kssl/ksslsettings.h b/kio/kssl/ksslsettings.h
index 44345937b..1b56a7a3a 100644
--- a/kio/kssl/ksslsettings.h
+++ b/kio/kssl/ksslsettings.h
@@ -208,7 +208,7 @@ public:
 	void save();
 
 private:
-	KConfig *m_cfg;
+	TDEConfig *m_cfg;
 	bool m_bUseSSLv2, m_bUseSSLv3, m_bUseTLSv1;
 	bool m_bWarnOnEnter, m_bWarnOnUnencrypted, m_bWarnOnLeave, m_bWarnOnMixed;
 	bool m_bWarnSelfSigned, m_bWarnRevoked, m_bWarnExpired;
diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp
index 19417b1fb..c150a732c 100644
--- a/kio/misc/kpac/downloader.cpp
+++ b/kio/misc/kpac/downloader.cpp
@@ -43,10 +43,10 @@ namespace KPAC
         m_script = TQString::null;
         m_scriptURL = url;
 
-        KIO::TransferJob* job = KIO::get( url, false, false );
-        connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-                 TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
-        connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( result( KIO::Job* ) ) );
+        TDEIO::TransferJob* job = TDEIO::get( url, false, false );
+        connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+                 TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+        connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) );
     }
 
     void Downloader::failed()
@@ -59,16 +59,16 @@ namespace KPAC
         m_error = error;
     }
 
-    void Downloader::data( KIO::Job*, const TQByteArray& data )
+    void Downloader::data( TDEIO::Job*, const TQByteArray& data )
     {
         unsigned offset = m_data.size();
         m_data.resize( offset + data.size() );
         std::memcpy( m_data.data() + offset, data.data(), data.size() );
     }
 
-    void Downloader::result( KIO::Job* job )
+    void Downloader::result( TDEIO::Job* job )
     {
-        if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() )
+        if ( !job->error() && !static_cast< TDEIO::TransferJob* >( job )->isErrorPage() )
         {
             bool dummy;
             m_script = TDEGlobal::charsets()->codecForName(
diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h
index 82418882f..808e09378 100644
--- a/kio/misc/kpac/downloader.h
+++ b/kio/misc/kpac/downloader.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 namespace KPAC
 {
@@ -48,8 +48,8 @@ namespace KPAC
         void setError( const TQString& );
 
     private slots:
-        void data( KIO::Job*, const TQByteArray& );
-        void result( KIO::Job* );
+        void data( TDEIO::Job*, const TQByteArray& );
+        void result( TDEIO::Job* );
 
     private:
         TQByteArray m_data;
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index 36a417b88..d282782fc 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -158,7 +158,7 @@ void SMTP::connectTimerTick(void)
     }
 
     kdDebug() << "connecting to " << serverHost << ":" << hostPort << " ..... " << endl;
-    sock = new KSocket(serverHost.ascii(), hostPort);
+    sock = new TDESocket(serverHost.ascii(), hostPort);
 
     if(sock == 0L || sock->socket() < 0) {
         timeOutTimer.stop();
@@ -173,8 +173,8 @@ void SMTP::connectTimerTick(void)
     state = INIT;
     serverState = NONE;
 
-    connect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *)));
-    connect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *)));
+    connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
+    connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
     //    sock->enableRead(true);
     timeOutTimer.stop();
     kdDebug() << "connected" << endl;
@@ -202,7 +202,7 @@ void SMTP::interactTimedOut(void)
     emit error(INTERACTTIMEOUT);
 }
 
-void SMTP::socketRead(KSocket *socket)
+void SMTP::socketRead(TDESocket *socket)
 {
     int n, nl;
 
@@ -228,11 +228,11 @@ void SMTP::socketRead(KSocket *socket)
         interactTimer.start(timeOut, true);
 }
 
-void SMTP::socketClose(KSocket *socket)
+void SMTP::socketClose(TDESocket *socket)
 {
     timeOutTimer.stop();
-    disconnect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *)));
-    disconnect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *)));
+    disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
+    disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
     socket->enableRead(false);
     kdDebug() << "connection terminated" << endl;
     connected = false;
diff --git a/kio/misc/ksendbugmail/smtp.h b/kio/misc/ksendbugmail/smtp.h
index 707d20ae4..acdb4a3c3 100644
--- a/kio/misc/ksendbugmail/smtp.h
+++ b/kio/misc/ksendbugmail/smtp.h
@@ -104,8 +104,8 @@ public slots:
     void connectTimedOut();
     void interactTimedOut();
 
-    void socketRead(KSocket *);
-    void socketClose(KSocket *);
+    void socketRead(TDESocket *);
+    void socketClose(TDESocket *);
 
 signals:
     void connectionClosed();
@@ -131,7 +131,7 @@ private:
 
     TQString domainName;
 
-    KSocket *sock;
+    TDESocket *sock;
     TQTimer connectTimer;
     TQTimer timeOutTimer;
     TQTimer interactTimer;
diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp
index 40c52a1be..22bf6ab84 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/kio/misc/kssld/kssld.cpp
@@ -61,7 +61,7 @@ extern "C" {
 }
 
 
-static void updatePoliciesConfig(KConfig *cfg) {
+static void updatePoliciesConfig(TDEConfig *cfg) {
 	TQStringList groups = cfg->groupList();
 
 	for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) {
@@ -641,7 +641,7 @@ TQFile out(path);
 	if (!out.open(IO_WriteOnly))
 		return false;
 
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 TQStringList x = cfg.groupList();
 
@@ -677,7 +677,7 @@ KSSLCertificate *x = KSSLCertificate::fromString(certificate.local8Bit());
 
 	if (!x) return false;
 
-KConfig cfg("ksslcalist", false, false);
+TDEConfig cfg("ksslcalist", false, false);
 
 	cfg.setGroup(x->getSubject());
 	cfg.writeEntry("x509", certificate);
@@ -766,7 +766,7 @@ bool KSSLD::caRemoveFromFile(TQString filename) {
 
 TQStringList KSSLD::caList() {
 TQStringList x;
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	x = cfg.groupList();
 	x.remove("<default>");
@@ -776,7 +776,7 @@ return x;
 
 
 bool KSSLD::caUseForSSL(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	if (!cfg.hasGroup(subject))
 		return false;
@@ -788,7 +788,7 @@ return cfg.readBoolEntry("site", false);
 
 
 bool KSSLD::caUseForEmail(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	if (!cfg.hasGroup(subject))
 		return false;
@@ -800,7 +800,7 @@ return cfg.readBoolEntry("email", false);
 
 
 bool KSSLD::caUseForCode(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	if (!cfg.hasGroup(subject))
 		return false;
@@ -811,7 +811,7 @@ return cfg.readBoolEntry("code", false);
 
 
 bool KSSLD::caRemove(TQString subject) {
-KConfig cfg("ksslcalist", false, false);
+TDEConfig cfg("ksslcalist", false, false);
 	if (!cfg.hasGroup(subject))
 		return false;
 
@@ -823,7 +823,7 @@ return true;
 
 
 TQString KSSLD::caGetCert(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 	if (!cfg.hasGroup(subject))
 		return TQString::null;
 
@@ -834,7 +834,7 @@ return cfg.readEntry("x509", TQString::null);
 
 
 bool KSSLD::caSetUse(TQString subject, bool ssl, bool email, bool code) {
-KConfig cfg("ksslcalist", false, false);
+TDEConfig cfg("ksslcalist", false, false);
 	if (!cfg.hasGroup(subject))
 		return false;
 
diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp
index ea8708863..cf1b5694c 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/kio/misc/ktelnetservice.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 	if (args->count() != 1)
 		return 1;
 
-	KConfig *config = new KConfig("kdeglobals", true);
+	TDEConfig *config = new TDEConfig("kdeglobals", true);
 	config->setGroup("General");
 	TQString terminal = config->readPathEntry("TerminalApplication", "konsole");
 
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp
index e87f96c31..afa634c64 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/kwalletd/kwalletd.cpp
@@ -314,7 +314,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 		setupDialog( wiz, wId, appid, modal );
 		int rc = wiz->exec();
 		if (rc == TQDialog::Accepted) {
-			KConfig cfg("kwalletrc");
+			TDEConfig cfg("kwalletrc");
 			cfg.setGroup("Wallet");
 			cfg.writeEntry("First Use", false);
 			cfg.writeEntry("Enabled", wiz->_useWallet->isChecked());
@@ -344,7 +344,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 			return -1;
 		}
 	} else if (_firstUse) {
-		KConfig cfg("kwalletrc");
+		TDEConfig cfg("kwalletrc");
 		_firstUse = false;
 		cfg.setGroup("Wallet");
 		cfg.writeEntry("First Use", false);
@@ -564,7 +564,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 
 	if (response == 0 || response == 1) {
 		if (response == 1) {
-			KConfig cfg("kwalletrc");
+			TDEConfig cfg("kwalletrc");
 			cfg.setGroup("Auto Allow");
 			TQStringList apps = cfg.readListEntry(wallet);
 			if (!apps.contains(thisApp)) {
@@ -575,7 +575,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 			}
 		}
 	} else if (response == 3) {
-		KConfig cfg("kwalletrc");
+		TDEConfig cfg("kwalletrc");
 		cfg.setGroup("Auto Deny");
 		TQStringList apps = cfg.readListEntry(wallet);
 		if (!apps.contains(thisApp)) {
@@ -1343,7 +1343,7 @@ void KWalletD::emitWalletListDirty() {
 
 
 void KWalletD::reconfigure() {
-	KConfig cfg("kwalletrc");
+	TDEConfig cfg("kwalletrc");
 	cfg.setGroup("Wallet");
 	_firstUse = cfg.readBoolEntry("First Use", true);
 	_enabled = cfg.readBoolEntry("Enabled", true);
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 3e890c553..e898e5a50 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -192,7 +192,7 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString
   m_defaultProgressVisible = showDefault;
 
   // create dialog, but don't show it
-  defaultProgress = new KIO::DefaultProgress( false );
+  defaultProgress = new TDEIO::DefaultProgress( false );
   defaultProgress->setOnlyClean( true );
   connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) );
   connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) );
@@ -217,11 +217,11 @@ ProgressItem::~ProgressItem() {
 }
 
 
-void ProgressItem::setTotalSize( KIO::filesize_t size ) {
+void ProgressItem::setTotalSize( TDEIO::filesize_t size ) {
   m_iTotalSize = size;
 
   // It's already in the % column...
-  //setText( listProgress->lv_total, KIO::convertSize( m_iTotalSize ) );
+  //setText( listProgress->lv_total, TDEIO::convertSize( m_iTotalSize ) );
 
   defaultProgress->slotTotalSize( 0, m_iTotalSize );
 }
@@ -239,10 +239,10 @@ void ProgressItem::setTotalDirs( unsigned long dirs ) {
 }
 
 
-void ProgressItem::setProcessedSize( KIO::filesize_t size ) {
+void ProgressItem::setProcessedSize( TDEIO::filesize_t size ) {
   m_iProcessedSize = size;
 
-  setText( ListProgress::TB_TOTAL, KIO::convertSize( size ) );
+  setText( ListProgress::TB_TOTAL, TDEIO::convertSize( size ) );
 
   defaultProgress->slotProcessedSize( 0, size );
 }
@@ -264,7 +264,7 @@ void ProgressItem::setProcessedDirs( unsigned long dirs ) {
 
 
 void ProgressItem::setPercent( unsigned long percent ) {
-  const TQString tmps = KIO::DefaultProgress::makePercentString( percent, m_iTotalSize, m_iTotalFiles );
+  const TQString tmps = TDEIO::DefaultProgress::makePercentString( percent, m_iTotalSize, m_iTotalFiles );
   setText( ListProgress::TB_PROGRESS, tmps );
 
   defaultProgress->slotPercent( 0, percent );
@@ -281,15 +281,15 @@ void ProgressItem::setInfoMessage( const TQString & msg ) {
 
 void ProgressItem::setSpeed( unsigned long bytes_per_second ) {
   m_iSpeed = bytes_per_second;
-  m_remainingSeconds = KIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, m_iSpeed );
+  m_remainingSeconds = TDEIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, m_iSpeed );
 
   TQString tmps, tmps2;
   if ( m_iSpeed == 0 ) {
     tmps = i18n( "Stalled");
     tmps2 = tmps;
   } else {
-    tmps = i18n( "%1/s").arg( KIO::convertSize( m_iSpeed ));
-    tmps2 = KIO::convertSeconds( m_remainingSeconds );
+    tmps = i18n( "%1/s").arg( TDEIO::convertSize( m_iSpeed ));
+    tmps2 = TDEIO::convertSeconds( m_remainingSeconds );
   }
   setText( ListProgress::TB_SPEED, tmps );
   setText( ListProgress::TB_REMAINING_TIME, tmps2 );
@@ -382,7 +382,7 @@ void ProgressItem::setUnmounting( const TQString & point ) {
   defaultProgress->slotUnmounting( 0, point );
 }
 
-void ProgressItem::setCanResume( KIO::filesize_t offset ) {
+void ProgressItem::setCanResume( TDEIO::filesize_t offset ) {
   /*
   TQString tmps;
   // set canResume
@@ -527,7 +527,7 @@ void ListProgress::applySettings()
 }
 
 void ListProgress::readSettings() {
-  KConfig config("uiserverrc");
+  TDEConfig config("uiserverrc");
 
   // read listview geometry properties
   config.setGroup( "ProgressList" );
@@ -560,7 +560,7 @@ void ListProgress::columnWidthChanged(int column)
 }
 
 void ListProgress::writeSettings() {
-   KConfig config("uiserverrc");
+   TDEConfig config("uiserverrc");
 
    // write listview geometry properties
    config.setGroup( "ProgressList" );
@@ -830,9 +830,9 @@ void UIServer::jobFinished( int id )
 void UIServer::totalSize( int id, unsigned long size )
 { totalSize64(id, size); }
 
-void UIServer::totalSize64( int id, KIO::filesize_t size )
+void UIServer::totalSize64( int id, TDEIO::filesize_t size )
 {
-//  kdDebug(7024) << "UIServer::totalSize " << id << " " << KIO::number(size) << endl;
+//  kdDebug(7024) << "UIServer::totalSize " << id << " " << TDEIO::number(size) << endl;
 
   ProgressItem *item = findItem( id );
   if ( item ) {
@@ -863,9 +863,9 @@ void UIServer::totalDirs( int id, unsigned long dirs )
 void UIServer::processedSize( int id, unsigned long size )
 { processedSize64(id, size); }
 
-void UIServer::processedSize64( int id, KIO::filesize_t size )
+void UIServer::processedSize64( int id, TDEIO::filesize_t size )
 {
-  //kdDebug(7024) << "UIServer::processedSize " << id << " " << KIO::number(size) << endl;
+  //kdDebug(7024) << "UIServer::processedSize " << id << " " << TDEIO::number(size) << endl;
 
   ProgressItem *item = findItem( id );
   if ( item ) {
@@ -926,7 +926,7 @@ void UIServer::infoMessage( int id, const TQString & msg )
 void UIServer::canResume( int id, unsigned long offset )
 { canResume64(id, offset); }
 
-void UIServer::canResume64( int id, KIO::filesize_t offset )
+void UIServer::canResume64( int id, TDEIO::filesize_t offset )
 {
   //kdDebug(7024) << "UIServer::canResume " << id << " " << offset << endl;
 
@@ -1018,8 +1018,8 @@ void UIServer::unmounting( int id, TQString point )
 
 void UIServer::killJob( TQCString observerAppId, int progressId )
 {
-    // Contact the object "KIO::Observer" in the application <appId>
-    Observer_stub observer( observerAppId, "KIO::Observer" );
+    // Contact the object "TDEIO::Observer" in the application <appId>
+    Observer_stub observer( observerAppId, "TDEIO::Observer" );
     // Tell it to kill the job
     observer.killJob( progressId );
 }
@@ -1029,7 +1029,7 @@ void UIServer::slotJobCanceled( ProgressItem *item ) {
   // kill the corresponding job
   killJob( item->appId(), item->jobId() );
 
-  // KIO::Job, when killed, should call back jobFinished(), but we can't
+  // TDEIO::Job, when killed, should call back jobFinished(), but we can't
   // really rely on that - the app may have crashed
   delete item;
 }
@@ -1071,7 +1071,7 @@ void UIServer::slotUpdate() {
   }
 
   int iTotalFiles = 0;
-  KIO::filesize_t iTotalSize = 0;
+  TDEIO::filesize_t iTotalSize = 0;
   int iTotalSpeed = 0;
   unsigned int totalRemTime = 0; // in seconds
 
@@ -1095,11 +1095,11 @@ void UIServer::slotUpdate() {
 
   // update statusbar
   statusBar()->changeItem( i18n( " Files: %1 ").arg( iTotalFiles ), ID_TOTAL_FILES);
-  statusBar()->changeItem( i18n( "Remaining Size", " Rem. Size: %1 ").arg( KIO::convertSize( iTotalSize ) ),
+  statusBar()->changeItem( i18n( "Remaining Size", " Rem. Size: %1 ").arg( TDEIO::convertSize( iTotalSize ) ),
                            ID_TOTAL_SIZE);
-  statusBar()->changeItem( i18n( "Remaining Time", " Rem. Time: %1 ").arg( KIO::convertSeconds( totalRemTime ) ),
+  statusBar()->changeItem( i18n( "Remaining Time", " Rem. Time: %1 ").arg( TDEIO::convertSeconds( totalRemTime ) ),
                            ID_TOTAL_TIME);
-  statusBar()->changeItem( i18n( " %1/s ").arg( KIO::convertSize( iTotalSpeed ) ),
+  statusBar()->changeItem( i18n( " %1/s ").arg( TDEIO::convertSize( iTotalSpeed ) ),
                            ID_TOTAL_SPEED);
 
 }
@@ -1145,12 +1145,12 @@ void UIServer::slotSelection() {
 
 // This code is deprecated, slaves go to Observer::openPassDlg now,
 // but this is kept for compat (DCOP calls to kio_uiserver).
-TQByteArray UIServer::openPassDlg( const KIO::AuthInfo &info )
+TQByteArray UIServer::openPassDlg( const TDEIO::AuthInfo &info )
 {
     kdDebug(7024) << "UIServer::openPassDlg: User= " << info.username
                   << ", Msg= " << info.prompt << endl;
-    KIO::AuthInfo inf(info);
-    int result = KIO::PasswordDialog::getNameAndPassword( inf.username, inf.password,
+    TDEIO::AuthInfo inf(info);
+    int result = TDEIO::PasswordDialog::getNameAndPassword( inf.username, inf.password,
                                                           &inf.keepPassword, inf.prompt,
                                                           inf.readOnly, inf.caption,
                                                           inf.comment, inf.commentLabel );
@@ -1169,12 +1169,12 @@ int UIServer::messageBox( int progressId, int type, const TQString &text, const
     return Observer::messageBox( progressId, type, text, caption, buttonYes, buttonNo );
 }
 
-void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta)
+void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &meta)
 {
     return showSSLInfoDialog(url,meta,0);
 }
 
-void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta, int mainwindow)
+void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &meta, int mainwindow)
 {
    KSSLInfoDlg *kid = new KSSLInfoDlg(meta["ssl_in_use"].upper()=="TRUE", 0L /*parent?*/, 0L, true);
    KSSLCertificate *x = KSSLCertificate::fromString(meta["ssl_peer_certificate"].local8Bit());
@@ -1269,8 +1269,8 @@ TQByteArray UIServer::open_RenameDlg64( int id,
                                      const TQString & caption,
                                      const TQString& src, const TQString & dest,
                                      int mode,
-                                     KIO::filesize_t sizeSrc,
-                                     KIO::filesize_t sizeDest,
+                                     TDEIO::filesize_t sizeSrc,
+                                     TDEIO::filesize_t sizeDest,
                                      unsigned long ctimeSrc,
                                      unsigned long ctimeDest,
                                      unsigned long mtimeSrc,
@@ -1282,17 +1282,17 @@ TQByteArray UIServer::open_RenameDlg64( int id,
   if ( item )
     setItemVisible( item, false );
   TQString newDest;
-  kdDebug(7024) << "Calling KIO::open_RenameDlg" << endl;
-  KIO::RenameDlg_Result result = KIO::open_RenameDlg( caption, src, dest,
-                                                      (KIO::RenameDlg_Mode) mode, newDest,
+  kdDebug(7024) << "Calling TDEIO::open_RenameDlg" << endl;
+  TDEIO::RenameDlg_Result result = TDEIO::open_RenameDlg( caption, src, dest,
+                                                      (TDEIO::RenameDlg_Mode) mode, newDest,
                                                       sizeSrc, sizeDest,
                                                       (time_t)ctimeSrc, (time_t)ctimeDest,
                                                       (time_t)mtimeSrc, (time_t)mtimeDest );
-  kdDebug(7024) << "KIO::open_RenameDlg done" << endl;
+  kdDebug(7024) << "TDEIO::open_RenameDlg done" << endl;
   TQByteArray data;
   TQDataStream stream( data, IO_WriteOnly );
   stream << TQ_UINT8(result) << newDest;
-  if ( item && result != KIO::R_CANCEL )
+  if ( item && result != TDEIO::R_CANCEL )
     setItemVisible( item, true );
   return data;
 }
@@ -1305,16 +1305,16 @@ int UIServer::open_SkipDlg( int id,
   ProgressItem *item = findItem( id );
   if ( item )
     setItemVisible( item, false );
-  kdDebug(7024) << "Calling KIO::open_SkipDlg" << endl;
-  KIO::SkipDlg_Result result = KIO::open_SkipDlg( (bool)multi, error_text );
-  if ( item && result != KIO::S_CANCEL )
+  kdDebug(7024) << "Calling TDEIO::open_SkipDlg" << endl;
+  TDEIO::SkipDlg_Result result = TDEIO::open_SkipDlg( (bool)multi, error_text );
+  if ( item && result != TDEIO::S_CANCEL )
     setItemVisible( item, true );
-  return (KIO::SkipDlg_Result) result;
+  return (TDEIO::SkipDlg_Result) result;
 }
 
 
 void UIServer::readSettings() {
-  KConfig config("uiserverrc");
+  TDEConfig config("uiserverrc");
   config.setGroup( "UIServer" );
   m_showStatusBar=config.readBoolEntry("ShowStatusBar",false);
   m_showToolBar=config.readBoolEntry("ShowToolBar",true);
@@ -1326,7 +1326,7 @@ void UIServer::readSettings() {
 }
 
 void UIServer::writeSettings() {
-  KConfig config("uiserverrc");
+  TDEConfig config("uiserverrc");
   config.setGroup( "UIServer" );
   config.writeEntry("InitialWidth",width());
   config.writeEntry("InitialHeight",height());
diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h
index 85e255a43..c7cfaf5c0 100644
--- a/kio/misc/uiserver.h
+++ b/kio/misc/uiserver.h
@@ -37,7 +37,7 @@ class KSqueezedTextLabel;
 class ProgressItem;
 class UIServer;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class DefaultProgress;
 }
@@ -122,11 +122,11 @@ public:
   void setDefaultProgressVisible( bool visible );
   bool isVisible() const { return m_visible; }
 
-  void setTotalSize( KIO::filesize_t bytes );
+  void setTotalSize( TDEIO::filesize_t bytes );
   void setTotalFiles( unsigned long files );
   void setTotalDirs( unsigned long dirs );
 
-  void setProcessedSize( KIO::filesize_t size );
+  void setProcessedSize( TDEIO::filesize_t size );
   void setProcessedFiles( unsigned long files );
   void setProcessedDirs( unsigned long dirs );
 
@@ -143,11 +143,11 @@ public:
   void setMounting( const TQString & dev, const TQString & point );
   void setUnmounting( const TQString & point );
 
-  void setCanResume( KIO::filesize_t offset );
+  void setCanResume( TDEIO::filesize_t offset );
 
-  KIO::filesize_t totalSize() { return m_iTotalSize; }
+  TDEIO::filesize_t totalSize() { return m_iTotalSize; }
   unsigned long totalFiles() { return m_iTotalFiles; }
-  KIO::filesize_t processedSize() { return m_iProcessedSize; }
+  TDEIO::filesize_t processedSize() { return m_iProcessedSize; }
   unsigned long processedFiles() { return m_iProcessedFiles; }
   unsigned long speed() { return m_iSpeed; }
   unsigned int remainingSeconds() { return m_remainingSeconds; }
@@ -179,12 +179,12 @@ protected:
   ListProgress *listProgress;
 
   // associated default progress dialog
-  KIO::DefaultProgress *defaultProgress;
+  TDEIO::DefaultProgress *defaultProgress;
 
   // we store these values for calculation of totals ( for statusbar )
-  KIO::filesize_t m_iTotalSize;
+  TDEIO::filesize_t m_iTotalSize;
   unsigned long m_iTotalFiles;
-  KIO::filesize_t m_iProcessedSize;
+  TDEIO::filesize_t m_iProcessedSize;
   unsigned long m_iProcessedFiles;
   unsigned long m_iSpeed;
   int m_remainingSeconds;
@@ -230,7 +230,7 @@ k_dcop:
   /**
    * Signal a new job
    * @param appId the DCOP application id of the job's parent application
-   * @see KIO::Observer::newJob
+   * @see TDEIO::Observer::newJob
    * @param showProgress whether to popup the progress for the job.
    *   Usually true, but may be false when we use kio_uiserver for
    *   other things, like SSL dialogs.
@@ -241,12 +241,12 @@ k_dcop:
   ASYNC jobFinished( int id );
 
   ASYNC totalSize( int id, unsigned long size );
-  ASYNC totalSize64( int id, KIO::filesize_t size );
+  ASYNC totalSize64( int id, TDEIO::filesize_t size );
   ASYNC totalFiles( int id, unsigned long files );
   ASYNC totalDirs( int id, unsigned long dirs );
 
   ASYNC processedSize( int id, unsigned long bytes );
-  ASYNC processedSize64( int id, KIO::filesize_t bytes );
+  ASYNC processedSize64( int id, TDEIO::filesize_t bytes );
   ASYNC processedFiles( int id, unsigned long files );
   ASYNC processedDirs( int id, unsigned long dirs );
 
@@ -265,14 +265,14 @@ k_dcop:
   ASYNC unmounting( int id, TQString point );
 
   ASYNC canResume( int id, unsigned long offset );
-  ASYNC canResume64( int id, KIO::filesize_t offset );
+  ASYNC canResume64( int id, TDEIO::filesize_t offset );
 
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::PasswordDialog::getNameAndPassword instead.
+   * Use TDEIO::PasswordDialog::getNameAndPassword instead.
    * To be removed in KDE 4.0.
    */
-  TQByteArray openPassDlg( const KIO::AuthInfo &info );
+  TQByteArray openPassDlg( const TDEIO::AuthInfo &info );
 
   /**
    * Popup a message box.
@@ -296,15 +296,15 @@ k_dcop:
 
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::open_RenameDlg instead.
+   * Use TDEIO::open_RenameDlg instead.
    * To be removed in KDE 4.0.
    */
   TQByteArray open_RenameDlg64( int id,
                              const TQString & caption,
                              const TQString& src, const TQString & dest,
-                             int /* KIO::RenameDlg_Mode */ mode,
-                             KIO::filesize_t sizeSrc,
-                             KIO::filesize_t sizeDest,
+                             int /* TDEIO::RenameDlg_Mode */ mode,
+                             TDEIO::filesize_t sizeSrc,
+                             TDEIO::filesize_t sizeDest,
                              unsigned long /* time_t */ ctimeSrc,
                              unsigned long /* time_t */ ctimeDest,
                              unsigned long /* time_t */ mtimeSrc,
@@ -312,13 +312,13 @@ k_dcop:
                              );
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::open_RenameDlg instead.
+   * Use TDEIO::open_RenameDlg instead.
    * To be removed in KDE 4.0.
    */
   TQByteArray open_RenameDlg( int id,
                              const TQString & caption,
                              const TQString& src, const TQString & dest,
-                             int /* KIO::RenameDlg_Mode */ mode,
+                             int /* TDEIO::RenameDlg_Mode */ mode,
                              unsigned long sizeSrc,
                              unsigned long sizeDest,
                              unsigned long /* time_t */ ctimeSrc,
@@ -329,7 +329,7 @@ k_dcop:
 
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::open_SkipDlg instead.
+   * Use TDEIO::open_SkipDlg instead.
    * To be removed in KDE 4.0.
    */
   int open_SkipDlg( int id,
@@ -350,12 +350,12 @@ k_dcop:
   /**
    * Show a SSL Information Dialog
    */
-  void showSSLInfoDialog(const TQString &url, const KIO::MetaData &data, int mainwindow);
+  void showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &data, int mainwindow);
 
   /**
    * @deprecated
    */
-  void showSSLInfoDialog(const TQString &url, const KIO::MetaData &data);
+  void showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &data);
 
   /*
    * Show an SSL Certificate Selection Dialog
diff --git a/kio/tests/dataprotocoltest.cpp b/kio/tests/dataprotocoltest.cpp
index 0c8470a61..dfacd92e4 100644
--- a/kio/tests/dataprotocoltest.cpp
+++ b/kio/tests/dataprotocoltest.cpp
@@ -39,7 +39,7 @@ public:
     testStrings("MIME Type: ",mime_type_expected,type);
   }
 
-  void totalSize(KIO::filesize_t bytes) {
+  void totalSize(TDEIO::filesize_t bytes) {
 //    cout << "content size: " << bytes << " bytes" << endl;
   }
 
@@ -47,7 +47,7 @@ public:
 //    meta_data[key] = value;
 //    cout << "§ " << key << " = " << value << endl;
     TQString prefix = "Metadata[\""+key+"\"]: ";
-    KIO::MetaData::Iterator it = attributes_expected.find(key);
+    TDEIO::MetaData::Iterator it = attributes_expected.find(key);
     if (it != attributes_expected.end()) {
       testStrings(prefix,it.data(),value);
       // remove key from map
@@ -60,8 +60,8 @@ public:
 
   void sendMetaData() {
     // check here if attributes_expected contains any excess keys
-    KIO::MetaData::ConstIterator it = attributes_expected.begin();
-    KIO::MetaData::ConstIterator end = attributes_expected.end();
+    TDEIO::MetaData::ConstIterator it = attributes_expected.begin();
+    TDEIO::MetaData::ConstIterator end = attributes_expected.end();
     for (; it != end; ++it) {
       cout << endl << "Metadata[\"" << it.key()
       		<< "\"] was expected but not defined";
@@ -93,7 +93,7 @@ private:
   // -- testcase related members
   TQString mime_type_expected;	// expected mime type
   /** contains all attributes and values the testcase has to set */
-  KIO::MetaData attributes_expected;
+  TDEIO::MetaData attributes_expected;
   /** contains the content as it is expected to be returned */
   TQByteArray content_expected;
   int passed;		// # of passed tests
@@ -150,7 +150,7 @@ public:
   /**
    * sets all attribute-value pairs the testcase must deliver.
    */
-  void setExpectedAttributes(const KIO::MetaData &attres) {
+  void setExpectedAttributes(const TDEIO::MetaData &attres) {
     attributes_expected = attres;
   }
 
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index cd9a99bb8..a0da57244 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -135,9 +135,9 @@ void JobTest::runAll()
 
 void JobTest::cleanup()
 {
-    KIO::NetAccess::del( homeTmpDir(), 0 );
-    KIO::NetAccess::del( otherTmpDir(), 0 );
-    KIO::NetAccess::del( systemTmpDir(), 0 );
+    TDEIO::NetAccess::del( homeTmpDir(), 0 );
+    TDEIO::NetAccess::del( otherTmpDir(), 0 );
+    TDEIO::NetAccess::del( systemTmpDir(), 0 );
 }
 
 static void setTimeStamp( const TQString& path )
@@ -194,19 +194,19 @@ void JobTest::get()
     createTestFile( filePath );
     KURL u; u.setPath( filePath );
     m_result = -1;
-    KIO::StoredTransferJob* job = KIO::storedGet( u );
-    connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-            this, TQT_SLOT( slotGetResult( KIO::Job* ) ) );
+    TDEIO::StoredTransferJob* job = TDEIO::storedGet( u );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+            this, TQT_SLOT( slotGetResult( TDEIO::Job* ) ) );
     kapp->eventLoop()->enterLoop();
     assert( m_result == 0 ); // no error
     assert( m_data.size() == 11 );
     assert( TQCString( m_data ) == "Hello world" );
 }
 
-void JobTest::slotGetResult( KIO::Job* job )
+void JobTest::slotGetResult( TDEIO::Job* job )
 {
     m_result = job->error();
-    m_data = static_cast<KIO::StoredTransferJob *>(job)->data();
+    m_data = static_cast<TDEIO::StoredTransferJob *>(job)->data();
     kapp->eventLoop()->exitLoop();
 }
 
@@ -220,7 +220,7 @@ void JobTest::copyLocalFile( const TQString& src, const TQString& dest )
     d.setPath( dest );
 
     // copy the file with file_copy
-    bool ok = KIO::NetAccess::file_copy( u, d );
+    bool ok = TDEIO::NetAccess::file_copy( u, d );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( TQFile::exists( src ) ); // still there
@@ -234,9 +234,9 @@ void JobTest::copyLocalFile( const TQString& src, const TQString& dest )
         assert( srcInfo.lastModified() == destInfo.lastModified() );
     }
 
-    // cleanup and retry with KIO::copy()
+    // cleanup and retry with TDEIO::copy()
     TQFile::remove( dest );
-    ok = KIO::NetAccess::dircopy( u, d, 0 );
+    ok = TDEIO::NetAccess::dircopy( u, d, 0 );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( TQFile::exists( src ) ); // still there
@@ -262,7 +262,7 @@ void JobTest::copyLocalDirectory( const TQString& src, const TQString& _dest, in
     else
         assert( !TQFile::exists( dest ) );
 
-    bool ok = KIO::NetAccess::dircopy( u, d, 0 );
+    bool ok = TDEIO::NetAccess::dircopy( u, d, 0 );
     assert( ok );
 
     if ( flags & AlreadyExists ) {
@@ -341,13 +341,13 @@ void JobTest::moveLocalFile( const TQString& src, const TQString& dest )
     d.setPath( dest );
 
     // move the file with file_move
-    bool ok = KIO::NetAccess::file_move( u, d );
+    bool ok = TDEIO::NetAccess::file_move( u, d );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( !TQFile::exists( src ) ); // not there anymore
 
-    // move it back with KIO::move()
-    ok = KIO::NetAccess::move( d, u, 0 );
+    // move it back with TDEIO::move()
+    ok = TDEIO::NetAccess::move( d, u, 0 );
     assert( ok );
     assert( !TQFile::exists( dest ) );
     assert( TQFile::exists( src ) ); // it's back
@@ -363,15 +363,15 @@ static void moveLocalSymlink( const TQString& src, const TQString& dest )
     d.setPath( dest );
 
     // move the symlink with move, NOT with file_move
-    bool ok = KIO::NetAccess::move( u, d );
+    bool ok = TDEIO::NetAccess::move( u, d );
     if ( !ok )
-        kdWarning() << KIO::NetAccess::lastError() << endl;
+        kdWarning() << TDEIO::NetAccess::lastError() << endl;
     assert( ok );
     assert ( KDE_lstat( TQFile::encodeName( dest ), &buf ) == 0 );
     assert( !TQFile::exists( src ) ); // not there anymore
 
-    // move it back with KIO::move()
-    ok = KIO::NetAccess::move( d, u, 0 );
+    // move it back with TDEIO::move()
+    ok = TDEIO::NetAccess::move( d, u, 0 );
     assert( ok );
     assert ( KDE_lstat( TQFile::encodeName( dest ), &buf ) != 0 ); // doesn't exist anymore
     assert ( KDE_lstat( TQFile::encodeName( src ), &buf ) == 0 ); // it's back
@@ -388,7 +388,7 @@ void JobTest::moveLocalDirectory( const TQString& src, const TQString& dest )
     KURL d;
     d.setPath( dest );
 
-    bool ok = KIO::NetAccess::move( u, d, 0 );
+    bool ok = TDEIO::NetAccess::move( u, d, 0 );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( TQFileInfo( dest ).isDir() );
@@ -455,12 +455,12 @@ void JobTest::moveFileNoPermissions()
     KURL d;
     d.setPath( dest );
 
-    KIO::CopyJob* job = KIO::move( u, d, 0 );
+    TDEIO::CopyJob* job = TDEIO::move( u, d, 0 );
     job->setInteractive( false ); // no skip dialog, thanks
     TQMap<TQString, TQString> metaData;
-    bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
+    bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
     assert( !ok );
-    assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED );
+    assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED );
     // OK this is fishy. Just like mv(1), KIO's behavior depends on whether
     // a direct rename(2) was used, or a full copy+del. In the first case
     // there is no destination file created, but in the second case the
@@ -482,12 +482,12 @@ void JobTest::moveDirectoryNoPermissions()
     KURL d;
     d.setPath( dest );
 
-    KIO::CopyJob* job = KIO::move( u, d, 0 );
+    TDEIO::CopyJob* job = TDEIO::move( u, d, 0 );
     job->setInteractive( false ); // no skip dialog, thanks
     TQMap<TQString, TQString> metaData;
-    bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
+    bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
     assert( !ok );
-    assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED );
+    assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED );
     assert( TQFile::exists( dest ) ); // see moveFileNoPermissions
     assert( TQFile::exists( src ) );
 }
@@ -497,10 +497,10 @@ void JobTest::listRecursive()
     const TQString src = homeTmpDir();
     KURL u;
     u.setPath( src );
-    KIO::ListJob* job = KIO::listRecursive( u );
-    connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
-             TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) );
-    bool ok = KIO::NetAccess::synchronousRun( job, 0 );
+    TDEIO::ListJob* job = TDEIO::listRecursive( u );
+    connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+             TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+    bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
     m_names.sort();
     check( "listRecursive", m_names.join( "," ), ".,..,"
@@ -510,18 +510,18 @@ void JobTest::listRecursive()
             "fileFromHome,fileFromHome_copied" );
 }
 
-void JobTest::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst )
+void JobTest::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& lst )
 {
-    for( KIO::UDSEntryList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
-        KIO::UDSEntry::ConstIterator it2 = (*it).begin();
+    for( TDEIO::UDSEntryList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+        TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
         TQString displayName;
         KURL url;
         for( ; it2 != (*it).end(); it2++ ) {
             switch ((*it2).m_uds) {
-            case KIO::UDS_NAME:
+            case TDEIO::UDS_NAME:
                 displayName = (*it2).m_str;
                 break;
-            case KIO::UDS_URL:
+            case TDEIO::UDS_URL:
                 url = (*it2).m_str;
                 break;
             }
@@ -564,10 +564,10 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
     kdDebug() << "copying " << u << " to " << d << endl;
 
     // copy the file with file_copy
-    KIO::FileCopyJob* job = KIO::file_copy( u, d );
-    connect( job, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&)),
-             this, TQT_SLOT(slotMimetype(KIO::Job*,const TQString&)) );
-    bool ok = KIO::NetAccess::synchronousRun( job, 0 );
+    TDEIO::FileCopyJob* job = TDEIO::file_copy( u, d );
+    connect( job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)),
+             this, TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) );
+    bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
 
     TQString dest = realSystemPath() + "fileFromHome_copied";
@@ -587,9 +587,9 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
     assert( m_mimetype == "application/octet-stream" );
     //assert( m_mimetype == "text/plain" );
 
-    // cleanup and retry with KIO::copy()
+    // cleanup and retry with TDEIO::copy()
     TQFile::remove( dest );
-    ok = KIO::NetAccess::dircopy( u, d, 0 );
+    ok = TDEIO::NetAccess::dircopy( u, d, 0 );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( TQFile::exists( src ) ); // still there
@@ -604,7 +604,7 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
     kio_resolve_local_urls = true;
 }
 
-void JobTest::slotMimetype(KIO::Job* job, const TQString& type)
+void JobTest::slotMimetype(TDEIO::Job* job, const TQString& type)
 {
     assert( job );
     m_mimetype = type;
diff --git a/kio/tests/jobtest.h b/kio/tests/jobtest.h
index 83ec2da7c..61051fbaf 100644
--- a/kio/tests/jobtest.h
+++ b/kio/tests/jobtest.h
@@ -54,9 +54,9 @@ public:
     void copyFileToSystem();
 
 private slots:
-    void slotEntries( KIO::Job*, const KIO::UDSEntryList& lst );
-    void slotGetResult( KIO::Job* );
-    void slotMimetype(KIO::Job*,const TQString&);
+    void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& lst );
+    void slotGetResult( TDEIO::Job* );
+    void slotMimetype(TDEIO::Job*,const TQString&);
 
 private:
     TQString homeTmpDir() const;
diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp
index e62408204..79ad44e3c 100644
--- a/kio/tests/kdefaultprogresstest.cpp
+++ b/kio/tests/kdefaultprogresstest.cpp
@@ -3,7 +3,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 int main(int argc, char **argv)
 {
diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp
index 01d0a36e9..000fb200c 100644
--- a/kio/tests/kdirlistertest.cpp
+++ b/kio/tests/kdirlistertest.cpp
@@ -82,10 +82,10 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name )
            debug,  TQT_SLOT( infoMessage( const TQString& ) ) );
   connect( lister, TQT_SIGNAL( percent( int ) ),
            debug,  TQT_SLOT( percent( int ) ) );
-  connect( lister, TQT_SIGNAL( totalSize( KIO::filesize_t ) ),
-           debug,  TQT_SLOT( totalSize( KIO::filesize_t ) ) );
-  connect( lister, TQT_SIGNAL( processedSize( KIO::filesize_t ) ),
-           debug,  TQT_SLOT( processedSize( KIO::filesize_t ) ) );
+  connect( lister, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+           debug,  TQT_SLOT( totalSize( TDEIO::filesize_t ) ) );
+  connect( lister, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ),
+           debug,  TQT_SLOT( processedSize( TDEIO::filesize_t ) ) );
   connect( lister, TQT_SIGNAL( speed( int ) ),
            debug,  TQT_SLOT( speed( int ) ) );
 
diff --git a/kio/tests/kdirlistertest.h b/kio/tests/kdirlistertest.h
index 12e72c911..065f7478d 100644
--- a/kio/tests/kdirlistertest.h
+++ b/kio/tests/kdirlistertest.h
@@ -88,10 +88,10 @@ public slots:
    void percent( int percent )
    { cout << "*** percent: " << percent << endl; }
 
-   void totalSize( KIO::filesize_t size )
+   void totalSize( TDEIO::filesize_t size )
    { cout << "*** totalSize: " << (long)size << endl; }
 
-   void processedSize( KIO::filesize_t size )
+   void processedSize( TDEIO::filesize_t size )
    { cout << "*** processedSize: " << (long)size << endl; }
 
    void speed( int bytes_per_second )
diff --git a/kio/tests/kionetrctest.cpp b/kio/tests/kionetrctest.cpp
index 82c669c74..2d96c8495 100644
--- a/kio/tests/kionetrctest.cpp
+++ b/kio/tests/kionetrctest.cpp
@@ -8,8 +8,8 @@
 void output( const KURL& u )
 {
     kdDebug() << "Looking up auto login for: " << u.url() << endl;
-    KIO::NetRC::AutoLogin l;
-    bool result = KIO::NetRC::self()->lookup( u, l, true );
+    TDEIO::NetRC::AutoLogin l;
+    bool result = TDEIO::NetRC::self()->lookup( u, l, true );
     if ( !result )
     {
        kdDebug() << "Either no .netrc and/or .kionetrc file was "
diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp
index 2bbdaa658..adb14a306 100644
--- a/kio/tests/kiopassdlgtest.cpp
+++ b/kio/tests/kiopassdlgtest.cpp
@@ -15,7 +15,7 @@ int main ( int argc, char** argv )
     TQString usr, pass, comment, label;
     label = "Site:";
     comment = "<b>localhost</b>";
-    int res = KIO::PasswordDialog::getNameAndPassword( usr, pass, 0L,
+    int res = TDEIO::PasswordDialog::getNameAndPassword( usr, pass, 0L,
                                                        TQString::null, false,
                                                        TQString::null, comment,
                                                        label );
diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp
index 72a7ffb05..27a99eabc 100644
--- a/kio/tests/kioslavetest.cpp
+++ b/kio/tests/kioslavetest.cpp
@@ -26,7 +26,7 @@
 
 #include "kioslavetest.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
   : KMainWindow(0, "")
@@ -165,10 +165,10 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
   setCentralWidget( main_widget );
 
   slave = 0;
-//  slave = KIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org"));
-  KIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(KIO::Slave*)),
+//  slave = TDEIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org"));
+  TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave*)),
 	this, TQT_SLOT(slotSlaveConnected()));
-  KIO::Scheduler::connect(TQT_SIGNAL(slaveError(KIO::Slave*,int,const TQString&)),
+  TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)),
 	this, TQT_SLOT(slotSlaveError()));
 }
 
@@ -183,7 +183,7 @@ void KioslaveTest::slotQuit(){
     job->kill( true );  // kill the job quietly
   }
   if (slave)
-    KIO::Scheduler::disconnectSlave(slave);
+    TDEIO::Scheduler::disconnectSlave(slave);
   kapp->quit();
 }
 
@@ -241,70 +241,70 @@ void KioslaveTest::startJob() {
 
   switch ( selectedOperation ) {
   case List:
-    myJob = KIO::listDir( src );
-    connect(myJob, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)),
-            TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList&)));
+    myJob = TDEIO::listDir( src );
+    connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+            TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
     break;
 
   case ListRecursive:
-    myJob = KIO::listRecursive( src );
-    connect(myJob, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)),
-            TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList&)));
+    myJob = TDEIO::listRecursive( src );
+    connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+            TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
     break;
 
   case Stat:
-    myJob = KIO::stat( src, false, 2 );
+    myJob = TDEIO::stat( src, false, 2 );
     break;
 
   case Get:
-    myJob = KIO::get( src, true );
-    connect(myJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)),
-            TQT_SLOT( slotData( KIO::Job*, const TQByteArray &)));
+    myJob = TDEIO::get( src, true );
+    connect(myJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+            TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
     break;
 
   case Put:
     putBuffer = 0;
-    myJob = KIO::put( src, -1, true, false);
-    connect(myJob, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray &)),
-            TQT_SLOT( slotDataReq( KIO::Job*, TQByteArray &)));
+    myJob = TDEIO::put( src, -1, true, false);
+    connect(myJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)),
+            TQT_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &)));
     break;
 
   case Copy:
-    job = KIO::copy( src, dest, observe );
+    job = TDEIO::copy( src, dest, observe );
     break;
 
   case Move:
-    job = KIO::move( src, dest, observe );
+    job = TDEIO::move( src, dest, observe );
     break;
 
   case Delete:
-    job = KIO::del( src, false, observe );
+    job = TDEIO::del( src, false, observe );
     break;
 
   case Shred:
-    job = KIO::del(src, true, observe);
+    job = TDEIO::del(src, true, observe);
     break;
 
   case Mkdir:
-    myJob = KIO::mkdir( src );
+    myJob = TDEIO::mkdir( src );
     break;
 
   case Mimetype:
-    myJob = KIO::mimetype( src );
+    myJob = TDEIO::mimetype( src );
     break;
   }
   if (myJob)
   {
     if (slave)
-      KIO::Scheduler::assignJobToSlave(slave, myJob);
+      TDEIO::Scheduler::assignJobToSlave(slave, myJob);
     job = myJob;
   }
 
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 
-  connect( job, TQT_SIGNAL( canceled( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( canceled( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 
   if (progressMode == ProgressStatus) {
     statusProgress->setJob( job );
@@ -314,7 +314,7 @@ void KioslaveTest::startJob() {
 }
 
 
-void KioslaveTest::slotResult( KIO::Job * _job )
+void KioslaveTest::slotResult( TDEIO::Job * _job )
 {
   if ( _job->error() )
   {
@@ -322,12 +322,12 @@ void KioslaveTest::slotResult( KIO::Job * _job )
   }
   else if ( selectedOperation == Stat )
   {
-      UDSEntry entry = ((KIO::StatJob*)_job)->statResult();
+      UDSEntry entry = ((TDEIO::StatJob*)_job)->statResult();
       printUDSEntry( entry );
   }
   else if ( selectedOperation == Mimetype )
   {
-      kdDebug() << "mimetype is " << ((KIO::MimetypeJob*)_job)->mimetype() << endl;
+      kdDebug() << "mimetype is " << ((TDEIO::MimetypeJob*)_job)->mimetype() << endl;
   }
 
   if (job == _job)
@@ -357,62 +357,62 @@ static void printACL( const TQString& acl )
 }
 
 
-void KioslaveTest::printUDSEntry( const KIO::UDSEntry & entry )
+void KioslaveTest::printUDSEntry( const TDEIO::UDSEntry & entry )
 {
-    KIO::UDSEntry::ConstIterator it = entry.begin();
+    TDEIO::UDSEntry::ConstIterator it = entry.begin();
     for( ; it != entry.end(); it++ ) {
         switch ((*it).m_uds) {
-            case KIO::UDS_FILE_TYPE:
+            case TDEIO::UDS_FILE_TYPE:
                 kdDebug() << "File Type : " << (mode_t)((*it).m_long) << endl;
                 if ( S_ISDIR( (mode_t)((*it).m_long) ) )
                 {
                     kdDebug() << "is a dir" << endl;
                 }
                 break;
-            case KIO::UDS_ACCESS:
+            case TDEIO::UDS_ACCESS:
                 kdDebug() << "Access permissions : " << (*it).m_long << endl;
                 break;
-            case KIO::UDS_EXTENDED_ACL:
+            case TDEIO::UDS_EXTENDED_ACL:
                 if( (*it).m_long == 1 )
                   kdDebug() << "Has extended ACL information." << endl;
                 break;
-            case KIO::UDS_ACL_STRING:
+            case TDEIO::UDS_ACL_STRING:
                 kdDebug() << "ACL: " << ( (*it).m_str.ascii() ) << endl;
                 printACL( (*it).m_str );
                 break;
-            case KIO::UDS_DEFAULT_ACL_STRING:
+            case TDEIO::UDS_DEFAULT_ACL_STRING:
                 kdDebug() << "Default ACL: " << ( (*it).m_str.ascii() ) << endl;
                 printACL( (*it).m_str );
                 break;
-            case KIO::UDS_USER:
+            case TDEIO::UDS_USER:
                 kdDebug() << "User : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_GROUP:
+            case TDEIO::UDS_GROUP:
                 kdDebug() << "Group : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_NAME:
+            case TDEIO::UDS_NAME:
                 kdDebug() << "Name : " << ((*it).m_str.ascii() ) << endl;
                 //m_strText = decodeFileName( (*it).m_str );
                 break;
-            case KIO::UDS_URL:
+            case TDEIO::UDS_URL:
                 kdDebug() << "URL : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_MIME_TYPE:
+            case TDEIO::UDS_MIME_TYPE:
                 kdDebug() << "MimeType : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_LINK_DEST:
+            case TDEIO::UDS_LINK_DEST:
                 kdDebug() << "LinkDest : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_SIZE:
-                kdDebug() << "Size: " << KIO::convertSize((*it).m_long) << endl;
+            case TDEIO::UDS_SIZE:
+                kdDebug() << "Size: " << TDEIO::convertSize((*it).m_long) << endl;
                 break;
         }
     }
 }
 
-void KioslaveTest::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list) {
+void KioslaveTest::slotEntries(TDEIO::Job* job, const TDEIO::UDSEntryList& list) {
 
-    KURL url = static_cast<KIO::ListJob*>( job )->url();
+    KURL url = static_cast<TDEIO::ListJob*>( job )->url();
     KProtocolInfo::ExtraFieldList extraFields = KProtocolInfo::extraFields(url);
     UDSEntryListConstIterator it=list.begin();
     for (; it != list.end(); ++it) {
@@ -433,7 +433,7 @@ void KioslaveTest::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list) {
     }
 }
 
-void KioslaveTest::slotData(KIO::Job*, const TQByteArray &data)
+void KioslaveTest::slotData(TDEIO::Job*, const TQByteArray &data)
 {
     if (data.size() == 0)
     {
@@ -445,7 +445,7 @@ void KioslaveTest::slotData(KIO::Job*, const TQByteArray &data)
     }
 }
 
-void KioslaveTest::slotDataReq(KIO::Job*, TQByteArray &data)
+void KioslaveTest::slotDataReq(TDEIO::Job*, TQByteArray &data)
 {
     const char *fileDataArray[] =
        {
diff --git a/kio/tests/kioslavetest.h b/kio/tests/kioslavetest.h
index 02fae7f23..79533bbc5 100644
--- a/kio/tests/kioslavetest.h
+++ b/kio/tests/kioslavetest.h
@@ -41,7 +41,7 @@ protected:
 
   void closeEvent( TQCloseEvent * );
 
-  void printUDSEntry( const KIO::UDSEntry & entry );
+  void printUDSEntry( const TDEIO::UDSEntry & entry );
 
   // info stuff
   TQLabel *lb_from;
@@ -84,25 +84,25 @@ protected slots:
   void startJob();
   void stopJob();
 
-  void slotResult( KIO::Job * );
-  void slotEntries( KIO::Job *, const KIO::UDSEntryList& );
-  void slotData( KIO::Job *, const TQByteArray &data );
-  void slotDataReq( KIO::Job *, TQByteArray &data );
+  void slotResult( TDEIO::Job * );
+  void slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& );
+  void slotData( TDEIO::Job *, const TQByteArray &data );
+  void slotDataReq( TDEIO::Job *, TQByteArray &data );
 
   void slotQuit();
   void slotSlaveConnected();
   void slotSlaveError();
 
 private:
-  KIO::Job *job;
+  TDEIO::Job *job;
   TQWidget *main_widget;
 
-  KIO::StatusbarProgress *statusProgress;
+  TDEIO::StatusbarProgress *statusProgress;
 
   int selectedOperation;
   int progressMode;
   int putBuffer;
-  KIO::Slave *slave;
+  TDEIO::Slave *slave;
 };
 
 #endif // _KIOSLAVETEST_H
diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp
index 66b02bae0..811f03923 100644
--- a/kio/tests/kpropsdlgtest.cpp
+++ b/kio/tests/kpropsdlgtest.cpp
@@ -25,7 +25,7 @@ int main ( int argc, char** argv )
     KURL u = args->url( 0 );
 
     // This is the test for the KPropertiesDialog constructor that is now
-    // documented to NOT work. Passing only a URL means a KIO::stat will happen,
+    // documented to NOT work. Passing only a URL means a TDEIO::stat will happen,
     // and asking for the dialog to be modal too creates problems.
     // (A non-modal, URL-only dialog is the one kicker uses for app buttons, no problem there)
     KPropertiesDialog* dlg = new KPropertiesDialog( u, 0, 0, true /*modal*/, false /*we do exec ourselves*/ );
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 9f4e09013..a5ed8da9d 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -354,7 +354,7 @@ int main(int argc, char **argv)
     filter( "config", tdehome+"/share/config", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" );
 
     // Clean up
-    KIO::NetAccess::del( tdehome, 0 );
+    TDEIO::NetAccess::del( tdehome, 0 );
 
     kdDebug() << "All tests done. Go home..." << endl;
     return 0;
diff --git a/kio/tests/netaccesstest.cpp b/kio/tests/netaccesstest.cpp
index a9aeb66d4..c83f45aae 100644
--- a/kio/tests/netaccesstest.cpp
+++ b/kio/tests/netaccesstest.cpp
@@ -31,8 +31,8 @@ int main(int argc, char **argv)
 
   for ( uint i = 0; i < 4 ; ++i ) {
     kdDebug() << "file_copy" << endl;
-    if ( !KIO::NetAccess::file_copy(srcURL, tmpURL, -1, true, false, 0) )
-      kdError() << "file_copy failed: " << KIO::NetAccess::lastErrorString() << endl;
+    if ( !TDEIO::NetAccess::file_copy(srcURL, tmpURL, -1, true, false, 0) )
+      kdError() << "file_copy failed: " << TDEIO::NetAccess::lastErrorString() << endl;
     else {
       TQFile f( tmpURL.path() );
       if (!f.open(IO_ReadOnly))
diff --git a/kio/tests/previewtest.cpp b/kio/tests/previewtest.cpp
index 52dea6ac7..62f6c3d62 100644
--- a/kio/tests/previewtest.cpp
+++ b/kio/tests/previewtest.cpp
@@ -30,13 +30,13 @@ void PreviewTest::slotGenerate()
 {
     KURL::List urls;
     urls.append(m_url->text());
-    KIO::PreviewJob *job = KIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48);
-    connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)));
+    TDEIO::PreviewJob *job = TDEIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48);
+    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
     connect(job, TQT_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQT_SLOT(slotPreview(const KFileItem *, const TQPixmap &)));
     connect(job, TQT_SIGNAL(failed(const KFileItem *)), TQT_SLOT(slotFailed()));
 }
 
-void PreviewTest::slotResult(KIO::Job*)
+void PreviewTest::slotResult(TDEIO::Job*)
 {
     kdDebug() << "PreviewTest::slotResult(...)" << endl;
 }
diff --git a/kio/tests/previewtest.h b/kio/tests/previewtest.h
index 27d797403..a749e95a3 100644
--- a/kio/tests/previewtest.h
+++ b/kio/tests/previewtest.h
@@ -14,7 +14,7 @@ public:
 
 private slots:
     void slotGenerate();
-    void slotResult(KIO::Job *);
+    void slotResult(TDEIO::Job *);
     void slotPreview( const KFileItem *, const TQPixmap & );
     void slotFailed();
 
diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp
index ae94d83e6..44a7d9330 100644
--- a/kio/tests/speed.cpp
+++ b/kio/tests/speed.cpp
@@ -25,21 +25,21 @@
 #include <tqdir.h>
 #include <kio/global.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 SpeedTest::SpeedTest( const KURL & url )
     : TQObject(0, "speed")
 {
     Job *job = listRecursive( url );
     //Job *job = del( KURL("file:" + TQDir::currentDirPath()) ); DANGEROUS !
-    connect(job, TQT_SIGNAL( result( KIO::Job*)),
-	    TQT_SLOT( finished( KIO::Job* ) ));
-    /*connect(job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)),
-	    TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList&)));
+    connect(job, TQT_SIGNAL( result( TDEIO::Job*)),
+	    TQT_SLOT( finished( TDEIO::Job* ) ));
+    /*connect(job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+	    TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
     */
 }
 
-void SpeedTest::entries(KIO::Job*, const UDSEntryList& list) {
+void SpeedTest::entries(TDEIO::Job*, const UDSEntryList& list) {
 
     UDSEntryListConstIterator it=list.begin();
     for (; it != list.end(); ++it) {
@@ -65,7 +65,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv) {
 
-    TDECmdLineArgs::init( argc, argv, "speedapp", "A KIO::listRecursive testing tool", "0.0" );
+    TDECmdLineArgs::init( argc, argv, "speedapp", "A TDEIO::listRecursive testing tool", "0.0" );
 
     TDECmdLineArgs::addCmdLineOptions( options );
 
@@ -79,15 +79,15 @@ int main(int argc, char **argv) {
     else
       url = "file:" + TQDir::currentDirPath();
 
-    kdDebug() << url.url() << " is probably " << (KIO::probably_slow_mounted(url.path()) ? "slow" : "normal") << " mounted\n";
-    kdDebug() << url.url() << " is " << (KIO::manually_mounted(url.path()) ? "manually" : "system") << " mounted\n";
-    TQString mp = KIO::findDeviceMountPoint(url.path());
+    kdDebug() << url.url() << " is probably " << (TDEIO::probably_slow_mounted(url.path()) ? "slow" : "normal") << " mounted\n";
+    kdDebug() << url.url() << " is " << (TDEIO::manually_mounted(url.path()) ? "manually" : "system") << " mounted\n";
+    TQString mp = TDEIO::findDeviceMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for device " << url.url() << " found\n";
     } else
         kdDebug() << mp << " is the mount point for device " << url.url() << endl;
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -95,7 +95,7 @@ int main(int argc, char **argv) {
     // SpeedTest test( url );
     // app.exec();
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -105,7 +105,7 @@ int main(int argc, char **argv) {
 
     url.setPath(TQDir::homeDirPath());
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
     // SpeedTest test( url );
     // app.exec();
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -126,7 +126,7 @@ int main(int argc, char **argv) {
     else
       url = "file:" + TQDir::currentDirPath();
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
diff --git a/kio/tests/speed.h b/kio/tests/speed.h
index 69b12465f..5b928a18e 100644
--- a/kio/tests/speed.h
+++ b/kio/tests/speed.h
@@ -5,7 +5,7 @@
 #include <kio/global.h>
 #include <kurl.h>
 
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
@@ -16,8 +16,8 @@ public:
     SpeedTest(const KURL & url);
 
 private slots:
-    void entries( KIO::Job *, const KIO::UDSEntryList& );
-    void finished( KIO::Job *job );
+    void entries( TDEIO::Job *, const TDEIO::UDSEntryList& );
+    void finished( TDEIO::Job *job );
 
 };