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

25 files changed, 81 insertions, 81 deletions

diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index a63b473ce..1f99f22f6 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -132,7 +132,7 @@ void DocMetaInfo::scanMetaInfo( bool force )
     mLanguageNames.insert( *it, languageName( *it ) );
   }
 
-  KConfig config( "khelpcenterrc" );
+  TDEConfig config( "khelpcenterrc" );
   config.setGroup( "General" );
   TQStringList metaInfos = config.readListEntry( "MetaInfoDirs" );
 
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index 1919ce841..7699ddd49 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -148,9 +148,9 @@ void FontDialog::setupFontEncodingBox()
 
 void FontDialog::load()
 {
-	KConfig *cfg = kapp->config();
+	TDEConfig *cfg = kapp->config();
 	{
-		KConfigGroupSaver groupSaver( cfg, "HTML Settings" );
+		TDEConfigGroupSaver groupSaver( cfg, "HTML Settings" );
 
 		m_minFontSize->setValue( cfg->readNumEntry( "MinimumFontSize", HTML_DEFAULT_MIN_FONT_SIZE ) );
 		m_medFontSize->setValue( cfg->readNumEntry( "MediumFontSize", 10 ) );
@@ -178,13 +178,13 @@ void FontDialog::load()
 
 void FontDialog::save()
 {
-	KConfig *cfg = kapp->config();
+	TDEConfig *cfg = kapp->config();
 	{
-		KConfigGroupSaver groupSaver( cfg, "General" );
+		TDEConfigGroupSaver groupSaver( cfg, "General" );
 		cfg->writeEntry( "UseKonqSettings", false );
 	}
 	{
-		KConfigGroupSaver groupSaver( cfg, "HTML Settings" );
+		TDEConfigGroupSaver groupSaver( cfg, "HTML Settings" );
 
 		cfg->writeEntry( "MinimumFontSize", m_minFontSize->value() );
 		cfg->writeEntry( "MediumFontSize", m_medFontSize->value() );
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index 892b2d0cd..9b35c4b09 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -42,7 +42,7 @@ Formatter:: ~Formatter()
 
 bool Formatter::readTemplates()
 {
-  KConfig *cfg = TDEGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   cfg->setGroup( "Templates" );
   TQString mainTemplate = cfg->readEntry( "MainTemplate" );
 
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index 37594811c..cb79e25b4 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -26,7 +26,7 @@
 #include <tqdom.h>
 #include <tqstringlist.h>
 
-class KConfig;
+class TDEConfig;
 class TDEProcess;
 
 class EntryItem;
@@ -129,7 +129,7 @@ class Glossary : public KListView
 		void buildGlossaryTree();
 		TQDomElement childElement( const TQDomElement &e, const TQString &name );
 
-		KConfig *m_config;
+		TDEConfig *m_config;
 		TQListViewItem *m_byTopicItem;
 		TQListViewItem *m_alphabItem;
 		TQString m_sourceFile;
diff --git a/khelpcenter/htmlsearch.cpp b/khelpcenter/htmlsearch.cpp
index 3a130883a..f82516479 100644
--- a/khelpcenter/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch.cpp
@@ -10,7 +10,7 @@ using namespace KHC;
 
 HTMLSearch::HTMLSearch()
 {
-  mConfig = new KConfig("khelpcenterrc", true);
+  mConfig = new TDEConfig("khelpcenterrc", true);
   mConfig->setGroup( "htdig" );
 }
 
diff --git a/khelpcenter/htmlsearch.h b/khelpcenter/htmlsearch.h
index 6a98b5ec3..1ca97488f 100644
--- a/khelpcenter/htmlsearch.h
+++ b/khelpcenter/htmlsearch.h
@@ -4,7 +4,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KHC {
 
@@ -24,7 +24,7 @@ class HTMLSearch : public QObject
     TQString defaultIndexTestFile( KHC::DocEntry * );
 
   private:
-    KConfig *mConfig;
+    TDEConfig *mConfig;
 };
 
 }
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index a4bca7e52..a0f79c270 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -69,7 +69,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
     _files.clear();
 
     // open config file
-    KConfig *config = new KConfig("khelpcenterrc");
+    TDEConfig *config = new TDEConfig("khelpcenterrc");
     config->setGroup("Scope");
 
     // add KDE help dirs
@@ -241,8 +241,8 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     progress->setState(1);
 
     // run htdig ------------------------------------------------------
-    KConfig *config = new KConfig("khelpcenterrc", true);
-    KConfigGroupSaver saver(config, "htdig");
+    TDEConfig *config = new TDEConfig("khelpcenterrc", true);
+    TDEConfigGroupSaver saver(config, "htdig");
     TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
 
     if (exe.isEmpty())
@@ -430,8 +430,8 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
   TQString result = dataPath(_lang)+"/result.html";
 
   // run htsearch ----------------------------------------------------
-  KConfig *config = new KConfig("khelpcenterrc", true);
-  KConfigGroupSaver saver(config, "htdig");
+  TDEConfig *config = new TDEConfig("khelpcenterrc", true);
+  TDEConfigGroupSaver saver(config, "htdig");
   TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
   if (exe.isEmpty())
   {
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 7bb403b06..588be7142 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -35,7 +35,7 @@
 
 
 KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name), indexProc(0)
+  : TDECModule(parent, name), indexProc(0)
 {
   TQVBoxLayout *vbox = new TQVBoxLayout(this, 5);
 
@@ -253,7 +253,7 @@ void KHTMLSearchConfig::configChanged()
 
 void KHTMLSearchConfig::load()
 {
-  KConfig *config = new KConfig("khelpcenterrc", true);
+  TDEConfig *config = new TDEConfig("khelpcenterrc", true);
 
   config->setGroup("htdig");
   htdigBin->lineEdit()->setText(config->readPathEntry("htdig", kapp->dirs()->findExe("htdig")));
@@ -281,7 +281,7 @@ void KHTMLSearchConfig::load()
 
 void KHTMLSearchConfig::save()
 {
-  KConfig *config= new KConfig("khelpcenterrc", false);
+  TDEConfig *config= new TDEConfig("khelpcenterrc", false);
 
   config->setGroup("htdig");
   config->writePathEntry("htdig", htdigBin->lineEdit()->text());
@@ -362,7 +362,7 @@ void KHTMLSearchConfig::indexTerminated(TDEProcess *)
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_htmlsearch(TQWidget *parent, const char *name)
+  KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name)
   {
     TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
     return new KHTMLSearchConfig(parent, name);
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 1b9c0b0f8..c4073388f 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -33,7 +33,7 @@ class TDEProcess;
 class KLanguageCombo;
 class KURLRequester;
 
-class KHTMLSearchConfig : public KCModule
+class KHTMLSearchConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index ea6dff669..a02538543 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -117,7 +117,7 @@ void HtmlSearchConfig::makeReadOnly()
     mDbDir->setEnabled( false );
 }
 
-void HtmlSearchConfig::load( KConfig *config )
+void HtmlSearchConfig::load( TDEConfig *config )
 {
   config->setGroup("htdig");
 
@@ -126,7 +126,7 @@ void HtmlSearchConfig::load( KConfig *config )
   mDbDir->lineEdit()->setText(config->readPathEntry("dbdir", "/opt/www/htdig/db/" ) );
 }
 
-void HtmlSearchConfig::save( KConfig *config )
+void HtmlSearchConfig::save( TDEConfig *config )
 {
   config->setGroup("htdig");
 
diff --git a/khelpcenter/htmlsearchconfig.h b/khelpcenter/htmlsearchconfig.h
index f1e093f13..7f5742b1e 100644
--- a/khelpcenter/htmlsearchconfig.h
+++ b/khelpcenter/htmlsearchconfig.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 
 class KURLRequester;
-class KConfig;
+class TDEConfig;
 
 namespace KHC {
 
@@ -35,8 +35,8 @@ class HtmlSearchConfig : public TQWidget
     HtmlSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
     virtual ~HtmlSearchConfig();
 
-    void load( KConfig * );
-    void save( KConfig * );
+    void load( TDEConfig * );
+    void save( TDEConfig * );
     void defaults();
     void makeReadOnly();
 
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 8e37e4c94..91dcb535a 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -95,7 +95,7 @@ void InfoTree::build( NavigatorItem *parent )
   m_categoryItem = new NavigatorItem( entry, parent );
   m_categoryItem->setAutoDeleteDocEntry( true );
 
-  KConfig *cfg = kapp->config();
+  TDEConfig *cfg = kapp->config();
   cfg->setGroup( "Info pages" );
   TQStringList infoDirFiles = cfg->readListEntry( "Search paths" );
   // Default paths taken fron tdebase/kioslave/info/kde-info2html.conf
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 10a3ced0f..c01d8f3c3 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -135,7 +135,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
 IndexProgressDialog::~IndexProgressDialog()
 {
   if ( !mLogView->isHidden() ) {
-    KConfig *cfg = TDEGlobal::config();
+    TDEConfig *cfg = TDEGlobal::config();
     cfg->setGroup( "indexprogressdialog" );
     cfg->writeEntry( "size", size() );
   }
@@ -196,7 +196,7 @@ void IndexProgressDialog::slotEnd()
 
 void IndexProgressDialog::toggleDetails()
 {
-  KConfig *cfg = TDEGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   cfg->setGroup( "indexprogressdialog" );
   if ( mLogView->isHidden() ) {
     mLogLabel->show();
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index 4e28428fc..10f0c5311 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -33,7 +33,7 @@ class TQTextEdit;
 class TQLabel;
 
 class TDEProcess;
-class KConfig;
+class TDEConfig;
 class TDEAboutData;
 class KTempFile;
 class KURLRequester;
@@ -162,7 +162,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
     TQValueList<KHC::DocEntry *> mIndexQueue;
     TQValueList<KHC::DocEntry *>::ConstIterator mCurrentEntry;
     
-    KConfig *mConfig;
+    TDEConfig *mConfig;
     
     TDEAboutData *mAboutData;
 
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index f6e16da15..56aec0179 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -97,8 +97,8 @@ MainWindow::MainWindow()
              TQT_SLOT( statusBarMessage( const TQString & ) ) );
     connect( mDoc, TQT_SIGNAL( onURL( const TQString & ) ),
              TQT_SLOT( statusBarMessage( const TQString & ) ) );
-    connect( mDoc, TQT_SIGNAL( started( KIO::Job * ) ),
-             TQT_SLOT( slotStarted( KIO::Job * ) ) );
+    connect( mDoc, TQT_SIGNAL( started( TDEIO::Job * ) ),
+             TQT_SLOT( slotStarted( TDEIO::Job * ) ) );
     connect( mDoc, TQT_SIGNAL( completed() ),
              TQT_SLOT( documentCompleted() ) );
     connect( mDoc, TQT_SIGNAL( searchResultCacheAvailable() ),
@@ -130,11 +130,11 @@ MainWindow::MainWindow()
     mSplitter->setSizes(sizes);
     setGeometry(366, 0, 800, 600);
 
-    KConfig *cfg = kapp->config();
+    TDEConfig *cfg = kapp->config();
     {
-      KConfigGroupSaver groupSaver( cfg, "General" );
+      TDEConfigGroupSaver groupSaver( cfg, "General" );
       if ( cfg->readBoolEntry( "UseKonqSettings", true ) ) {
-        KConfig konqCfg( "konquerorrc" );
+        TDEConfig konqCfg( "konquerorrc" );
         const_cast<KHTMLSettings *>( mDoc->settings() )->init( &konqCfg );
       }
       const int zoomFactor = cfg->readNumEntry( "Font zoom factor", 100 );
@@ -171,21 +171,21 @@ void MainWindow::enableCopyTextAction()
     mCopyText->setEnabled( mDoc->hasSelection() );
 }
 
-void MainWindow::saveProperties( KConfig *config )
+void MainWindow::saveProperties( TDEConfig *config )
 {
-    kdDebug()<<"void MainWindow::saveProperties( KConfig *config )" << endl;
+    kdDebug()<<"void MainWindow::saveProperties( TDEConfig *config )" << endl;
     config->writePathEntry( "URL" , mDoc->baseURL().url() );
 }
 
-void MainWindow::readProperties( KConfig *config )
+void MainWindow::readProperties( TDEConfig *config )
 {
-    kdDebug()<<"void MainWindow::readProperties( KConfig *config )" << endl;
+    kdDebug()<<"void MainWindow::readProperties( TDEConfig *config )" << endl;
     mDoc->slotReload( KURL( config->readPathEntry( "URL" ) ) );
 }
 
 void MainWindow::readConfig()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "MainWindowState" );
     TQValueList<int> sizes = config->readIntListEntry( "Splitter" );
     if ( sizes.count() == 2 ) {
@@ -197,7 +197,7 @@ void MainWindow::readConfig()
 
 void MainWindow::writeConfig()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "MainWindowState" );
     config->writeEntry( "Splitter", mSplitter->sizes() );
 
@@ -237,7 +237,7 @@ void MainWindow::setupActions()
     KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ),
       actionCollection() );
 
-    KConfig *cfg = TDEGlobal::config();
+    TDEConfig *cfg = TDEGlobal::config();
     cfg->setGroup( "Debug" );
     if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) {
       new KAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this),
@@ -262,11 +262,11 @@ void MainWindow::print()
     mDoc->view()->print();
 }
 
-void MainWindow::slotStarted(KIO::Job *job)
+void MainWindow::slotStarted(TDEIO::Job *job)
 {
     if (job)
-       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 &)));
 
     History::self().updateActions();
 }
@@ -342,7 +342,7 @@ void MainWindow::documentCompleted()
     History::self().updateActions();
 }
 
-void MainWindow::slotInfoMessage(KIO::Job *, const TQString &m)
+void MainWindow::slotInfoMessage(TDEIO::Job *, const TQString &m)
 {
     statusBarMessage(m);
 }
@@ -447,9 +447,9 @@ void MainWindow::updateZoomActions()
   actionCollection()->action( "incFontSizes" )->setEnabled( mDoc->zoomFactor() + mDoc->zoomStepping() <= 300 );
   actionCollection()->action( "decFontSizes" )->setEnabled( mDoc->zoomFactor() - mDoc->zoomStepping() >= 20 );
 
-  KConfig *cfg = kapp->config();
+  TDEConfig *cfg = kapp->config();
   {
-    KConfigGroupSaver groupSaver( cfg, "General" );
+    TDEConfigGroupSaver groupSaver( cfg, "General" );
     cfg->writeEntry( "Font zoom factor", mDoc->zoomFactor() );
     cfg->sync();
   }
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 8f6b2e727..7e2d8b0b7 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -61,8 +61,8 @@ class MainWindow : public KMainWindow, public DCOPObject
   protected:
     void setupActions();
 
-    virtual void saveProperties( KConfig *config );
-    virtual void readProperties( KConfig *config );
+    virtual void saveProperties( TDEConfig *config );
+    virtual void readProperties( TDEConfig *config );
 
     void readConfig();
     void writeConfig();
@@ -76,8 +76,8 @@ class MainWindow : public KMainWindow, public DCOPObject
 
   private slots:
     void slotGlossSelected(const GlossaryEntry &entry);
-    void slotStarted(KIO::Job *job);
-    void slotInfoMessage(KIO::Job *, const TQString &);
+    void slotStarted(TDEIO::Job *job);
+    void slotInfoMessage(TDEIO::Job *, const TQString &);
     void goInternalUrl( const KURL & );
     /**
       This function is called when the user clicks on a link in the viewer part.
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 1907ac1f8..1c813972f 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -80,7 +80,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
    : TQWidget( parent, name ), mIndexDialog( 0 ),
      mView( view ), mSelected( false )
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("General");
     mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false);
 
@@ -591,7 +591,7 @@ void Navigator::hideSearch()
 
 bool Navigator::checkSearchIndex()
 {
-  KConfig *cfg = TDEGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   cfg->setGroup( "Search" );
   if ( cfg->readBoolEntry( "IndexExists", false ) ) return true;
 
@@ -626,7 +626,7 @@ KURL Navigator::homeURL()
 {
   if ( !mHomeUrl.isEmpty() ) return mHomeUrl;
 
-  KConfig *cfg = TDEGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   // We have to reparse the configuration here in order to get a
   // language-specific StartUrl, e.g. "StartUrl[de]".
   cfg->reparseConfiguration();
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index 0f73369f9..e48ec8359 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -73,7 +73,7 @@ void PluginTraverser::process( DocEntry *entry )
       appItem = new NavigatorAppItem( entry, mListView, mCurrentItem );
     else
       appItem = new NavigatorAppItem( entry, mParentItem, mCurrentItem );
-    KConfig *cfg = kapp->config();
+    TDEConfig *cfg = kapp->config();
     cfg->setGroup( "General" );
     appItem->setRelpath( cfg->readPathEntry( "AppsRoot" ) );
     mCurrentItem = appItem;
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 0b830725e..b62777272 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -44,9 +44,9 @@ ScrollKeeperTreeBuilder::ScrollKeeperTreeBuilder( TQObject *parent, const char *
 
 void ScrollKeeperTreeBuilder::loadConfig()
 {
-  KConfig *cfg = kapp->config();
+  TDEConfig *cfg = kapp->config();
   {
-    KConfigGroupSaver groupSaver( cfg, "ScrollKeeper" );
+    TDEConfigGroupSaver groupSaver( cfg, "ScrollKeeper" );
     mShowEmptyDirs = cfg->readBoolEntry( "ShowEmptyDirs", false );
   }
 }
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index bc0a1d167..ca4f56c01 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -293,7 +293,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
   if ( method == "or" ) mOperation = Or;
   else mOperation = And;
 
-  KConfig *cfg = TDEGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   cfg->setGroup( "Search" );
   TQString commonSearchProgram = cfg->readPathEntry( "CommonProgram" );
   bool useCommon = cfg->readBoolEntry( "UseCommonProgram", false );
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index 31f4c667f..9821c0da0 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -12,7 +12,7 @@
 
 class TQWidget;
 class TDEProcess;
-class KConfig;
+class TDEConfig;
 class KHTMLPart;
 
 namespace KHC {
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 076890428..adf0574a2 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -138,11 +138,11 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
   
     kdDebug() << "SearchHandler::search() URL: " << urlString << endl;
   
-    KIO::TransferJob *job = KIO::get( KURL( urlString ) );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             TQT_SLOT( slotJobResult( KIO::Job * ) ) );
-    connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
+    TDEIO::TransferJob *job = TDEIO::get( KURL( urlString ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
     SearchJob *searchJob = new SearchJob;
     searchJob->mEntry = entry;
@@ -213,12 +213,12 @@ void SearchHandler::searchExited( TDEProcess *proc )
   }
 }
 
-void SearchHandler::slotJobResult( KIO::Job *job )
+void SearchHandler::slotJobResult( TDEIO::Job *job )
 {
   TQString result;
   DocEntry *entry = 0;
 
-  TQMap<KIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job );
+  TQMap<TDEIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job );
   if ( it != mKioJobs.end() ) {
     SearchJob *j = *it;
 
@@ -236,11 +236,11 @@ void SearchHandler::slotJobResult( KIO::Job *job )
   }
 }
  
-void SearchHandler::slotJobData( KIO::Job *job, const TQByteArray &data )
+void SearchHandler::slotJobData( TDEIO::Job *job, const TQByteArray &data )
 {
 //  kdDebug() << "SearchHandler::slotJobData()" << endl;
 
-  TQMap<KIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job );
+  TQMap<TDEIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job );
   if ( it != mKioJobs.end() ) {
     (*it)->mResult += data.data();
   }
diff --git a/khelpcenter/searchhandler.h b/khelpcenter/searchhandler.h
index 356446db5..31c3adb1f 100644
--- a/khelpcenter/searchhandler.h
+++ b/khelpcenter/searchhandler.h
@@ -25,7 +25,7 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
@@ -39,7 +39,7 @@ class SearchJob
     DocEntry *mEntry;
   
     TDEProcess *mProcess;
-    KIO::Job *mKioJob;
+    TDEIO::Job *mKioJob;
     
     TQString mCmd;
     
@@ -75,8 +75,8 @@ class SearchHandler : public QObject
     void searchStderr( TDEProcess *proc, char *buffer, int buflen );
     void searchExited( TDEProcess *proc ); 
 
-    void slotJobResult( KIO::Job *job );
-    void slotJobData( KIO::Job *, const TQByteArray &data );
+    void slotJobResult( TDEIO::Job *job );
+    void slotJobData( TDEIO::Job *, const TQByteArray &data );
 
   private:
     SearchHandler();
@@ -89,7 +89,7 @@ class SearchHandler : public QObject
     TQStringList mDocumentTypes;
 
     TQMap<TDEProcess *,SearchJob *> mProcessJobs;
-    TQMap<KIO::Job *,SearchJob *> mKioJobs;
+    TQMap<TDEIO::Job *,SearchJob *> mKioJobs;
 };
 
 }
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index df04f9531..4930197a0 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -115,7 +115,7 @@ SearchWidget::~SearchWidget()
 }
 
 
-void SearchWidget::readConfig( KConfig *cfg )
+void SearchWidget::readConfig( TDEConfig *cfg )
 {
   cfg->setGroup( "Search" );
 
@@ -142,7 +142,7 @@ void SearchWidget::readConfig( KConfig *cfg )
   checkScope();
 }
 
-void SearchWidget::writeConfig( KConfig *cfg )
+void SearchWidget::writeConfig( TDEConfig *cfg )
 {
   cfg->setGroup( "Search" );
   
diff --git a/khelpcenter/searchwidget.h b/khelpcenter/searchwidget.h
index 408c64560..14801223b 100644
--- a/khelpcenter/searchwidget.h
+++ b/khelpcenter/searchwidget.h
@@ -33,7 +33,7 @@ class TQListViewItem;
 class TQComboBox;
 
 class KLanguageCombo;
-class KConfig;
+class TDEConfig;
 
 class KCMHelpCenter;
 
@@ -64,8 +64,8 @@ class SearchWidget : public TQWidget, public DCOPObject
 
     TQString scopeSelectionLabel( int ) const;
 
-    void readConfig( KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     int scopeCount() const;