Rename a number of libraries and executables to avoid conflicts with KDE4

5 files changed, 11 insertions, 11 deletions

diff --git a/kate/filetemplates/plugin/Makefile.am b/kate/filetemplates/plugin/Makefile.am
index 7963916..826ca4b 100644
--- a/kate/filetemplates/plugin/Makefile.am
+++ b/kate/filetemplates/plugin/Makefile.am
@@ -9,7 +9,7 @@ subdirs=src templates
 kde_module_LTLIBRARIES = katefiletemplates.la
 
 katefiletemplates_la_SOURCES = filetemplates.cpp
-katefiletemplates_la_LIBADD = -lkateinterfaces -lktexteditor $(LIB_KNEWSTUFF)
+katefiletemplates_la_LIBADD = -lkateinterfaces -ltdetexteditor $(LIB_KNEWSTUFF)
 katefiletemplates_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir = $(kde_datadir)/kate/plugins/katefiletemplates
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index e1c35be..0be3393 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -67,7 +67,7 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <ktexteditor/templateinterface.h>
+#include <tdetexteditor/templateinterface.h>
 //END Includes
 
 //BEGIN plugin + factory stuff
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index 327f903..ca95595 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -26,7 +26,7 @@
 #include <cassert>
 #include <kdebug.h>
 #include <tqstring.h>
-#include <ktexteditor/editinterfaceext.h>
+#include <tdetexteditor/editinterfaceext.h>
 #include <kapplication.h>
 #include <kcompletion.h>
 #include <klineedit.h>
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 3e044e6..913dbf8 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -977,9 +977,9 @@
 <entity name="nbsp" type="gen">
 <text-expanded>&amp;#x00A0;</text-expanded>
 </entity>
-<entity name="tkmidi" type="gen">
+<entity name="ttdemidi" type="gen">
 <text-expanded>
-<application>tkmidi</application>
+<application>ttdemidi</application>
 </text-expanded>
 </entity>
 <entity name="b.tau" type="gen">
@@ -1246,7 +1246,7 @@
 <entity name="tstrok" type="gen">
 <text-expanded>&amp;#x0167;</text-expanded>
 </entity>
-<entity name="kscreensaver" type="gen">
+<entity name="tdescreensaver" type="gen">
 <text-expanded>
 <application>KScreensaver</application>
 </text-expanded>
@@ -2523,7 +2523,7 @@
 <entity name="gdot" type="gen">
 <text-expanded>&amp;#x0121;</text-expanded>
 </entity>
-<entity name="kspell" type="gen">
+<entity name="tdespell" type="gen">
 <text-expanded>
 <application>KSpell</application>
 </text-expanded>
@@ -2948,7 +2948,7 @@
 <application>kwm</application>
 </text-expanded>
 </entity>
-<entity name="kmidi" type="gen">
+<entity name="tdemidi" type="gen">
 <text-expanded>
 <application>KMidi</application>
 </text-expanded>
@@ -3406,9 +3406,9 @@
 <entity name="equiv" type="gen">
 <text-expanded>&amp;#x2261;</text-expanded>
 </entity>
-<entity name="kmid" type="gen">
+<entity name="tdemid" type="gen">
 <text-expanded>
-<application>kmid</application>
+<application>tdemid</application>
 </text-expanded>
 </entity>
 <entity name="Backspace" type="gen">
diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h
index 56fff4e..6cf5728 100644
--- a/kate/xmltools/plugin_katexmltools.h
+++ b/kate/xmltools/plugin_katexmltools.h
@@ -39,7 +39,7 @@
 #include <kate/mainwindow.h>
 #include <kate/viewmanager.h>
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 #include <kcombobox.h>
 #include <kdialog.h>