Rename common header files for consistency with class renaming

12 years ago · d5f01dcc48
parent 256525ac7b
commit d5f01dcc48
148 changed files with 185 additions and 185 deletions
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@ -13,7 +13,7 @@
 #include <tqtimer.h>

 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
--- a/blinken/src/blinkengame.cpp
+++ b/blinken/src/blinkengame.cpp
@ -11,7 +11,7 @@

 #include <tqtimer.h>

-#include <kapplication.h>
+#include <tdeapplication.h>

 #include "artsplayer.h"
 #include "blinkengame.h"
--- a/blinken/src/button.cpp
+++ b/blinken/src/button.cpp
@ -8,7 +8,7 @@
 ***************************************************************************/

 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@ -12,7 +12,7 @@
 #include <tqtabbar.h>
 #include <tqtabwidget.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>

--- a/blinken/src/main.cpp
+++ b/blinken/src/main.cpp
@ -7,9 +7,9 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/

-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>

--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@ -26,7 +26,7 @@
 #include <kstandarddirs.h>
 #include <tdeactioncollection.h>
 #include <kcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>

 #include <tqfile.h>
 #include <tqlabel.h>
--- a/kalzium/src/elementdataviewer.cpp
+++ b/kalzium/src/elementdataviewer.cpp
@ -23,7 +23,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>

 //QT-Includes
 #include <tqlayout.h>
--- a/kalzium/src/eqchemview.cpp
+++ b/kalzium/src/eqchemview.cpp
@ -28,7 +28,7 @@
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>

 #include "config.h"
 #include "eqresult.h"
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@ -44,7 +44,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 #include <kdialogbase.h>
--- a/kalzium/src/kalziumdataobject.cpp
+++ b/kalzium/src/kalziumdataobject.cpp
@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>

 KalziumDataObject* KalziumDataObject::instance()
 {
--- a/kalzium/src/main.cpp
+++ b/kalzium/src/main.cpp
@ -17,9 +17,9 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
 ***************************************************************************/

-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>

 #include "config.h"
 #include "kalzium.h"
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@ -33,7 +33,7 @@ using namespace std;
 #include <tqdir.h>

 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
--- a/kanagram/src/kanagramgame.cpp
+++ b/kanagram/src/kanagramgame.cpp
@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>

 #include "kanagramgame.h"
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@ -18,7 +18,7 @@

 #include "keduvocdocument.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
--- a/kanagram/src/keduvockvtmlreader.cpp
+++ b/kanagram/src/keduvockvtmlreader.cpp
@ -16,7 +16,7 @@
 *                                                                         *
 ***************************************************************************/

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/kanagram/src/main.cpp
+++ b/kanagram/src/main.cpp
@ -18,9 +18,9 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
 ***************************************************************************/

-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>

--- a/kbruch/src/exercisebase.cpp
+++ b/kbruch/src/exercisebase.cpp
@ -19,7 +19,7 @@
 #include "exercisebase.moc"

 /* these includes are needed for KDE support */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>

 /* ----- public member functions ----- */
--- a/kbruch/src/exercisecompare.cpp
+++ b/kbruch/src/exercisecompare.cpp
@ -19,7 +19,7 @@
 #include "exercisecompare.moc"

 /* these includes are needed for KDE support */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>

 /* these includes are needed for TQt support */
--- a/kbruch/src/exerciseconvert.cpp
+++ b/kbruch/src/exerciseconvert.cpp
@ -19,7 +19,7 @@
 #include "exerciseconvert.moc"

 /* these includes are needed for KDE support */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knumvalidator.h>
--- a/kbruch/src/exercisefactorize.cpp
+++ b/kbruch/src/exercisefactorize.cpp
@ -19,7 +19,7 @@
 #include "exercisefactorize.moc"

 /* these includes are needed for KDE support */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knumvalidator.h>
--- a/kbruch/src/kbruch.cpp
+++ b/kbruch/src/kbruch.cpp
@ -24,9 +24,9 @@
 #include <stdlib.h>

 /* these includes are needed for TQt support */
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>

 /* the main program */
 int main(int argc, char * argv[])
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@ -19,7 +19,7 @@
 #include <config.h>

 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
--- a/kbruch/src/taskview.cpp
+++ b/kbruch/src/taskview.cpp
@ -21,7 +21,7 @@
 /* these includes are needed for KDE support */
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knumvalidator.h>

 /* these includes are needed for TQt support */
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@ -20,7 +20,7 @@
 #include "keduca_part.h"
 #include "../libkeduca/kgallerydialog.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
--- a/keduca/keduca/keduca.h
+++ b/keduca/keduca/keduca.h
@ -24,7 +24,7 @@
 #endif
 */

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/part.h>
 #include <tdeaction.h>
--- a/keduca/keduca/keduca_part.cpp
+++ b/keduca/keduca/keduca_part.cpp
@ -26,7 +26,7 @@
 #include "settings.h"
 #include "configdialogbase.h"

-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeparts/genericfactory.h>
 #include <kstdaction.h>
 #include <tdeconfigdialog.h>
--- a/keduca/keduca/main.cpp
+++ b/keduca/keduca/main.cpp
@ -15,8 +15,8 @@
 *                                                                         *
 ***************************************************************************/

-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>

 #include <tqfileinfo.h>
--- a/keduca/keducabuilder/main.cpp
+++ b/keduca/keducabuilder/main.cpp
@ -15,9 +15,9 @@
 *                                                                         *
 ***************************************************************************/

-#include <kcmdlineargs.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>

 #include <tqfileinfo.h>
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@ -11,7 +11,7 @@
 #include <stdlib.h> // for RAND_MAX

 #include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>

--- a/kgeography/src/main.cpp
+++ b/kgeography/src/main.cpp
@ -8,9 +8,9 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/

-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>

 #include "kgeography.h"

--- a/kgeography/src/map.cpp
+++ b/kgeography/src/map.cpp
@ -10,7 +10,7 @@

 #include <stdlib.h> // for RAND_MAX

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>

 #include <tqfile.h>
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@ -11,7 +11,7 @@
 #include <math.h> // for rint
 #include <stdlib.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>

 #include <tqcursor.h>
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@ -31,7 +31,7 @@
 #include <tqpainter.h>
 #include <tqdir.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeactionclasses.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
--- a/khangman/khangman/khangmanview.cpp
+++ b/khangman/khangman/khangmanview.cpp
@ -15,7 +15,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kaudioplayer.h>
 #include <kdebug.h>
 #include <klineedit.h>
--- a/khangman/khangman/khnewstuff.cpp
+++ b/khangman/khangman/khnewstuff.cpp
@ -22,7 +22,7 @@
    without including the source code for TQt in the source distribution.
 */

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
--- a/khangman/khangman/main.cpp
+++ b/khangman/khangman/main.cpp
@ -19,9 +19,9 @@
 #include "khangman.h"
 #include "version.h"

-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
--- a/kig/kig/aboutdata.h
+++ b/kig/kig/aboutdata.h
@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.

-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>

 #include "config.h"
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@ -25,7 +25,7 @@
 #include <tqtimer.h>

 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
--- a/kig/kig/kig.h
+++ b/kig/kig/kig.h
@ -35,7 +35,7 @@
 #define KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
 #endif

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <dcopclient.h>

--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@ -44,7 +44,7 @@
 #include <functional>

 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kcursor.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
--- a/kig/kig/main.cpp
+++ b/kig/kig/main.cpp
@ -21,8 +21,8 @@
 #include "kig.h"

 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <klibloader.h>
 #include <kdebug.h>
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cc
@ -23,7 +23,7 @@
 #include "edittype.h"
 #include "edittype.moc"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kicondialog.h>
 #include <klineedit.h>
 #include <klocale.h>
--- a/kig/modes/macrowizard.cc
+++ b/kig/modes/macrowizard.cc
@ -22,7 +22,7 @@

 #include <kdebug.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>

 MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m )
  : MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m )
--- a/kig/modes/textlabelwizard.cc
+++ b/kig/modes/textlabelwizard.cc
@ -22,7 +22,7 @@
 #include "linkslabel.h"

 #include <tqtextedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>

 #include <tqlayout.h>

--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@ -28,7 +28,7 @@
 #include "../misc/guiaction.h"
 #include "../misc/object_constructor.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
--- a/kig/objects/text_type.cc
+++ b/kig/objects/text_type.cc
@ -33,7 +33,7 @@
 #include <tqclipboard.h>
 #include <tqstringlist.h>

-#include <kapplication.h>
+#include <tdeapplication.h>

 #include <cmath>

--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@ -28,7 +28,7 @@
 // make it still work on old kde 3.1...
 #include <tdeaction.h>
 //
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <tdepopupmenu.h>
 #include <ktextedit.h>
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@ -20,7 +20,7 @@
 **/

 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@ -20,7 +20,7 @@
 **/

 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdelistview.h>
--- a/kiten/main.cpp
+++ b/kiten/main.cpp
@ -19,9 +19,9 @@
 USA
 **/

-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqsqlpropertymap.h>

--- a/kiten/optiondialog.cpp
+++ b/kiten/optiondialog.cpp
@ -20,7 +20,7 @@
 **/

 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqvgroupbox.h>
 #include <tdefontdialog.h>
 #include <tqtextcodec.h>
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@ -19,7 +19,7 @@
 USA
 **/

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@ -20,7 +20,7 @@
 **/

 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
 #include <klocale.h>
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@ -15,7 +15,7 @@

 #include <tqradiobutton.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
--- a/klatin/klatin/klatingrammar.cpp
+++ b/klatin/klatin/klatingrammar.cpp
@ -16,7 +16,7 @@
 #include <tqfile.h>
 #include <tqlabel.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
--- a/klatin/klatin/klatinverbs.cpp
+++ b/klatin/klatin/klatinverbs.cpp
@ -16,7 +16,7 @@
 #include <tqfile.h>
 #include <tqlabel.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@ -17,7 +17,7 @@
 #include <tqlabel.h>
 #include <tqlistview.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klocale.h>
--- a/klatin/klatin/main.cpp
+++ b/klatin/klatin/main.cpp
@ -13,9 +13,9 @@
 *                                                                         *
 ***************************************************************************/

-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>

 #include "klatin.h"

--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@ -30,7 +30,7 @@

 //KDE includes
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
--- a/klettres/klettres/klettresview.cpp
+++ b/klettres/klettres/klettresview.cpp
@ -24,7 +24,7 @@
 #include <tqwhatsthis.h>
 #include <tqpainter.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
--- a/klettres/klettres/klnewstuff.cpp
+++ b/klettres/klettres/klnewstuff.cpp
@ -20,7 +20,7 @@
 #include <ktar.h>
 #include <tqdir.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include "klnewstuff.h"
 #include "prefs.h"
--- a/klettres/klettres/main.cpp
+++ b/klettres/klettres/main.cpp
@ -22,9 +22,9 @@
 /* Please save with utf8 encoding, thanks  */
 /*****************************************************/

-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>

 #include "klettres.h"
 #include "version.h"
--- a/kmplot/kmplot/FktDlg.cpp
+++ b/kmplot/kmplot/FktDlg.cpp
@ -28,7 +28,7 @@
 // #include <tqpopupmenu.h>

 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@ -29,8 +29,8 @@

 // KDE includes
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
@ -767,7 +767,7 @@ void MainDlg::resetZoom()

 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>

 TDEInstance*  KmPlotPartFactory::s_instance = 0L;
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@ -34,7 +34,7 @@

 // KDE includes
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
--- a/kmplot/kmplot/editfunction.cpp
+++ b/kmplot/kmplot/editfunction.cpp
@ -36,7 +36,7 @@


 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <klineedit.h>
--- a/kmplot/kmplot/kconstanteditor.cpp
+++ b/kmplot/kmplot/kconstanteditor.cpp
@ -23,7 +23,7 @@
 *
 */

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
--- a/kmplot/kmplot/keditparametric.cpp
+++ b/kmplot/kmplot/keditparametric.cpp
@ -26,7 +26,7 @@
 #include <tqcheckbox.h>

 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <klineedit.h>
 #include <klocale.h>
--- a/kmplot/kmplot/keditpolar.cpp
+++ b/kmplot/kmplot/keditpolar.cpp
@ -26,7 +26,7 @@
 #include <tqcheckbox.h>

 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <klineedit.h>
 #include <klocale.h>
--- a/kmplot/kmplot/kmplot.h
+++ b/kmplot/kmplot/kmplot.h
@ -30,8 +30,8 @@
 #include <config.h>
 #endif

-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeparts/mainwindow.h>

 #include "kmplotIface.h"
--- a/kmplot/kmplot/main.cpp
+++ b/kmplot/kmplot/main.cpp
@ -33,9 +33,9 @@


 // KDE includes
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>



--- a/kmplot/kmplot/xparser.cpp
+++ b/kmplot/kmplot/xparser.cpp
@ -25,7 +25,7 @@

 // KDE includes
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kinputdialog.h>
 #include <klocale.h>
--- a/kpercentage/kpercentage/kpercentage.h
+++ b/kpercentage/kpercentage/kpercentage.h
@ -30,7 +30,7 @@
 #include <tqspinbox.h>

 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>

 // local includes
--- a/kpercentage/kpercentage/main.cpp
+++ b/kpercentage/kpercentage/main.cpp
@ -20,8 +20,8 @@
 ***************************************************************************/

 // KDE includes
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>

 // local includes
 #include "kpercentage.h"
--- a/kstars/kstars/addlinkdialog.cpp
+++ b/kstars/kstars/addlinkdialog.cpp
@ -15,7 +15,7 @@
 *                                                                         *
 ***************************************************************************/

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@ -21,7 +21,7 @@
 #include <tqimage.h>
 #include <tqregexp.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kactivelabel.h>
--- a/kstars/kstars/fitsimage.cpp
+++ b/kstars/kstars/fitsimage.cpp
@ -25,7 +25,7 @@
 #include <tdeaccel.h>
 #include <kdebug.h>
 #include <tdetoolbar.h> 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmap.h> 
 #include <ktempfile.h>
 #include <kimageeffect.h> 
--- a/kstars/kstars/fitsprocess.cpp
+++ b/kstars/kstars/fitsprocess.cpp
@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprogress.h>
- #include <kapplication.h>
+ #include <tdeapplication.h>
 
 #include <tqimage.h>
 
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@ -25,7 +25,7 @@
 #include <tdeaccel.h>
 #include <kdebug.h>
 #include <tdetoolbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmap.h> 
 #include <ktempfile.h>
 #include <kimageeffect.h> 
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include "imageviewer.h"

-#include <kapplication.h>
+#include <tdeapplication.h>

 ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *parent, const char *name)
 	: TDEMainWindow (parent, name), imageURL (*url), fileIsImage (false),
--- a/kstars/kstars/indidevice.cpp
+++ b/kstars/kstars/indidevice.cpp
@ -66,7 +66,7 @@
 #include <kled.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdelistview.h>
--- a/kstars/kstars/indimenu.cpp
+++ b/kstars/kstars/indimenu.cpp
@ -43,7 +43,7 @@
 #include <klineedit.h>
 #include <tdelistbox.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdelistview.h>
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@ -47,7 +47,7 @@
 #include <klineedit.h>
 #include <kstatusbar.h>
 #include <kmessagebox.h>
- #include <kapplication.h>
+ #include <tdeapplication.h>
 #include <kprogress.h>
 #include <kurl.h>
 #include <kdirlister.h>
--- a/kstars/kstars/ksnewstuff.cpp
+++ b/kstars/kstars/ksnewstuff.cpp
@ -18,7 +18,7 @@
 #include <tdeversion.h>
 #if KDE_IS_VERSION( 3, 2, 90 )

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
--- a/kstars/kstars/kstars.h
+++ b/kstars/kstars/kstars.h
@ -22,7 +22,7 @@
 #endif

 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqwidget.h>

--- a/kstars/kstars/kstarsdata.cpp
+++ b/kstars/kstars/kstarsdata.cpp
@ -19,7 +19,7 @@
 #include <tqdir.h>
 #include <tqfile.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <klocale.h>
--- a/kstars/kstars/kstarssplash.cpp
+++ b/kstars/kstars/kstarssplash.cpp
@ -20,7 +20,7 @@
 #include <tqlayout.h>
 #include <klocale.h>

-#include <kapplication.h>
+#include <tdeapplication.h>

 #include "kstarssplash.h"
 #include "ksutils.h"
--- a/kstars/kstars/main.cpp
+++ b/kstars/kstars/main.cpp
@ -15,8 +15,8 @@
 *                                                                         *
 ***************************************************************************/

-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <dcopclient.h>
 #include <klocale.h>
 #include <kdebug.h>
--- a/kstars/kstars/skymap.cpp
+++ b/kstars/kstars/skymap.cpp
@ -15,7 +15,7 @@
 *                                                                         *
 ***************************************************************************/

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@ -24,7 +24,7 @@
 #include <tqrect.h>
 #include <tqstyle.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
--- a/kstars/kstars/tools/astrocalc.h
+++ b/kstars/kstars/tools/astrocalc.h
@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <kdialogbase.h>

-#include <kapplication.h>
+#include <tdeapplication.h>

 #include "dms.h"

--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@ -37,7 +37,7 @@
 #include "kstars.h"
 #include "kstarsdata.h"

-#include <kapplication.h>
+#include <tdeapplication.h>

 LCGenerator::LCGenerator( TQWidget* parent)
    : KDialogBase( parent, "lcgenerator", false, i18n( "AAVSO Light Curve Generator"),0) , Hostprefix("http://www.aavso.org/cgi-bin/kstar.pl"), JDCutOff(2437600)
--- a/kstars/kstars/tools/modcalcangdist.cpp
+++ b/kstars/kstars/tools/modcalcangdist.cpp
@ -28,7 +28,7 @@
 #include <tdefiledialog.h>
 #include <kmessagebox.h>

-//#include <kapplication.h> ..already included in modcalcapcoord.h
+//#include <tdeapplication.h> ..already included in modcalcapcoord.h

 modCalcAngDist::modCalcAngDist(TQWidget *parentSplit, const char *name) : modCalcAngDistDlg(parentSplit,name) {

--- a/kstars/kstars/tools/modcalcangdist.h
+++ b/kstars/kstars/tools/modcalcangdist.h
@ -19,7 +19,7 @@
 #define MODCALCANGDIST_H

 #include "modcalcangdistdlg.h"
-#include <kapplication.h>
+#include <tdeapplication.h>

 /** Module to compute the angular distance between two points in the sky 
  *@author Pablo de Vicente
--- a/kstars/kstars/tools/modcalcapcoord.cpp
+++ b/kstars/kstars/tools/modcalcapcoord.cpp
@ -35,7 +35,7 @@
 #include <tdefiledialog.h>
 #include <kmessagebox.h>

-//#include <kapplication.h> ..already included in modcalcapcoord.h
+//#include <tdeapplication.h> ..already included in modcalcapcoord.h

 modCalcApCoord::modCalcApCoord(TQWidget *parentSplit, const char *name) : modCalcApCoordDlg(parentSplit,name) {

--- a/kstars/kstars/tools/modcalcapcoord.h
+++ b/kstars/kstars/tools/modcalcapcoord.h
@ -19,7 +19,7 @@
 #define MODCALCAPCOORD_H

 #include "modcalcapcoorddlg.h"
-#include <kapplication.h>
+#include <tdeapplication.h>

 /** Module to compute the equatorial coordinates for a given date and time
 * from a given epoch or equinox
--- a/kstars/kstars/tools/modcalcazel.h
+++ b/kstars/kstars/tools/modcalcazel.h
@ -18,7 +18,7 @@
 #ifndef MODCALCAZEL_H
 #define MODCALCAZEL_H

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "modcalcazeldlg.h"

--- a/kstars/kstars/tools/modcalcdaylength.cpp
+++ b/kstars/kstars/tools/modcalcdaylength.cpp
@ -28,7 +28,7 @@
 #include "kstarsdatetime.h"
 #include "libtdeedu/extdate/extdatetimeedit.h"

-#include <kapplication.h> 
+#include <tdeapplication.h> 

 modCalcDayLength::modCalcDayLength(TQWidget *parentSplit, const char *name) : modCalcDayLengthDlg(parentSplit,name) {
 	showCurrentDate();
--- a/kstars/kstars/tools/modcalceclipticcoords.cpp
+++ b/kstars/kstars/tools/modcalceclipticcoords.cpp
@ -30,7 +30,7 @@
 #include <tqtextstream.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>

--- a/kstars/kstars/tools/modcalcequinox.h
+++ b/kstars/kstars/tools/modcalcequinox.h
@ -18,7 +18,7 @@
 #ifndef MODCALCEQUINOX_H
 #define MODCALCEQUINOX_H

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "modcalcequinoxdlg.h"

--- a/kstars/kstars/tools/modcalcgalcoord.cpp
+++ b/kstars/kstars/tools/modcalcgalcoord.cpp
@ -29,7 +29,7 @@
 #include <tqtextstream.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>

--- a/kstars/kstars/tools/modcalcgeodcoord.cpp
+++ b/kstars/kstars/tools/modcalcgeodcoord.cpp
@ -29,7 +29,7 @@

 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knumvalidator.h>
 #include <klocale.h>
 #include <klineedit.h>
--- a/kstars/kstars/tools/modcalcjd.h
+++ b/kstars/kstars/tools/modcalcjd.h
@ -20,7 +20,7 @@

 #include <tqvbox.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "modcalcjddlg.h"

 /**
--- a/kstars/kstars/tools/modcalcplanets.h
+++ b/kstars/kstars/tools/modcalcplanets.h
@ -18,7 +18,7 @@
 #ifndef MODCALCPLANETS_H
 #define MODCALCPLANETS_H

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "modcalcplanetsdlg.h"
 #include "geolocation.h"
--- a/kstars/kstars/tools/modcalcprec.cpp
+++ b/kstars/kstars/tools/modcalcprec.cpp
@ -27,7 +27,7 @@
 #include <tqtextstream.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>

--- a/kstars/kstars/tools/modcalcsidtime.h
+++ b/kstars/kstars/tools/modcalcsidtime.h
@ -19,7 +19,7 @@
 #define MODCALCSIDTIME_H

 #include "modcalcsidtimedlg.h"
-#include <kapplication.h>
+#include <tdeapplication.h>

 /**
  * Class which implements the KStars calculator module to compute Universal
--- a/kstars/kstars/tools/modcalcvlsr.h
+++ b/kstars/kstars/tools/modcalcvlsr.h
@ -18,7 +18,7 @@
 #ifndef MODCALCVLSR_H
 #define MODCALCVLSR_H

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "modcalcvlsrdlg.h"

--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@ -22,7 +22,7 @@
 #include <tqvaluevector.h>

 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>

 class TQLabel;
--- a/ktouch/src/main.cpp
+++ b/ktouch/src/main.cpp
@ -11,8 +11,8 @@
 ***************************************************************************/

 #include "ktouch.h"
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>

 #include <kdebug.h>

--- a/kturtle/src/dialogs.cpp
+++ b/kturtle/src/dialogs.cpp
@ -16,7 +16,7 @@
 */
 

-#include <kapplication.h>   
+#include <tdeapplication.h>   
 #include <kdebug.h>
 #include <klocale.h>

--- a/kturtle/src/executer.cpp
+++ b/kturtle/src/executer.cpp
@ -25,7 +25,7 @@

 #include <tqtimer.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>

--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@ -27,7 +27,7 @@
 #include <tqtimer.h>
 #include <tqwhatsthis.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
--- a/kturtle/src/main.cpp
+++ b/kturtle/src/main.cpp
@ -16,9 +16,9 @@
 */

 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>

 #include "kturtle.h"

--- a/kverbos/kverbos/kfeedercontrol.cpp
+++ b/kverbos/kverbos/kfeedercontrol.cpp
@ -17,7 +17,7 @@

 #include "kfeedercontrol.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>

 KFeederControl::KFeederControl(int ID, bool splash, bool automatic)
--- a/kverbos/kverbos/kstartuplogo.cpp
+++ b/kverbos/kverbos/kstartuplogo.cpp
@ -16,7 +16,7 @@
 ***************************************************************************/

 #include "kstartuplogo.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>

--- a/kverbos/kverbos/kverbos.h
+++ b/kverbos/kverbos/kverbos.h
@ -26,7 +26,7 @@
 // include files for TQt

 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>

--- a/kverbos/kverbos/main.cpp
+++ b/kverbos/kverbos/main.cpp
@ -15,8 +15,8 @@
 *                                                                         *
 ***************************************************************************/

-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>

 #include "kverbos.h"

--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@ -30,7 +30,7 @@
 #include <tqlabel.h>
 #include <tqfileinfo.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <dcopclient.h>
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
@ -27,7 +27,7 @@

 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>

 #include "DocPropDlg.h"
 #include <langset.h>
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
@ -32,7 +32,7 @@
 #include <tqvaluelist.h>
 #include <tqtabwidget.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>

--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@ -25,7 +25,7 @@

 #include "LessOptPage.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@ -27,7 +27,7 @@

 #include <tqpushbutton.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
@ -26,7 +26,7 @@
 #include "TitlePage.h"


-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>

 #include <tqlineedit.h>
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@ -25,7 +25,7 @@

 #include "TypeOptPage.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@ -25,7 +25,7 @@

 #include "UsageOptPage.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
@ -33,7 +33,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@ -30,7 +30,7 @@
 #include <tqlineedit.h>

 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twinmodule.h>

 #include <langset.h>
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@ -35,7 +35,7 @@
 #include <tqpainter.h>

 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
 #include <kmenubar.h>
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@ -26,7 +26,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprinter.h>

 #include <tqlayout.h>
--- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
@ -23,7 +23,7 @@
 *                                                                         *
 ***************************************************************************/

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>

--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@ -27,7 +27,7 @@
 #include "QueryManager.h"
 #include "UsageManager.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>

--- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
@ -24,7 +24,7 @@
 ***************************************************************************/

 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>

 #include "kvoctraindoc.h"
--- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
@ -22,7 +22,7 @@
 ***************************************************************************/

 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>

--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@ -28,7 +28,7 @@

 #include "kvoctraindoc.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@ -25,8 +25,8 @@
 #include "kvoctrain.h"
 #include "kvoctraincore.h"

-# include <kcmdlineargs.h>
-# include <kaboutdata.h>
+# include <tdecmdlineargs.h>
+# include <tdeaboutdata.h>
 # include <klocale.h>

 int main(int argc, char* argv[]) {
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
@ -29,7 +29,7 @@
 #include <kv_resource.h>
 #include <langset.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kprogress.h>
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
@ -30,7 +30,7 @@

 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprogress.h>

 #include <tqtimer.h>
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
@ -27,7 +27,7 @@

 #include <kv_resource.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@ -30,7 +30,7 @@

 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprogress.h>

 #include <tqcheckbox.h>
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@ -32,7 +32,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kprogress.h>
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
@ -27,7 +27,7 @@

 #include <kv_resource.h>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kprogress.h>
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@ -33,7 +33,7 @@ using namespace std;


 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>

 #define KVD_VERS_PREFIX " v"     //#include "kvoctraindoc.h"
 #define TQM_VERB         "v"      //#include "QueryManager.h"
--- a/kwordquiz/src/kwordquiz.h
+++ b/kwordquiz/src/kwordquiz.h
@ -27,7 +27,7 @@
 #include <tqsignalmapper.h>

 // include files for KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
 #include <kdirwatch.h>
--- a/kwordquiz/src/main.cpp
+++ b/kwordquiz/src/main.cpp
@ -15,8 +15,8 @@
 *                                                                         *
 ***************************************************************************/

-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>

 #include "kwordquiz.h"
 #include "version.h"
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@ -43,7 +43,7 @@
 //#include "extdatepicker.h"
 #include "extdatetbl.h"

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include "tdepopupmenu.h"
--- a/libtdeedu/extdate/main.cpp
+++ b/libtdeedu/extdate/main.cpp
@ -1,7 +1,7 @@
 #include "testwidget.h"
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>

 static const char description[] = I18N_NOOP("ExtDatePicker test program");
 static const char notice[] = I18N_NOOP("Compares KDatePicker and ExtDatePicker");