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

4 files changed, 10 insertions, 10 deletions

diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp
index 0e539d56..913f9ff7 100644
--- a/keduca/keducabuilder/kcontroladdedit.cpp
+++ b/keduca/keducabuilder/kcontroladdedit.cpp
@@ -225,7 +225,7 @@ void KControlAddEdit::addQuestion()
 /** Read config settings */
 void KControlAddEdit::configRead()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("AddModify Window");
     TQSize defaultSize(500,400);
     resize( config->readSizeEntry("Geometry", &defaultSize ) );
@@ -234,7 +234,7 @@ void KControlAddEdit::configRead()
 /** Write config settings */
 void KControlAddEdit::configWrite()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("AddModify Window");
     config->writeEntry("Geometry", size() );
     config->sync();
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index bcd1eaa0..ee9b6e35 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -226,7 +226,7 @@ void KControlHeader::insertHeader()
     TQStringList tmpResult = _defaultCategories.grep( _headerCategory->currentText() );
     if( tmpResult.count() == 0 )
     {
-        KConfig *appconfig = TDEGlobal::config();
+        TDEConfig *appconfig = TDEGlobal::config();
         _defaultCategories.append( _headerCategory->currentText() );
         appconfig->setGroup("General");
         appconfig->writeEntry( "Categories", _defaultCategories);
@@ -306,8 +306,8 @@ void KControlHeader::slotOk()
 /** Read settings */
 void KControlHeader::configRead()
 {
-    KConfig *config = new KConfig("emaildefaults");
-    KConfig *appconfig = TDEGlobal::config();
+    TDEConfig *config = new TDEConfig("emaildefaults");
+    TDEConfig *appconfig = TDEGlobal::config();
 
     config->setGroup("UserInfo");
 
@@ -369,7 +369,7 @@ void KControlHeader::configRead()
 /** Write settings */
 void KControlHeader::configWrite()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("kcontrolheader");
     config->writeEntry("Geometry", size() );
     config->sync();
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index 485a09cc..560677ae 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -257,7 +257,7 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item )
 /** Read config data */
 void KEducaBuilder::configRead()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     config->setGroup( "keducacontrol" );
     applyMainWindowSettings( config, "keducacontrol" );
@@ -268,7 +268,7 @@ void KEducaBuilder::configRead()
 /** Write settings */
 void KEducaBuilder::configWrite()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     config->setGroup( "keducacontrol" );
     saveMainWindowSettings( config, "keducacontrol" );
@@ -445,7 +445,7 @@ bool KEducaBuilder::fileSaveAs()
             newURL.setPath( newURL.path() + extension );
         }
 
-        if ( KIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
+        if ( TDEIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
             bOk = KMessageBox::warningContinueCancel( this,
                                               i18n("A document with this name already exists.\n"\
                                                    "Do you want to overwrite it?"),
diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp
index 7878e6c3..6ff7038b 100644
--- a/keduca/keducabuilder/keducaeditorstartdialog.cpp
+++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp
@@ -53,7 +53,7 @@ void KEducaEditorStartDialog::buildRecentFilesList()
     TQString     key;
     TQString     value;
     TQString     oldGroup;
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     oldGroup = config->group();