From 4bc3dcd8cbc23e1470e121e25a83d57c22e61b26 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:00:38 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kate/cppsymbolviewer/plugin_katesymbolviewer.cpp    | 2 +-
 kate/cppsymbolviewer/plugin_katesymbolviewer.h      | 2 +-
 kate/filelistloader/katefll_initplugin.cpp          | 2 +-
 kate/filelistloader/katefll_plugin.cpp              | 4 ++--
 kate/filetemplates/plugin/filetemplates.cpp         | 6 +++---
 kate/insertcommand/plugin_kateinsertcommand.cpp     | 4 ++--
 kate/make/plugin_katemake.cpp                       | 2 +-
 kate/openheader/plugin_kateopenheader.cpp           | 2 +-
 kate/snippets/plugin_katesnippets.h                 | 2 +-
 kate/tabbarextension/plugin_katetabbarextension.cpp | 4 ++--
 kate/xmltools/plugin_katexmltools.cpp               | 4 ++--
 11 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'kate')

diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index 6bf06d7..39abc4a 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqlayout.h>
 #include <tqgroupbox.h>
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
index 05fbb39..1f18dfb 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class KatePluginSymbolViewerView : public TQObject, public KXMLGUIClient
diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index ccc8afa..b0530c5 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
                                      
 K_EXPORT_COMPONENT_FACTORY( katefll_initplugin, KGenericFactory<InitPluginKateFileListLoader>( "katefll_loader" ) )
 
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index deec021..6852485 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -26,8 +26,8 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
 
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 0be3393..5488f48 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -27,14 +27,14 @@
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kdirwatch.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index 0d473a4..2d0587f 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -32,9 +32,9 @@
 
 #include <kaction.h>
 #include <kanimwidget.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index f7f69ce..6e573a1 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -51,7 +51,7 @@
 #include <kpassivepopup.h>
 #include <klineedit.h>
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kate/toolviewmanager.h>
 
diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp
index ba5dfb7..f6ede42 100644
--- a/kate/openheader/plugin_kateopenheader.cpp
+++ b/kate/openheader/plugin_kateopenheader.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 class PluginView : public KXMLGUIClient
 {
diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h
index d50a851..cf04e06 100644
--- a/kate/snippets/plugin_katesnippets.h
+++ b/kate/snippets/plugin_katesnippets.h
@@ -19,7 +19,7 @@
 
 #include <tqlistview.h>
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqptrlist.h>
 #include <tqtoolbutton.h>
 #include <tqtextedit.h>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 56f7b61..3c9e5f3 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -33,9 +33,9 @@
 
 #include <kdebug.h>
 #include <ktoolbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqpushbutton.h>
 #include <tqlayout.h>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 90108e1..05ff8ae 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -94,10 +94,10 @@ TODO:
 #include <klineedit.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-- 
cgit v1.2.1