summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:15:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:15:06 -0600
commitc8d2c86fa91a88915c64665a57de1e9a88c67da2 (patch)
tree1b2125a8cfb72e51006d3ffc1feaa2c186f0c810
parente7cf1663f517b900014c46cc61ffaab2813e0dc5 (diff)
downloadtdeaccessibility-c8d2c86fa91a88915c64665a57de1e9a88c67da2.tar.gz
tdeaccessibility-c8d2c86fa91a88915c64665a57de1e9a88c67da2.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--IconThemes/mono/scalable/actions/tdehtml_kget.svgz (renamed from IconThemes/mono/scalable/actions/khtml_kget.svgz)bin2985 -> 2987 bytes
-rw-r--r--IconThemes/mono/scalable/apps/tdemid.svgz (renamed from IconThemes/mono/scalable/apps/kmid.svgz)bin2378 -> 2380 bytes
-rw-r--r--IconThemes/mono/scalable/apps/tdemidi.svgz (renamed from IconThemes/mono/scalable/apps/kmidi.svgz)bin2379 -> 2381 bytes
-rw-r--r--IconThemes/mono/scalable/apps/tdescreensaver.svgz (renamed from IconThemes/mono/scalable/apps/kscreensaver.svgz)bin1719 -> 1721 bytes
-rw-r--r--IconThemes/mono/scalable/apps/tdewallet.svgz (renamed from IconThemes/mono/scalable/apps/kwallet.svgz)bin9774 -> 9774 bytes
-rw-r--r--IconThemes/mono/scalable/apps/tdewalletmanager.svgz (renamed from IconThemes/mono/scalable/apps/kwalletmanager.svgz)bin9774 -> 9774 bytes
-rw-r--r--IconThemes/mono/scalable/mimetypes/tdemultiple.svgz (renamed from IconThemes/mono/scalable/mimetypes/kmultiple.svgz)bin2797 -> 2799 bytes
-rw-r--r--doc/kttsd/index.docbook4
-rw-r--r--kmag/Makefile.am2
-rw-r--r--kmousetool/kmousetool/Makefile.am2
-rw-r--r--kmouth/Makefile.am2
-rw-r--r--kmouth/optionsdialog.cpp2
-rw-r--r--ksayit/src/Makefile.am2
-rw-r--r--kttsd/ChangeLog2
-rw-r--r--kttsd/README2
-rw-r--r--kttsd/README.kttsd2
-rw-r--r--kttsd/app-plugins/kate/Makefile.am14
-rw-r--r--kttsd/app-plugins/kate/katekttsd.cpp8
-rw-r--r--kttsd/app-plugins/kate/katekttsd.h4
-rw-r--r--kttsd/app-plugins/kate/tdetexteditor_kttsd.desktop (renamed from kttsd/app-plugins/kate/ktexteditor_kttsd.desktop)2
-rw-r--r--kttsd/app-plugins/kate/tdetexteditor_kttsdui.rc (renamed from kttsd/app-plugins/kate/ktexteditor_kttsdui.rc)2
-rw-r--r--kttsd/compat/interfaces/kspeech/kspeech.h2
-rwxr-xr-xkttsd/cvs2dist2
-rw-r--r--kttsd/debian/kttsd.install16
-rw-r--r--kttsd/filters/Makefile.am2
-rw-r--r--kttsd/filters/main.cpp2
-rw-r--r--kttsd/filters/sbd/sbdconf.cpp2
-rw-r--r--kttsd/filters/stringreplacer/stringreplacerconf.cpp2
-rw-r--r--kttsd/filters/talkerchooser/talkerchooserconf.cpp2
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.cpp2
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.h2
-rw-r--r--kttsd/kttsd/Makefile.am2
-rw-r--r--kttsd/kttsd/filtermgr.cpp2
-rw-r--r--kttsd/kttsd/speaker.cpp2
-rw-r--r--kttsd/kttsd/talkermgr.cpp2
-rw-r--r--kttsd/kttsjobmgr/kttsjobmgr.h2
-rw-r--r--kttsd/kttsmgr/Makefile.am2
-rw-r--r--kttsd/libkttsd/testplayer.cpp2
38 files changed, 49 insertions, 49 deletions
diff --git a/IconThemes/mono/scalable/actions/khtml_kget.svgz b/IconThemes/mono/scalable/actions/tdehtml_kget.svgz
index 6ee7e47..0157057 100644
--- a/IconThemes/mono/scalable/actions/khtml_kget.svgz
+++ b/IconThemes/mono/scalable/actions/tdehtml_kget.svgz
Binary files differ
diff --git a/IconThemes/mono/scalable/apps/kmid.svgz b/IconThemes/mono/scalable/apps/tdemid.svgz
index 60c2827..e8b33e1 100644
--- a/IconThemes/mono/scalable/apps/kmid.svgz
+++ b/IconThemes/mono/scalable/apps/tdemid.svgz
Binary files differ
diff --git a/IconThemes/mono/scalable/apps/kmidi.svgz b/IconThemes/mono/scalable/apps/tdemidi.svgz
index 5867fa0..e973805 100644
--- a/IconThemes/mono/scalable/apps/kmidi.svgz
+++ b/IconThemes/mono/scalable/apps/tdemidi.svgz
Binary files differ
diff --git a/IconThemes/mono/scalable/apps/kscreensaver.svgz b/IconThemes/mono/scalable/apps/tdescreensaver.svgz
index 68ac06c..60d1552 100644
--- a/IconThemes/mono/scalable/apps/kscreensaver.svgz
+++ b/IconThemes/mono/scalable/apps/tdescreensaver.svgz
Binary files differ
diff --git a/IconThemes/mono/scalable/apps/kwallet.svgz b/IconThemes/mono/scalable/apps/tdewallet.svgz
index 9523cc6..9523cc6 100644
--- a/IconThemes/mono/scalable/apps/kwallet.svgz
+++ b/IconThemes/mono/scalable/apps/tdewallet.svgz
Binary files differ
diff --git a/IconThemes/mono/scalable/apps/kwalletmanager.svgz b/IconThemes/mono/scalable/apps/tdewalletmanager.svgz
index 9523cc6..9523cc6 100644
--- a/IconThemes/mono/scalable/apps/kwalletmanager.svgz
+++ b/IconThemes/mono/scalable/apps/tdewalletmanager.svgz
Binary files differ
diff --git a/IconThemes/mono/scalable/mimetypes/kmultiple.svgz b/IconThemes/mono/scalable/mimetypes/tdemultiple.svgz
index cfed5b8..ae65161 100644
--- a/IconThemes/mono/scalable/mimetypes/kmultiple.svgz
+++ b/IconThemes/mono/scalable/mimetypes/tdemultiple.svgz
Binary files differ
diff --git a/doc/kttsd/index.docbook b/doc/kttsd/index.docbook
index 45afec2..1750c9d 100644
--- a/doc/kttsd/index.docbook
+++ b/doc/kttsd/index.docbook
@@ -194,13 +194,13 @@ kttsd. kttsmgr sits in the system tray.
</para></listitem></varlistentry>
<varlistentry>
-<term><command>libkhtmlkttsdplugin</command></term>
+<term><command>libtdehtmlkttsdplugin</command></term>
<listitem><para>A plugin for the &konqueror; web browser that permits you
to speak all or a portion of the text on a web page.
</para></listitem></varlistentry>
<varlistentry>
-<term><command>ktexteditor_kttsd</command></term>
+<term><command>tdetexteditor_kttsd</command></term>
<listitem><para>A plugin for the &kate; text editor that permits you to speak
all or a portion of a text file.
</para></listitem></varlistentry>
diff --git a/kmag/Makefile.am b/kmag/Makefile.am
index ec7bf5e..a4387d2 100644
--- a/kmag/Makefile.am
+++ b/kmag/Makefile.am
@@ -27,7 +27,7 @@ METASOURCES = AUTO
KDE_OPTIONS = nofinal
# the library search path.
-kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/kmag
rc_DATA = kmagui.rc
diff --git a/kmousetool/kmousetool/Makefile.am b/kmousetool/kmousetool/Makefile.am
index b619b5a..7418514 100644
--- a/kmousetool/kmousetool/Makefile.am
+++ b/kmousetool/kmousetool/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES= $(all_includes)
METASOURCES = AUTO
# the library search path.
-kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
messages: rc.cpp
LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
diff --git a/kmouth/Makefile.am b/kmouth/Makefile.am
index a78d4a5..d48dfb4 100644
--- a/kmouth/Makefile.am
+++ b/kmouth/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES= -Iphrasebook -Iwordcompletion $(all_includes)
METASOURCES = AUTO
# the library search path.
-kmouth_LDFLAGS = $(all_libraries) -lkspell $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmouth_LDFLAGS = $(all_libraries) -ltdespell $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/kmouth
rc_DATA = kmouthui.rc
diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index fe79eba..e173380 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <tdecmodule.h>
#include <klibloader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include "optionsdialog.h"
#include "wordcompletion/wordcompletionwidget.h"
diff --git a/ksayit/src/Makefile.am b/ksayit/src/Makefile.am
index ff2dd4e..ff0e43e 100644
--- a/ksayit/src/Makefile.am
+++ b/ksayit/src/Makefile.am
@@ -31,7 +31,7 @@ ksayit_SOURCES = doctreeviewimpl.cpp effectstack.cpp fxpluginhandler.cpp \
parasaxparser.cpp saxhandler.cpp ksayitbookmarkhandler.cpp contextmenuhandler.cpp docbookclasses.cpp \
docbookgenerator.cpp docbookparser.cpp
-ksayit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lartsflow -lartsflow_idl
+ksayit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lartsflow -lartsflow_idl
ksayit_LDADD = $(top_builddir)/ksayit/KTTSD_Lib/libKTTSD_Lib.la $(LIB_KIO) \
-lartskde -lsoundserver_idl -lartsflow -lartsflow_idl
diff --git a/kttsd/ChangeLog b/kttsd/ChangeLog
index 441502c..f74d51b 100644
--- a/kttsd/ChangeLog
+++ b/kttsd/ChangeLog
@@ -263,7 +263,7 @@
2004-12-20 Gary Cramblitt (PhantomsDad)
* kdenonbeta/kttsd moved to tdeaccessibility/kttsd.
* kdenonbeta/kttsd/libktts moved to tdelibs/interfaces/kspeech. libktts dropped.
- * kdenonbeta/app-plugins/khtml-plugin moved to tdebase/konqueror/kttsplugin.
+ * kdenonbeta/app-plugins/tdehtml-plugin moved to tdebase/konqueror/kttsplugin.
* kdenonbeta/app-plugins/kate-plugin moved to tdebase/kate/plugins/ktts.
* kdenonbeta/app-plugins/katepart-plugin moved to tdebase/kate/plugin/katepartktts.
diff --git a/kttsd/README b/kttsd/README
index 0b4c292..6a9bf2e 100644
--- a/kttsd/README
+++ b/kttsd/README
@@ -21,7 +21,7 @@ kcmkttsd
A KControl module for configuring the KTTS System. kcmkttsd runs in the
TDE Control Center or start it with the command "kcmshell kcmkttsd".
-ktexteditor_kttsd
+tdetexteditor_kttsd
A plugin for the KDE Advanced Text Editor that permits you to speak an entire
text file or any portion of a file.
diff --git a/kttsd/README.kttsd b/kttsd/README.kttsd
index 9661507..9ddeb8d 100644
--- a/kttsd/README.kttsd
+++ b/kttsd/README.kttsd
@@ -5,6 +5,6 @@ Most of it has moved to tdeaccessibility/kttsd.
The following pieces were also moved.
kttsd/libktts -> tdelibs/interfaces/kspeech
-kttsd/app-plugins/khtml-plugin -> tdebase/konqueror/kttsplugin
+kttsd/app-plugins/tdehtml-plugin -> tdebase/konqueror/kttsplugin
kttsd/app-plugins/kate-plugin -> tdebase/kate/plugins/ktts
kttsd/app-plugins/katepart-plugin -> tdebase/kate/plugin/katepartktts
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" />
diff --git a/kttsd/compat/interfaces/kspeech/kspeech.h b/kttsd/compat/interfaces/kspeech/kspeech.h
index d217b89..263e0c5 100644
--- a/kttsd/compat/interfaces/kspeech/kspeech.h
+++ b/kttsd/compat/interfaces/kspeech/kspeech.h
@@ -186,7 +186,7 @@
*
* There are two methods of making DCOP calls from your application to %KTTSD.
*
- * - Manually code them using dcopClient object. See tdebase/konqueror/kttsplugin/khtmlkttsd.cpp
+ * - Manually code them using dcopClient object. See tdebase/konqueror/kttsplugin/tdehtmlkttsd.cpp
* for an example. This method is recommended if you want to make a few simple calls to KTTSD.
* - Use kspeech_stub as described below. This method generates the marshalling code for you
* and is recommended for a more complex speech-enabled applications. kcmkttsmgr in the
diff --git a/kttsd/cvs2dist b/kttsd/cvs2dist
index d9a6075..7d62bb0 100755
--- a/kttsd/cvs2dist
+++ b/kttsd/cvs2dist
@@ -24,7 +24,7 @@ always_skip_languages="xx"
pofilenames="kttsd kttsd_commandplugin kttsd_eposplugin kttsd_festivalintplugin
kttsd_fliteplugin kttsd_freettsplugin kttsd_hadifixplugin kttsd_sbdplugin
kttsd_stringreplacerplugin kttsd_talkerchooserplugin kttsd_xmltransformerplugin
-kttsjobmgr kttsmgr kcmkttsd khtmlkttsd ktexteditor_kttsd"
+kttsjobmgr kttsmgr kcmkttsd tdehtmlkttsd tdetexteditor_kttsd"
exit_cleanup()
{
diff --git a/kttsd/debian/kttsd.install b/kttsd/debian/kttsd.install
index 0b6d2de..3d2c1f2 100644
--- a/kttsd/debian/kttsd.install
+++ b/kttsd/debian/kttsd.install
@@ -29,11 +29,11 @@ debian/tmp/usr/lib/trinity/libkttsjobmgrpart.so
debian/tmp/usr/lib/trinity/libkttsjobmgrpart.la
debian/tmp/usr/lib/trinity/kcm_kttsd.so
debian/tmp/usr/lib/trinity/kcm_kttsd.la
-debian/tmp/usr/lib/trinity/ktexteditor_kttsd.la
-debian/tmp/usr/lib/trinity/ktexteditor_kttsd.so
+debian/tmp/usr/lib/trinity/tdetexteditor_kttsd.la
+debian/tmp/usr/lib/trinity/tdetexteditor_kttsd.so
-debian/tmp/usr/lib/trinity/libkhtmlkttsdplugin.la
-debian/tmp/usr/lib/trinity/libkhtmlkttsdplugin.so
+debian/tmp/usr/lib/trinity/libtdehtmlkttsdplugin.la
+debian/tmp/usr/lib/trinity/libtdehtmlkttsdplugin.so
debian/tmp/usr/share/servicetypes/kttsd_synthplugin.desktop
debian/tmp/usr/share/servicetypes/kttsd_audioplugin.desktop
@@ -55,7 +55,7 @@ debian/tmp/usr/share/apps/kttsd/stringreplacer/chat.xml
debian/tmp/usr/share/apps/kttsd/stringreplacer/kmail.xml
debian/tmp/usr/share/apps/kttsd/stringreplacer/polish_festival_unspeakables.xml
debian/tmp/usr/share/apps/kttsd/xmltransformer/xhtml2ssml.xsl
-debian/tmp/usr/share/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
+debian/tmp/usr/share/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc
debian/tmp/usr/share/doc/tde/HTML/*/kttsd/common
debian/tmp/usr/share/doc/tde/HTML/*/kttsd/general.png
@@ -86,10 +86,10 @@ debian/tmp/usr/share/services/kttsd_talkerchooserplugin.desktop
debian/tmp/usr/share/services/kttsd.desktop
debian/tmp/usr/share/services/kttsjobmgr.desktop
debian/tmp/usr/share/services/kttsd_artsplugin.desktop
-debian/tmp/usr/share/services/ktexteditor_kttsd.desktop
+debian/tmp/usr/share/services/tdetexteditor_kttsd.desktop
-debian/tmp/usr/share/apps/khtml/kpartplugins/khtmlkttsd.desktop
-debian/tmp/usr/share/apps/khtml/kpartplugins/khtmlkttsd.rc
+debian/tmp/usr/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.desktop
+debian/tmp/usr/share/apps/tdehtml/kpartplugins/tdehtmlkttsd.rc
debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png
debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png
diff --git a/kttsd/filters/Makefile.am b/kttsd/filters/Makefile.am
index 9c95218..2db77e5 100644
--- a/kttsd/filters/Makefile.am
+++ b/kttsd/filters/Makefile.am
@@ -17,7 +17,7 @@ check_PROGRAMS = testfilter
testfilter_SOURCES = main.cpp
-testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testfilter_LDADD = \
$(top_builddir)/kttsd/libkttsd/libkttsd.la \
$(LIB_TDECORE)
diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp
index 983b68b..755fa68 100644
--- a/kttsd/filters/main.cpp
+++ b/kttsd/filters/main.cpp
@@ -34,7 +34,7 @@ using namespace std;
#include <kcmdlineargs.h>
#include <kconfig.h>
#include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include "filterproc.h"
#include "talkercode.h"
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index 4fe3c9d..5720549 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -43,7 +43,7 @@
#include <kstandarddirs.h>
#include <kregexpeditorinterface.h>
#include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <kfiledialog.h>
// KTTS includes.
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index 6a96307..a0de6d9 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -44,7 +44,7 @@
#include <kstandarddirs.h>
#include <kregexpeditorinterface.h>
#include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <kfiledialog.h>
#include <kmessagebox.h>
diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
index ce5e00f..1a78ab3 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
@@ -37,7 +37,7 @@
#include <kstandarddirs.h>
#include <kregexpeditorinterface.h>
#include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <kfiledialog.h>
// KTTS includes.
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index e9cbd86..3b8a40c 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -38,7 +38,7 @@
// KDE includes.
#include <dcopclient.h>
#include <klistview.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <klineedit.h>
#include <kurlrequester.h>
#include <kiconloader.h>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h
index 7660945..fc0276b 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.h
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h
@@ -29,7 +29,7 @@
#include <tdecmodule.h>
#include <ktrader.h>
#include <kdebug.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
// KTTS includes.
#include "addtalker.h"
diff --git a/kttsd/kttsd/Makefile.am b/kttsd/kttsd/Makefile.am
index ba7e1c1..32ef645 100644
--- a/kttsd/kttsd/Makefile.am
+++ b/kttsd/kttsd/Makefile.am
@@ -33,7 +33,7 @@ kttsd_SOURCES = \
filtermgr.cpp \
talkermgr.cpp
-kttsd_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kttsd_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kttsd_LDADD = \
$(top_builddir)/kttsd/libkttsd/libkttsd.la \
$(LIB_TDECORE) \
diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp
index c8293e4..9ec4329 100644
--- a/kttsd/kttsd/filtermgr.cpp
+++ b/kttsd/kttsd/filtermgr.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <kconfig.h>
#include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <klocale.h>
// FilterMgr includes.
diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp
index 0de2066..c43ecd2 100644
--- a/kttsd/kttsd/speaker.cpp
+++ b/kttsd/kttsd/speaker.cpp
@@ -27,7 +27,7 @@
// KDE includes.
#include <kdebug.h>
#include <klocale.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <ktrader.h>
#include <kapplication.h>
#include <kstandarddirs.h>
diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp
index c3771e7..6821888 100644
--- a/kttsd/kttsd/talkermgr.cpp
+++ b/kttsd/kttsd/talkermgr.cpp
@@ -25,7 +25,7 @@
// KDE includes.
#include <kdebug.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <ktrader.h>
#include <kstandarddirs.h>
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.h b/kttsd/kttsjobmgr/kttsjobmgr.h
index 0a7a1d5..43c1188 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.h
+++ b/kttsd/kttsjobmgr/kttsjobmgr.h
@@ -19,7 +19,7 @@
#define _KTTSJOBMGRPART_H_
// KDE includes.
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
#include <klibloader.h>
// KTTS includes.
diff --git a/kttsd/kttsmgr/Makefile.am b/kttsd/kttsmgr/Makefile.am
index 3cfa7bf..1fa099c 100644
--- a/kttsd/kttsmgr/Makefile.am
+++ b/kttsd/kttsmgr/Makefile.am
@@ -22,7 +22,7 @@ kttsmgr_SOURCES = \
kspeechsink.skel \
kttsmgr.cpp
-kttsmgr_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kttsmgr_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kttsmgr_LDADD = \
$(LIB_KUTILS) \
$(LIB_TDEUI)
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index 06d97cf..836b615 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -29,7 +29,7 @@
#include <kapplication.h>
#include <ktempfile.h>
#include <kstandarddirs.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <ktrader.h>
#include <kdebug.h>