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

46 files changed, 117 insertions, 117 deletions

diff --git a/cervisia/ChangeLog b/cervisia/ChangeLog
index eaa88397..7c378f87 100644
--- a/cervisia/ChangeLog
+++ b/cervisia/ChangeLog
@@ -598,7 +598,7 @@
 2003-01-11  André Wöbbeking <Woebbeking@kde.org>
 
 	* Moved colors from UpdateViewItem to UpdateView:
-	  o it's faster as you don't need KConfig in UpdateViewItem ctor
+	  o it's faster as you don't need TDEConfig in UpdateViewItem ctor
 	  o it needs less memory (3 colors per item)
 
 2003-01-09  Christian Loose <christian.loose@hamburg.de>
@@ -750,7 +750,7 @@
 	* Mark files with option -kb with a binary icon
 	* Fixed restoration of the last loaded sandbox
 	* Use different instance names for part and shell,
-	  otherwise KConfig get messed up
+	  otherwise TDEConfig get messed up
 
 2002-06-26  Bernd Gehrmann  <bernd@mail.berlios.de>
 
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index c370b02a..342f52b2 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -32,7 +32,7 @@
 #include <knuminput.h>
 
 
-AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo, 
+AddRepositoryDialog::AddRepositoryDialog(TDEConfig& cfg, const TQString& repo, 
                                          TQWidget* parent, const char* name)
     : KDialogBase(parent, name, true, i18n("Add Repository"),
                   Ok | Cancel, Ok, true)
@@ -114,7 +114,7 @@ void AddRepositoryDialog::setCompression(int compression)
 {
     if( compression < 0 )
     {
-        // TODO: use KConfigXT to retrieve default compression level
+        // TODO: use TDEConfigXT to retrieve default compression level
         m_compressionLevel->setValue(0);
         m_useDifferentCompression->setChecked(false);
     }
diff --git a/cervisia/addrepositorydlg.h b/cervisia/addrepositorydlg.h
index f326dad1..23323c32 100644
--- a/cervisia/addrepositorydlg.h
+++ b/cervisia/addrepositorydlg.h
@@ -25,7 +25,7 @@
 #include <kdialogbase.h>
 
 class TQCheckBox;
-class KConfig;
+class TDEConfig;
 class KIntNumInput;
 class KLineEdit;
 
@@ -36,7 +36,7 @@ class AddRepositoryDialog : public KDialogBase
   
 
 public:
-    AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* parent = 0,
+    AddRepositoryDialog(TDEConfig& cfg, const TQString& repo, TQWidget* parent = 0,
                          const char* name = 0);
     virtual ~AddRepositoryDialog();
 
@@ -63,7 +63,7 @@ private:
     TQCheckBox*    m_useDifferentCompression;
     TQCheckBox*    m_retrieveCvsignoreFile;
     KIntNumInput* m_compressionLevel;
-    KConfig&      partConfig;
+    TDEConfig&      partConfig;
 };
 
 #endif
diff --git a/cervisia/annotatedlg.cpp b/cervisia/annotatedlg.cpp
index b1a0977c..0616fb9e 100644
--- a/cervisia/annotatedlg.cpp
+++ b/cervisia/annotatedlg.cpp
@@ -23,7 +23,7 @@
 #include "annotateview.h"
 
 
-AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *parent, const char *name)
+AnnotateDialog::AnnotateDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, false, TQString(),
                   Close | Help, Close, true)
     , partConfig(cfg)
diff --git a/cervisia/annotatedlg.h b/cervisia/annotatedlg.h
index d9ba0317..72356390 100644
--- a/cervisia/annotatedlg.h
+++ b/cervisia/annotatedlg.h
@@ -27,7 +27,7 @@
 
 class AnnotateView;
 class TQDate;
-class KConfig;
+class TDEConfig;
 
 namespace Cervisia
 {
@@ -39,7 +39,7 @@ class AnnotateDialog : public KDialogBase
 {
 public:
 
-    explicit AnnotateDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit AnnotateDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
 
     virtual ~AnnotateDialog();
 
@@ -48,7 +48,7 @@ public:
 
 private:
     AnnotateView *annotate;
-    KConfig&      partConfig;
+    TDEConfig&      partConfig;
 };
 
 #endif
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index bdbcf2a9..174ade20 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -140,7 +140,7 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col
   caused by a bug in TQHeader::adjustHeaderSize() in TQt <= 3.0.4.
 */
 
-AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name)
+AnnotateView::AnnotateView(TDEConfig &cfg, TQWidget *parent, const char *name)
     : TQListView(parent, name, WRepaintNoErase | WResizeNoErase)
 {
     setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
@@ -162,7 +162,7 @@ AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name)
     connect(toolTip, TQT_SIGNAL(queryToolTip(const TQPoint&, TQRect&, TQString&)),
             this, TQT_SLOT(slotQueryToolTip(const TQPoint&, TQRect&, TQString&)));
 
-    KConfigGroupSaver cs(&cfg, "LookAndFeel");
+    TDEConfigGroupSaver cs(&cfg, "LookAndFeel");
     setFont(cfg.readFontEntry("AnnotateFont"));
 }
 
diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h
index 2a878611..52178f7f 100644
--- a/cervisia/annotateview.h
+++ b/cervisia/annotateview.h
@@ -25,7 +25,7 @@
 #include <tqlistview.h>
 
 
-class KConfig;
+class TDEConfig;
 
 
 namespace Cervisia
@@ -41,7 +41,7 @@ class AnnotateView : public TQListView
 
 public:
 
-    explicit AnnotateView( KConfig &cfg, TQWidget *parent=0, const char *name=0 );
+    explicit AnnotateView( TDEConfig &cfg, TQWidget *parent=0, const char *name=0 );
 
     void addLine(const Cervisia::LogInfo& logInfo, const TQString& content,
                  bool odd);
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 931adefa..e3eb4e95 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -121,7 +121,7 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
       cvsService = new CvsService_stub(appId, "CvsService");
 
     // Create UI
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     conf->setGroup("LookAndFeel");
     bool splitHorz = conf->readBoolEntry("SplitHorizontally",true);
 
@@ -176,7 +176,7 @@ CervisiaPart::~CervisiaPart()
         writeSettings();
 }
 
-KConfig *CervisiaPart::config()
+TDEConfig *CervisiaPart::config()
 {
     return CervisiaFactory::instance()->config();
 }
@@ -184,7 +184,7 @@ KConfig *CervisiaPart::config()
 bool CervisiaPart::openURL( const KURL &u )
 {
     // support url protocols like system:// or home://
-    KURL url = KIO::NetAccess::mostLocalURL(u, widget());
+    KURL url = TDEIO::NetAccess::mostLocalURL(u, widget());
 
     // right now, we are unfortunately not network-aware
     if( !url.isLocalFile() )
@@ -975,7 +975,7 @@ void CervisiaPart::slotCommit()
             while (recentCommits.count() > 50)
                 recentCommits.remove( recentCommits.last() );
 
-            KConfig* conf = config();
+            TDEConfig* conf = config();
             conf->setGroup( "CommitLogs" );
             conf->writeEntry( sandbox, recentCommits, COMMIT_SPLIT_CHAR );
         }
@@ -1628,7 +1628,7 @@ void CervisiaPart::slotDoCVSEdit()
 
 void CervisiaPart::slotConfigure()
 {
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     SettingsDialog *l = new SettingsDialog( conf, widget() );
     l->exec();
 
@@ -1755,7 +1755,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
     update->openDirectory(sandbox);
     setFilter();
 
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     conf->setGroup("General");
     bool dostatus = conf->readBoolEntry(repository.contains(":")?
                                         "StatusForRemoteRepos" :
@@ -1767,7 +1767,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
         slotStatus();
     }
 
-    //load the recentCommits for this app from the KConfig app
+    //load the recentCommits for this app from the TDEConfig app
     conf->setGroup( "CommitLogs" );
     recentCommits = conf->readListEntry( sandbox, COMMIT_SPLIT_CHAR );
 
@@ -1808,12 +1808,12 @@ void CervisiaPart::setFilter()
 
 void CervisiaPart::readSettings()
 {
-    KConfig* config = CervisiaFactory::instance()->config();
+    TDEConfig* config = CervisiaFactory::instance()->config();
 
     config->setGroup("Session");
     recent->loadEntries( config );
 
-    // Unfortunately, the KConfig systems sucks and we have to live
+    // Unfortunately, the TDEConfig systems sucks and we have to live
     // with all entries in one group for session management.
 
     opt_createDirs = config->readBoolEntry("Create Dirs", true);
@@ -1872,7 +1872,7 @@ void CervisiaPart::readSettings()
 
 void CervisiaPart::writeSettings()
 {
-    KConfig* config = CervisiaFactory::instance()->config();
+    TDEConfig* config = CervisiaFactory::instance()->config();
 
     config->setGroup("Session");
     recent->saveEntries( config );
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index 5ab4efe4..6d1d097b 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -63,7 +63,7 @@ public:
     /**
      * Get the config object for the part's instance.
      */
-    static KConfig *config();
+    static TDEConfig *config();
 
     TQString sandBox() const { return sandbox; }
 
diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp
index 125df1ba..0805d8dc 100644
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@@ -177,7 +177,7 @@ bool CervisiaShell::queryExit()
 }
 
 
-void CervisiaShell::readProperties(KConfig* config)
+void CervisiaShell::readProperties(TDEConfig* config)
 {   
     m_lastOpenDir = config->readPathEntry("Current Directory");
     
@@ -188,7 +188,7 @@ void CervisiaShell::readProperties(KConfig* config)
 }
 
 
-void CervisiaShell::saveProperties(KConfig* config)
+void CervisiaShell::saveProperties(TDEConfig* config)
 {
     // Save current working directory (if part was created)
     if( m_part )
@@ -203,7 +203,7 @@ void CervisiaShell::saveProperties(KConfig* config)
 
 void CervisiaShell::readSettings()
 {
-    KConfig* config = TDEGlobal::config(); 
+    TDEConfig* config = TDEGlobal::config(); 
     config->setGroup("Session");
     
     readProperties(config);
@@ -212,7 +212,7 @@ void CervisiaShell::readSettings()
 
 void CervisiaShell::writeSettings()
 {
-    KConfig* config = TDEGlobal::config();  
+    TDEConfig* config = TDEGlobal::config();  
     config->setGroup("Session");
     
     saveProperties(config);
diff --git a/cervisia/cervisiashell.h b/cervisia/cervisiashell.h
index 1aad2c11..2a676d76 100644
--- a/cervisia/cervisiashell.h
+++ b/cervisia/cervisiashell.h
@@ -53,8 +53,8 @@ protected:
     void setupActions();
     
     bool queryExit();
-    virtual void readProperties(KConfig* config);
-    virtual void saveProperties(KConfig* config);
+    virtual void readProperties(TDEConfig* config);
+    virtual void saveProperties(TDEConfig* config);
 
 private:
     void readSettings();
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 8c19a9fc..943d7dd0 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -40,7 +40,7 @@ static inline TQString DateStringISO8601()
 ChangeLogDialog::Options *ChangeLogDialog::options = 0;
 
 
-ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ChangeLogDialog::ChangeLogDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, true, i18n("Edit ChangeLog"),
                   Ok | Cancel, Ok, true)
     , partConfig(cfg)
@@ -118,7 +118,7 @@ bool ChangeLogDialog::readFile(const TQString &filename)
             f.close();
         }
 
-    KConfigGroupSaver cs(&partConfig, "General");
+    TDEConfigGroupSaver cs(&partConfig, "General");
     const TQString username = partConfig.readEntry("Username", Cervisia::UserName());
 
     edit->insertParagraph("", 0);
diff --git a/cervisia/changelogdlg.h b/cervisia/changelogdlg.h
index ee7b8fc4..7b9e0d25 100644
--- a/cervisia/changelogdlg.h
+++ b/cervisia/changelogdlg.h
@@ -25,13 +25,13 @@
 #include <kdialogbase.h>
 
 class KTextEdit;
-class KConfig;
+class TDEConfig;
 
 
 class ChangeLogDialog : public KDialogBase
 {
 public:
-    explicit ChangeLogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit ChangeLogDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
 
     virtual ~ChangeLogDialog();
 
@@ -49,7 +49,7 @@ private:
 
     TQString fname;
     KTextEdit *edit;
-    KConfig&   partConfig;
+    TDEConfig&   partConfig;
 };
 
 #endif
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index 16a57098..0fe06352 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -42,7 +42,7 @@
 using Cervisia::IsValidTag;
 
 
-CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
+CheckoutDialog::CheckoutDialog(TDEConfig& cfg, CvsService_stub* service,
                                ActionType action, TQWidget* parent,
                                const char* name)
     : KDialogBase(parent, name, true, TQString(),
@@ -415,7 +415,7 @@ void CheckoutDialog::branchButtonClicked()
 
 void CheckoutDialog::restoreUserInput()
 {
-    KConfigGroupSaver cs(&partConfig, "CheckoutDialog");
+    TDEConfigGroupSaver cs(&partConfig, "CheckoutDialog");
 
     repo_combo->setEditText(partConfig.readEntry("Repository"));
     workdir_edit->setText(partConfig.readPathEntry("Working directory"));
@@ -441,7 +441,7 @@ void CheckoutDialog::restoreUserInput()
 
 void CheckoutDialog::saveUserInput()
 {
-    KConfigGroupSaver cs(&partConfig, "CheckoutDialog");
+    TDEConfigGroupSaver cs(&partConfig, "CheckoutDialog");
 
     partConfig.writeEntry("Repository", repository());
     partConfig.writeEntry("Module", module());
diff --git a/cervisia/checkoutdlg.h b/cervisia/checkoutdlg.h
index d0b4a42f..2547f680 100644
--- a/cervisia/checkoutdlg.h
+++ b/cervisia/checkoutdlg.h
@@ -27,7 +27,7 @@
 
 class TQCheckBox;
 class TQComboBox;
-class KConfig;
+class TDEConfig;
 class KLineEdit;
 class CvsService_stub;
 
@@ -40,7 +40,7 @@ class CheckoutDialog : public KDialogBase
 public:
     enum ActionType { Checkout, Import };
     
-    CheckoutDialog( KConfig& cfg, CvsService_stub* service, ActionType action,
+    CheckoutDialog( TDEConfig& cfg, CvsService_stub* service, ActionType action,
                     TQWidget *parent=0, const char *name=0 );
 
     TQString workingDirectory() const;
@@ -77,7 +77,7 @@ private:
     TQCheckBox *binary_box, *export_box, *recursive_box;
     TQCheckBox* m_useModificationTimeBox;
     ActionType act;
-    KConfig&   partConfig;
+    TDEConfig&   partConfig;
 
     CvsService_stub *cvsService;
 };
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index 976d93bd..485547fc 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -52,7 +52,7 @@ private:
 };
 
 
-CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
+CommitDialog::CommitDialog(TDEConfig& cfg, CvsService_stub* service,
                            TQWidget *parent, const char *name)
     : KDialogBase(parent, name, true, i18n("CVS Commit"),
                   Ok | Cancel | Help | User1, Ok, true)
@@ -119,7 +119,7 @@ CommitDialog::~CommitDialog()
 {
     saveDialogSize(partConfig, "CommitDialog");
 
-    KConfigGroupSaver cs(&partConfig, "CommitDialog");
+    TDEConfigGroupSaver cs(&partConfig, "CommitDialog");
     partConfig.writeEntry("UseTemplate", m_useTemplateChk->isChecked());
 }
 
@@ -286,7 +286,7 @@ void CommitDialog::checkForTemplateFile()
             f.close();
 
             m_useTemplateChk->setEnabled(true);
-            KConfigGroupSaver cs(&partConfig, "CommitDialog");
+            TDEConfigGroupSaver cs(&partConfig, "CommitDialog");
             bool check = partConfig.readBoolEntry("UseTemplate", true);
             m_useTemplateChk->setChecked(check);
 
diff --git a/cervisia/commitdlg.h b/cervisia/commitdlg.h
index 458528cb..05508163 100644
--- a/cervisia/commitdlg.h
+++ b/cervisia/commitdlg.h
@@ -30,7 +30,7 @@ namespace Cervisia { class LogMessageEdit; }
 class TQComboBox;
 class TQCheckBox;
 class KListView;
-class KConfig;
+class TDEConfig;
 class CvsService_stub;
 
 
@@ -40,7 +40,7 @@ class CommitDialog : public KDialogBase
   
 
 public:
-    CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *parent=0, 
+    CommitDialog( TDEConfig& cfg, CvsService_stub* service, TQWidget *parent=0, 
                   const char *name=0 );
 
     virtual ~CommitDialog();
@@ -75,7 +75,7 @@ private:
     TQCheckBox* m_useTemplateChk;
     TQString    m_templateText;
 
-    KConfig&            partConfig;
+    TDEConfig&            partConfig;
     CvsService_stub*    cvsService;     // for diff dialog
 };
 
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index ce69caf5..70cb283d 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -86,8 +86,8 @@ CvsService::CvsService()
     d->cvsJobs.setAutoDelete(true);
     d->loginJobs.setAutoDelete(true);
 
-    KConfig* config = kapp->config();
-    KConfigGroupSaver cs(config, "General");
+    TDEConfig* config = kapp->config();
+    TDEConfigGroupSaver cs(config, "General");
     if( config->readBoolEntry("UseSshAgent", false) )
     {
         // use the existing or start a new ssh-agent
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index 398c1c47..92a56baa 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -201,7 +201,7 @@ void Repository::slotConfigDirty(const TQString& fileName)
 
 void Repository::Private::readGeneralConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     // get path to cvs client programm
     config->setGroup("General");
@@ -211,7 +211,7 @@ void Repository::Private::readGeneralConfig()
 
 void Repository::Private::readConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     // Sometimes the location can be unequal to the entry in the CVS/Root.
     //
@@ -251,7 +251,7 @@ void Repository::Private::readConfig()
     // use default global compression level instead?
     if( compressionLevel < 0 )
     {
-        KConfigGroupSaver cs(config, "General");
+        TDEConfigGroupSaver cs(config, "General");
         compressionLevel = config->readNumEntry("Compression", 0);
     }
 
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 993f4f6c..bdf34841 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -41,7 +41,7 @@
 #include "diffview.h"
 
 
-DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool modal)
+DiffDialog::DiffDialog(TDEConfig& cfg, TQWidget *parent, const char *name, bool modal)
     : KDialogBase(parent, name, modal, TQString(),
                   Close | Help | User1, Close, true, KStdGuiItem::saveAs())
     , partConfig(cfg)
@@ -118,7 +118,7 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
     TQSize size = configDialogSize(partConfig, "DiffDialog");
     resize(size);
 
-    KConfigGroupSaver cs(&partConfig, "DiffDialog");
+    TDEConfigGroupSaver cs(&partConfig, "DiffDialog");
     syncbox->setChecked(partConfig.readBoolEntry("Sync"));
 }
 
@@ -127,7 +127,7 @@ DiffDialog::~DiffDialog()
 {
     saveDialogSize(partConfig, "DiffDialog");
 
-    KConfigGroupSaver cs(&partConfig, "DiffDialog");
+    TDEConfigGroupSaver cs(&partConfig, "DiffDialog");
     partConfig.writeEntry("Sync", syncbox->isChecked());
 }
 
@@ -230,7 +230,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName
                         i18n("Working dir:")
                         : i18n("Revision ")+revB+":" );
 
-    KConfigGroupSaver cs(&partConfig, "General");
+    TDEConfigGroupSaver cs(&partConfig, "General");
 
     // Ok, this is a hack: When the user wants an external diff
     // front end, it is executed from here. Of course, in that
diff --git a/cervisia/diffdlg.h b/cervisia/diffdlg.h
index 7600af66..7553cdc7 100644
--- a/cervisia/diffdlg.h
+++ b/cervisia/diffdlg.h
@@ -28,7 +28,7 @@
 class TQLabel;
 class TQCheckBox;
 class TQComboBox;
-class KConfig;
+class TDEConfig;
 class DiffItem;
 class DiffView;
 class CvsService_stub;
@@ -41,7 +41,7 @@ class DiffDialog : public KDialogBase
 
 public:
 
-    explicit DiffDialog( KConfig& config, TQWidget *parent=0, const char *name=0, 
+    explicit DiffDialog( TDEConfig& config, TQWidget *parent=0, const char *name=0, 
                          bool modal=false );
 
     virtual ~DiffDialog();
@@ -76,7 +76,7 @@ private:
 
     TQPtrList<DiffItem> items;
     int markeditem;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
     TQStringList m_diffOutput;
 };
 
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 90e82516..c3e43862 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -53,7 +53,7 @@ int DiffViewItemList::compareItems(TQPtrCollection::Item item1, TQPtrCollection:
 const int DiffView::BORDER = 7;
 
 
-DiffView::DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
+DiffView::DiffView( TDEConfig& cfg, bool withlinenos, bool withmarker,
                     TQWidget *parent, const char *name )
     : QtTableView(parent, name, WRepaintNoErase)
     , partConfig(cfg)
@@ -388,7 +388,7 @@ void DiffView::wheelEvent(TQWheelEvent *e)
 }
 
 
-DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name)
+DiffZoomWidget::DiffZoomWidget(TDEConfig& cfg, TQWidget *parent, const char *name)
     : TQFrame(parent, name)
 {
     setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
diff --git a/cervisia/diffview.h b/cervisia/diffview.h
index f691c0b6..2eff4753 100644
--- a/cervisia/diffview.h
+++ b/cervisia/diffview.h
@@ -28,7 +28,7 @@
 #include <tqptrlist.h>
 
 
-class KConfig;
+class TDEConfig;
 class DiffViewItem;
 
 
@@ -47,7 +47,7 @@ class DiffView : public QtTableView
 public:
     enum DiffType { Change, Insert, Delete, Neutral, Unchanged, Separator };
 
-    DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
+    DiffView( TDEConfig& cfg, bool withlinenos, bool withmarker,
               TQWidget *parent=0, const char *name=0 );
 
     void setPartner(DiffView *other);
@@ -98,7 +98,7 @@ private:
     TQColor diffDeleteColor;
 
     int m_tabWidth;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
 };
 
 
@@ -108,7 +108,7 @@ class DiffZoomWidget : public TQFrame
   
 
 public:
-    DiffZoomWidget(KConfig& cfg, TQWidget *parent=0, const char *name=0);
+    DiffZoomWidget(TDEConfig& cfg, TQWidget *parent=0, const char *name=0);
     ~DiffZoomWidget();
 
     void setDiffView(DiffView *view);
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 20e95d37..8f2ffee2 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -138,7 +138,7 @@ bool HistoryItem::isOther()
 }
 
 
-HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
+HistoryDialog::HistoryDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, false, TQString(),
                   Close | Help, ButtonCode(0), true)
     , partConfig(cfg)
diff --git a/cervisia/historydlg.h b/cervisia/historydlg.h
index fa589215..8b4345c1 100644
--- a/cervisia/historydlg.h
+++ b/cervisia/historydlg.h
@@ -26,7 +26,7 @@
 
 
 class TQCheckBox;
-class KConfig;
+class TDEConfig;
 class KLineEdit;
 class KListView;
 class CvsService_stub;
@@ -38,7 +38,7 @@ class HistoryDialog : public KDialogBase
   
 
 public:
-    explicit HistoryDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit HistoryDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
     virtual ~HistoryDialog();
 
     bool parseHistory(CvsService_stub* cvsService);
@@ -52,7 +52,7 @@ private:
     TQCheckBox *commit_box, *checkout_box, *tag_box, *other_box;
     TQCheckBox *onlyuser_box, *onlyfilenames_box, *onlydirnames_box;
     KLineEdit *user_edit, *filename_edit, *dirname_edit;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
 };
 
 #endif
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index 1c09509a..bb0b9223 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -57,7 +57,7 @@
 #include "patchoptiondlg.h"
 
 
-LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
+LogDialog::LogDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, false, TQString(),
                   Ok | Apply | Close | Help | User1 | User2 | User3, Close, true,
                   KGuiItem(i18n("&Annotate")),
@@ -204,7 +204,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
     TQSize size = configDialogSize(partConfig, "LogDialog");
     resize(size);
 
-    KConfigGroupSaver cs(&partConfig, "LogDialog");
+    TDEConfigGroupSaver cs(&partConfig, "LogDialog");
     tabWidget->setCurrentPage(partConfig.readNumEntry("ShowTab", 0));
 
     updateButtons();
@@ -215,7 +215,7 @@ LogDialog::~LogDialog()
 {
     saveDialogSize(partConfig, "LogDialog");
 
-    KConfigGroupSaver cs(&partConfig, "LogDialog");
+    TDEConfigGroupSaver cs(&partConfig, "LogDialog");
     partConfig.writeEntry("ShowTab", tabWidget->currentPageIndex());
 }
 
diff --git a/cervisia/logdlg.h b/cervisia/logdlg.h
index 2e676d04..59f3b9f5 100644
--- a/cervisia/logdlg.h
+++ b/cervisia/logdlg.h
@@ -32,7 +32,7 @@ class LogListView;
 class LogTreeView;
 class LogPlainView;
 
-class KConfig;
+class TDEConfig;
 
 class TQComboBox;
 class TQLabel;
@@ -55,7 +55,7 @@ class LogDialog : public KDialogBase
   
 
 public:
-    explicit LogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit LogDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
 
     virtual ~LogDialog();
 
@@ -95,7 +95,7 @@ private:
     TQComboBox *tagcombo[2];
 
     CvsService_stub* cvsService;
-    KConfig&         partConfig;
+    TDEConfig&         partConfig;
 };
 
 #endif
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index d676718a..3b0432fd 100644
--- a/cervisia/loglist.cpp
+++ b/cervisia/loglist.cpp
@@ -106,7 +106,7 @@ int LogListViewItem::compare(TQListViewItem* i, int col, bool ascending) const
 }
 
 
-LogListView::LogListView(KConfig& cfg, TQWidget *parent, const char *name)
+LogListView::LogListView(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KListView(parent, name)
     , partConfig(cfg)
 {
diff --git a/cervisia/loglist.h b/cervisia/loglist.h
index 0530283b..49c3ecdc 100644
--- a/cervisia/loglist.h
+++ b/cervisia/loglist.h
@@ -25,7 +25,7 @@
 #include <klistview.h>
 
 
-class KConfig;
+class TDEConfig;
 
 class TipLabel;
 class LogListViewItem;
@@ -42,7 +42,7 @@ class LogListView : public KListView
   
     
 public:
-    explicit LogListView( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit LogListView( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
     virtual ~LogListView();
     
     void addRevision(const Cervisia::LogInfo& logInfo);
@@ -61,7 +61,7 @@ private slots:
 
 private:
 
-    KConfig& partConfig;
+    TDEConfig& partConfig;
 };
 
 #endif
diff --git a/cervisia/logplainview.h b/cervisia/logplainview.h
index 324c3417..75e004df 100644
--- a/cervisia/logplainview.h
+++ b/cervisia/logplainview.h
@@ -22,7 +22,7 @@
 
 #include <ktextbrowser.h>
 
-class KConfig;
+class TDEConfig;
 class KFind;
 
 namespace Cervisia
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index 9d9c89a9..e5aa2120 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -62,7 +62,7 @@ static CvsService_stub* StartDCOPService(const TQString& directory)
 
 static int ShowResolveDialog(const TQString& fileName)
 {
-    KConfig* config = new KConfig("cervisiapartrc");
+    TDEConfig* config = new TDEConfig("cervisiapartrc");
 
     ResolveDialog* dlg = new ResolveDialog(*config);
     kapp->setMainWidget(dlg);
@@ -81,7 +81,7 @@ static int ShowResolveDialog(const TQString& fileName)
 
 static int ShowLogDialog(const TQString& fileName)
 {
-    KConfig* config = new KConfig("cervisiapartrc");
+    TDEConfig* config = new TDEConfig("cervisiapartrc");
     LogDialog* dlg = new LogDialog(*config);
     kapp->setMainWidget(dlg);
 
@@ -111,7 +111,7 @@ static int ShowLogDialog(const TQString& fileName)
 
 static int ShowAnnotateDialog(const TQString& fileName)
 {
-    KConfig* config = new KConfig("cervisiapartrc");
+    TDEConfig* config = new TDEConfig("cervisiapartrc");
     AnnotateDialog* dlg = new AnnotateDialog(*config);
     kapp->setMainWidget(dlg);
 
diff --git a/cervisia/misc.h b/cervisia/misc.h
index 803c8131..f66926f4 100644
--- a/cervisia/misc.h
+++ b/cervisia/misc.h
@@ -26,7 +26,7 @@
 class TQString;
 class TQStringList;
 class TQWidget;
-class KConfig;
+class TDEConfig;
 class CvsService_stub;
 
 
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index 004226a8..62e15dde 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -42,7 +42,7 @@ ProtocolView::ProtocolView(const TQCString& appId, TQWidget *parent, const char
     setTabChangesFocus(true);
     setTextFormat(TQt::LogText);
 
-    KConfig *config = CervisiaPart::config();
+    TDEConfig *config = CervisiaPart::config();
     config->setGroup("LookAndFeel");
     setFont(config->readFontEntry("ProtocolFont"));
 
diff --git a/cervisia/repositories.cpp b/cervisia/repositories.cpp
index 7f52a39d..28302ce3 100644
--- a/cervisia/repositories.cpp
+++ b/cervisia/repositories.cpp
@@ -111,7 +111,7 @@ TQStringList Repositories::readConfigFile()
 {
     TQStringList list;
     
-    KConfig *config = CervisiaPart::config();
+    TDEConfig *config = CervisiaPart::config();
     config->setGroup("Repositories");
     list = config->readListEntry("Repos");
 
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index be19890d..54694307 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -152,7 +152,7 @@ void RepositoryListItem::changeLoginStatusColumn()
 }
 
 
-RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
+RepositoryDialog::RepositoryDialog(TDEConfig& cfg, CvsService_stub* cvsService,
                                    TQWidget* parent, const char* name)
     : KDialogBase(parent, name, true, i18n("Configure Access to Repositories"),
                   Ok | Cancel | Help, Ok, true)
@@ -204,7 +204,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
              this, TQT_SLOT(slotLogoutClicked()) );
 
     // open cvs DCOP service configuration file
-    m_serviceConfig = new KConfig("cvsservicerc");
+    m_serviceConfig = new TDEConfig("cvsservicerc");
 
     readCvsPassFile();
     readConfigFile();
diff --git a/cervisia/repositorydlg.h b/cervisia/repositorydlg.h
index 85b9688f..6d7bffa4 100644
--- a/cervisia/repositorydlg.h
+++ b/cervisia/repositorydlg.h
@@ -27,7 +27,7 @@
 
 class TQListViewItem;
 class TQPushButton;
-class KConfig;
+class TDEConfig;
 class KListView;
 class CvsService_stub;
 class RepositoryListItem;
@@ -39,7 +39,7 @@ class RepositoryDialog : public KDialogBase
   
 
 public:
-    RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
+    RepositoryDialog(TDEConfig& cfg, CvsService_stub* cvsService,
                      TQWidget* parent = 0, const char* name = 0);
     virtual ~RepositoryDialog();
 
@@ -62,9 +62,9 @@ private:
     void writeRepositoryData(RepositoryListItem* item);
 
 private:
-    KConfig&         m_partConfig;
+    TDEConfig&         m_partConfig;
     CvsService_stub* m_cvsService;
-    KConfig*         m_serviceConfig;
+    TDEConfig*         m_serviceConfig;
     KListView*       m_repoList;
     TQPushButton*     m_modifyButton;
     TQPushButton*     m_removeButton;
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index 3df6a8ee..d9652bf1 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -95,7 +95,7 @@ private:
 }
 
 
-ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ResolveDialog::ResolveDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, false, TQString(),
                   Close | Help | User1 | User2, Close, true,
                   KStdGuiItem::saveAs(), KStdGuiItem::save())
diff --git a/cervisia/resolvedlg.h b/cervisia/resolvedlg.h
index 71aa91f2..c847e3da 100644
--- a/cervisia/resolvedlg.h
+++ b/cervisia/resolvedlg.h
@@ -31,7 +31,7 @@
 
 class TQLabel;
 class TQTextCodec;
-class KConfig;
+class TDEConfig;
 class ResolveItem;
 
 
@@ -43,7 +43,7 @@ class ResolveDialog : public KDialogBase
 public:
     enum ChooseType { ChA, ChB, ChAB, ChBA, ChEdit };
 
-    explicit ResolveDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit ResolveDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
     virtual ~ResolveDialog();
 
     bool parseFile(const TQString &name);
@@ -85,7 +85,7 @@ private:
     TQString fname;
     TQTextCodec *fcodec;
     int markeditem;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
     
     TQString    m_contentMergedVersion;
 };
diff --git a/cervisia/resolvedlg_p.cpp b/cervisia/resolvedlg_p.cpp
index b353c9f4..94f06ff4 100644
--- a/cervisia/resolvedlg_p.cpp
+++ b/cervisia/resolvedlg_p.cpp
@@ -22,7 +22,7 @@ using namespace Cervisia;
 #include <ktextedit.h>
 
 
-ResolveEditorDialog::ResolveEditorDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ResolveEditorDialog::ResolveEditorDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, true, TQString(),
                   Ok | Cancel, Ok, true)
     , m_partConfig(cfg)
diff --git a/cervisia/resolvedlg_p.h b/cervisia/resolvedlg_p.h
index 680da0a6..ad2ad907 100644
--- a/cervisia/resolvedlg_p.h
+++ b/cervisia/resolvedlg_p.h
@@ -23,7 +23,7 @@
 
 class KTextEdit;
 class TQStringList;
-class KConfig;
+class TDEConfig;
 
 
 namespace Cervisia
@@ -33,7 +33,7 @@ namespace Cervisia
 class ResolveEditorDialog : public KDialogBase
 {
 public:
-    explicit ResolveEditorDialog(KConfig& cfg, TQWidget* parent=0, const char* name=0);
+    explicit ResolveEditorDialog(TDEConfig& cfg, TQWidget* parent=0, const char* name=0);
     virtual ~ResolveEditorDialog();
 
     void setContent(const TQString& text);
@@ -41,7 +41,7 @@ public:
 
 private:   
     KTextEdit* m_edit;
-    KConfig&   m_partConfig;
+    TDEConfig&   m_partConfig;
 };  
 
 
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index b5923964..6e677e95 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -77,7 +77,7 @@ void FontButton::chooseFont()
 }
 
 
-SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *name )
+SettingsDialog::SettingsDialog( TDEConfig *conf, TQWidget *parent, const char *name )
     : KDialogBase(KDialogBase::IconList, i18n("Configure Cervisia"),
       KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help,
       KDialogBase::Ok,
@@ -86,7 +86,7 @@ SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *nam
     config = conf;
 
     // open cvs DCOP service configuration file
-    serviceConfig = new KConfig("cvsservicerc");
+    serviceConfig = new TDEConfig("cvsservicerc");
 
     //
     // General Options
diff --git a/cervisia/settingsdlg.h b/cervisia/settingsdlg.h
index 9b4aecfc..8c1de6f3 100644
--- a/cervisia/settingsdlg.h
+++ b/cervisia/settingsdlg.h
@@ -29,7 +29,7 @@
 class TQCheckBox;
 class KIntNumInput;
 class KLineEdit;
-class KConfig;
+class TDEConfig;
 class KColorButton;
 class KURLRequester;
 class AdvancedPage;
@@ -54,7 +54,7 @@ class SettingsDialog : public KDialogBase
   
 
 public:
-    SettingsDialog( KConfig *conf, TQWidget *parent=0, const char *name=0 );
+    SettingsDialog( TDEConfig *conf, TQWidget *parent=0, const char *name=0 );
     virtual ~SettingsDialog();
 
 protected slots:
@@ -70,7 +70,7 @@ private:
     void addAdvancedPage();
     void addLookAndFeelPage();
 
-    KConfig *config;
+    TDEConfig *config;
     KIntNumInput *contextedit;
     KIntNumInput *tabwidthedit;
     KURLRequester *cvspathedit;
@@ -95,7 +95,7 @@ private:
     TQCheckBox*    m_splitterBox;
     AdvancedPage* m_advancedPage;
 
-    KConfig* serviceConfig;
+    TDEConfig* serviceConfig;
 };
 
 #endif
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 52e44b2e..c05c1c3f 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -38,7 +38,7 @@ using Cervisia::Entry;
 using Cervisia::EntryStatus;
 
 
-UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
+UpdateView::UpdateView(TDEConfig& partConfig, TQWidget *parent, const char *name)
     : KListView(parent, name),
       m_partConfig(partConfig),
       m_unfoldingTree(false)
@@ -531,7 +531,7 @@ void UpdateView::syncSelection()
  */
 void UpdateView::updateColors()
 {
-    KConfigGroupSaver cs(&m_partConfig, "Colors");
+    TDEConfigGroupSaver cs(&m_partConfig, "Colors");
     m_partConfig.setGroup("Colors");
 
     TQColor defaultColor = TQColor(255, 130, 130);
diff --git a/cervisia/updateview.h b/cervisia/updateview.h
index 0b140f43..07894253 100644
--- a/cervisia/updateview.h
+++ b/cervisia/updateview.h
@@ -29,7 +29,7 @@
 #include "entry.h"
 
 
-class KConfig;
+class TDEConfig;
 
 
 class UpdateView : public KListView
@@ -43,7 +43,7 @@ public:
                   NoRemoved=4, NoNotInCVS=8 , NoEmptyDirectories = 16 };
     enum Action { Add, Remove, Update, UpdateNoAct, Commit };
     
-    explicit UpdateView(KConfig& partConfig, TQWidget *parent=0, const char *name=0);
+    explicit UpdateView(TDEConfig& partConfig, TQWidget *parent=0, const char *name=0);
 
     virtual ~UpdateView();
 
@@ -93,7 +93,7 @@ private:
 
     void updateColors();
 
-    KConfig& m_partConfig;
+    TDEConfig& m_partConfig;
 
     Filter filt;
     Action act;
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index d8427f82..fec97848 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -30,7 +30,7 @@
 #include "progressdlg.h"
 
 
-WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
+WatchersDialog::WatchersDialog(TDEConfig& cfg, TQWidget* parent, const char* name)
     : KDialogBase(parent, name, false, TQString(),
                   Close, ButtonCode(0), true)
     , partConfig(cfg)
diff --git a/cervisia/watchersdlg.h b/cervisia/watchersdlg.h
index fff50d88..e8f43d7a 100644
--- a/cervisia/watchersdlg.h
+++ b/cervisia/watchersdlg.h
@@ -24,14 +24,14 @@
 #include <kdialogbase.h>
 
 class TQTable;
-class KConfig;
+class TDEConfig;
 class CvsService_stub;
 
 
 class WatchersDialog : public KDialogBase
 {
 public:
-    explicit WatchersDialog(KConfig& cfg, TQWidget* parent = 0,
+    explicit WatchersDialog(TDEConfig& cfg, TQWidget* parent = 0,
                             const char* name = 0);
     virtual ~WatchersDialog();
 
@@ -39,7 +39,7 @@ public:
 
 private:
     TQTable*  table;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
 };
 
 #endif