diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:57 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:53:57 -0600 |
commit | c96f95eaac4e5415ddb92103a5c29ab55597408d (patch) | |
tree | d6b026edcb7e58f72fed333952a22f4c45fb01f8 /kmouth | |
parent | 127600d4f12c1787365edc471904f9732743c771 (diff) | |
download | tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.tar.gz tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmouth')
-rw-r--r-- | kmouth/configwizard.cpp | 2 | ||||
-rw-r--r-- | kmouth/kmouth.cpp | 4 | ||||
-rw-r--r-- | kmouth/main.cpp | 2 | ||||
-rw-r--r-- | kmouth/optionsdialog.cpp | 4 | ||||
-rw-r--r-- | kmouth/phrasebook/phrasebook.cpp | 8 | ||||
-rw-r--r-- | kmouth/phrasebook/phrasebookdialog.cpp | 4 | ||||
-rw-r--r-- | kmouth/phrasebook/phrasetree.cpp | 4 | ||||
-rw-r--r-- | kmouth/phraselist.cpp | 4 | ||||
-rw-r--r-- | kmouth/speech.h | 2 | ||||
-rw-r--r-- | kmouth/texttospeechconfigurationwidget.cpp | 2 | ||||
-rw-r--r-- | kmouth/wordcompletion/dictionarycreationwizard.cpp | 2 | ||||
-rw-r--r-- | kmouth/wordcompletion/klanguagebuttonhelper.cpp | 4 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordcompletionwidget.cpp | 6 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordlist.cpp | 2 |
14 files changed, 25 insertions, 25 deletions
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" |