From a1dc980408b413b3596c22d4631d18e4c348ab98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:00:30 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kttsd/README | 4 ++-- kttsd/filters/main.cpp | 2 +- kttsd/filters/sbd/sbdconf.cpp | 4 ++-- kttsd/filters/sbd/sbdconf.h | 2 +- kttsd/filters/sbd/sbdproc.cpp | 2 +- kttsd/filters/stringreplacer/stringreplacerconf.cpp | 4 ++-- kttsd/filters/stringreplacer/stringreplacerconf.h | 2 +- kttsd/filters/stringreplacer/stringreplacerproc.cpp | 2 +- kttsd/filters/talkerchooser/talkerchooserconf.cpp | 4 ++-- kttsd/filters/talkerchooser/talkerchooserconf.h | 2 +- kttsd/filters/talkerchooser/talkerchooserproc.cpp | 2 +- kttsd/filters/xmltransformer/xmltransformerconf.cpp | 2 +- kttsd/filters/xmltransformer/xmltransformerconf.h | 2 +- kttsd/filters/xmltransformer/xmltransformerproc.cpp | 2 +- kttsd/kcmkttsmgr/kcmkttsd.desktop | 2 +- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 4 ++-- kttsd/kcmkttsmgr/selectevent.cpp | 2 +- kttsd/kttsd/filtermgr.cpp | 2 +- kttsd/kttsd/kttsd.cpp | 2 +- kttsd/kttsd/speaker.cpp | 2 +- kttsd/kttsd/speechdata.h | 2 +- kttsd/kttsmgr/kttsmgr.cpp | 2 +- kttsd/libkttsd/filterconf.h | 2 +- kttsd/libkttsd/notify.cpp | 2 +- kttsd/libkttsd/pluginconf.h | 2 +- kttsd/libkttsd/pluginproc.h | 2 +- kttsd/libkttsd/selecttalkerdlg.cpp | 2 +- kttsd/players/alsaplayer/alsaplayer.cpp | 2 +- kttsd/players/artsplayer/artsplayer.cpp | 2 +- kttsd/players/gstplayer/gstreamerplayer.cpp | 2 +- kttsd/plugins/command/commandconf.h | 2 +- kttsd/plugins/command/commandproc.cpp | 2 +- kttsd/plugins/epos/eposconf.h | 2 +- kttsd/plugins/epos/eposproc.cpp | 2 +- kttsd/plugins/festivalint/festivalintconf.h | 2 +- kttsd/plugins/festivalint/festivalintproc.cpp | 2 +- kttsd/plugins/flite/fliteconf.h | 2 +- kttsd/plugins/flite/fliteproc.cpp | 2 +- kttsd/plugins/freetts/freettsconf.h | 2 +- kttsd/plugins/freetts/freettsproc.cpp | 2 +- kttsd/plugins/hadifix/hadifixconf.h | 2 +- kttsd/plugins/hadifix/hadifixproc.cpp | 2 +- 42 files changed, 47 insertions(+), 47 deletions(-) (limited to 'kttsd') diff --git a/kttsd/README b/kttsd/README index 6a9bf2e..1e23ee6 100644 --- a/kttsd/README +++ b/kttsd/README @@ -19,7 +19,7 @@ kttsjobmgr kcmkttsd A KControl module for configuring the KTTS System. kcmkttsd runs in the -TDE Control Center or start it with the command "kcmshell kcmkttsd". +TDE Control Center or start it with the command "tdecmshell kcmkttsd". tdetexteditor_kttsd A plugin for the KDE Advanced Text Editor that permits you to speak an entire @@ -158,7 +158,7 @@ plugins Plugins for KTTSD. You must have at least one plugin to use kttsd KTTSD itself. Non-interactive deamon. icons Icon for kttsmgr and KTTSD. kttsjobmgr A KPart used by kcmkttsmgr for managing text jobs in KTTSD. -kcmkttsmgr A KControl module for managing KTTSD. Run using "kcmshell kcmkttsd". +kcmkttsmgr A KControl module for managing KTTSD. Run using "tdecmshell kcmkttsd". kttsmgr Application for managing KTTSD. Wrapper for kcmkttsmgr plus a system tray icon. app-plugins Plugins for other applications to speak text. kate Embedded Kate plugin. diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index 755fa68..2a4f134 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -32,7 +32,7 @@ using namespace std; #include #include #include -#include +#include #include #include diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index 5720549..97afb3f 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -39,12 +39,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include // KTTS includes. #include "filterconf.h" diff --git a/kttsd/filters/sbd/sbdconf.h b/kttsd/filters/sbd/sbdconf.h index 8bcd34b..2eb8ca2 100644 --- a/kttsd/filters/sbd/sbdconf.h +++ b/kttsd/filters/sbd/sbdconf.h @@ -28,7 +28,7 @@ #include // KDE includes. -#include +#include #include // KTTS includes. diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index f817147..c534b47 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -29,7 +29,7 @@ // KDE includes. #include #include -#include +#include // KTTS includes. #include "utils.h" diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index a0de6d9..dbf6dc1 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -40,12 +40,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include // KTTS includes. diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.h b/kttsd/filters/stringreplacer/stringreplacerconf.h index ba66d0b..542912d 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.h +++ b/kttsd/filters/stringreplacer/stringreplacerconf.h @@ -28,7 +28,7 @@ #include // KDE includes. -#include +#include #include // KTTS includes. diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp index a00b66f..d26bd8c 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp @@ -29,7 +29,7 @@ // KDE includes. #include #include -#include +#include #include #include diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index 1a78ab3..cdc2eb1 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -33,12 +33,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include // KTTS includes. diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.h b/kttsd/filters/talkerchooser/talkerchooserconf.h index 2d59c59..6b4f0b7 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.h +++ b/kttsd/filters/talkerchooser/talkerchooserconf.h @@ -28,7 +28,7 @@ #include // KDE includes. -#include +#include #include // KTTS includes. diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.cpp b/kttsd/filters/talkerchooser/talkerchooserproc.cpp index 4cf2bd9..38bbdb5 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserproc.cpp @@ -26,7 +26,7 @@ // KDE includes. #include -#include +#include // KTTS includes. #include "talkercode.h" diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index 8ead454..766e97c 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -28,7 +28,7 @@ // KDE includes. #include #include -#include +#include #include #include #include diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.h b/kttsd/filters/xmltransformer/xmltransformerconf.h index b129a02..7cd5e87 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.h +++ b/kttsd/filters/xmltransformer/xmltransformerconf.h @@ -28,7 +28,7 @@ #include // KDE includes. -#include +#include #include // KTTS includes. diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index 23ba3db..9105983 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -27,7 +27,7 @@ // KDE includes. #include -#include +#include #include #include #include diff --git a/kttsd/kcmkttsmgr/kcmkttsd.desktop b/kttsd/kcmkttsmgr/kcmkttsd.desktop index 20e2544..86fce6a 100644 --- a/kttsd/kcmkttsmgr/kcmkttsd.desktop +++ b/kttsd/kcmkttsmgr/kcmkttsd.desktop @@ -96,7 +96,7 @@ DocPath=kttsd NoDisplay=false StartupNotify=false StartupWMClass= -Exec=kcmshell kcmkttsd +Exec=tdecmshell kcmkttsd Icon=kttsd Categories=Qt;TDE;Utility;Accessibility; Keywords=kttsd,kcmkttsmgr,kttsmgr,tts,ttsd,ktts,text,to,speech,speak,synthesizer,synth,festival,command,freetts,proklam,via,voice diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index 3b8a40c..941477a 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -46,12 +46,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include // KTTS includes. #include "talkercode.h" diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 685e1f7..c8e8466 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -26,7 +26,7 @@ // KDE includes #include -#include +#include #include #include #include diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp index 9ec4329..36dd822 100644 --- a/kttsd/kttsd/filtermgr.cpp +++ b/kttsd/kttsd/filtermgr.cpp @@ -25,7 +25,7 @@ // KDE includes. #include -#include +#include #include #include #include diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp index 91c132b..ee32780 100644 --- a/kttsd/kttsd/kttsd.cpp +++ b/kttsd/kttsd/kttsd.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index c43ecd2..53c1b25 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -32,7 +32,7 @@ #include #include #include -//#include +//#include // KTTSD includes. #include "player.h" diff --git a/kttsd/kttsd/speechdata.h b/kttsd/kttsd/speechdata.h index 4d4d727..ccc5255 100644 --- a/kttsd/kttsd/speechdata.h +++ b/kttsd/kttsd/speechdata.h @@ -33,7 +33,7 @@ #include // KDE includes. -#include +#include // KTTS includes. #include diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index 6dbc288..257c8ee 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -26,7 +26,7 @@ #include // KDE includes. -#include +#include #include #include #include diff --git a/kttsd/libkttsd/filterconf.h b/kttsd/libkttsd/filterconf.h index 606813c..13e9b51 100644 --- a/kttsd/libkttsd/filterconf.h +++ b/kttsd/libkttsd/filterconf.h @@ -29,7 +29,7 @@ #include // KDE includes. -#include +#include #include #include #include "kdeexportfix.h" diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp index 4e25693..ad28419 100644 --- a/kttsd/libkttsd/notify.cpp +++ b/kttsd/libkttsd/notify.cpp @@ -22,7 +22,7 @@ #include // KDE includes. -#include +#include #include #include diff --git a/kttsd/libkttsd/pluginconf.h b/kttsd/libkttsd/pluginconf.h index 37081df..e8e1516 100644 --- a/kttsd/libkttsd/pluginconf.h +++ b/kttsd/libkttsd/pluginconf.h @@ -22,7 +22,7 @@ #include // KDE includes. -#include +#include #include #include #include "kdeexportfix.h" diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h index f856193..e05ab02 100644 --- a/kttsd/libkttsd/pluginproc.h +++ b/kttsd/libkttsd/pluginproc.h @@ -23,7 +23,7 @@ #include #include #include "kdeexportfix.h" -#include +#include /** * @interface PlugInProc diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp index 0091215..973c9ff 100644 --- a/kttsd/libkttsd/selecttalkerdlg.cpp +++ b/kttsd/libkttsd/selecttalkerdlg.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include // KTTS includes. diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp index 83ebc9b..580da8c 100644 --- a/kttsd/players/alsaplayer/alsaplayer.cpp +++ b/kttsd/players/alsaplayer/alsaplayer.cpp @@ -45,7 +45,7 @@ // KDE includes. #include -#include +#include #include #include #include diff --git a/kttsd/players/artsplayer/artsplayer.cpp b/kttsd/players/artsplayer/artsplayer.cpp index 7f80691..9629d29 100644 --- a/kttsd/players/artsplayer/artsplayer.cpp +++ b/kttsd/players/artsplayer/artsplayer.cpp @@ -19,7 +19,7 @@ #include "artsplayer.h" #include -#include +#include #include #include diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp index 145b9de..c07294e 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.cpp +++ b/kttsd/players/gstplayer/gstreamerplayer.cpp @@ -17,7 +17,7 @@ // KDE includes. #include -#include +#include #include #include diff --git a/kttsd/plugins/command/commandconf.h b/kttsd/plugins/command/commandconf.h index bbc0421..743e6d0 100644 --- a/kttsd/plugins/command/commandconf.h +++ b/kttsd/plugins/command/commandconf.h @@ -23,7 +23,7 @@ #include // KDE includes. -#include +#include // KTTS includes. #include diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp index b284287..7b011e3 100644 --- a/kttsd/plugins/command/commandproc.cpp +++ b/kttsd/plugins/command/commandproc.cpp @@ -26,7 +26,7 @@ // KDE includes. #include -#include +#include #include #include #include diff --git a/kttsd/plugins/epos/eposconf.h b/kttsd/plugins/epos/eposconf.h index dc0abdc..0e19a8a 100644 --- a/kttsd/plugins/epos/eposconf.h +++ b/kttsd/plugins/epos/eposconf.h @@ -28,7 +28,7 @@ #include // KDE includes. -#include +#include #include #include diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index bdf0d25..b5c78fd 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -33,7 +33,7 @@ // KDE includes. #include -#include +#include #include #include #include diff --git a/kttsd/plugins/festivalint/festivalintconf.h b/kttsd/plugins/festivalint/festivalintconf.h index 9e55d8c..5399b76 100644 --- a/kttsd/plugins/festivalint/festivalintconf.h +++ b/kttsd/plugins/festivalint/festivalintconf.h @@ -29,7 +29,7 @@ #include // KDE includes. -#include +#include #include // KTTS includes. diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp index 4001208..c3b8965 100644 --- a/kttsd/plugins/festivalint/festivalintproc.cpp +++ b/kttsd/plugins/festivalint/festivalintproc.cpp @@ -32,7 +32,7 @@ // KDE includes. #include -#include +#include #include // KTTS includes. diff --git a/kttsd/plugins/flite/fliteconf.h b/kttsd/plugins/flite/fliteconf.h index d3ba729..f2a1dc4 100644 --- a/kttsd/plugins/flite/fliteconf.h +++ b/kttsd/plugins/flite/fliteconf.h @@ -28,7 +28,7 @@ #include // KDE includes. -#include +#include #include // KTTS includes. diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp index fdd2449..1cb8b27 100644 --- a/kttsd/plugins/flite/fliteproc.cpp +++ b/kttsd/plugins/flite/fliteproc.cpp @@ -27,7 +27,7 @@ // KDE includes. #include -#include +#include #include #include diff --git a/kttsd/plugins/freetts/freettsconf.h b/kttsd/plugins/freetts/freettsconf.h index b55fceb..37bbe2c 100644 --- a/kttsd/plugins/freetts/freettsconf.h +++ b/kttsd/plugins/freetts/freettsconf.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp index e78a75c..95bcd8a 100644 --- a/kttsd/plugins/freetts/freettsproc.cpp +++ b/kttsd/plugins/freetts/freettsproc.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/kttsd/plugins/hadifix/hadifixconf.h b/kttsd/plugins/hadifix/hadifixconf.h index 67e0dcb..14d56bc 100644 --- a/kttsd/plugins/hadifix/hadifixconf.h +++ b/kttsd/plugins/hadifix/hadifixconf.h @@ -3,7 +3,7 @@ #include -#include +#include #include diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp index 52f10db..3f2899f 100644 --- a/kttsd/plugins/hadifix/hadifixproc.cpp +++ b/kttsd/plugins/hadifix/hadifixproc.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include -- cgit v1.2.3