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

2 files changed, 11 insertions, 11 deletions

diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index ec68f6e..e1c35be 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -180,7 +180,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d)
   TQRegExp re( "\\b(\\w+)\\s*=\\s*(.+)(?:\\s+\\w+=|$)" );
   re.setMinimal( true );
 
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   TQStringList hidden;
   config->readListEntry( "Hidden", hidden, ';' );
 
@@ -371,7 +371,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
   TQString tmpfile;
   TQString filename = url.fileName();
   kdDebug()<<"file: "<<filename<<endl;
-  if ( KIO::NetAccess::download( url, tmpfile, 0L ) )
+  if ( TDEIO::NetAccess::download( url, tmpfile, 0L ) )
   {
     bool isTemplate ( filename.endsWith( ".katetemplate" ) );
     TQString docname;
@@ -383,7 +383,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
       KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(),
                           i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").arg(filename),
                           i18n("Template Plugin"), 0 );
-      KIO::NetAccess::removeTempFile( tmpfile );
+      TDEIO::NetAccess::removeTempFile( tmpfile );
       return;
     }
 
@@ -451,7 +451,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
       numlines++;
     }
     file.close();
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
 
     uint line, col;
     line = col = 0;
@@ -969,7 +969,7 @@ void KateTemplateWizard::accept()
       u = KURL( kft->templates().at( selectedTemplateIdx )->filename );
 
     TQString tmpfile, tmp;
-    if ( KIO::NetAccess::download( u, tmpfile, 0L ) )
+    if ( TDEIO::NetAccess::download( u, tmpfile, 0L ) )
     {
       TQFile file(tmpfile);
       if ( ! file.open( IO_ReadOnly ) )
@@ -979,7 +979,7 @@ void KateTemplateWizard::accept()
             "The document will not be created</qt>").arg(u.prettyURL()),
             i18n("Template Plugin"), 0 );
 
-        KIO::NetAccess::removeTempFile( tmpfile );
+        TDEIO::NetAccess::removeTempFile( tmpfile );
         return;
       }
 
@@ -998,7 +998,7 @@ void KateTemplateWizard::accept()
       }
 
       file.close();
-      KIO::NetAccess::removeTempFile( tmpfile );
+      TDEIO::NetAccess::removeTempFile( tmpfile );
     }
 
     if ( toid == 2 ) // file
@@ -1046,8 +1046,8 @@ void KateTemplateWizard::accept()
       stream << str;
       tmp.close();
 
-      succes = KIO::NetAccess::upload( fn, templateUrl, 0 );
-      KIO::NetAccess::removeTempFile( fn );
+      succes = TDEIO::NetAccess::upload( fn, templateUrl, 0 );
+      TDEIO::NetAccess::removeTempFile( fn );
     }
   }
 
@@ -1188,7 +1188,7 @@ void KateTemplateManager::slotRemoveTemplate()
     // Find all instances of filename, and try to delete them.
     // If it fails (there was a global, unwritable instance), add to a
     // list of removed templates
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString fname = item->templateinfo->filename.section( '/', -1 );
     TQStringList templates = TDEGlobal::dirs()->findAllResources(
         "data", fname.prepend( "kate/plugins/katefiletemplates/templates/" ),
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index a9d53f2..bb7f912 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -147,7 +147,7 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface
     TQPtrList<class TemplateInfo> m_templates;
     class KDirWatch *m_dw;
     class KUser *m_user;
-    class KConfig *m_emailstuff;
+    class TDEConfig *m_emailstuff;
     class KActionMenu *m_menu;
 };