From c8d2c86fa91a88915c64665a57de1e9a88c67da2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:15:06 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- .../{khtml_kget.svgz => tdehtml_kget.svgz} | Bin 2985 -> 2987 bytes .../scalable/apps/{kmid.svgz => tdemid.svgz} | Bin 2378 -> 2380 bytes .../apps/{kmidi.svgz => tdemidi.svgz} | Bin 2379 -> 2381 bytes ...{kscreensaver.svgz => tdescreensaver.svgz} | Bin 1719 -> 1721 bytes .../apps/{kwallet.svgz => tdewallet.svgz} | Bin ...lletmanager.svgz => tdewalletmanager.svgz} | Bin .../{kmultiple.svgz => tdemultiple.svgz} | Bin 2797 -> 2799 bytes doc/kttsd/index.docbook | 4 ++-- kmag/Makefile.am | 2 +- kmousetool/kmousetool/Makefile.am | 2 +- kmouth/Makefile.am | 2 +- kmouth/optionsdialog.cpp | 2 +- ksayit/src/Makefile.am | 2 +- kttsd/ChangeLog | 2 +- kttsd/README | 2 +- kttsd/README.kttsd | 2 +- kttsd/app-plugins/kate/Makefile.am | 14 +++++++------- kttsd/app-plugins/kate/katekttsd.cpp | 8 ++++---- kttsd/app-plugins/kate/katekttsd.h | 4 ++-- ...sd.desktop => tdetexteditor_kttsd.desktop} | 2 +- ...or_kttsdui.rc => tdetexteditor_kttsdui.rc} | 2 +- kttsd/compat/interfaces/kspeech/kspeech.h | 2 +- kttsd/cvs2dist | 2 +- kttsd/debian/kttsd.install | 16 ++++++++-------- kttsd/filters/Makefile.am | 2 +- kttsd/filters/main.cpp | 2 +- kttsd/filters/sbd/sbdconf.cpp | 2 +- .../stringreplacer/stringreplacerconf.cpp | 2 +- .../talkerchooser/talkerchooserconf.cpp | 2 +- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 2 +- kttsd/kcmkttsmgr/kcmkttsmgr.h | 2 +- kttsd/kttsd/Makefile.am | 2 +- kttsd/kttsd/filtermgr.cpp | 2 +- kttsd/kttsd/speaker.cpp | 2 +- kttsd/kttsd/talkermgr.cpp | 2 +- kttsd/kttsjobmgr/kttsjobmgr.h | 2 +- kttsd/kttsmgr/Makefile.am | 2 +- kttsd/libkttsd/testplayer.cpp | 2 +- 38 files changed, 49 insertions(+), 49 deletions(-) rename IconThemes/mono/scalable/actions/{khtml_kget.svgz => tdehtml_kget.svgz} (85%) rename IconThemes/mono/scalable/apps/{kmid.svgz => tdemid.svgz} (89%) rename IconThemes/mono/scalable/apps/{kmidi.svgz => tdemidi.svgz} (89%) rename IconThemes/mono/scalable/apps/{kscreensaver.svgz => tdescreensaver.svgz} (77%) rename IconThemes/mono/scalable/apps/{kwallet.svgz => tdewallet.svgz} (100%) rename IconThemes/mono/scalable/apps/{kwalletmanager.svgz => tdewalletmanager.svgz} (100%) rename IconThemes/mono/scalable/mimetypes/{kmultiple.svgz => tdemultiple.svgz} (90%) rename kttsd/app-plugins/kate/{ktexteditor_kttsd.desktop => tdetexteditor_kttsd.desktop} (99%) rename kttsd/app-plugins/kate/{ktexteditor_kttsdui.rc => tdetexteditor_kttsdui.rc} (77%) diff --git a/IconThemes/mono/scalable/actions/khtml_kget.svgz b/IconThemes/mono/scalable/actions/tdehtml_kget.svgz similarity index 85% rename from IconThemes/mono/scalable/actions/khtml_kget.svgz rename to IconThemes/mono/scalable/actions/tdehtml_kget.svgz index 6ee7e47735aa1e29fe732fb6bc65b2e9027ea9a1..01570570325b41988a402d35a96a3e6351413777 100644 GIT binary patch delta 22 dcmZ1}zFM4DzMF%iIbn|@19M4A>PGH)+yG6d2G0Nh delta 20 bcmZ22zEYf9zMF%iIbn|@19SF9-g(>rKhXvK diff --git a/IconThemes/mono/scalable/apps/kmid.svgz b/IconThemes/mono/scalable/apps/tdemid.svgz similarity index 89% rename from IconThemes/mono/scalable/apps/kmid.svgz rename to IconThemes/mono/scalable/apps/tdemid.svgz index 60c282799ee43da2038f75f713fb7bb568941719..e8b33e146f274233ea9a37f7b8f32f57f1ee4df2 100644 GIT binary patch delta 22 dcmX>lbVi6*zMF%?NOzqh19M4A>PBvRP5?@71{44Q delta 20 bcmX>jbV`U@zMF%?NOzqh19SF9UVBaeJxm2c diff --git a/IconThemes/mono/scalable/apps/kmidi.svgz b/IconThemes/mono/scalable/apps/tdemidi.svgz similarity index 89% rename from IconThemes/mono/scalable/apps/kmidi.svgz rename to IconThemes/mono/scalable/apps/tdemidi.svgz index 5867fa0ef781ffb5eef0fa5aa8102b6cd8637913..e973805a404f956219d4920295967d56864487f7 100644 GIT binary patch delta 22 dcmX>tbXJI0zMF%?NOzqh19M4A>PBt{P5?@p1{VMT delta 20 bcmX>rbXtg8zMF%?NOzqh19SF9UI$J9J#+;{ diff --git a/IconThemes/mono/scalable/apps/kscreensaver.svgz b/IconThemes/mono/scalable/apps/tdescreensaver.svgz similarity index 77% rename from IconThemes/mono/scalable/apps/kscreensaver.svgz rename to IconThemes/mono/scalable/apps/tdescreensaver.svgz index 68ac06c4231d96bf8b9206d2f685e221ca9d732f..60d1552fb1a9cc922c2679c7c4e5aaa814e77ec4 100644 GIT binary patch delta 22 ecmdnayOWn!zMF&N^Y4w049q1dsT;Z1umJ#C^#|Yp delta 20 ccmdnVyPcO?zMF&N^Y4w049wXZdDpN3080-C4gdfE diff --git a/IconThemes/mono/scalable/apps/kwallet.svgz b/IconThemes/mono/scalable/apps/tdewallet.svgz similarity index 100% rename from IconThemes/mono/scalable/apps/kwallet.svgz rename to IconThemes/mono/scalable/apps/tdewallet.svgz diff --git a/IconThemes/mono/scalable/apps/kwalletmanager.svgz b/IconThemes/mono/scalable/apps/tdewalletmanager.svgz similarity index 100% rename from IconThemes/mono/scalable/apps/kwalletmanager.svgz rename to IconThemes/mono/scalable/apps/tdewalletmanager.svgz diff --git a/IconThemes/mono/scalable/mimetypes/kmultiple.svgz b/IconThemes/mono/scalable/mimetypes/tdemultiple.svgz similarity index 90% rename from IconThemes/mono/scalable/mimetypes/kmultiple.svgz rename to IconThemes/mono/scalable/mimetypes/tdemultiple.svgz index cfed5b81370c2bfc35819472d068daf57d8aa457..ae651615abbc7f24f8f7de7a7fbe127a29e1efcb 100644 GIT binary patch delta 22 dcmaDW`d*Y*zMF$%oyj&w2Ii8K)Q#MaxByt=2af;% delta 20 bcmaDa`c{-%zMF$%oyj&w2IlOIypOm5N)raX 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. -libkhtmlkttsdplugin +libtdehtmlkttsdplugin A plugin for the &konqueror; web browser that permits you to speak all or a portion of the text on a web page. -ktexteditor_kttsd +tdetexteditor_kttsd A plugin for the &kate; text editor that permits you to speak all or a portion of a text file. 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 #include #include -#include +#include #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 // KDE includes. -#include -#include +#include +#include #include #include @@ -36,7 +36,7 @@ #include "katekttsd.h" #include "katekttsd.moc" -K_EXPORT_COMPONENT_FACTORY( ktexteditor_kttsd, KGenericFactory( "ktexteditor_kttsd" ) ) +K_EXPORT_COMPONENT_FACTORY( tdetexteditor_kttsd, KGenericFactory( "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::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 -#include +#include +#include #include #include diff --git a/kttsd/app-plugins/kate/ktexteditor_kttsd.desktop b/kttsd/app-plugins/kate/tdetexteditor_kttsd.desktop similarity index 99% rename from kttsd/app-plugins/kate/ktexteditor_kttsd.desktop rename to 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 similarity index 77% rename from kttsd/app-plugins/kate/ktexteditor_kttsdui.rc rename to 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 @@ - + &Tools 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 #include #include -#include +#include #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 #include #include -#include +#include #include // 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 #include #include -#include +#include #include #include 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 #include #include -#include +#include #include // 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 #include -#include +#include #include #include #include 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 #include #include -#include +#include // 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 #include #include -#include +#include #include // 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 #include -#include +#include #include #include #include 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 -#include +#include #include #include 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 +#include #include // 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 #include #include -#include +#include #include #include