From c96f95eaac4e5415ddb92103a5c29ab55597408d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:53:57 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kttsd/app-plugins/kate/katekttsd.cpp | 2 +- kttsd/filters/main.cpp | 2 +- kttsd/filters/sbd/sbdconf.cpp | 4 ++-- kttsd/filters/sbd/sbdproc.cpp | 2 +- kttsd/filters/stringreplacer/stringreplacerconf.cpp | 6 +++--- kttsd/filters/stringreplacer/stringreplacerproc.cpp | 4 ++-- kttsd/filters/talkerchooser/talkerchooserconf.cpp | 2 +- kttsd/filters/xmltransformer/xmltransformerconf.cpp | 2 +- kttsd/filters/xmltransformer/xmltransformerproc.cpp | 2 +- kttsd/kcmkttsmgr/addtalker.cpp | 4 ++-- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 2 +- kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui | 4 ++-- kttsd/kcmkttsmgr/selectevent.cpp | 2 +- kttsd/kttsd/filtermgr.cpp | 2 +- kttsd/kttsd/kttsd.cpp | 4 ++-- kttsd/kttsd/main.cpp | 2 +- kttsd/kttsd/speaker.cpp | 4 ++-- kttsd/kttsd/speechdata.cpp | 2 +- kttsd/kttsd/ssmlconvert.cpp | 2 +- kttsd/kttsjobmgr/kttsjobmgr.cpp | 2 +- kttsd/libkttsd/filterconf.cpp | 4 ++-- kttsd/libkttsd/notify.cpp | 2 +- kttsd/libkttsd/player.h | 4 ++-- kttsd/libkttsd/pluginconf.cpp | 4 ++-- kttsd/libkttsd/pluginproc.cpp | 2 +- kttsd/libkttsd/selecttalkerdlg.h | 2 +- kttsd/libkttsd/talkercode.cpp | 4 ++-- kttsd/libkttsd/testplayer.cpp | 2 +- kttsd/players/alsaplayer/alsaplayer.cpp | 4 ++-- kttsd/players/artsplayer/artsplayer.cpp | 4 ++-- kttsd/players/gstplayer/gstreamerplayer.cpp | 2 +- kttsd/plugins/command/commandconf.cpp | 4 ++-- kttsd/plugins/command/commandproc.cpp | 2 +- kttsd/plugins/epos/eposconf.cpp | 4 ++-- kttsd/plugins/epos/eposproc.cpp | 2 +- kttsd/plugins/festivalint/festivalintconf.cpp | 6 +++--- kttsd/plugins/flite/fliteconf.cpp | 4 ++-- kttsd/plugins/freetts/freettsconf.cpp | 6 +++--- kttsd/plugins/hadifix/hadifixconf.cpp | 4 ++-- kttsd/plugins/hadifix/hadifixconfigui.ui | 2 +- kttsd/plugins/hadifix/voicefileui.ui | 2 +- 41 files changed, 63 insertions(+), 63 deletions(-) (limited to 'kttsd') diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp index 137953f..fbb56ac 100644 --- a/kttsd/app-plugins/kate/katekttsd.cpp +++ b/kttsd/app-plugins/kate/katekttsd.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index a97349d..daf1c4c 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -28,7 +28,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 b6c4f8e..d17e4b8 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -32,8 +32,8 @@ #include // KDE includes. -#include -#include +#include +#include #include #include #include diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index c534b47..d868d5c 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -28,7 +28,7 @@ // KDE includes. #include -#include +#include #include // KTTS includes. diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index ba71c70..00abecb 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -33,8 +33,8 @@ #include // KDE includes. -#include -#include +#include +#include #include #include #include @@ -46,7 +46,7 @@ #include #include #include -#include +#include // KTTS includes. #include "filterconf.h" diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp index d26bd8c..f558d6d 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp @@ -28,9 +28,9 @@ // KDE includes. #include -#include +#include #include -#include +#include #include // KTTS includes. diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index 90cc4a3..ff9a6e8 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -27,7 +27,7 @@ #include // KDE includes. -#include +#include #include #include #include diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index 766e97c..ab45284 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -26,7 +26,7 @@ #include // KDE includes. -#include +#include #include #include #include diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index 9105983..9a48f9c 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -28,7 +28,7 @@ // KDE includes. #include #include -#include +#include #include #include #include diff --git a/kttsd/kcmkttsmgr/addtalker.cpp b/kttsd/kcmkttsmgr/addtalker.cpp index d43b5b2..d3fe4d7 100644 --- a/kttsd/kcmkttsmgr/addtalker.cpp +++ b/kttsd/kcmkttsmgr/addtalker.cpp @@ -27,8 +27,8 @@ // KDE includes. #include -#include -#include +#include +#include #include // KTTS includes. diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index 050e629..d4c0e76 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include // KTTS includes. diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui index ffde8a9..79a6db1 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui @@ -1884,8 +1884,8 @@ keepAudioPath - klocale.h - klocale.h + tdelocale.h + tdelocale.h kdebug.h diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 1e8f15c..46b2205 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -27,7 +27,7 @@ // KDE includes #include #include -#include +#include #include #include #include diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp index 25c34eb..3c97443 100644 --- a/kttsd/kttsd/filtermgr.cpp +++ b/kttsd/kttsd/filtermgr.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include // FilterMgr includes. #include "filtermgr.h" diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp index 3cd18f8..7506b78 100644 --- a/kttsd/kttsd/kttsd.cpp +++ b/kttsd/kttsd/kttsd.cpp @@ -28,8 +28,8 @@ // KDE includes. #include #include -#include -#include +#include +#include #include #include #include diff --git a/kttsd/kttsd/main.cpp b/kttsd/kttsd/main.cpp index 4f02938..e1a7d4e 100644 --- a/kttsd/kttsd/main.cpp +++ b/kttsd/kttsd/main.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include "kttsd.h" diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index 5bbaa27..4794739 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -26,12 +26,12 @@ // KDE includes. #include -#include +#include #include #include #include #include -#include +#include //#include // KTTSD includes. diff --git a/kttsd/kttsd/speechdata.cpp b/kttsd/kttsd/speechdata.cpp index db76327..cdc19b7 100644 --- a/kttsd/kttsd/speechdata.cpp +++ b/kttsd/kttsd/speechdata.cpp @@ -34,7 +34,7 @@ // KDE includes. #include -#include +#include #include #include diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp index 2bae1e7..00bca92 100644 --- a/kttsd/kttsd/ssmlconvert.cpp +++ b/kttsd/kttsd/ssmlconvert.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include // SSMLConvert includes. diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index bcbbef9..98e22d7 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -29,7 +29,7 @@ // KDE includes. #include -#include +#include #include #include #include diff --git a/kttsd/libkttsd/filterconf.cpp b/kttsd/libkttsd/filterconf.cpp index 00e42e1..e0a7b23 100644 --- a/kttsd/libkttsd/filterconf.cpp +++ b/kttsd/libkttsd/filterconf.cpp @@ -32,8 +32,8 @@ #include // KDE includes. -#include -#include +#include +#include // PluginConf includes. #include "filterconf.h" diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp index ad28419..90166b1 100644 --- a/kttsd/libkttsd/notify.cpp +++ b/kttsd/libkttsd/notify.cpp @@ -23,7 +23,7 @@ // KDE includes. #include -#include +#include #include // KTTS includes. diff --git a/kttsd/libkttsd/player.h b/kttsd/libkttsd/player.h index fdb980f..28c2591 100644 --- a/kttsd/libkttsd/player.h +++ b/kttsd/libkttsd/player.h @@ -20,8 +20,8 @@ #include #include #include "kdeexportfix.h" -#include "kglobal.h" -#include "klocale.h" +#include "tdeglobal.h" +#include "tdelocale.h" // #include "filehandle.h" diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp index b076729..03420ff 100644 --- a/kttsd/libkttsd/pluginconf.cpp +++ b/kttsd/libkttsd/pluginconf.cpp @@ -25,8 +25,8 @@ #include // KDE includes. -#include -#include +#include +#include #include // PluginConf includes. diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp index d50d668..ec86a2a 100644 --- a/kttsd/libkttsd/pluginproc.cpp +++ b/kttsd/libkttsd/pluginproc.cpp @@ -22,7 +22,7 @@ // KDE includes. #include #include -#include +#include // PlugInProc includes. #include "pluginproc.h" diff --git a/kttsd/libkttsd/selecttalkerdlg.h b/kttsd/libkttsd/selecttalkerdlg.h index 31c51e5..e656be5 100644 --- a/kttsd/libkttsd/selecttalkerdlg.h +++ b/kttsd/libkttsd/selecttalkerdlg.h @@ -32,7 +32,7 @@ // KDE includes. #include -#include +#include #include // KTTS includes. diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp index 5ae1afa..f53311d 100644 --- a/kttsd/libkttsd/talkercode.cpp +++ b/kttsd/libkttsd/talkercode.cpp @@ -23,8 +23,8 @@ ******************************************************************************/ // KDE includes. -#include -#include +#include +#include #include #include diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp index 948c629..80d8b90 100644 --- a/kttsd/libkttsd/testplayer.cpp +++ b/kttsd/libkttsd/testplayer.cpp @@ -27,7 +27,7 @@ // KDE includes. #include -#include +#include #include #include #include diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp index 580da8c..4222ca6 100644 --- a/kttsd/players/alsaplayer/alsaplayer.cpp +++ b/kttsd/players/alsaplayer/alsaplayer.cpp @@ -47,8 +47,8 @@ #include #include #include -#include -#include +#include +#include // AlsaPlayer includes. #include "alsaplayer.h" diff --git a/kttsd/players/artsplayer/artsplayer.cpp b/kttsd/players/artsplayer/artsplayer.cpp index 9629d29..49c9e26 100644 --- a/kttsd/players/artsplayer/artsplayer.cpp +++ b/kttsd/players/artsplayer/artsplayer.cpp @@ -32,9 +32,9 @@ #include -#include +#include #include -#include +#include //////////////////////////////////////////////////////////////////////////////// // public methods diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp index a62a2e9..957aeda 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.cpp +++ b/kttsd/players/gstplayer/gstreamerplayer.cpp @@ -18,7 +18,7 @@ // KDE includes. #include #include -#include +#include #include // GStreamerPlayer includes. diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp index 837e862..f95bca0 100644 --- a/kttsd/plugins/command/commandconf.cpp +++ b/kttsd/plugins/command/commandconf.cpp @@ -25,10 +25,10 @@ // KDE includes. #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp index 7b011e3..0347d79 100644 --- a/kttsd/plugins/command/commandproc.cpp +++ b/kttsd/plugins/command/commandproc.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include // KTTS includes. diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp index 7bc8c17..40f9d1a 100644 --- a/kttsd/plugins/epos/eposconf.cpp +++ b/kttsd/plugins/epos/eposconf.cpp @@ -33,10 +33,10 @@ // KDE includes. #include -#include +#include #include #include -#include +#include #include // KTTS includes. diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index b5c78fd..137314d 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -34,7 +34,7 @@ // KDE includes. #include #include -#include +#include #include #include diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp index e7aa13b..0dc737a 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -38,10 +38,10 @@ // KDE includes. #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp index 1fa1d42..2d5737e 100644 --- a/kttsd/plugins/flite/fliteconf.cpp +++ b/kttsd/plugins/flite/fliteconf.cpp @@ -27,9 +27,9 @@ #include // KDE includes. -#include +#include #include -#include +#include #include #include diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp index 523dda9..5be75f0 100644 --- a/kttsd/plugins/freetts/freettsconf.cpp +++ b/kttsd/plugins/freetts/freettsconf.cpp @@ -25,10 +25,10 @@ // KDE includes. #include -#include +#include #include -#include -#include +#include +#include #include // KTTS includes. diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 08b8ab0..9b86384 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -25,11 +25,11 @@ #include // KDE includes. -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui index 8a686c2..367200c 100644 --- a/kttsd/plugins/hadifix/hadifixconfigui.ui +++ b/kttsd/plugins/hadifix/hadifixconfigui.ui @@ -636,7 +636,7 @@ tqpixmap.h kurl.h tqmap.h - kglobal.h + tdeglobal.h tqstringlist.h math.h kiconloader.h diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui index 32b4fc5..c333670 100644 --- a/kttsd/plugins/hadifix/voicefileui.ui +++ b/kttsd/plugins/hadifix/voicefileui.ui @@ -99,7 +99,7 @@ kurlrequesterdlg.h - kmessagebox.h + tdemessagebox.h hadifixproc.h voicefileui.ui.h -- cgit v1.2.3