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

5 files changed, 15 insertions, 15 deletions

diff --git a/kttsd/app-plugins/kate/Makefile.am b/kttsd/app-plugins/kate/Makefile.am
index 16d8eff..c0f9b34 100644
--- a/kttsd/app-plugins/kate/Makefile.am
+++ b/kttsd/app-plugins/kate/Makefile.am
@@ -7,13 +7,13 @@ INCLUDES    = \
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_kttsd.la
+kde_module_LTLIBRARIES = tdetexteditor_kttsd.la
 
-ktexteditor_kttsd_la_SOURCES = katekttsd.cpp
-ktexteditor_kttsd_la_LIBADD  = -lktexteditor
-ktexteditor_kttsd_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_kttsd_la_SOURCES = katekttsd.cpp
+tdetexteditor_kttsd_la_LIBADD  = -ltdetexteditor
+tdetexteditor_kttsd_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-kttsddatadir = $(kde_datadir)/ktexteditor_kttsd
-kttsddata_DATA = ktexteditor_kttsdui.rc
+kttsddatadir = $(kde_datadir)/tdetexteditor_kttsd
+kttsddata_DATA = tdetexteditor_kttsdui.rc
 
-kde_services_DATA = ktexteditor_kttsd.desktop
+kde_services_DATA = tdetexteditor_kttsd.desktop
diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp
index 9ee05e6..7354f7f 100644
--- a/kttsd/app-plugins/kate/katekttsd.cpp
+++ b/kttsd/app-plugins/kate/katekttsd.cpp
@@ -23,8 +23,8 @@
 #include <tqtimer.h>
 
 // KDE includes.
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/selectioninterface.h>
 
 #include <kaction.h>
 #include <klocale.h>
@@ -36,7 +36,7 @@
 #include "katekttsd.h"
 #include "katekttsd.moc"
 
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_kttsd, KGenericFactory<KateKttsdPlugin>( "ktexteditor_kttsd" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_kttsd, KGenericFactory<KateKttsdPlugin>( "tdetexteditor_kttsd" ) )
 
 KateKttsdPlugin::KateKttsdPlugin( TQObject *parent, const char* name, const TQStringList& )
     : KTextEditor::Plugin ( (KTextEditor::Document*) parent, name )
@@ -75,7 +75,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n
     setInstance( KGenericFactory<KateKttsdPlugin>::instance() );
     TDEGlobal::locale()->insertCatalogue("kttsd");
     (void) new KAction( i18n("Speak Text"), "kttsd", 0, this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" );
-    setXMLFile( "ktexteditor_kttsdui.rc" );
+    setXMLFile( "tdetexteditor_kttsdui.rc" );
 }
 
 void KateKttsdPluginView::slotReadOut()
diff --git a/kttsd/app-plugins/kate/katekttsd.h b/kttsd/app-plugins/kate/katekttsd.h
index ed4ac6d..e137aee 100644
--- a/kttsd/app-plugins/kate/katekttsd.h
+++ b/kttsd/app-plugins/kate/katekttsd.h
@@ -20,8 +20,8 @@
 #ifndef _KATEKTTSD_H_
 #define _KATEKTTSD_H_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
 #include <kxmlguiclient.h>
 #include <tqobject.h>
 
diff --git a/kttsd/app-plugins/kate/ktexteditor_kttsd.desktop b/kttsd/app-plugins/kate/tdetexteditor_kttsd.desktop
index 7985419..b6a5e1e 100644
--- a/kttsd/app-plugins/kate/ktexteditor_kttsd.desktop
+++ b/kttsd/app-plugins/kate/tdetexteditor_kttsd.desktop
@@ -97,7 +97,7 @@ Comment[zh_CN]=添加可读出文本的菜单项
 Comment[zh_TW]=新增朗讀文字的目錄
 Type=Service
 ServiceTypes=KTextEditor/Plugin
-X-TDE-Library=ktexteditor_kttsd
+X-TDE-Library=tdetexteditor_kttsd
 X-Kate-Version=2.2
 MimeType=text/plain
 Icon=kttsd
diff --git a/kttsd/app-plugins/kate/ktexteditor_kttsdui.rc b/kttsd/app-plugins/kate/tdetexteditor_kttsdui.rc
index 9dea629..3277b00 100644
--- a/kttsd/app-plugins/kate/ktexteditor_kttsdui.rc
+++ b/kttsd/app-plugins/kate/tdetexteditor_kttsdui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_kttsd" library="ktexteditor_kttsd" version="2">
+<kpartplugin name="tdetexteditor_kttsd" library="tdetexteditor_kttsd" version="2">
     <MenuBar>
         <Menu name="tools"><Text>&amp;Tools</Text>
             <Action name="tools_kttsd" />