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

6 files changed, 21 insertions, 21 deletions

diff --git a/konqueror/kttsplugin/CMakeLists.txt b/konqueror/kttsplugin/CMakeLists.txt
index 80180aa8e..fc3f409fe 100644
--- a/konqueror/kttsplugin/CMakeLists.txt
+++ b/konqueror/kttsplugin/CMakeLists.txt
@@ -24,16 +24,16 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    khtmlkttsd.rc khtmlkttsd.desktop
-  DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins )
+    tdehtmlkttsd.rc tdehtmlkttsd.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins )
 
 
-##### libkhtmlkttsdplugin (module) ##############
+##### libtdehtmlkttsdplugin (module) ##############
 
-set( target libkhtmlkttsdplugin )
+set( target libtdehtmlkttsdplugin )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES khtmlkttsd.cpp
-  LINK khtml-shared
+  SOURCES tdehtmlkttsd.cpp
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/kttsplugin/Makefile.am b/konqueror/kttsplugin/Makefile.am
index 580a18dcd..d82a56fc2 100644
--- a/konqueror/kttsplugin/Makefile.am
+++ b/konqueror/kttsplugin/Makefile.am
@@ -2,15 +2,15 @@ INCLUDES    = $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = libkhtmlkttsdplugin.la
+kde_module_LTLIBRARIES = libtdehtmlkttsdplugin.la
 
-libkhtmlkttsdplugin_la_SOURCES = khtmlkttsd.cpp
-libkhtmlkttsdplugin_la_LIBADD  = $(LIB_KHTML)
-libkhtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+libtdehtmlkttsdplugin_la_SOURCES = tdehtmlkttsd.cpp
+libtdehtmlkttsdplugin_la_LIBADD  = $(LIB_KHTML)
+libtdehtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
-plugins_DATA = khtmlkttsd.rc khtmlkttsd.desktop
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
+plugins_DATA = tdehtmlkttsd.rc tdehtmlkttsd.desktop
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc > rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/khtmlkttsd.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdehtmlkttsd.pot
diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index e832bd27a..80b756a8b 100644
--- a/konqueror/kttsplugin/khtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -13,12 +13,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <khtml_part.h> // this plugin applies to a khtml part
+#include <tdehtml_part.h> // this plugin applies to a tdehtml part
 #include <dom/html_document.h>
 #include <dom/html_element.h>
 #include <dom/dom_string.h>
 #include <kdebug.h>
-#include "khtmlkttsd.h"
+#include "tdehtmlkttsd.h"
 #include <kaction.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
@@ -133,6 +133,6 @@ void KHTMLPluginKTTSD::slotReadOut()
     }
 }
 
-K_EXPORT_COMPONENT_FACTORY( libkhtmlkttsdplugin, KGenericFactory<KHTMLPluginKTTSD>("khtmlkttsd") )
+K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory<KHTMLPluginKTTSD>("tdehtmlkttsd") )
 
-#include "khtmlkttsd.moc"
+#include "tdehtmlkttsd.moc"
diff --git a/konqueror/kttsplugin/khtmlkttsd.desktop b/konqueror/kttsplugin/tdehtmlkttsd.desktop
index 5e8519eb3..35db3445c 100644
--- a/konqueror/kttsplugin/khtmlkttsd.desktop
+++ b/konqueror/kttsplugin/tdehtmlkttsd.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-X-TDE-Library=libkhtmlkttsdplugin
+X-TDE-Library=libtdehtmlkttsdplugin
 X-TDE-PluginInfo-Author=Olaf Schmidt
 X-TDE-PluginInfo-Email=ojschmidt@kde.org
-X-TDE-PluginInfo-Name=khtmlkttsdplugin
+X-TDE-PluginInfo-Name=tdehtmlkttsdplugin
 X-TDE-PluginInfo-Version=3.4
 X-TDE-PluginInfo-Website=
 X-TDE-PluginInfo-Category=Tools
diff --git a/konqueror/kttsplugin/khtmlkttsd.h b/konqueror/kttsplugin/tdehtmlkttsd.h
index cfe1e7d38..f42c9b03e 100644
--- a/konqueror/kttsplugin/khtmlkttsd.h
+++ b/konqueror/kttsplugin/tdehtmlkttsd.h
@@ -17,7 +17,7 @@
 #ifndef KHTMLKTTSD_H
 #define KHTMLKTTSD_H
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KURL;
 class TDEInstance;
diff --git a/konqueror/kttsplugin/khtmlkttsd.rc b/konqueror/kttsplugin/tdehtmlkttsd.rc
index 388aec9e7..a06a29742 100644
--- a/konqueror/kttsplugin/khtmlkttsd.rc
+++ b/konqueror/kttsplugin/tdehtmlkttsd.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="khtmlkttsdplugin" library="libkhtmlkttsdplugin" version="2" >
+<kpartgui name="tdehtmlkttsdplugin" library="libtdehtmlkttsdplugin" version="2" >
 	<MenuBar>
 		<Menu name="tools">
 		<Text>&amp;Tools</Text>