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

pull/1/head
Timothy Pearson 11 years ago
parent e7cf1663f5
commit c8d2c86fa9

@ -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>

@ -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

@ -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`; \

@ -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

@ -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"

@ -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

@ -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.

@ -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.

@ -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

@ -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

@ -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()

@ -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>

@ -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

@ -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" />

@ -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

@ -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()
{

@ -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

@ -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)

@ -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"

@ -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.

@ -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>

@ -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.

@ -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>

@ -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"

@ -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) \

@ -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.

@ -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>

@ -25,7 +25,7 @@
// KDE includes.
#include <kdebug.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <ktrader.h>
#include <kstandarddirs.h>

@ -19,7 +19,7 @@
#define _KTTSJOBMGRPART_H_
// KDE includes.
#include <kparts/browserextension.h>
#include <tdeparts/browserextension.h>
#include <klibloader.h>
// KTTS includes.

@ -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)

@ -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>

Loading…
Cancel
Save