From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:35:07 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kate/plugins/autobookmarker/autobookmarker.cpp    | 4 ++--
 kate/plugins/insertfile/insertfileplugin.cpp      | 6 +++---
 kate/plugins/insertfile/insertfileplugin.h        | 6 +++---
 kate/plugins/isearch/ISearchPlugin.cpp            | 4 ++--
 kate/plugins/wordcompletion/docwordcompletion.cpp | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kate/plugins')

diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index a0e61f3d0..2a7a6de45 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -199,7 +199,7 @@ void ABGlobal::readConfig()
     m_ents = new ABEntityList;
   else
     m_ents->clear();
-  KConfig *config = new KConfig("ktexteditor_autobookmarkerrc");
+  TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
 
   uint n( 0 );
   while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) )
@@ -225,7 +225,7 @@ void ABGlobal::readConfig()
 
 void ABGlobal::writeConfig()
 {
-  KConfig *config = new KConfig("ktexteditor_autobookmarkerrc");
+  TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
 
   // clean the config object
   TQStringList l = config->groupList();
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index 6a350831f..082c0ffc9 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -103,12 +103,12 @@ void InsertFilePluginView::slotInsertFile()
 
     KURL destURL;
     destURL.setPath( _tmpfile );
-    _job = KIO::file_copy( _file, destURL, 0600, true, false, true );
-    connect( _job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished ( KIO::Job * ) ) );
+    _job = TDEIO::file_copy( _file, destURL, 0600, true, false, true );
+    connect( _job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished ( TDEIO::Job * ) ) );
   }
 }
 
-void InsertFilePluginView::slotFinished( KIO::Job *job )
+void InsertFilePluginView::slotFinished( TDEIO::Job *job )
 {
   assert( job == _job );
   _job = 0;
diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h
index 9331f8100..d6751f0d1 100644
--- a/kate/plugins/insertfile/insertfileplugin.h
+++ b/kate/plugins/insertfile/insertfileplugin.h
@@ -58,13 +58,13 @@ class InsertFilePluginView : public TQObject, public KXMLGUIClient
     /* display a file dialog, and insert the chosen file */
     void slotInsertFile();
   private slots:
-    void slotFinished( KIO::Job *job );
-    //slotAborted( KIO::Job *job );
+    void slotFinished( TDEIO::Job *job );
+    //slotAborted( TDEIO::Job *job );
   private:
     void insertFile();
     KURL _file;
     TQString _tmpfile;
-    KIO::FileCopyJob *_job;
+    TDEIO::FileCopyJob *_job;
 };
 
 #endif // _INSERT_FILE_PLUGIN_H_
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 249abf9f2..27d0b138d 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -170,12 +170,12 @@ void ISearchPluginView::setView( KTextEditor::View* view )
 
 void ISearchPluginView::readConfig()
 {
-    // KConfig* config = instance()->config();
+    // TDEConfig* config = instance()->config();
 }
 
 void ISearchPluginView::writeConfig()
 {
-    // KConfig* config = instance()->config();
+    // TDEConfig* config = instance()->config();
 }
 
 void ISearchPluginView::setCaseSensitive( bool caseSensitive )
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 37da55224..2c2bbcb23 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -68,7 +68,7 @@ DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
 
 void DocWordCompletionPlugin::readConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "DocWordCompletion Plugin" );
   m_treshold = config->readNumEntry( "treshold", 3 );
   m_autopopup = config->readBoolEntry( "autopopup", true );
@@ -76,7 +76,7 @@ void DocWordCompletionPlugin::readConfig()
 
 void DocWordCompletionPlugin::writeConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("DocWordCompletion Plugin");
   config->writeEntry("autopopup", m_autopopup );
   config->writeEntry("treshold", m_treshold );
-- 
cgit v1.2.1