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 --- IconThemes/mono/scalable/apps/kconfigure.svgz | Bin 7967 -> 0 bytes IconThemes/mono/scalable/apps/kfilereplace.svgz | Bin 2946 -> 0 bytes IconThemes/mono/scalable/apps/kio_uiserver.svgz | Bin 1709 -> 0 bytes IconThemes/mono/scalable/apps/knetworkconf.svgz | Bin 1638 -> 0 bytes IconThemes/mono/scalable/apps/knetwortdeconf.svgz | Bin 0 -> 1638 bytes IconThemes/mono/scalable/apps/tdeconfigure.svgz | Bin 0 -> 7969 bytes IconThemes/mono/scalable/apps/tdefilereplace.svgz | Bin 0 -> 2948 bytes IconThemes/mono/scalable/apps/tdeio_uiserver.svgz | Bin 0 -> 1709 bytes kbstateapplet/Makefile.am | 2 +- kbstateapplet/kbstate.cpp | 2 +- kmag/kmag.cpp | 8 ++++---- kmousetool/kmousetool/kmousetool.cpp | 2 +- kmousetool/kmousetool/main.cpp | 2 +- kmouth/configwizard.cpp | 2 +- kmouth/kmouth.cpp | 2 +- kmouth/optionsdialog.cpp | 2 +- kmouth/phrasebook/phrasebook.cpp | 4 ++-- kmouth/phrasebook/phrasebookdialog.cpp | 2 +- kmouth/phrasebook/phrasetree.cpp | 2 +- kmouth/phraselist.cpp | 2 +- kmouth/texttospeechconfigurationwidget.cpp | 2 +- kmouth/texttospeechsystem.cpp | 2 +- kmouth/wordcompletion/dictionarycreationwizard.cpp | 2 +- kmouth/wordcompletion/wordcompletion.cpp | 2 +- kmouth/wordcompletion/wordcompletionwidget.cpp | 6 +++--- ksayit/Freeverb_plugin/freeverbsetupimpl.h | 2 +- ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp | 6 +++--- ksayit/src/doctreeviewimpl.cpp | 2 +- ksayit/src/effectstack.h | 2 +- ksayit/src/fxpluginhandler.h | 2 +- ksayit/src/fxsetupimpl.h | 2 +- ksayit/src/ksayit.cpp | 6 +++--- ksayit/src/ksayit.h | 2 +- ksayit/src/voicesetupdlg.h | 2 +- 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 +- 76 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 IconThemes/mono/scalable/apps/kconfigure.svgz delete mode 100644 IconThemes/mono/scalable/apps/kfilereplace.svgz delete mode 100644 IconThemes/mono/scalable/apps/kio_uiserver.svgz delete mode 100644 IconThemes/mono/scalable/apps/knetworkconf.svgz create mode 100644 IconThemes/mono/scalable/apps/knetwortdeconf.svgz create mode 100644 IconThemes/mono/scalable/apps/tdeconfigure.svgz create mode 100644 IconThemes/mono/scalable/apps/tdefilereplace.svgz create mode 100644 IconThemes/mono/scalable/apps/tdeio_uiserver.svgz diff --git a/IconThemes/mono/scalable/apps/kconfigure.svgz b/IconThemes/mono/scalable/apps/kconfigure.svgz deleted file mode 100644 index 16e702f..0000000 Binary files a/IconThemes/mono/scalable/apps/kconfigure.svgz and /dev/null differ diff --git a/IconThemes/mono/scalable/apps/kfilereplace.svgz b/IconThemes/mono/scalable/apps/kfilereplace.svgz deleted file mode 100644 index bd81768..0000000 Binary files a/IconThemes/mono/scalable/apps/kfilereplace.svgz and /dev/null differ diff --git a/IconThemes/mono/scalable/apps/kio_uiserver.svgz b/IconThemes/mono/scalable/apps/kio_uiserver.svgz deleted file mode 100644 index 43cda0b..0000000 Binary files a/IconThemes/mono/scalable/apps/kio_uiserver.svgz and /dev/null differ diff --git a/IconThemes/mono/scalable/apps/knetworkconf.svgz b/IconThemes/mono/scalable/apps/knetworkconf.svgz deleted file mode 100644 index e5e2ba4..0000000 Binary files a/IconThemes/mono/scalable/apps/knetworkconf.svgz and /dev/null differ diff --git a/IconThemes/mono/scalable/apps/knetwortdeconf.svgz b/IconThemes/mono/scalable/apps/knetwortdeconf.svgz new file mode 100644 index 0000000..e5e2ba4 Binary files /dev/null and b/IconThemes/mono/scalable/apps/knetwortdeconf.svgz differ diff --git a/IconThemes/mono/scalable/apps/tdeconfigure.svgz b/IconThemes/mono/scalable/apps/tdeconfigure.svgz new file mode 100644 index 0000000..6a5c9c7 Binary files /dev/null and b/IconThemes/mono/scalable/apps/tdeconfigure.svgz differ diff --git a/IconThemes/mono/scalable/apps/tdefilereplace.svgz b/IconThemes/mono/scalable/apps/tdefilereplace.svgz new file mode 100644 index 0000000..4272338 Binary files /dev/null and b/IconThemes/mono/scalable/apps/tdefilereplace.svgz differ diff --git a/IconThemes/mono/scalable/apps/tdeio_uiserver.svgz b/IconThemes/mono/scalable/apps/tdeio_uiserver.svgz new file mode 100644 index 0000000..43cda0b Binary files /dev/null and b/IconThemes/mono/scalable/apps/tdeio_uiserver.svgz differ diff --git a/kbstateapplet/Makefile.am b/kbstateapplet/Makefile.am index 3c955d3..36e0d29 100644 --- a/kbstateapplet/Makefile.am +++ b/kbstateapplet/Makefile.am @@ -19,6 +19,6 @@ messages: $(XGETTEXT) *.cpp *.h -o $(podir)/kbstateapplet.pot srcdoc: - kdoc -a -p -H -d $$HOME/web/src/kbstateapplet kbstateapplet *.h -lqt -ltdecore -ltdeui -lkfile + kdoc -a -p -H -d $$HOME/web/src/kbstateapplet kbstateapplet *.h -lqt -ltdecore -ltdeui -ltdefile SUBDIRS = images diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 2fb3799..170512f 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -701,7 +701,7 @@ void KbStateApplet::configureKeyboard() { // The modulename "keyboard" is ambiguous on SuSE systems // as there is also a YaST-module called "keyboard". TDEProcess proc; - proc << "kcmshell"; + proc << "tdecmshell"; proc << "kde/keyboard"; proc.start(TDEProcess::DontCare); proc.detach(); diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index 6bcf106..66cda4e 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -41,16 +41,16 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index e251545..530b04f 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool/kmousetool.cpp @@ -23,7 +23,7 @@ #include "Xmd_kmousetool.h" #include "kmousetool.h" #include "kmousetool.moc" -#include +#include #include /* Intrinsics Definitions*/ #include /* Standard Name-String definitions*/ #include /* Standard Name-String definitions*/ diff --git a/kmousetool/kmousetool/main.cpp b/kmousetool/kmousetool/main.cpp index b836bcc..c09a0c3 100644 --- a/kmousetool/kmousetool/main.cpp +++ b/kmousetool/kmousetool/main.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "kmousetool.h" diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp index b92551b..9cb0b8b 100644 --- a/kmouth/configwizard.cpp +++ b/kmouth/configwizard.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "texttospeechconfigurationwidget.h" #include "phrasebook/phrasebookdialog.h" diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp index 7c78bae..b395ece 100644 --- a/kmouth/kmouth.cpp +++ b/kmouth/kmouth.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp index e173380..c15f992 100644 --- a/kmouth/optionsdialog.cpp +++ b/kmouth/optionsdialog.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index 8f51ba6..6494321 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index 832e184..544bc86 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp index f8e89a9..5cb29b2 100644 --- a/kmouth/phrasebook/phrasetree.cpp +++ b/kmouth/phrasebook/phrasetree.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp index 24a0bd0..762fd3e 100644 --- a/kmouth/phraselist.cpp +++ b/kmouth/phraselist.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/kmouth/texttospeechconfigurationwidget.cpp b/kmouth/texttospeechconfigurationwidget.cpp index 64c7035..144db1c 100644 --- a/kmouth/texttospeechconfigurationwidget.cpp +++ b/kmouth/texttospeechconfigurationwidget.cpp @@ -17,7 +17,7 @@ #include "texttospeechconfigurationwidget.h" -#include +#include #include #include #include diff --git a/kmouth/texttospeechsystem.cpp b/kmouth/texttospeechsystem.cpp index b061f6b..36e1f67 100644 --- a/kmouth/texttospeechsystem.cpp +++ b/kmouth/texttospeechsystem.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include "speech.h" diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index b7edf60..dff21e8 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "dictionarycreationwizard.h" #include "klanguagebutton.h" diff --git a/kmouth/wordcompletion/wordcompletion.cpp b/kmouth/wordcompletion/wordcompletion.cpp index ce373a1..994c0ac 100644 --- a/kmouth/wordcompletion/wordcompletion.cpp +++ b/kmouth/wordcompletion/wordcompletion.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include "wordcompletion.h" diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index c9e9a1e..e35ce39 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -26,10 +26,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include "dictionarycreationwizard.h" diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.h b/ksayit/Freeverb_plugin/freeverbsetupimpl.h index 2112af0..6e2eab3 100644 --- a/ksayit/Freeverb_plugin/freeverbsetupimpl.h +++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.h @@ -22,7 +22,7 @@ #include // KDE includes -#include +#include // App specific includes #include diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp index b0bc36c..c176d78 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp @@ -42,8 +42,8 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter() FILE *fp; char cmdresult[20]; - // if ( (fp = popen("kcmshell --list | grep kcmkttsmgr", "r")) != NULL){ - if ( (fp = popen("kcmshell --list | grep kcmkttsd", "r")) != NULL){ + // if ( (fp = popen("tdecmshell --list | grep kcmkttsmgr", "r")) != NULL){ + if ( (fp = popen("tdecmshell --list | grep kcmkttsd", "r")) != NULL){ fgets(cmdresult, 18, fp); pclose(fp); } @@ -57,7 +57,7 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter() TDEProcess *kcmproc = new TDEProcess(); connect(kcmproc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotKCMProcessExited(TDEProcess*)) ); - (*kcmproc) << "kcmshell"; + (*kcmproc) << "tdecmshell"; (*kcmproc) << "kcmkttsd"; kcmproc->start(TDEProcess::NotifyOnExit); diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp index 34e5f64..57e5d8b 100644 --- a/ksayit/src/doctreeviewimpl.cpp +++ b/ksayit/src/doctreeviewimpl.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/ksayit/src/effectstack.h b/ksayit/src/effectstack.h index 0a2f959..e32356d 100644 --- a/ksayit/src/effectstack.h +++ b/ksayit/src/effectstack.h @@ -14,7 +14,7 @@ // KDE includes #include -#include +#include #include #include diff --git a/ksayit/src/fxpluginhandler.h b/ksayit/src/fxpluginhandler.h index 1ee84e7..92db2da 100644 --- a/ksayit/src/fxpluginhandler.h +++ b/ksayit/src/fxpluginhandler.h @@ -21,7 +21,7 @@ // #include // KDE includes -#include +#include #include #include diff --git a/ksayit/src/fxsetupimpl.h b/ksayit/src/fxsetupimpl.h index e062877..422368e 100644 --- a/ksayit/src/fxsetupimpl.h +++ b/ksayit/src/fxsetupimpl.h @@ -24,7 +24,7 @@ // KDE includes -#include +#include // App specific includes #include "fx_setup.h" diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index 101bd86..e2e931d 100644 --- a/ksayit/src/ksayit.cpp +++ b/ksayit/src/ksayit.cpp @@ -29,11 +29,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -290,7 +290,7 @@ void KSayItApp::slotChangeBookmarkFilename(const TQString &newname) if ( newbkFile.isNull() ) return; - // copy old bookmarkfile to new file + // copy old bookmartdefile to new file if ( m_currentBookmarkFile != newbkFile ){ if ( TQFile::exists(m_currentBookmarkFile) ){ TQString command = TQString("cp %1 %2").arg(m_currentBookmarkFile).arg(newbkFile); diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h index dd27641..d1150bf 100644 --- a/ksayit/src/ksayit.h +++ b/ksayit/src/ksayit.h @@ -310,7 +310,7 @@ private: // Methods void setActions(int actions); /** - * Returns the absolute pathname of the given bookmarkfile. + * Returns the absolute pathname of the given bookmartdefile. * This is the first KDE resource directory \p (share/apps) in which * the user has write permissions. The relative path is * \p ksayit/ksayit_bookmarks/. diff --git a/ksayit/src/voicesetupdlg.h b/ksayit/src/voicesetupdlg.h index 01d171c..f2ddc38 100644 --- a/ksayit/src/voicesetupdlg.h +++ b/ksayit/src/voicesetupdlg.h @@ -23,7 +23,7 @@ // KDE includes #include -#include +#include // forward declaration class FXPluginHandler; 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.1