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

2 files changed, 8 insertions, 8 deletions

diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index 7f790f0b..a4c4b27b 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -57,7 +57,7 @@ int main( int argc, char *argv[] )
   KLocale::setMainCatalogue("kommander");
   TDEApplication a(true, true);
   
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("General");
   bool splashScreen = config->readBoolEntry("SplashScreen", true);
   KSplashScreen* splash = 0;
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 43aea773..36d23b04 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -434,7 +434,7 @@ void MainWindow::runForm()
   bool readOnlyFile = !TQFileInfo(m_fileName).isWritable();
   struct stat statbuf;
   ::stat(m_fileName.local8Bit(), &statbuf);
-  if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true))
+  if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true))
   {
     KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName));
     return;
@@ -444,7 +444,7 @@ void MainWindow::runForm()
     form->formFile()->setModified(true);
   if (form->formFile()->save(false))
   {
-    if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true))
+    if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true))
     {
       KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
     }
@@ -498,7 +498,7 @@ void MainWindow::runForm4()
   bool readOnlyFile = !TQFileInfo(m_fileName).isWritable();
   struct stat statbuf;
   ::stat(m_fileName.local8Bit(), &statbuf);
-  if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true))
+  if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true))
   {
     KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName));
     return;
@@ -508,7 +508,7 @@ void MainWindow::runForm4()
     form->formFile()->setModified(true);
   if (form->formFile()->save(false))
   {
-    if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true))
+    if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true))
     {
       KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
     }
@@ -537,7 +537,7 @@ void MainWindow::closeRunningForm(TDEProcess* process)
     struct stat statbuf;
     ::stat(m_fileName.local8Bit(), &statbuf);
     FormWindow* form = activeForm();
-    KIO::NetAccess::file_move(KURL::fromPathOrURL(m_backupName), KURL::fromPathOrURL(m_fileName), statbuf.st_mode, true);
+    TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_backupName), KURL::fromPathOrURL(m_fileName), statbuf.st_mode, true);
     form->formFile()->setModified(m_modified);
   }
 }
@@ -1448,7 +1448,7 @@ void MainWindow::selectionChanged()
 
 void MainWindow::writeConfig()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
 
   config->setGroup("General");
   config->writeEntry("RestoreWorkspace", restoreConfig);
@@ -1485,7 +1485,7 @@ void MainWindow::writeConfig()
 
 void MainWindow::readConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
 
   config->setGroup("General");
   restoreConfig = config->readBoolEntry("RestoreWorkspace", true);