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

37 files changed, 120 insertions, 120 deletions

diff --git a/lib/kformula/contextstyle.cc b/lib/kformula/contextstyle.cc
index b6067e10..a744e02d 100644
--- a/lib/kformula/contextstyle.cc
+++ b/lib/kformula/contextstyle.cc
@@ -89,7 +89,7 @@ const SymbolTable& ContextStyle::symbolTable() const
 }
 
 
-void ContextStyle::readConfig( KConfig* config, bool init )
+void ContextStyle::readConfig( TDEConfig* config, bool init )
 {
     config->setGroup( "kformula Font" );
     TQString fontName = config->readEntry( "defaultFont", "Times,12,-1,5,50,1,0,0,0,0" );
diff --git a/lib/kformula/contextstyle.h b/lib/kformula/contextstyle.h
index 11a103dd..edf9cefa 100644
--- a/lib/kformula/contextstyle.h
+++ b/lib/kformula/contextstyle.h
@@ -93,7 +93,7 @@ public:
      * installation. Mark as false when this is not intended (i. e. creating
      * configuration dialog from another component)
      */
-    void readConfig( KConfig* config, bool init = true );
+    void readConfig( TDEConfig* config, bool init = true );
 
     bool edit() const { return m_edit; }
     void setEdit( bool e ) { m_edit = e; }
diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc
index 0df68fcb..94f3c241 100644
--- a/lib/kformula/fontstyle.cc
+++ b/lib/kformula/fontstyle.cc
@@ -118,21 +118,21 @@ void FontStyle::installFonts()
         for (TQStringList::iterator it = missing.begin(); it != missing.end(); ++it)
         {
             if ( *it == "arev sans" ) {
-                if (!KIO::NetAccess::exists("fonts:/Personal/Arev.ttf", true, NULL))
+                if (!TDEIO::NetAccess::exists("fonts:/Personal/Arev.ttf", true, NULL))
                     urlList.append(locate("data", "kformula/fonts/Arev.ttf"));
-                if (!KIO::NetAccess::exists("fonts:/Personal/ArevIt.ttf", true, NULL))
+                if (!TDEIO::NetAccess::exists("fonts:/Personal/ArevIt.ttf", true, NULL))
                     urlList.append(locate("data", "kformula/fonts/ArevIt.ttf"));
-                if (!KIO::NetAccess::exists("fonts:/Personal/ArevBd.ttf", true, NULL))
+                if (!TDEIO::NetAccess::exists("fonts:/Personal/ArevBd.ttf", true, NULL))
                     urlList.append(locate("data", "kformula/fonts/ArevBd.ttf"));
-                if (!KIO::NetAccess::exists("fonts:/Personal/ArevBI.ttf", true, NULL))
+                if (!TDEIO::NetAccess::exists("fonts:/Personal/ArevBI.ttf", true, NULL))
                     urlList.append(locate("data", "kformula/fonts/ArevBI.ttf"));
             }
             else {
-                if (!KIO::NetAccess::exists("fonts:/Personal/" + *it + ".ttf", true, NULL))
+                if (!TDEIO::NetAccess::exists("fonts:/Personal/" + *it + ".ttf", true, NULL))
                     urlList.append(locate("data", "kformula/fonts/" + *it + ".ttf"));
             }
         }
-        KIO::copy(urlList, "fonts:/Personal/", false);
+        TDEIO::copy(urlList, "fonts:/Personal/", false);
         KMessageBox::information(tqApp->mainWidget(), 
                                  i18n("Some fonts have been installed to assure that symbols in formulas are properly visualized. You must restart the application in order so that changes take effect"));
     }
diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc
index 87160a98..a803dbc2 100644
--- a/lib/kformula/kformulaconfigpage.cc
+++ b/lib/kformula/kformulaconfigpage.cc
@@ -53,7 +53,7 @@
 KFORMULA_NAMESPACE_BEGIN
 
 
-ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name )
+ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* config, TQVBox* box, char* name )
     : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config ), m_changed( false )
 {
     const ContextStyle& contextStyle = document->getContextStyle( true );
@@ -342,7 +342,7 @@ void ConfigurePage::slotChanged()
 // }
 
 // MathFontsConfigurePage::MathFontsConfigurePage( Document* document, TQWidget* view,
-//                                                 KConfig* config, TQVBox* box, char* name )
+//                                                 TDEConfig* config, TQVBox* box, char* name )
 //     : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config )
 // {
 //     TQWidget* fontWidget = new TQWidget( box );
diff --git a/lib/kformula/kformulaconfigpage.h b/lib/kformula/kformulaconfigpage.h
index 54856a04..37776f0f 100644
--- a/lib/kformula/kformulaconfigpage.h
+++ b/lib/kformula/kformulaconfigpage.h
@@ -39,7 +39,7 @@ class TQStringList;
 class TQWidget;
 
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KListView;
 class KPushButton;
 class KIntNumInput;
@@ -55,7 +55,7 @@ class KOFORMULA_EXPORT ConfigurePage : public TQObject
   
 public:
 
-    ConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name = 0 );
+    ConfigurePage( Document* document, TQWidget* view, TDEConfig* config, TQVBox* box, char* name = 0 );
     void apply();
     void slotDefault();
 
@@ -83,7 +83,7 @@ private:
 
     Document* m_document;
     TQWidget* m_view;
-    KConfig* m_config;
+    TDEConfig* m_config;
 
     TQFont defaultFont;
     TQFont nameFont;
@@ -114,7 +114,7 @@ private:
 //     
 // public:
 
-//     MathFontsConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name = 0 );
+//     MathFontsConfigurePage( Document* document, TQWidget* view, TDEConfig* config, TQVBox* box, char* name = 0 );
 //     void apply();
 //     void slotDefault();
 
@@ -133,7 +133,7 @@ private:
 
 //     Document* m_document;
 //     TQWidget* m_view;
-//     KConfig* m_config;
+//     TDEConfig* m_config;
 
 //     KListView* availableFonts;
 //     KListView* requestedFonts;
diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc
index 917d54c5..36b691de 100644
--- a/lib/kformula/kformuladocument.cc
+++ b/lib/kformula/kformuladocument.cc
@@ -368,7 +368,7 @@ void Document::introduceWrapper( DocumentWrapper* wrapper, bool init )
 
 //////////////////////////////////////////////////////////////////////////////
 
-DocumentWrapper::DocumentWrapper( KConfig* config,
+DocumentWrapper::DocumentWrapper( TDEConfig* config,
                                   KActionCollection* collection,
                                   KoCommandHistory* history )
     : m_document( 0 ),
diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h
index 61fdb7cc..3cee9f0c 100644
--- a/lib/kformula/kformuladocument.h
+++ b/lib/kformula/kformuladocument.h
@@ -295,12 +295,12 @@ class KOFORMULA_EXPORT DocumentWrapper : public TQObject {
 
 public:
 
-    DocumentWrapper( KConfig* config,
+    DocumentWrapper( TDEConfig* config,
                      KActionCollection* collection,
                      KoCommandHistory* history = 0 );
     ~DocumentWrapper();
 
-    KConfig* config() { return m_config; }
+    TDEConfig* config() { return m_config; }
     KoCommandHistory* history() { return m_history; }
 
     /**
@@ -495,7 +495,7 @@ private:
     SymbolType m_rightBracketChar;
     TQString m_selectedName;
 
-    KConfig* m_config;
+    TDEConfig* m_config;
     KoCommandHistory* m_history;
 
     /**
diff --git a/lib/kformula/symboltable.h b/lib/kformula/symboltable.h
index 7820af81..99cebe46 100644
--- a/lib/kformula/symboltable.h
+++ b/lib/kformula/symboltable.h
@@ -30,7 +30,7 @@
 
 #include "kformuladefs.h"
 
-class KConfig;
+class TDEConfig;
 
 KFORMULA_NAMESPACE_BEGIN
 
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 1e204af7..8fb84589 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -97,7 +97,7 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
   KGuiItem openGItem(i18n("Use This Template"));
   m_openButton->setGuiItem(openGItem);
   m_documentList->header()->hide();
-  KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+  TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
   TQString fullTemplateName = cfgGrp.readPathEntry("FullTemplateName");
   d->m_alwaysUseTemplate = cfgGrp.readPathEntry("AlwaysUseTemplate");
   connect(m_alwaysUseCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(alwaysUseClicked()));
@@ -173,7 +173,7 @@ void KoTemplatesPane::openTemplate()
 void KoTemplatesPane::openTemplate(TQListViewItem* item)
 {
   if(item) {
-    KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+    TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
     cfgGrp.writePathEntry("FullTemplateName", item->text(2));
     cfgGrp.writeEntry("LastReturnType", "Template");
     cfgGrp.writeEntry("AlwaysUseTemplate", d->m_alwaysUseTemplate);
@@ -199,7 +199,7 @@ void KoTemplatesPane::alwaysUseClicked()
   TQListViewItem* item = m_documentList->selectedItem();
 
   if(!m_alwaysUseCheckBox->isChecked()) {
-    KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+    TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
     cfgGrp.writeEntry("AlwaysUseTemplate", TQString());
     d->m_alwaysUseTemplate = TQString();
   } else {
@@ -264,7 +264,7 @@ class KoRecentDocumentsPanePrivate
         m_previewJob->kill();
     }
 
-    KIO::PreviewJob* m_previewJob;
+    TDEIO::PreviewJob* m_previewJob;
     TDEInstance* m_instance;
 };
 
@@ -346,9 +346,9 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst
 
   m_documentList->setSelected(m_documentList->firstChild(), true);
 
-  d->m_previewJob = KIO::filePreview(fileList, 200, 200);
+  d->m_previewJob = TDEIO::filePreview(fileList, 200, 200);
 
-  connect(d->m_previewJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(previewResult(KIO::Job*)));
+  connect(d->m_previewJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(previewResult(TDEIO::Job*)));
   connect(d->m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
           this, TQT_SLOT(updatePreview(const KFileItem*, const TQPixmap&)));
 }
@@ -369,9 +369,9 @@ void KoRecentDocumentsPane::selectionChanged(TQListViewItem* item)
       KFileItem* fileItem = static_cast<KoFileListItem*>(item)->fileItem();
       TQString details = "<center><table border=\"0\">";
       details += i18n("File modification date and time. %1 is date time", "<tr><td><b>Modified:</b></td><td>%1</td></tr>")
-          .arg(fileItem->timeString(KIO::UDS_MODIFICATION_TIME));
+          .arg(fileItem->timeString(TDEIO::UDS_MODIFICATION_TIME));
       details += i18n("File access date and time. %1 is date time", "<tr><td><b>Accessed:</b></td><td>%1</td></tr>")
-          .arg(fileItem->timeString(KIO::UDS_ACCESS_TIME));
+          .arg(fileItem->timeString(TDEIO::UDS_ACCESS_TIME));
       details += "</table></center>";
       m_detailsLabel->setText(details);
     } else {
@@ -393,14 +393,14 @@ void KoRecentDocumentsPane::openFile()
 
 void KoRecentDocumentsPane::openFile(TQListViewItem* item)
 {
-  KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+  TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
   cfgGrp.writeEntry("LastReturnType", "File");
 
   if(item)
     emit openFile(item->text(1));
 }
 
-void KoRecentDocumentsPane::previewResult(KIO::Job* job)
+void KoRecentDocumentsPane::previewResult(TDEIO::Job* job)
 {
   if(d->m_previewJob == job)
     d->m_previewJob = 0;
diff --git a/lib/kofficecore/KoDetailsPane.h b/lib/kofficecore/KoDetailsPane.h
index 86190ede..596c3c12 100644
--- a/lib/kofficecore/KoDetailsPane.h
+++ b/lib/kofficecore/KoDetailsPane.h
@@ -32,7 +32,7 @@ class KoRichTextListItemPrivate;
 class KFileItem;
 class TQPixmap;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -122,7 +122,7 @@ class KoRecentDocumentsPane : public KoDetailsPaneBase
     void openFile();
     void openFile(TQListViewItem* item);
 
-    void previewResult(KIO::Job* job);
+    void previewResult(TDEIO::Job* job);
     void updatePreview(const KFileItem* fileItem, const TQPixmap& preview);
 
     void changePalette();
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index beb0b266..8bc8f88c 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -264,7 +264,7 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec
 
     // A way to 'fix' the job's window, since we have no widget known to KParts
     if ( !singleViewMode )
-        connect( this, TQT_SIGNAL( started( KIO::Job* ) ), TQT_SLOT( slotStarted( KIO::Job* ) ) );
+        connect( this, TQT_SIGNAL( started( TDEIO::Job* ) ), TQT_SLOT( slotStarted( TDEIO::Job* ) ) );
 }
 
 KoDocument::~KoDocument()
@@ -393,8 +393,8 @@ bool KoDocument::saveFile()
         if ( url().isLocalFile() )
             KSaveFile::backupFile( url().path(), d->m_backupPath );
         else {
-            KIO::UDSEntry entry;
-            if ( KIO::NetAccess::stat( url(), entry, shells().current() ) ) { // this file exists => backup
+            TDEIO::UDSEntry entry;
+            if ( TDEIO::NetAccess::stat( url(), entry, shells().current() ) ) { // this file exists => backup
                 emit sigStatusBarMessage( i18n("Making backup...") );
                 KURL backup;
                 if ( d->m_backupPath.isEmpty())
@@ -404,7 +404,7 @@ bool KoDocument::saveFile()
                 backup.setPath( backup.path() + TQString::fromLatin1("~") );
                 KFileItem item( entry, url() );
                 Q_ASSERT( item.name() == url().fileName() );
-                KIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() );
+                TDEIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() );
             }
         }
     }
@@ -2485,7 +2485,7 @@ bool KoDocument::hasExternURL() const
     return !url().protocol().isEmpty() && url().protocol() != STORE_PROTOCOL && url().protocol() != INTERNAL_PROTOCOL;
 }
 
-void KoDocument::slotStarted( KIO::Job* job )
+void KoDocument::slotStarted( TDEIO::Job* job )
 {
     if ( job )
     {
@@ -2545,7 +2545,7 @@ TQString KoDocument::unitName() const
 void KoDocument::showStartUpWidget( KoMainWindow* parent, bool alwaysShow )
 {
     if(!alwaysShow) {
-        KConfigGroup cfgGrp( instance()->config(), "TemplateChooserDialog" );
+        TDEConfigGroup cfgGrp( instance()->config(), "TemplateChooserDialog" );
         TQString fullTemplateName = cfgGrp.readPathEntry( "AlwaysUseTemplate" );
 
         if( !fullTemplateName.isEmpty() ) {
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index 30b9ad97..4dc192b7 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -1123,7 +1123,7 @@ protected:
     /**
      * Creates the open widget showed at application start up.
      * @param parent the parent widget
-     * @param instance the TDEInstance to be used for KConfig data
+     * @param instance the TDEInstance to be used for TDEConfig data
      * @param templateType the template-type (group) that should be selected on creation.
      * @since 1.5
      */
@@ -1134,7 +1134,7 @@ private slots:
     void slotChildChanged( KoChild *c );
     void slotChildDestroyed();
     void slotAutoSave();
-    void slotStarted( KIO::Job* );
+    void slotStarted( TDEIO::Job* );
     void startCustomDocument();
     /**
      * Removes the open widget showed at application start up.
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index 871c81fd..eafda4b5 100644
--- a/lib/kofficecore/KoDocumentInfo.cpp
+++ b/lib/kofficecore/KoDocumentInfo.cpp
@@ -217,9 +217,9 @@ KoDocumentInfoAuthor::~KoDocumentInfoAuthor()
 }
 void KoDocumentInfoAuthor::initParameters()
 {
-    KConfig* config = KoGlobal::kofficeConfig();
+    TDEConfig* config = KoGlobal::kofficeConfig();
     if ( config->hasGroup( "Author" ) ) {
-        KConfigGroupSaver cgs( config, "Author" );
+        TDEConfigGroupSaver cgs( config, "Author" );
         m_telephoneHome=config->readEntry( "telephone" );
         m_telephoneWork=config->readEntry( "telephone-work" );
         m_fax=config->readEntry( "fax" );
@@ -229,7 +229,7 @@ void KoDocumentInfoAuthor::initParameters()
         m_street=config->readEntry( "street" );
     }
 
-  m_emailCfg = new KConfig( "emaildefaults", true );
+  m_emailCfg = new TDEConfig( "emaildefaults", true );
   m_emailCfg->setGroup( "Defaults" );
   TQString group = m_emailCfg->readEntry("Profile","Default");
   m_emailCfg->setGroup(TQString("PROFILE_%1").arg(group));
diff --git a/lib/kofficecore/KoDocumentInfo.h b/lib/kofficecore/KoDocumentInfo.h
index 4ecd2cef..b113e75e 100644
--- a/lib/kofficecore/KoDocumentInfo.h
+++ b/lib/kofficecore/KoDocumentInfo.h
@@ -131,7 +131,7 @@ private:
     TQString m_street;
     TQString m_initial;
     TQString m_position;
-    KConfig *m_emailCfg;
+    TDEConfig *m_emailCfg;
 };
 
 class KOFFICECORE_EXPORT KoDocumentInfoAbout : public KoDocumentInfoPage
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 7918fab2..7e67c148 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -346,8 +346,8 @@ void KoDocumentInfoDlg::save( KoDocumentInfoAuthor *authorInfo )
   authorInfo->setStreet( d->m_authorWidget->leStreet->text() );
   authorInfo->setPosition( d->m_authorWidget->leAuthorPosition->text() );
 
-  KConfig* config = KoGlobal::kofficeConfig();
-  KConfigGroupSaver cgs( config, "Author" );
+  TDEConfig* config = KoGlobal::kofficeConfig();
+  TDEConfigGroupSaver cgs( config, "Author" );
   config->writeEntry("telephone", d->m_authorWidget->leTelephoneHome->text());
   config->writeEntry("telephone-work", d->m_authorWidget->leTelephoneWork->text());
   config->writeEntry("fax", d->m_authorWidget->leFax->text());
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 10ee5bd9..56639797 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -111,7 +111,7 @@ TQStringList KoGlobal::_listOfLanguages()
 
 void KoGlobal::createListOfLanguages()
 {
-    KConfig config( "all_languages", true, false, "locale" );
+    TDEConfig config( "all_languages", true, false, "locale" );
     // Note that we could also use KLocale::allLanguagesTwoAlpha
 
     TQMap<TQString, bool> seenLanguages;
@@ -188,10 +188,10 @@ TQString KoGlobal::languageFromTag( const TQString &langTag )
     return langTag;
 }
 
-KConfig* KoGlobal::_kofficeConfig()
+TDEConfig* KoGlobal::_kofficeConfig()
 {
     if ( !m_kofficeConfig ) {
-        m_kofficeConfig = new KConfig( "kofficerc" );
+        m_kofficeConfig = new TDEConfig( "kofficerc" );
     }
     return m_kofficeConfig;
 }
diff --git a/lib/kofficecore/KoGlobal.h b/lib/kofficecore/KoGlobal.h
index cad645b4..15523b3e 100644
--- a/lib/kofficecore/KoGlobal.h
+++ b/lib/kofficecore/KoGlobal.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <tqfont.h>
 #include <tqmap.h>
-class KConfig;
+class TDEConfig;
 
 #include <koffice_export.h>
 class KOFFICECORE_EXPORT KoGlobal
@@ -46,12 +46,12 @@ public:
     }
 
     /**
-     * @return the global KConfig object around kofficerc.
+     * @return the global TDEConfig object around kofficerc.
      * kofficerc is used for KOffice-wide settings, from totally unrelated classes,
-     * so this is the centralization of the KConfig object so that the file is
+     * so this is the centralization of the TDEConfig object so that the file is
      * parsed only once
      */
-    static KConfig* kofficeConfig() {
+    static TDEConfig* kofficeConfig() {
         return self()->_kofficeConfig();
     }
 
@@ -87,13 +87,13 @@ private:
     TQFont _defaultFont();
     TQStringList _listOfLanguages();
     TQStringList _listOfLanguageTags();
-    KConfig* _kofficeConfig();
+    TDEConfig* _kofficeConfig();
     void createListOfLanguages();
 
     int m_pointSize;
     typedef TQMap<TQString, TQString> LanguageMap;
     LanguageMap m_langMap; // display-name -> language tag
-    KConfig* m_kofficeConfig;
+    TDEConfig* m_kofficeConfig;
     int m_dpiX;
     int m_dpiY;
     // No BC problem here, constructor is private, feel free to add members
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 70275b6e..f06d2c46 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -284,7 +284,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
     d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this)));
 
     // Load list of recent files
-    KConfig * config = instance ? instance->config() : TDEGlobal::config();
+    TDEConfig * config = instance ? instance->config() : TDEGlobal::config();
     m_recent->loadEntries( config );
 
     createShellGUI();
@@ -462,7 +462,7 @@ void KoMainWindow::addRecentURL( const KURL& url )
 void KoMainWindow::saveRecentFiles()
 {
     // Save list of recent files
-    KConfig * config = instance() ? instance()->config() : TDEGlobal::config();
+    TDEConfig * config = instance() ? instance()->config() : TDEGlobal::config();
     kdDebug(30003) << this << " Saving recent files list into config. instance()=" << instance() << endl;
     m_recent->saveEntries( config );
     config->sync();
@@ -478,7 +478,7 @@ void KoMainWindow::saveRecentFiles()
 
 void KoMainWindow::reloadRecentFileList()
 {
-    KConfig * config = instance() ? instance()->config() : TDEGlobal::config();
+    TDEConfig * config = instance() ? instance()->config() : TDEGlobal::config();
     m_recent->loadEntries( config );
 }
 
@@ -542,7 +542,7 @@ KParts::PartManager *KoMainWindow::partManager()
 
 bool KoMainWindow::openDocument( const KURL & url )
 {
-    if ( !KIO::NetAccess::exists(url,true,0) )
+    if ( !TDEIO::NetAccess::exists(url,true,0) )
     {
         KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(url.url()) );
         m_recent->removeURL(url); //remove the file from the recent-opened-file-list
@@ -555,7 +555,7 @@ bool KoMainWindow::openDocument( const KURL & url )
 // (not virtual)
 bool KoMainWindow::openDocument( KoDocument *newdoc, const KURL & url )
 {
-    if (!KIO::NetAccess::exists(url,true,0) )
+    if (!TDEIO::NetAccess::exists(url,true,0) )
     {
         if (!newdoc->checkAutoSaveFile())
         {
@@ -847,7 +847,7 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent )
 
             // this file exists and we are not just clicking "Save As" to change filter options
             // => ask for confirmation
-            if ( KIO::NetAccess::exists( newURL, false /*will write*/, this ) && !justChangingFilterOptions )
+            if ( TDEIO::NetAccess::exists( newURL, false /*will write*/, this ) && !justChangingFilterOptions )
             {
                 bOk = KMessageBox::questionYesNo( this,
                                                   i18n("A document with this name already exists.\n"\
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 1079d589..a8fa0f93 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -132,7 +132,7 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString&
   m_splitter->setSizes(sizes);
 
   // Set the sizes of the details pane splitters
-  KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+  TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
   sizes = cfgGrp.readIntListEntry("DetailsPaneSplitterSizes");
   emit splitterResized(0, sizes);
 
@@ -146,7 +146,7 @@ KoOpenPane::~KoOpenPane()
 
   if(item) {
     if(!dynamic_cast<KoDetailsPaneBase*>(m_widgetStack->widget(item->widgetIndex()))) {
-      KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+      TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
       cfgGrp.writeEntry("LastReturnType", "Custom");
     }
   }
@@ -162,7 +162,7 @@ void KoOpenPane::showOpenFileDialog()
   KURL url = KFileDialog::getOpenURL(":OpenDialog", mimeFilter.join(" "), this);
 
   if(!url.isEmpty()) {
-    KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+    TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
     cfgGrp.writeEntry("LastReturnType", "File");
     emit openExistingFile(url.url());
   }
@@ -231,7 +231,7 @@ void KoOpenPane::initTemplates(const TQString& templateType)
     firstItem = m_sectionList->firstChild();
   }
 
-  KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+  TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
 
   if(selectItem && (cfgGrp.readEntry("LastReturnType") == "Template")) {
     m_sectionList->setSelected(selectItem, true);
@@ -247,7 +247,7 @@ void KoOpenPane::setCustomDocumentWidget(TQWidget *widget) {
 
   TQListViewItem* item = addPane(i18n("Custom Document"), TQString(), widget, INT_MAX);
 
-  KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+  TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
 
   if(cfgGrp.readEntry("LastReturnType") == "Custom") {
     m_sectionList->setSelected(item, true);
@@ -299,7 +299,7 @@ void KoOpenPane::selectionChanged(TQListViewItem* item)
 
 void KoOpenPane::saveSplitterSizes(KoDetailsPaneBase* /*sender*/, const TQValueList<int>& sizes)
 {
-  KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
+  TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
   cfgGrp.writeEntry("DetailsPaneSplitterSizes", sizes);
 }
 
diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h
index d9abf832..0efad845 100644
--- a/lib/kofficecore/KoOpenPane.h
+++ b/lib/kofficecore/KoOpenPane.h
@@ -24,7 +24,7 @@
 #include <koOpenPaneBase.h>
 
 class KoCustomDocumentCreator;
-class KConfig;
+class TDEConfig;
 class KoTemplateGroup;
 class KoOpenPanePrivate;
 class TDEInstance;
@@ -42,7 +42,7 @@ class KoOpenPane : public KoOpenPaneBase
     /**
      * Constructor
      * @param parent the parent widget
-     * @param instance the TDEInstance to be used for KConfig data
+     * @param instance the TDEInstance to be used for TDEConfig data
      * @param templateType the template-type (group) that should be selected on creation.
      */
     KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& templateType = TQString());
diff --git a/lib/kofficecore/KoPicture.cpp b/lib/kofficecore/KoPicture.cpp
index 8e74c0b5..2dd6f730 100644
--- a/lib/kofficecore/KoPicture.cpp
+++ b/lib/kofficecore/KoPicture.cpp
@@ -237,13 +237,13 @@ bool KoPicture::setKeyAndDownloadPicture(const KURL& url, TQWidget *window)
     bool result=false;
 
     TQString tmpFileName;
-    if ( KIO::NetAccess::download(url, tmpFileName, window) )
+    if ( TDEIO::NetAccess::download(url, tmpFileName, window) )
     {
         KoPictureKey key;
         key.setKeyFromFile( tmpFileName );
         setKey( key );
         result=loadFromFile( tmpFileName );
-        KIO::NetAccess::removeTempFile( tmpFileName );
+        TDEIO::NetAccess::removeTempFile( tmpFileName );
     }
 
     return result;
diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp
index 5f81efde..1d476f74 100644
--- a/lib/kofficecore/KoPictureBase.cpp
+++ b/lib/kofficecore/KoPictureBase.cpp
@@ -39,7 +39,7 @@ KoPictureBase::KoPictureBase(void)
     // Slow mode can be very slow, especially at high zoom levels -> configurable
     if ( s_useSlowResizeMode == -1 )
     {
-        KConfigGroup group( TDEGlobal::config(), "KOfficeImage" );
+        TDEConfigGroup group( TDEGlobal::config(), "KOfficeImage" );
         s_useSlowResizeMode = group.readNumEntry( "HighResolution", 1 );
         kdDebug(30003) << "HighResolution = " << s_useSlowResizeMode << endl;
     }
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index 0f0bea62..d81cffec 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -193,7 +193,7 @@ void KoSpeaker::startSpeech()
         startText(d->m_jobNums[i]);
 }
 
-void KoSpeaker::readConfig(KConfig* config)
+void KoSpeaker::readConfig(TDEConfig* config)
 {
     delete d->m_timer;
     d->m_timer = 0;
diff --git a/lib/kofficecore/KoSpeaker.h b/lib/kofficecore/KoSpeaker.h
index c5acda32..c4ab8786 100644
--- a/lib/kofficecore/KoSpeaker.h
+++ b/lib/kofficecore/KoSpeaker.h
@@ -36,7 +36,7 @@
 
 class TQWidget;
 class TQPoint;
-class KConfig;
+class TDEConfig;
 class KoSpeakerPrivate;
 
 #define kospeaker KoSpeaker::koSpeaker()
@@ -92,7 +92,7 @@ public:
      * If KTTSD daemon is not installed, @ref isEnabled will return false.
      * If screen reader is requested and KTTSD is installed, but not running, it will be started.
      */
-    void readConfig(KConfig* config);
+    void readConfig(TDEConfig* config);
 
     /**
      * Given a widget @p w and its @p pos screen coordinates, tries to extract the text of the widget
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index 4b0cfe5b..5acc72a7 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -166,7 +166,7 @@ void KoTemplateTree::writeTemplateTree() {
                 //kdDebug() << "hidden" << endl;
                 if(group->dirs().count()==1 && !group->dirs().grep(localDir).isEmpty()) {
                     //kdDebug() << "local only" << endl;
-                    KIO::NetAccess::del(group->dirs().first(), 0);
+                    TDEIO::NetAccess::del(group->dirs().first(), 0);
                     //kdDebug() << "removing: " << group->dirs().first() << endl;
                 }
                 else {
@@ -350,7 +350,7 @@ void KoTemplateTree::writeTemplate(KoTemplate *t, KoTemplateGroup *group,
     if ( t->isHidden() && TQFile::exists(fileName) )
         return;
     TQString fill;
-    while ( KIO::NetAccess::exists( fileName, true, 0 ) )
+    while ( TDEIO::NetAccess::exists( fileName, true, 0 ) )
     {
         fill += '_';
         fileName = path + fill + name + ".desktop";
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index d904fac0..991ffff8 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -403,7 +403,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
     layout->addWidget(d->boxdescription, 1, 0 );
 
     // config
-    KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
+    TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
     int templateNum = grp.readNumEntry( "TemplateTab", -1 );
     TQString templateName = grp.readPathEntry( "TemplateName" );
 	if ( templateName.isEmpty() && d->tree->defaultTemplate() )
@@ -504,7 +504,7 @@ void KoTemplateChooseDia::setupDialog()
 {
 
     TQGridLayout *maingrid=new TQGridLayout( d->m_mainwidget, 1, 1, 2, 6);
-    KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
+    TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
 
     if (d->m_dialogType == Everything)
     {
@@ -638,7 +638,7 @@ void KoTemplateChooseDia::slotOk()
     if (collectInfo())
     {
 	// Save it for the next time
-	KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
+	TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
 	static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" };
 	if ( d->m_returnType <= Empty )
 	{
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index b82efbb6..3b4975f0 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -272,7 +272,7 @@ void KoTemplateCreateDia::slotOk() {
             tmpIcon=".icon/"+file+".png";
             icon=iconDir+file+".png";
         }
-        while ( KIO::NetAccess::exists( dest, true, this ) );
+        while ( TDEIO::NetAccess::exists( dest, true, this ) );
     }
     bool ignore = false;
     kdDebug(30004) << "Trying to create template: " << d->m_name->text() << "URL=" << ".source/"+file+ext << " ICON=" << tmpIcon << endl;
@@ -306,7 +306,7 @@ void KoTemplateCreateDia::slotOk() {
     if ( !ignore )
     {
         // copy the template file
-        KIO::NetAccess::file_copy( orig, dest, -1, true, false, this );
+        TDEIO::NetAccess::file_copy( orig, dest, -1, true, false, this );
 
         // save the picture
         if(d->m_default->isChecked() && !m_pixmap.isNull())
@@ -324,10 +324,10 @@ void KoTemplateCreateDia::slotOk() {
         if((*it).contains(dir)==0) {
             orig.setPath( (*it)+".directory" );
             // Check if we can read the file
-            if( KIO::NetAccess::exists(orig, true, this) ) {
+            if( TDEIO::NetAccess::exists(orig, true, this) ) {
                 dest.setPath( dir+"/.directory" );
                 // We copy the file with overwrite
-                KIO::NetAccess::file_copy( orig, dest, -1, true, false, this );
+                TDEIO::NetAccess::file_copy( orig, dest, -1, true, false, this );
                 ready=true;
             }
         }
@@ -337,7 +337,7 @@ void KoTemplateCreateDia::slotOk() {
 
     if ( d->m_defaultTemplate->isChecked() )
     {
-      KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
+      TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
       grp.writeEntry( "LastReturnType", "Template" );
       grp.writePathEntry( "FullTemplateName", dir + "/" + t->file() );
       grp.writePathEntry( "AlwaysUseTemplate", dir + "/" + t->file() );
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index 430b972a..8084068c 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -63,7 +63,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name)
 void KoPalette::resetFont()
 {
             
-    KConfig * cfg = TDEGlobal::config();
+    TDEConfig * cfg = TDEGlobal::config();
     Q_ASSERT(cfg);
     cfg->setGroup("");
     m_font  = TDEGlobalSettings::generalFont();
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index 7d4a32d9..cf215120 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cc
@@ -65,7 +65,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c
     connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int)));
     m_viewActionMenu = new KActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu");
 
-    KConfig * cfg = TDEGlobal::config();
+    TDEConfig * cfg = TDEGlobal::config();
     cfg->setGroup("palettes");
 
     bool palettesShown = cfg->readBoolEntry("palettesshown", true);
@@ -149,7 +149,7 @@ void KoPaletteManager::addWidget(TQWidget * widget,
 
     bool visible = true;
 
-    KConfig * cfg = TDEGlobal::config();
+    TDEConfig * cfg = TDEGlobal::config();
     if (cfg->hasGroup("palettetab-" + name)) {
         cfg->setGroup("palettetab-" + name);
 
@@ -367,7 +367,7 @@ void KoPaletteManager::placePalette(const TQString & name, TQt::Dock location)
     if (!palette) return;
 
     //XXX:  Check whether this name occurs in the config list, retrieve the location, set the location
-    KConfig * cfg = TDEGlobal::config();
+    TDEConfig * cfg = TDEGlobal::config();
 
     if (cfg->hasGroup("palette-" + name)) {
         cfg->setGroup("palette-" + name);
@@ -529,7 +529,7 @@ void KoPaletteManager::save()
     if (!m_view) return;
     if (!m_view->mainWindow()) return;
 
-    KConfig * cfg = TDEGlobal::config();
+    TDEConfig * cfg = TDEGlobal::config();
     Q_ASSERT(cfg);
     cfg->setGroup("");
 
diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index 1dbed289..32efad60 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -332,8 +332,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
   if( sizeIsRelativeState && sizeIsRelativeCheckBox )
     setSizeIsRelative( *sizeIsRelativeState );
 
-  KConfig *config = TDEGlobal::config();
-  KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver(config, TQString::fromLatin1("General"));
   showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
 }
 
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index 7ca6f1a7..84ec27d5 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -251,8 +251,8 @@ void KoAutoFormat::updateMaxWords()
 
 void KoAutoFormat::loadListOfWordCompletion()
 {
-    KConfig* config = KoGlobal::kofficeConfig();
-    KConfigGroupSaver cgs( config, "Completion Word" );
+    TDEConfig* config = KoGlobal::kofficeConfig();
+    TDEConfigGroupSaver cgs( config, "Completion Word" );
     m_listCompletion->insertItems(config->readListEntry( "list" ));
 }
 
@@ -263,8 +263,8 @@ void KoAutoFormat::readConfig(bool force)
     // so that loading is faster and to avoid doing it for readonly documents.
     if ( m_configRead && !force )
         return;
-    KConfig* config = KoGlobal::kofficeConfig();
-    KConfigGroupSaver cgs( config, "AutoFormat" );
+    TDEConfig* config = KoGlobal::kofficeConfig();
+    TDEConfigGroupSaver cgs( config, "AutoFormat" );
     //when we force don't load format language.
     if ( !force)
         m_autoFormatLanguage = config->readEntry("formatLanguage", TQString());
@@ -615,10 +615,10 @@ void KoAutoFormat::loadEntry( const TQDomElement &nl, bool _allLanguages)
 
 void KoAutoFormat::saveConfig()
 {
-    KConfig* config = KoGlobal::kofficeConfig();
+    TDEConfig* config = KoGlobal::kofficeConfig();
     KLocale klocale(m_doc->instance()->instanceName());
 
-    KConfigGroupSaver cgs( config, "AutoFormat" );
+    TDEConfigGroupSaver cgs( config, "AutoFormat" );
     config->writeEntry( "ConvertUpperCase", m_convertUpperCase );
     config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage);
 
diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp
index 09e12f0d..8464bf4d 100644
--- a/lib/kotext/KoCompletionDia.cpp
+++ b/lib/kotext/KoCompletionDia.cpp
@@ -189,8 +189,8 @@ void KoCompletion::saveSettings() {
 }
 
 void KoCompletion::slotSaveCompletionEntry() {
-    KConfig config("kofficerc");
-    KConfigGroupSaver cgs( &config, "Completion Word" );
+    TDEConfig config("kofficerc");
+    TDEConfigGroupSaver cgs( &config, "Completion Word" );
     config.writeEntry( "list", m_listCompletion );
     config.sync();
     KMessageBox::information( this, i18n(
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 6b040905..770c1da2 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -1390,10 +1390,10 @@ TQCString KoDateVariable::formatStr(int & correct)
     DateFormatWidget* widget=new DateFormatWidget(dialog);
     int count=0;
     dialog->setMainWidget(widget);
-    KConfig* config = KoGlobal::kofficeConfig();
+    TDEConfig* config = KoGlobal::kofficeConfig();
     if( config->hasGroup("Date format history") )
     {
-        KConfigGroupSaver cgs( config, "Date format history");
+        TDEConfigGroupSaver cgs( config, "Date format history");
         const int noe=config->readNumEntry("Number Of Entries", 5);
         for(int i=0;i<noe;i++)
         {
@@ -1601,11 +1601,11 @@ TQCString KoTimeVariable::formatStr(int & _correct)
     KDialogBase* dialog=new KDialogBase(0, 0, true, i18n("Time Format"), KDialogBase::Ok|KDialogBase::Cancel);
     TimeFormatWidget* widget=new TimeFormatWidget(dialog);
     dialog->setMainWidget(widget);
-    KConfig* config = KoGlobal::kofficeConfig();
+    TDEConfig* config = KoGlobal::kofficeConfig();
     int count=0;
     if( config->hasGroup("Time format history") )
     {
-        KConfigGroupSaver cgs( config, "Time format history" );
+        TDEConfigGroupSaver cgs( config, "Time format history" );
         const int noe=config->readNumEntry("Number Of Entries", 5);
         for(int i=0;i<noe;i++)
         {
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index 05e4f9aa..a90c3d9d 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -171,7 +171,7 @@ bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile)
             i18n("Replace")) != KMessageBox::Continue )
                 return false;
 
-        if(! KIO::NetAccess::del(destination, 0) ) {
+        if(! TDEIO::NetAccess::del(destination, 0) ) {
             KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(destination));
             return false;
         }
@@ -187,7 +187,7 @@ bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile)
 
 bool ScriptGUIClient::uninstallScriptPackage(const TQString& scriptpackagepath)
 {
-    if(! KIO::NetAccess::del(scriptpackagepath, 0) ) {
+    if(! TDEIO::NetAccess::del(scriptpackagepath, 0) ) {
         KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(scriptpackagepath));
         return false;
     }
diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp
index 98c8e828..f87dfef7 100644
--- a/lib/store/KoStore.cpp
+++ b/lib/store/KoStore.cpp
@@ -132,7 +132,7 @@ KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, con
   else
   {
     const bool downloaded =
-        KIO::NetAccess::download( url, tmpFile, window );
+        TDEIO::NetAccess::download( url, tmpFile, window );
 
     if (!downloaded)
     {
@@ -194,14 +194,14 @@ bool KoStore::open( const TQString & _name )
   if ( m_bIsOpen )
   {
     kdWarning(s_area) << "KoStore: File is already opened" << endl;
-    //return KIO::ERR_INTERNAL;
+    //return TDEIO::ERR_INTERNAL;
     return false;
   }
 
   if ( m_sName.length() > 512 )
   {
       kdError(s_area) << "KoStore: Filename " << m_sName << " is too long" << endl;
-      //return KIO::ERR_MALFORMED_URL;
+      //return TDEIO::ERR_MALFORMED_URL;
       return false;
   }
 
@@ -211,7 +211,7 @@ bool KoStore::open( const TQString & _name )
     if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there
     {
       kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl;
-      //return KIO::ERR_FILE_ALREADY_EXIST;
+      //return TDEIO::ERR_FILE_ALREADY_EXIST;
       return false;
     }
 
@@ -228,7 +228,7 @@ bool KoStore::open( const TQString & _name )
       return false;
   }
   else
-    //return KIO::ERR_UNSUPPORTED_ACTION;
+    //return TDEIO::ERR_UNSUPPORTED_ACTION;
     return false;
 
   m_bIsOpen = true;
@@ -247,7 +247,7 @@ bool KoStore::close()
   if ( !m_bIsOpen )
   {
     kdWarning(s_area) << "KoStore: You must open before closing" << endl;
-    //return KIO::ERR_INTERNAL;
+    //return TDEIO::ERR_INTERNAL;
     return false;
   }
 
diff --git a/lib/store/KoTarStore.cpp b/lib/store/KoTarStore.cpp
index db45d155..5d131a90 100644
--- a/lib/store/KoTarStore.cpp
+++ b/lib/store/KoTarStore.cpp
@@ -87,11 +87,11 @@ KoTarStore::~KoTarStore()
     // Now we have still some job to do for remote files.
     if ( m_fileMode == KoStoreBase::RemoteRead )
     {
-        KIO::NetAccess::removeTempFile( m_localFileName );
+        TDEIO::NetAccess::removeTempFile( m_localFileName );
     }
     else if ( m_fileMode == KoStoreBase::RemoteWrite )
     {
-        KIO::NetAccess::upload( m_localFileName, m_url, m_window );
+        TDEIO::NetAccess::upload( m_localFileName, m_url, m_window );
         // ### FIXME: delete temp file
     }
 }
@@ -137,13 +137,13 @@ bool KoTarStore::openRead( const TQString& name )
     if ( entry == 0L )
     {
         //kdWarning(s_area) << "Unknown filename " << name << endl;
-        //return KIO::ERR_DOES_NOT_EXIST;
+        //return TDEIO::ERR_DOES_NOT_EXIST;
         return false;
     }
     if ( entry->isDirectory() )
     {
         kdWarning(s_area) << name << " is a directory !" << endl;
-        //return KIO::ERR_IS_DIRECTORY;
+        //return TDEIO::ERR_IS_DIRECTORY;
         return false;
     }
     KTarFile * f = (KTarFile *) entry;
diff --git a/lib/store/KoZipStore.cpp b/lib/store/KoZipStore.cpp
index c1b7d01f..635ad248 100644
--- a/lib/store/KoZipStore.cpp
+++ b/lib/store/KoZipStore.cpp
@@ -98,11 +98,11 @@ KoZipStore::~KoZipStore()
     // Now we have still some job to do for remote files.
     if ( m_fileMode == KoStoreBase::RemoteRead )
     {
-        KIO::NetAccess::removeTempFile( m_localFileName );
+        TDEIO::NetAccess::removeTempFile( m_localFileName );
     }
     else if ( m_fileMode == KoStoreBase::RemoteWrite )
     {
-        KIO::NetAccess::upload( m_localFileName, m_url, m_window );
+        TDEIO::NetAccess::upload( m_localFileName, m_url, m_window );
         // ### FIXME: delete temp file
     }
 }
@@ -148,13 +148,13 @@ bool KoZipStore::openRead( const TQString& name )
     if ( entry == 0L )
     {
         //kdWarning(s_area) << "Unknown filename " << name << endl;
-        //return KIO::ERR_DOES_NOT_EXIST;
+        //return TDEIO::ERR_DOES_NOT_EXIST;
         return false;
     }
     if ( entry->isDirectory() )
     {
         kdWarning(s_area) << name << " is a directory !" << endl;
-        //return KIO::ERR_IS_DIRECTORY;
+        //return TDEIO::ERR_IS_DIRECTORY;
         return false;
     }
     // Must cast to KZipFileEntry, not only KArchiveFile, because device() isn't virtual!