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

28 files changed, 97 insertions, 97 deletions

diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index fb76d4f8..9cb96f18 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 
 
-AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *parent, const char *name)
+AutolayoutDlg::AutolayoutDlg(TDEConfig* c,UMLView* v,TQWidget *parent, const char *name)
         :MyDialog1(parent, name)
 {
     view=v;
@@ -122,7 +122,7 @@ void AutolayoutDlg::slotDoAutolayout()
     accept();
 }
 
-void AutolayoutDlg::readConfig( KConfig * conf)
+void AutolayoutDlg::readConfig( TDEConfig * conf)
 {
     conf->setGroup("AutolayoutDlg");
     associationEdgesCB->setChecked((bool)(conf->readBoolEntry( "associationAsEdges",false)));
@@ -138,7 +138,7 @@ void AutolayoutDlg::readConfig( KConfig * conf)
     algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0)));
 }
 
-void AutolayoutDlg::writeConfig( KConfig * conf)
+void AutolayoutDlg::writeConfig( TDEConfig * conf)
 {
     //  conf=kapp->config();
     conf->setGroup("AutolayoutDlg");
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index 35f75231..d970c521 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -23,7 +23,7 @@ class AutolayoutDlg : public MyDialog1
     Q_OBJECT
   
   public:
-    AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0);
+    AutolayoutDlg(TDEConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0);
   public slots:
     virtual void slotSetAssociationWeight(int i);
     virtual void slotSetDependenciesWeight(int i);
@@ -38,8 +38,8 @@ class AutolayoutDlg : public MyDialog1
     virtual void slotReloadSettings();
     virtual void slotSaveSettings();
     virtual void slotDoAutolayout();
-    void readConfig(KConfig*);
-    void writeConfig(KConfig*);
+    void readConfig(TDEConfig*);
+    void writeConfig(TDEConfig*);
     virtual void slotSelectAlgorithm(const TQString&);
 
 
@@ -55,7 +55,7 @@ class AutolayoutDlg : public MyDialog1
     bool centerDiagram;
     bool clusterizeHierarchies;
     int shapeSeparation;
-    KConfig* config;
+    TDEConfig* config;
     TQString algname;
     Autolayout::Autolayouter* getAutolayouter();
 
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index fcb9043c..725f322f 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -100,7 +100,7 @@ CodeGenerationPolicy::CodeGenerationPolicy(CodeGenerationPolicy * clone)
     setDefaults(clone,false);
 }
 
-CodeGenerationPolicy::CodeGenerationPolicy(KConfig * config)
+CodeGenerationPolicy::CodeGenerationPolicy(TDEConfig * config)
 {
     initFields();
     setDefaults(config,false);
@@ -441,7 +441,7 @@ void CodeGenerationPolicy::setDefaults ( CodeGenerationPolicy * clone , bool emi
 
 }
 
-void CodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal)
+void CodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSignal)
 {
 
     if(!config)
@@ -485,7 +485,7 @@ void CodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal)
 
 }
 
-void CodeGenerationPolicy::writeConfig (KConfig * config) {
+void CodeGenerationPolicy::writeConfig (TDEConfig * config) {
 
     config->setGroup("Code Generation");
 
diff --git a/umbrello/umbrello/codegenerationpolicy.h b/umbrello/umbrello/codegenerationpolicy.h
index 146299c2..3d065dee 100644
--- a/umbrello/umbrello/codegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerationpolicy.h
@@ -24,7 +24,7 @@
 #include <tqdom.h>
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 /**
@@ -79,7 +79,7 @@ public:
     // note that as the code gen policy may be the 'default' policy, it may
     // not be coupled with a code generator.
     CodeGenerationPolicy (CodeGenerationPolicy * clone = 0);
-    CodeGenerationPolicy (KConfig * config );
+    CodeGenerationPolicy (TDEConfig * config );
 
     /**
      * Empty Destructor
@@ -315,14 +315,14 @@ public:
     virtual void setDefaults (CodeGenerationPolicy * defaults, bool emitUpdateSignal = true);
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true);
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true);
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config);
+    virtual void writeConfig (TDEConfig * config);
 
     void emitModifiedCodeContentSig();
 
diff --git a/umbrello/umbrello/codegenerator.h b/umbrello/umbrello/codegenerator.h
index 5bca8eb6..aa8a9188 100644
--- a/umbrello/umbrello/codegenerator.h
+++ b/umbrello/umbrello/codegenerator.h
@@ -47,7 +47,7 @@ class CodeDocument;
 class CodeOperation;
 class CodeViewerDialog;
 
-class KConfig;
+class TDEConfig;
 
 /**
   * class CodeGenerator
diff --git a/umbrello/umbrello/codegenerators/codegenpolicyext.h b/umbrello/umbrello/codegenerators/codegenpolicyext.h
index 29e358a1..b95cfdac 100644
--- a/umbrello/umbrello/codegenerators/codegenpolicyext.h
+++ b/umbrello/umbrello/codegenerators/codegenpolicyext.h
@@ -15,7 +15,7 @@
 #include <tqobject.h>
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 /**
@@ -39,14 +39,14 @@ public:
     virtual CodeGenerationPolicyPage * createPage(TQWidget *parent = 0, const char *name = 0) = 0;
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true) = 0;
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true) = 0;
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config) = 0;
+    virtual void writeConfig (TDEConfig * config) = 0;
 };
 
 #endif
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
index 8aec0351..70983d96 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
@@ -45,7 +45,7 @@ const bool CPPCodeGenerationPolicy::DEFAULT_PUBLIC_ACCESSORS = false;
 // Constructors/Destructors
 //
 
-CPPCodeGenerationPolicy::CPPCodeGenerationPolicy(KConfig *config)
+CPPCodeGenerationPolicy::CPPCodeGenerationPolicy(TDEConfig *config)
 {
     init();
     setDefaults(config,false);
@@ -264,7 +264,7 @@ TQString CPPCodeGenerationPolicy::getObjectMethodInit(const TQString & variableN
 // Other methods
 //
 
-void CPPCodeGenerationPolicy::writeConfig ( KConfig * config )
+void CPPCodeGenerationPolicy::writeConfig ( TDEConfig * config )
 {
 
     // write ONLY the CPP specific stuff
@@ -319,7 +319,7 @@ void CPPCodeGenerationPolicy::setDefaults ( CPPCodeGenerationPolicy * cppclone,
 
 }
 
-void CPPCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal )
+void CPPCodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSignal )
 {
 
     if(!config)
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
index d3b2d1b0..b2742ae0 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
@@ -21,7 +21,7 @@
 #include "codegenpolicyext.h"
 #include "../codegenerationpolicy.h"
 
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 class CPPCodeGenerationPolicy : public CodeGenPolicyExt
@@ -56,7 +56,7 @@ public:
     /**
      * Constructors
      */
-    CPPCodeGenerationPolicy ( KConfig * config = 0 );
+    CPPCodeGenerationPolicy ( TDEConfig * config = 0 );
 
     /**
      * Empty Destructor
@@ -180,14 +180,14 @@ public:
     virtual void setDefaults (CPPCodeGenerationPolicy * defaults, bool emitUpdateSignal = true);
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true);
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true);
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config);
+    virtual void writeConfig (TDEConfig * config);
 
     /**
      * Create a new dialog interface for this object.
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h
index 1b7cfe0b..a6687249 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h
@@ -28,7 +28,7 @@
 class CodeViewerDialog;
 class CPPHeaderCodeDocument;
 class CodeBlockWithComments;
-class KConfig;
+class TDEConfig;
 
 class CPPCodeGenerator : public CodeGenerator
 {
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
index 6225485f..02cd8adf 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
@@ -37,7 +37,7 @@ JavaCodeGenerationPolicy::JavaCodeGenerationPolicy(CodeGenerationPolicy *default
 }
  */
 
-JavaCodeGenerationPolicy::JavaCodeGenerationPolicy(KConfig *config)
+JavaCodeGenerationPolicy::JavaCodeGenerationPolicy(TDEConfig *config)
   //      : CodeGenerationPolicy(config)
 {
     init();
@@ -93,7 +93,7 @@ bool JavaCodeGenerationPolicy::getAutoGenerateAssocAccessors( ){
 // Other methods
 //
 
-void JavaCodeGenerationPolicy::writeConfig ( KConfig * config )
+void JavaCodeGenerationPolicy::writeConfig ( TDEConfig * config )
 {
 
     // write ONLY the Java specific stuff
@@ -136,7 +136,7 @@ void JavaCodeGenerationPolicy::setDefaults ( CodeGenPolicyExt * clone, bool emit
 
 }
 
-void JavaCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal )
+void JavaCodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSignal )
 {
 
     if(!config)
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
index bde47753..89e6b294 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
@@ -21,7 +21,7 @@
 #include "codegenpolicyext.h"
 #include "../codegenerationpolicy.h"
 
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 class JavaCodeGenerationPolicy : public CodeGenPolicyExt
@@ -40,7 +40,7 @@ public:
      * Constructors
      */
     //JavaCodeGenerationPolicy (CodeGenerationPolicy * defaults = 0);
-    JavaCodeGenerationPolicy (KConfig * config = 0);
+    JavaCodeGenerationPolicy (TDEConfig * config = 0);
 
     /**
      * Empty Destructor
@@ -84,14 +84,14 @@ public:
     virtual void setDefaults (CodeGenPolicyExt * defaults, bool emitUpdateSignal = true);
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true);
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true);
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config);
+    virtual void writeConfig (TDEConfig * config);
 
     /**
      * Create a new dialog interface for this object.
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
index 8e58fdf0..d9c8527d 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
@@ -32,7 +32,7 @@ const bool RubyCodeGenerationPolicy::DEFAULT_AUTO_GEN_ASSOC_ACCESSORS = true;
 // Constructors/Destructors
 //
 
-RubyCodeGenerationPolicy::RubyCodeGenerationPolicy(KConfig *config)
+RubyCodeGenerationPolicy::RubyCodeGenerationPolicy(TDEConfig *config)
 {
     init();
     setDefaults(config,false);
@@ -87,7 +87,7 @@ bool RubyCodeGenerationPolicy::getAutoGenerateAssocAccessors( ){
 // Other methods
 //
 
-void RubyCodeGenerationPolicy::writeConfig ( KConfig * config )
+void RubyCodeGenerationPolicy::writeConfig ( TDEConfig * config )
 {
     // @todo do we need to call CodeGenerationPolicy::writeConfig ???
 
@@ -125,7 +125,7 @@ void RubyCodeGenerationPolicy::setDefaults ( CodeGenPolicyExt * clone, bool emit
 
 }
 
-void RubyCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal )
+void RubyCodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSignal )
 {
 
     if(!config)
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
index afbc26b4..f9f35894 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
@@ -24,7 +24,7 @@
 #include "codegenpolicyext.h"
 #include "../codegenerationpolicy.h"
 
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 class RubyCodeGenerationPolicy : public CodeGenPolicyExt
@@ -42,7 +42,7 @@ public:
     /**
      * Constructors
      */
-    RubyCodeGenerationPolicy (KConfig * config = 0);
+    RubyCodeGenerationPolicy (TDEConfig * config = 0);
 
     /**
      * Empty Destructor
@@ -86,14 +86,14 @@ public:
     virtual void setDefaults (CodeGenPolicyExt * defaults, bool emitUpdateSignal = true);
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true);
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true);
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config);
+    virtual void writeConfig (TDEConfig * config);
 
     /**
      * Create a new dialog interface for this object.
diff --git a/umbrello/umbrello/configurable.cpp b/umbrello/umbrello/configurable.cpp
index 96bef270..c4f9683c 100644
--- a/umbrello/umbrello/configurable.cpp
+++ b/umbrello/umbrello/configurable.cpp
@@ -44,7 +44,7 @@ Configurable::~Configurable()
 }
 
 bool
-Configurable::loadPlugins(KConfig *config,
+Configurable::loadPlugins(TDEConfig *config,
                           const TQString &key)
 {
     bool ret = true;
diff --git a/umbrello/umbrello/configurable.h b/umbrello/umbrello/configurable.h
index df6bf7d8..758c2aa6 100644
--- a/umbrello/umbrello/configurable.h
+++ b/umbrello/umbrello/configurable.h
@@ -24,7 +24,7 @@
 
 // forward declarations
 class KLibrary;
-class KConfig;
+class TDEConfig;
 
 /**
  * @defgroup U2_Lib Umbrello2 API
@@ -97,7 +97,7 @@ protected:
      *
      * @return True on success, false on failure.
      */
-    bool loadPlugins(KConfig *config, const TQString &key);
+    bool loadPlugins(TDEConfig *config, const TQString &key);
 
     /**
      * This is a convenience method for derived classes. When a functional object
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index ff745bd7..78f8b064 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -163,7 +163,7 @@ private:
     CodeGenerationOptionsPage * m_pCodeGenPage;
     CodeViewerOptionsPage * m_pCodeViewerPage;
 
-    KConfig * m_pCfg;
+    TDEConfig * m_pCfg;
     bool m_bChangesApplied;
 
 private slots:
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index 0afbcb0a..e1e3c297 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -61,7 +61,7 @@ bool DocbookGenerator::generateDocbookForProject()
   return true;
 }
 
-KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
+TDEIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
 {
   UMLApp* app = UMLApp::app();
   UMLDoc* umlDoc = app->getDocument();
@@ -135,7 +135,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
   url.setPath(destDir.path());
   url.addPath(fileName);
   kDebug() << "Copying result to: " << url << endl;
-  KIO::Job* job = KIO::file_copy(tmpDocBook.file()->name(),url,-1,true,false,false);
+  TDEIO::Job* job = TDEIO::file_copy(tmpDocBook.file()->name(),url,-1,true,false,false);
   job->setAutoErrorHandlingEnabled(true);
 
   return job;
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.h b/umbrello/umbrello/docgenerators/docbookgenerator.h
index 04c295a9..0dc873f3 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.h
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.h
@@ -23,7 +23,7 @@
 
 class UMLDoc;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -72,7 +72,7 @@ class DocbookGenerator : public TQObject
      * @todo better handling of error conditions
      * @return true if saving is successful and false otherwise.
      */
-    KIO::Job* generateDocbookForProjectInto(const KURL& destDir);
+    TDEIO::Job* generateDocbookForProjectInto(const KURL& destDir);
 
 };
 
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
index 1b8e3a46..5c147e84 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
@@ -66,17 +66,17 @@ bool XhtmlGenerator::generateXhtmlForProjectInto(const KURL& destDir)
   kDebug() << "First convert to docbook" << endl;
   m_destDir = destDir;
 //   KURL url(TQString("file://")+m_tmpDir.name());
-  KIO::Job* docbookJob = DocbookGenerator().generateDocbookForProjectInto(destDir);
+  TDEIO::Job* docbookJob = DocbookGenerator().generateDocbookForProjectInto(destDir);
   if (docbookJob == 0)
   {
     return false;
   }
   kDebug() << "Connecting..." << endl;
-  connect(docbookJob, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotDocbookToXhtml( KIO::Job *)));
+  connect(docbookJob, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotDocbookToXhtml( TDEIO::Job *)));
   return true;
 }
 
-void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
+void XhtmlGenerator::slotDocbookToXhtml(TDEIO::Job * docbookJob)
 {
   kDebug() << "Now convert docbook to html..." << endl;
   if ( docbookJob->error() )
@@ -150,19 +150,19 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
   xhtmlUrl.addPath(xhtmlName);
 
   kDebug() << "Copying HTML result to: " << xhtmlUrl << endl;
-  KIO::Job* job = KIO::file_copy(tmpXhtml.file()->name(),xhtmlUrl,-1,true,false,false);
+  TDEIO::Job* job = TDEIO::file_copy(tmpXhtml.file()->name(),xhtmlUrl,-1,true,false,false);
   job->setAutoErrorHandlingEnabled(true);
-  connect (job, TQT_SIGNAL(result( KIO::Job* )), this, TQT_SLOT(slotHtmlCopyFinished( KIO::Job* )));
+  connect (job, TQT_SIGNAL(result( TDEIO::Job* )), this, TQT_SLOT(slotHtmlCopyFinished( TDEIO::Job* )));
 
   TQString cssFileName(TDEGlobal::dirs()->findResource("appdata","xmi.css"));
   kDebug() << "CSS file is'"<<cssFileName<<"'" << endl;
   KURL cssUrl = m_destDir;
   cssUrl.addPath("xmi.css");
-  KIO::Job* cssJob = KIO::file_copy(cssFileName,cssUrl,-1,true,false,false);
+  TDEIO::Job* cssJob = TDEIO::file_copy(cssFileName,cssUrl,-1,true,false,false);
   cssJob->setAutoErrorHandlingEnabled(true);
 }
 
-void XhtmlGenerator::slotHtmlCopyFinished( KIO::Job* )
+void XhtmlGenerator::slotHtmlCopyFinished( TDEIO::Job* )
 {
   kDebug() << "HTML copy finished: emiting finished" << endl;
   emit(finished());
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.h b/umbrello/umbrello/docgenerators/xhtmlgenerator.h
index c63b3bba..a6b8e6a4 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.h
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.h
@@ -22,7 +22,7 @@
 #include <ktempdir.h>
 #include <tqobject.h>
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -86,12 +86,12 @@ class XhtmlGenerator : public TQObject
      * @param docbookJob the job copying the docbook file to its destination.
      * Used only for error reporting
      */
-    void slotDocbookToXhtml(KIO::Job * docbookJob);
+    void slotDocbookToXhtml(TDEIO::Job * docbookJob);
 
     /** Triggered when the copying of the HTML result file is finished. Emits
      * the signal finished().
      */
-    void slotHtmlCopyFinished( KIO::Job* );
+    void slotHtmlCopyFinished( TDEIO::Job* );
 
   private:
 
diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp
index 24928759..52d96693 100644
--- a/umbrello/umbrello/main.cpp
+++ b/umbrello/umbrello/main.cpp
@@ -62,7 +62,7 @@ bool getShowGUI(TDECmdLineArgs *args);
  * @param showGUI If the GUI should be shown.
  * @return The startup logo for the application, or a null pointer if it shouldn't be shown.
  */
-KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI);
+KStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI);
 
 /**
  * Initializes the document used by the application.
@@ -73,7 +73,7 @@ KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI);
  * @param args The command line arguments given.
  * @param cfg The application configuration.
  */
-void initDocument(TDECmdLineArgs *args, KConfig* cfg);
+void initDocument(TDECmdLineArgs *args, TDEConfig* cfg);
 
 /**
  * Export all the views in the document using the command line args set by the user.
@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) {
 
         UMLApp *uml = new UMLApp();
         flushEvents();
-        KConfig * cfg = app.config();
+        TDEConfig * cfg = app.config();
 
         KStartupLogo* startLogo = showStartupLogo(cfg, showGUI);
 
@@ -145,7 +145,7 @@ bool getShowGUI(TDECmdLineArgs *args) {
     return true;
 }
 
-KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI) {
+KStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI) {
     KStartupLogo* startLogo = 0L;
 
     cfg->setGroup( "General Options" );
@@ -167,7 +167,7 @@ KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI) {
     return startLogo;
 }
 
-void initDocument(TDECmdLineArgs *args, KConfig* cfg) {
+void initDocument(TDECmdLineArgs *args, TDEConfig* cfg) {
     if ( args -> count() ) {
         UMLApp::app()->openDocumentFile( args->url( 0 ) );
     } else {
diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp
index fddbb6e9..d3efb4e7 100644
--- a/umbrello/umbrello/plugin.cpp
+++ b/umbrello/umbrello/plugin.cpp
@@ -112,7 +112,7 @@ Plugin::instanceName() const
     return _instanceName;
 }
 
-KConfig *
+TDEConfig *
 Plugin::config()
 {
     return _config;
@@ -136,7 +136,7 @@ Plugin::configure()
     bool ret = true;
 
     // grab the OnStartup map
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     if(!conf) {
         kdDebug() << "no configuration for " << instanceName() << endl;
         ret = false;
diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h
index da8e92df..ec26c542 100644
--- a/umbrello/umbrello/plugin.h
+++ b/umbrello/umbrello/plugin.h
@@ -30,7 +30,7 @@
 
 // forward declarations
 class TQStringList;
-class KConfig;
+class TDEConfig;
 
 /**
  * This macro replaces the K_EXPORT_COMPONENT_FACTORY macro because of
@@ -99,7 +99,7 @@ public:
     TQCString instanceName() const;
 
     /** Return the configuration record for the plugin */
-    KConfig *config();
+    TDEConfig *config();
 
     /** Return the category descriptor string */
     virtual TQString category();
@@ -157,7 +157,7 @@ private:
 protected:
     uint        _ref;           ///< Reference counter
     TQCString    _instanceName;  ///< Instance name of the plugin
-    KConfig    *_config;        ///< Configuration record
+    TDEConfig    *_config;        ///< Configuration record
 };
 }
 
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index cc262b44..f6792444 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -587,7 +587,7 @@ void UMLApp::readOptions() {
     resize( m_config->readSizeEntry("Geometry", & tmpTQSize) );
 }
 
-void UMLApp::saveProperties(KConfig *_config) {
+void UMLApp::saveProperties(TDEConfig *_config) {
     if(m_doc->URL().fileName()!=i18n("Untitled") && !m_doc->isModified()) {
         // saving to tempfile not necessary
 
@@ -603,7 +603,7 @@ void UMLApp::saveProperties(KConfig *_config) {
     }
 }
 
-void UMLApp::readProperties(KConfig* _config) {
+void UMLApp::readProperties(TDEConfig* _config) {
     TQString filename = _config->readPathEntry("filename");
     KURL url(filename);
     bool modified = _config->readBoolEntry("modified", false);
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 2c4f59c8..dc4dcfec 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -69,7 +69,7 @@ class TQCustomEvent;
  * full session management as well as using KActions.
  * @see KMainWindow
  * @see TDEApplication
- * @see KConfig
+ * @see TDEConfig
  *
  * @author Paul Hensgen <phensgen@techie.com>
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org
@@ -402,7 +402,7 @@ protected:
      * temporary filename provided by TDEApplication.
      * @see KMainWindow#saveProperties
      */
-    virtual void saveProperties(KConfig *_cfg);
+    virtual void saveProperties(TDEConfig *_cfg);
 
     /**
      * Reads the session config file and restores the
@@ -411,7 +411,7 @@ protected:
      * saveProperties()
      * @see KMainWindow#readProperties
      */
-    virtual void readProperties(KConfig *_cfg);
+    virtual void readProperties(TDEConfig *_cfg);
 
     CodeGenerationPolicy * m_commoncodegenpolicy;
 
@@ -433,7 +433,7 @@ protected slots:
 public slots:
 
     /**
-     * Reads the activeLanguage from the KConfig and calls updateLangSelectMenu()
+     * Reads the activeLanguage from the TDEConfig and calls updateLangSelectMenu()
      */
     void initGenerator();
 
@@ -650,8 +650,8 @@ public slots:
     TQString activeLanguageScopeSeparator();
 
     /**
-     * Return the default code generation language as configured by KConfig.
-     * If the activeLanguage is not found in the KConfig then use Uml::pl_Cpp
+     * Return the default code generation language as configured by TDEConfig.
+     * If the activeLanguage is not found in the TDEConfig then use Uml::pl_Cpp
      * as the default.
      */
     Uml::Programming_Language getDefaultLanguage();
@@ -801,7 +801,7 @@ public slots:
      */
     void slotMoveTabRight();
 
-    KConfig *getConfig() { return m_config; }
+    TDEConfig *getConfig() { return m_config; }
 
     /**
      * This slot deletes the current XHTML documentation generator as soon as
@@ -866,7 +866,7 @@ private:
     /**
      * The configuration object of the application.
      */
-    KConfig* m_config;
+    TDEConfig* m_config;
 
     /**
      * View is the main widget which represents your working area.
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index edf56b23..8bff0db0 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -349,7 +349,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     // changed to true to block recording of changes in redo-buffer
     m_bLoading = true;
     TQString tmpfile;
-    KIO::NetAccess::download( url, tmpfile, UMLApp::app() );
+    TDEIO::NetAccess::download( url, tmpfile, UMLApp::app() );
     TQFile file( tmpfile );
     if ( !file.exists() ) {
         KMessageBox::error(0, i18n("The file %1 does not exist.").arg(d.path()), i18n("Load Error"));
@@ -482,7 +482,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     }
 
     file.close();
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
     if( !status )
     {
         KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
@@ -592,7 +592,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 
         // now we have to check, if we have to upload the file
         if ( !url.isLocalFile() ) {
-            uploaded = KIO::NetAccess::upload( tmp_tgz_file.name(), m_doc_url,
+            uploaded = TDEIO::NetAccess::upload( tmp_tgz_file.name(), m_doc_url,
                                                UMLApp::app() );
         }
 
@@ -626,10 +626,10 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 
         // if it is a remote file, we have to upload the tmp file
         if ( !url.isLocalFile() ) {
-            uploaded = KIO::NetAccess::upload( tmpfile.name(), m_doc_url, UMLApp::app() );
+            uploaded = TDEIO::NetAccess::upload( tmpfile.name(), m_doc_url, UMLApp::app() );
         } else {
             // now remove the original file
-            if ( KIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) {
+            if ( TDEIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) {
                 KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 return false;
diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp
index c669086d..6436536d 100644
--- a/umbrello/umbrello/umlviewimageexporter.cpp
+++ b/umbrello/umbrello/umlviewimageexporter.cpp
@@ -61,7 +61,7 @@ bool UMLViewImageExporter::prepareExportView() {
         }
 
         // check if the file exists
-        if (KIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) {
+        if (TDEIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) {
             int wantSave = KMessageBox::warningContinueCancel(0,
                                 i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()),
                                 i18n("File Already Exists"), i18n("&Overwrite"));
diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp
index 155ba9b8..7bd5a30a 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@@ -153,7 +153,7 @@ TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &im
 
     // if the file wasn't local, upload the temp file to the target
     if (!url.isLocalFile()) {
-        if (!KIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) {
+        if (!TDEIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) {
             tmpFile.unlink();
             return i18n("There was a problem saving file: %1").arg(url.path());
         }
@@ -198,9 +198,9 @@ bool UMLViewImageExporterModel::prepareDirectory(const KURL &url) const {
     for (TQStringList::ConstIterator it = dirs.begin() ; it != dirs.end(); ++it ) {
         directory.addPath(*it);
 
-        if (!KIO::NetAccess::exists(directory, true, UMLApp::app())) {
+        if (!TDEIO::NetAccess::exists(directory, true, UMLApp::app())) {
 
-            if (!KIO::NetAccess::mkdir(directory, UMLApp::app())) {
+            if (!TDEIO::NetAccess::mkdir(directory, UMLApp::app())) {
                 return false;
             }
         }