From a9184bb205c837f932e03b2a6cac578582f36ed5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:17:49 -0600
Subject: Rename many classes and header files 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              | 2 +-
 kate/filetemplates/plugin/filetemplates.cpp         | 6 +++---
 kate/helloworld/plugin_katehelloworld.cpp           | 2 +-
 kate/htmltools/plugin_katehtmltools.cpp             | 2 +-
 kate/insertcommand/plugin_kateinsertcommand.cpp     | 2 +-
 kate/kpybrowser/kpybrowser.h                        | 2 +-
 kate/kpybrowser/pybrowse_part.cpp                   | 2 +-
 kate/make/plugin_katemake.cpp                       | 2 +-
 kate/modeline/ModelinePlugin.cpp                    | 2 +-
 kate/openheader/plugin_kateopenheader.cpp           | 2 +-
 kate/snippets/csnippet.h                            | 2 +-
 kate/snippets/plugin_katesnippets.cpp               | 2 +-
 kate/tabbarextension/plugin_katetabbarextension.cpp | 4 ++--
 kate/tabbarextension/plugin_katetabbarextension.h   | 2 +-
 kate/textfilter/plugin_katetextfilter.cpp           | 2 +-
 kate/xmlcheck/plugin_katexmlcheck.cpp               | 2 +-
 kate/xmltools/plugin_katexmltools.cpp               | 2 +-
 20 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'kate')

diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index d12bb99..f2c8419 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -41,7 +41,7 @@
 #include "plugin_katesymbolviewer.h"
 #include "plugin_katesymbolviewer.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
index 9e7a59a..ec3cf0a 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
@@ -38,7 +38,7 @@
 #include <tqregexp.h>
 #include <klibloader.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 
diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index b0530c5..a1d5ec7 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfileinfo.h>
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index f3f6f4d..8a6fd79 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfileinfo.h>
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 4fdf1d8..932d49d 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -24,8 +24,8 @@
 #include <kate/document.h>
 
 #include <kaboutdata.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
@@ -35,7 +35,7 @@
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knewstuff/knewstuff.h>
diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp
index f44cd66..e710c83 100644
--- a/kate/helloworld/plugin_katehelloworld.cpp
+++ b/kate/helloworld/plugin_katehelloworld.cpp
@@ -2,7 +2,7 @@
 #include "plugin_katehelloworld.h"
 #include "plugin_katehelloworld.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp
index a1fb5e1..02b2cba 100644
--- a/kate/htmltools/plugin_katehtmltools.cpp
+++ b/kate/htmltools/plugin_katehtmltools.cpp
@@ -19,7 +19,7 @@
 #include "plugin_katehtmltools.moc"
 
 #include <klineeditdlg.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <cassert>
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index edf269e..84fbfc5 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -30,7 +30,7 @@
 #include <tqwhatsthis.h>
 #include <tqwidget.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kanimwidget.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h
index d8a0afb..8a23437 100644
--- a/kate/kpybrowser/kpybrowser.h
+++ b/kate/kpybrowser/kpybrowser.h
@@ -23,7 +23,7 @@
 #endif
 
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <tqtooltip.h>
diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp
index 788bac8..61732b4 100644
--- a/kate/kpybrowser/pybrowse_part.cpp
+++ b/kate/kpybrowser/pybrowse_part.cpp
@@ -21,7 +21,7 @@
 #include "pybrowse.xpm"
 
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index f2dfd1f..3bf75e7 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -40,7 +40,7 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kdockwidget.h>
diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp
index 59f6a27..7d05b9e 100644
--- a/kate/modeline/ModelinePlugin.cpp
+++ b/kate/modeline/ModelinePlugin.cpp
@@ -18,7 +18,7 @@
 #include <tqregexp.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 
 #include <kate/application.h>
diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp
index fde6fad..139c49d 100644
--- a/kate/openheader/plugin_kateopenheader.cpp
+++ b/kate/openheader/plugin_kateopenheader.cpp
@@ -20,7 +20,7 @@
 
 #include <tqfileinfo.h>
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/kate/snippets/csnippet.h b/kate/snippets/csnippet.h
index c341194..b453175 100644
--- a/kate/snippets/csnippet.h
+++ b/kate/snippets/csnippet.h
@@ -12,7 +12,7 @@
 
 #include <tqobject.h>
 #include <tqlistview.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqsignalmapper.h>
 
 /**
diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp
index f28b944..629cc87 100644
--- a/kate/snippets/plugin_katesnippets.cpp
+++ b/kate/snippets/plugin_katesnippets.cpp
@@ -4,7 +4,7 @@
 
 #include "plugin_katesnippets.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 4f553d3..616f284 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -26,13 +26,13 @@
 // BEGIN INCLUDES
 #include "plugin_katetabbarextension.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
 #include <kdebug.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index ec808cf..7d625f9 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -37,7 +37,7 @@
 
 #include <klibloader.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <tqwidget.h>
 #include <tqpushbutton.h>
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index f1c10e5..cfe2793 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -18,7 +18,7 @@
 #include "plugin_katetextfilter.h"
 #include "plugin_katetextfilter.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index 49f2af2..c5f3a7b 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -40,7 +40,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kdockwidget.h>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 8daeb83..6ebd9d9 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -89,7 +89,7 @@ TODO:
 #include <tqstring.h>
 #include <tqtimer.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbuttonbox.h>
 #include <klineedit.h>
 #include <kcursor.h>
-- 
cgit v1.2.1