diff options
78 files changed, 135 insertions, 135 deletions
diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 708621e..9a35c0d 100644 --- a/kbstateapplet/kbstate.cpp +++ b/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> diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index 0bd9cdd..7961ee6 100644 --- a/kmag/kmag.cpp +++ b/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> diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp index cde24d1..ba49fe3 100644 --- a/kmag/kmagselrect.cpp +++ b/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}; diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index da8bc8e..644e91a 100644 --- a/kmag/kmagzoomview.cpp +++ b/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> diff --git a/kmag/main.cpp b/kmag/main.cpp index 0eb747f..1d85e05 100644 --- a/kmag/main.cpp +++ b/kmag/main.cpp @@ -18,7 +18,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "kmag.h" diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index c71a360..0dff42e 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/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> diff --git a/kmousetool/kmousetool/main.cpp b/kmousetool/kmousetool/main.cpp index 975c193..ebab64a 100644 --- a/kmousetool/kmousetool/main.cpp +++ b/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> diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp index 41c8dfc..4960cff 100644 --- a/kmouth/configwizard.cpp +++ b/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> diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp index 1350125..a7b815f 100644 --- a/kmouth/kmouth.cpp +++ b/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> diff --git a/kmouth/main.cpp b/kmouth/main.cpp index 50cf6ee..012beea 100644 --- a/kmouth/main.cpp +++ b/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" diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp index 559370d..1583923 100644 --- a/kmouth/optionsdialog.cpp +++ b/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> diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index eb166ab..94eb42f 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/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" diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index 0d60ea0..29f4a1f 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/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> diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp index da82164..6a2bac2 100644 --- a/kmouth/phrasebook/phrasetree.cpp +++ b/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" diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp index d3df504..24df32f 100644 --- a/kmouth/phraselist.cpp +++ b/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> diff --git a/kmouth/speech.h b/kmouth/speech.h index 3c62a44..145b032 100644 --- a/kmouth/speech.h +++ b/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 diff --git a/kmouth/texttospeechconfigurationwidget.cpp b/kmouth/texttospeechconfigurationwidget.cpp index 144db1c..4245100 100644 --- a/kmouth/texttospeechconfigurationwidget.cpp +++ b/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> diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index 8584e60..7211768 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/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> diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp index 5d00ff0..a2c5e70 100644 --- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp +++ b/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" diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index a5d1b8f..6e6002d 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/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" diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp index d081110..adf73cb 100644 --- a/kmouth/wordcompletion/wordlist.cpp +++ b/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" diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp index 02560b6..1141e68 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp +++ b/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> diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp index ff2e023..32e66e4 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.cpp +++ b/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> diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp index c176d78..1dc4196 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp +++ b/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" diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp index 9961b18..d6c5ddb 100644 --- a/ksayit/src/contextmenuhandler.cpp +++ b/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 diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp index 914d99a..6b9e8d9 100644 --- a/ksayit/src/docbookclasses.cpp +++ b/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" diff --git a/ksayit/src/docbookgenerator.cpp b/ksayit/src/docbookgenerator.cpp index d9ab809..475ffaf 100644 --- a/ksayit/src/docbookgenerator.cpp +++ b/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" diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp index 4cdad6a..7f0c74f 100644 --- a/ksayit/src/docbookparser.cpp +++ b/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" diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp index 9f343b2..f72a717 100644 --- a/ksayit/src/doctreeviewimpl.cpp +++ b/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 diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index 82ceb31..f1cbbfc 100644 --- a/ksayit/src/ksayit.cpp +++ b/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> diff --git a/ksayit/src/ksayitbookmarkhandler.cpp b/ksayit/src/ksayitbookmarkhandler.cpp index d764681..476c8b0 100644 --- a/ksayit/src/ksayitbookmarkhandler.cpp +++ b/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 diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp index 9700b97..4a8ac59 100644 --- a/ksayit/src/ksayitsystemtray.cpp +++ b/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" diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h index ddade16..02e35bd 100644 --- a/ksayit/src/ksayitsystemtray.h +++ b/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> diff --git a/ksayit/src/ksayitviewimpl.cpp b/ksayit/src/ksayitviewimpl.cpp index e3eb5ee..72b9e03 100644 --- a/ksayit/src/ksayitviewimpl.cpp +++ b/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" diff --git a/ksayit/src/main.cpp b/ksayit/src/main.cpp index b8ba783..66aead2 100644 --- a/ksayit/src/main.cpp +++ b/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> diff --git a/ksayit/src/saxhandler.cpp b/ksayit/src/saxhandler.cpp index e8035dc..9410be6 100644 --- a/ksayit/src/saxhandler.cpp +++ b/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" diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp index f8b30bd..6b1a270 100644 --- a/ksayit/src/voicesetupdlg.cpp +++ b/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" 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 <tdetexteditor/selectioninterface.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeapplication.h> #include <kgenericfactory.h> 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 <tqtextstream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> 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 <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> 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 <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> // 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 <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" 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 <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> // 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 <tqlayout.h> // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kdialog.h> #include <kdialogbase.h> 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 <tqlayout.h> // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdeconfig.h> #include <kdialog.h> 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 <tdeversion.h> #include <tdeconfig.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstandarddirs.h> #include <kprocess.h> #include <kdebug.h> 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 <kcombobox.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> // 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 <knuminput.h> #include <kcombobox.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> // 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 @@ <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> 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 <kstandarddirs.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdelistview.h> #include <kiconloader.h> 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 <tdeconfig.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> -#include <klocale.h> +#include <tdelocale.h> // 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 <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> 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 <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #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 <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. 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 <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <tdeapplication.h> 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 <tdeversion.h> #include <kstandarddirs.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> // 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 <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdelistview.h> #include <kiconloader.h> 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 <tqstring.h> // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> // 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 <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> // 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 <tqstringlist.h> #include <kdemacros.h> #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 <tqstring.h> // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> // 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 <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> // 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 <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdemacros.h> // 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 <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <ktrader.h> #include <kdebug.h> 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 <tdeapplication.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstandarddirs.h> #include <tdeparts/componentfactory.h> #include <ktrader.h> 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 <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" 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 <sys/wait.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kaudiomanagerplay.h> -#include <klocale.h> +#include <tdelocale.h> //////////////////////////////////////////////////////////////////////////////// // 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 <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> // 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 <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> 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 <kdebug.h> #include <tdeconfig.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstandarddirs.h> // 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 <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. 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 <kdebug.h> #include <tdeconfig.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstandarddirs.h> #include <kprocess.h> 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 <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> 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 <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> 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 <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. 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 <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> 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 @@ <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> 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 @@ </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> |