Rename additional header files to avoid conflicts with KDE4

kbstateapplet/kbstate.cpp

@@ -25,9 +25,9 @@
 #include <tdeaboutapplication.h>
 #include <tdepopupmenu.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>

kmag/kmag.cpp

@@ -40,10 +40,10 @@
 #include <kkeydialog.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstdaction.h>
@@ -51,7 +51,7 @@
 #include <kimageio.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdepopupmenu.h>
 #include <kedittoolbar.h>
 #include <twin.h>

kmag/kmagselrect.cpp

@@ -27,7 +27,7 @@
 #include <tqbitmap.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static uchar line_bits[] = {0x2d, 0x96, 0x4b, 0xa5, 0xd2, 0x69, 0xb4, 0x5a};
 

kmag/kmagzoomview.cpp

@@ -36,7 +36,7 @@
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>

kmag/main.cpp

@@ -18,7 +18,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kmag.h"
 

kmousetool/kmousetool/kmousetool.cpp

@@ -29,15 +29,15 @@
 #include <X11/extensions/xtestext1.h>    /* Standard Name-String definitions*/
 #include <X11/extensions/XTest.h>    /* Standard Name-String definitions*/
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 #include <tqpoint.h>
 #include <tqnamespace.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kaudioplayer.h>
 #include <kstandarddirs.h>
 #include <tqsound.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>

kmousetool/kmousetool/main.cpp

@@ -19,7 +19,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kuniqueapplication.h>
 #include <dcopclient.h>

kmouth/configwizard.cpp

@@ -20,7 +20,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <ksconfig.h>

kmouth/kmouth.cpp

@@ -21,9 +21,9 @@
 
 // include files for KDE
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kprinter.h>

kmouth/main.cpp

@@ -18,7 +18,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kuniqueapplication.h>
 
 #include "kmouth.h"

kmouth/optionsdialog.cpp

@@ -25,9 +25,9 @@
 #include <tqfile.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdecmodule.h>
 #include <klibloader.h>

kmouth/phrasebook/phrasebook.cpp

@@ -22,15 +22,15 @@
 #include <tqregexp.h>
 #include <tqptrstack.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <tdetoolbar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 
 #include "phrasebookparser.h"
 #include "phrasebook.h"

kmouth/phrasebook/phrasebookdialog.cpp

@@ -31,13 +31,13 @@
 
 // include files for KDE
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h> 

kmouth/phrasebook/phrasetree.cpp

@@ -15,14 +15,14 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
 #include <tdestdaccel.h>
 #include <tdeshortcutlist.h>
 #include <tdeactionshortcutlist.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "phrasetree.h"
 #include "phrasebookdialog.h"

kmouth/phraselist.cpp

@@ -29,10 +29,10 @@
 #include <kaudioplayer.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <stdlib.h>
 

kmouth/speech.h

@@ -21,7 +21,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 /**This class is used internally by TextToSpeechSystem in order to do the actual speaking.
   *@author Gunnar Schmi Dt

kmouth/texttospeechconfigurationwidget.cpp

@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include "speech.h"
 #include <tqlineedit.h>

kmouth/wordcompletion/dictionarycreationwizard.cpp

@@ -27,7 +27,7 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <ksconfig.h>
 #include <tdeapplication.h>

kmouth/wordcompletion/klanguagebuttonhelper.cpp

@@ -23,8 +23,8 @@
 
 #include "klanguagebuttonhelper.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include "klanguagebutton.h"

kmouth/wordcompletion/wordcompletionwidget.cpp

@@ -23,14 +23,14 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "dictionarycreationwizard.h"
 #include "wordcompletionwidget.h"

kmouth/wordcompletion/wordlist.cpp

@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "wordlist.h"
 

ksayit/Freeverb_plugin/ksayitfreeverblib.cpp

@@ -16,7 +16,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdemacros.h>
 #include <arts/artsmodules.h>
 

ksayit/KTTSD_Lib/kttsdlib.cpp

@@ -16,8 +16,8 @@
 #include <tqstringlist.h>
 
 // KDE includes
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 

ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp

@@ -17,8 +17,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "kttsdlibsetupimpl.h"

ksayit/src/contextmenuhandler.cpp

@@ -16,8 +16,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 // App specific includes

ksayit/src/docbookclasses.cpp

@@ -18,10 +18,10 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "parasaxparser.h"

ksayit/src/docbookgenerator.cpp

@@ -16,8 +16,8 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // App specific includes
 #include "docbookgenerator.h"

ksayit/src/docbookparser.cpp

@@ -17,7 +17,7 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // App specific includes
 #include "docbookparser.h"

ksayit/src/doctreeviewimpl.cpp

@@ -23,10 +23,10 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 
 // App specific includes

ksayit/src/ksayit.cpp

@@ -24,13 +24,13 @@
 #include <tqfile.h>
 
 // include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>

ksayit/src/ksayitbookmarkhandler.cpp

@@ -15,8 +15,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 // App specific includes

ksayit/src/ksayitsystemtray.cpp

@@ -20,8 +20,8 @@
 #include <tqtranslator.h>
 
 // KDE includes
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // App specific includes
 #include "ksayitsystemtray.h"

ksayit/src/ksayitsystemtray.h

@@ -27,7 +27,7 @@
 #include <ksystemtray.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 

ksayit/src/ksayitviewimpl.cpp

@@ -26,9 +26,9 @@ using namespace std;
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "ksayitviewimpl.h"

ksayit/src/main.cpp

@@ -23,8 +23,8 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <arts/kartsdispatcher.h>
 #include <dcopclient.h>
 

ksayit/src/saxhandler.cpp

@@ -14,8 +14,8 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "saxhandler.h"

ksayit/src/voicesetupdlg.cpp

@@ -28,10 +28,10 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // App specific includes
 #include "voicesetupdlg.h"

kttsd/app-plugins/kate/katekttsd.cpp

@@ -27,7 +27,7 @@
 #include <tdetexteditor/selectioninterface.h>
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kgenericfactory.h>

kttsd/filters/main.cpp

@@ -28,7 +28,7 @@ using namespace std;
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>

kttsd/filters/sbd/sbdconf.cpp

@@ -32,8 +32,8 @@
 #include <tqradiobutton.h>
 
 // KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kdialog.h>

kttsd/filters/sbd/sbdproc.cpp

@@ -28,7 +28,7 @@
 
 // KDE includes.
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 // KTTS includes.

kttsd/filters/stringreplacer/stringreplacerconf.cpp

@@ -33,8 +33,8 @@
 #include <tqradiobutton.h>
 
 // KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kdialog.h>
@@ -46,7 +46,7 @@
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // KTTS includes.
 #include "filterconf.h"

kttsd/filters/stringreplacer/stringreplacerproc.cpp

@@ -28,9 +28,9 @@
 
 // KDE includes.
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 // KTTS includes.

kttsd/filters/talkerchooser/talkerchooserconf.cpp

@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 
 // KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kdialog.h>
 #include <kdialogbase.h>

kttsd/filters/xmltransformer/xmltransformerconf.cpp

@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 
 // KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdeconfig.h>
 #include <kdialog.h>

kttsd/filters/xmltransformer/xmltransformerproc.cpp

@@ -28,7 +28,7 @@
 // KDE includes.
 #include <tdeversion.h>
 #include <tdeconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <kdebug.h>

kttsd/kcmkttsmgr/addtalker.cpp

@@ -27,8 +27,8 @@
 
 // KDE includes.
 #include <kcombobox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // KTTS includes.

kttsd/kcmkttsmgr/kcmkttsmgr.cpp

@@ -50,7 +50,7 @@
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 
 // KTTS includes.

kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui

@@ -1884,8 +1884,8 @@
     <tabstop>keepAudioPath</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="global" impldecl="in implementation">kdebug.h</include>
 </includes>
 <Q_SIGNALS>

kttsd/kcmkttsmgr/selectevent.cpp

@@ -27,7 +27,7 @@
 // KDE includes
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdelistview.h>
 #include <kiconloader.h>

kttsd/kttsd/filtermgr.cpp

@@ -28,7 +28,7 @@
 #include <tdeconfig.h>
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // FilterMgr includes.
 #include "filtermgr.h"

kttsd/kttsd/kttsd.cpp

@@ -28,8 +28,8 @@
 // KDE includes.
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <dcopclient.h>
 #include <knotifyclient.h>

kttsd/kttsd/main.cpp

@@ -26,7 +26,7 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 #include "kttsd.h"

kttsd/kttsd/speaker.cpp

@@ -26,12 +26,12 @@
 
 // KDE includes.
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/componentfactory.h>
 #include <ktrader.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 //#include <tdeio/job.h>
 
 // KTTSD includes.

kttsd/kttsd/speechdata.cpp

@@ -34,7 +34,7 @@
 
 // KDE includes.
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 

kttsd/kttsd/ssmlconvert.cpp

@@ -30,7 +30,7 @@
 #include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 // SSMLConvert includes.

kttsd/kttsjobmgr/kttsjobmgr.cpp

@@ -29,7 +29,7 @@
 
 // KDE includes.
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdelistview.h>
 #include <kiconloader.h>

kttsd/libkttsd/filterconf.cpp

@@ -32,8 +32,8 @@
 #include <tqstring.h>
 
 // KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // PluginConf includes.
 #include "filterconf.h"

kttsd/libkttsd/notify.cpp

@@ -23,7 +23,7 @@
 
 // KDE includes.
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 // KTTS includes.

kttsd/libkttsd/player.h

@@ -20,8 +20,8 @@
 #include <tqstringlist.h>
 #include <kdemacros.h>
 #include "kdeexportfix.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
 
 // #include "filehandle.h"
 

kttsd/libkttsd/pluginconf.cpp

@@ -25,8 +25,8 @@
 #include <tqstring.h>
 
 // KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // PluginConf includes.

kttsd/libkttsd/pluginproc.cpp

@@ -22,7 +22,7 @@
 // KDE includes.
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // PlugInProc includes.
 #include "pluginproc.h"

kttsd/libkttsd/selecttalkerdlg.h

@@ -32,7 +32,7 @@
 
 // KDE includes.
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdemacros.h>
 
 // KTTS includes.

kttsd/libkttsd/talkercode.cpp

@@ -23,8 +23,8 @@
  ******************************************************************************/
 
 // KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 #include <kdebug.h>
 

kttsd/libkttsd/testplayer.cpp

@@ -27,7 +27,7 @@
 
 // KDE includes.
 #include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <tdeparts/componentfactory.h>
 #include <ktrader.h>

kttsd/players/alsaplayer/alsaplayer.cpp

@@ -47,8 +47,8 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 // AlsaPlayer includes.
 #include "alsaplayer.h"

kttsd/players/artsplayer/artsplayer.cpp

@@ -32,9 +32,9 @@
 
 #include <sys/wait.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kaudiomanagerplay.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // public methods

kttsd/players/gstplayer/gstreamerplayer.cpp

@@ -18,7 +18,7 @@
 // KDE includes.
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 // GStreamerPlayer includes.

kttsd/plugins/command/commandconf.cpp

@@ -25,10 +25,10 @@
 // KDE includes.
 #include <kdialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kcombobox.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 

kttsd/plugins/command/commandproc.cpp

@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 // KTTS includes.

kttsd/plugins/epos/eposconf.cpp

@@ -33,10 +33,10 @@
 
 // KDE includes.
 #include <kdialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 // KTTS includes.

kttsd/plugins/epos/eposproc.cpp

@@ -34,7 +34,7 @@
 // KDE includes.
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 

kttsd/plugins/festivalint/festivalintconf.cpp

@@ -38,10 +38,10 @@
 // KDE includes.
 #include <kdialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
-#include <kglobal.h>
-#include <ktempfile.h>
+#include <tdeglobal.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <kprocio.h>

kttsd/plugins/flite/fliteconf.cpp

@@ -27,9 +27,9 @@
 #include <tqapplication.h>
 
 // KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 

kttsd/plugins/freetts/freettsconf.cpp

@@ -25,10 +25,10 @@
 
 // KDE includes.
 #include <kdialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 // KTTS includes.

kttsd/plugins/hadifix/hadifixconf.cpp

@@ -25,11 +25,11 @@
 #include <tqfile.h>
 
 // KDE includes.
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeaboutdata.h>
 #include <tdeaboutapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kcombobox.h>
 #include <kstandarddirs.h>

kttsd/plugins/hadifix/hadifixconfigui.ui

@@ -636,7 +636,7 @@
     <include location="global" impldecl="in declaration">tqpixmap.h</include>
     <include location="global" impldecl="in declaration">kurl.h</include>
     <include location="global" impldecl="in declaration">tqmap.h</include>
-    <include location="global" impldecl="in implementation">kglobal.h</include>
+    <include location="global" impldecl="in implementation">tdeglobal.h</include>
     <include location="global" impldecl="in implementation">tqstringlist.h</include>
     <include location="global" impldecl="in implementation">math.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>

kttsd/plugins/hadifix/voicefileui.ui

@@ -99,7 +99,7 @@
 </connections>
 <includes>
     <include location="global" impldecl="in implementation">kurlrequesterdlg.h</include>
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
     <include location="local" impldecl="in implementation">hadifixproc.h</include>
     <include location="local" impldecl="in implementation">voicefileui.ui.h</include>
 </includes>