Rename common header files for consistency with class renaming

47 files changed, 66 insertions, 66 deletions

diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index 95b14e67..5ce1bc84 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -33,7 +33,7 @@
 
 #include <kdebug.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <ksharedptr.h>
diff --git a/kexi/core/kexiaboutdata.h b/kexi/core/kexiaboutdata.h
index 06e3497d..ca13e6c6 100644
--- a/kexi/core/kexiaboutdata.h
+++ b/kexi/core/kexiaboutdata.h
@@ -22,7 +22,7 @@
 #ifndef _KEXI_ABOU_DATA_
 #define _KEXI_ABOU_DATA_
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 namespace Kexi {
 
diff --git a/kexi/core/kexicmdlineargs.h b/kexi/core/kexicmdlineargs.h
index c1bf80b3..5c31f63f 100644
--- a/kexi/core/kexicmdlineargs.h
+++ b/kexi/core/kexicmdlineargs.h
@@ -22,7 +22,7 @@
 #ifndef KEXICMDLINEARGS_H
 #define KEXICMDLINEARGS_H
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static TDECmdLineOptions options[] =
diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp
index 63f72d87..ac2ed101 100644
--- a/kexi/core/kexicontexthelp.cpp
+++ b/kexi/core/kexicontexthelp.cpp
@@ -20,7 +20,7 @@
 #include "kexicontexthelp.h"
 #include <KoContextCelp.h>
 #include <kxmlguiclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeaction.h>
 #include <tqlayout.h>
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index d9b5d884..34057696 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -38,7 +38,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 KexiDialogBase::KexiDialogBase(KexiMainWindow *parent, const TQString &caption)
diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp
index a4cdf54e..7ced2d6f 100644
--- a/kexi/core/kexitemplateloader.cpp
+++ b/kexi/core/kexitemplateloader.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqdir.h>
 
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index b3875169..9ab98f4a 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -40,9 +40,9 @@
 #include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kdialogbase.h>
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 83b63cc8..4445e9ec 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -29,10 +29,10 @@
 #include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp
index 87f78c4c..d1a3edfd 100644
--- a/kexi/formeditor/test/kfd_mainwindow.cpp
+++ b/kexi/formeditor/test/kfd_mainwindow.cpp
@@ -23,7 +23,7 @@
 #include <klibloader.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kfd_mainwindow.h"
 
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 176db016..649c2fe9 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -29,10 +29,10 @@
 #include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index 1120acce..3f0727b7 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -18,10 +18,10 @@
 */
 #include "kfd_mainwindow.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char *description =
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp
index c1fdb861..72507c6c 100644
--- a/kexi/kexidb/simplecommandlineapp.cpp
+++ b/kexi/kexidb/simplecommandlineapp.cpp
@@ -21,7 +21,7 @@
 
 #include <tqfileinfo.h>
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include <kexidb/connectiondata.h>
diff --git a/kexi/kexidb/simplecommandlineapp.h b/kexi/kexidb/simplecommandlineapp.h
index fc189198..91dfee42 100644
--- a/kexi/kexidb/simplecommandlineapp.h
+++ b/kexi/kexidb/simplecommandlineapp.h
@@ -23,7 +23,7 @@
 #include <kexidb/connection.h>
 #include <kexidb/driver.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 struct TDECmdLineOptions;
 
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index 052f149a..f9fd3cd0 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmap.h>
 #include <kiconeffect.h>
 #include <kpixmapeffect.h>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 417efd05..dd629780 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -36,8 +36,8 @@
 #include <tqdockwindow.h>
 #include <tqdockarea.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeaction.h>
 #include <klocale.h>
 #include <tdestdaccel.h>
@@ -135,8 +135,8 @@
 #ifdef FEEDBACK_INCLUDE
 #include FEEDBACK_INCLUDE
 #endif
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #endif
 
 #include "keximainwindowimpl_p.h"
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 49ebd9fd..1d81f9f8 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -23,7 +23,7 @@
 #include <ktar.h>
 #include <tqdir.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <tdeversion.h>
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 36560959..05c5f3ab 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -22,7 +22,7 @@
 #include <core/keximainwindow.h>
 #include <kexiutils/utils.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdefontdialog.h>
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 56675be8..4b15b16d 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -25,7 +25,7 @@
 #include <kexiutils/utils.h>
 #include <kexi_version.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdefontdialog.h>
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 0d6634ab..acd0d709 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KexiSimplePrintPreviewView::KexiSimplePrintPreviewView(
 	TQWidget *parent, KexiSimplePrintPreviewWindow *window)
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 870d6f24..f09f911f 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -28,7 +28,7 @@
 #include <widget/kexiprjtypeselector.h>
 #include <widget/kexidbconnectionwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <klocale.h>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 29b4c2ca..2ce05870 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -32,7 +32,7 @@
 #include <kexiutils/utils.h>
 #include <kexiguimsghandler.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <klocale.h>
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index b3ee1ce7..cdc770d9 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -23,7 +23,7 @@
 #include <kexidb/connectiondata.h>
 #include "core/kexi.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <klocale.h>
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 07cb7185..9bbe7a13 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -43,7 +43,7 @@
 #include <klocale.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeversion.h>
 #include <kprogress.h>
 #include <ktextedit.h>
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 7d06dd2e..4288ef78 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -47,7 +47,7 @@
 #include <tdefileiconview.h>
 #include <tdefileitem.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmimetype.h>
 #include <ktextbrowser.h>
 #include <tdeconfig.h>
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index ef8df97b..474dc98a 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -26,7 +26,7 @@
 #include <tqtextcodec.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <klocale.h>
diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h
index 0c60c5b7..d8eb0dfc 100644
--- a/kexi/migration/importwizard.h
+++ b/kexi/migration/importwizard.h
@@ -24,7 +24,7 @@
 
 #include <kwizard.h>
 #include <kprogress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kexiutils/tristate.h> 
 #include "migratemanager.h"
diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp
index 5783d11c..c7d519ba 100644
--- a/kexi/migration/keximigrate.cpp
+++ b/kexi/migration/keximigrate.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kexiutils/identifier.h>
 #include <core/kexi.h>
diff --git a/kexi/migration/keximigratetest.cpp b/kexi/migration/keximigratetest.cpp
index e81e8d80..a1b03c68 100644
--- a/kexi/migration/keximigratetest.cpp
+++ b/kexi/migration/keximigratetest.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #include <migration/importwizard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 /*
 This is in no way meant to compile let alone work
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index d0db5f94..69ca6602 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -26,7 +26,7 @@
 #include <ktabwidget.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include <kexiviewbase.h>
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 5d2a24fd..cf6e5cc3 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -23,7 +23,7 @@
 
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqmetaobject.h>
 #include <tqpainter.h>
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index 8967258b..6352f334 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -22,7 +22,7 @@
 #include "kexidblineedit.h"
 #include <kexidb/queryschema.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdestdaccel.h>
 #include <kdebug.h>
 
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index c5c46560..2e49660d 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -33,12 +33,12 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqclipboard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksavefile.h>
 
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 72292afc..070ea234 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -33,12 +33,12 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqclipboard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksavefile.h>
 
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 3c96cd09..2bbe979c 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -42,7 +42,7 @@
 #include <tqfontmetrics.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index 08ec0b18..642c2b3a 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqtextcodec.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <klocale.h>
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index afc9c98b..c1754ef3 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -16,9 +16,9 @@
  * Boston, MA 02110-1301, USA.
  ***************************************************************************/
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdeunittest/runner.h>
 
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index a0814f1f..f0bc50c1 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -16,9 +16,9 @@
  * Boston, MA 02110-1301, USA.
  ***************************************************************************/
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include "tdeunittest/runnergui.h"
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 650e90a6..0f39cb59 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -24,7 +24,7 @@
 #include <tqvbox.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 85ee5ce6..3328e42f 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -27,7 +27,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kexiquerydesignersqlhistory.h"
 
diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp
index 838fd5ea..8c86cfb5 100644
--- a/kexi/tests/gui/finddialog/main.cpp
+++ b/kexi/tests/gui/finddialog/main.cpp
@@ -17,10 +17,10 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "kexifinddialog.h"
 
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index fb0bd629..d0099ffc 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -21,11 +21,11 @@
 #include <tqguardedptr.h>
 
 #include <kdebug.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kinstance.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <kexidb/drivermanager.h>
 #include <kexidb/driver.h>
diff --git a/kexi/tests/startup/main.cpp b/kexi/tests/startup/main.cpp
index d7429cf4..24869f31 100644
--- a/kexi/tests/startup/main.cpp
+++ b/kexi/tests/startup/main.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 //#include <tableview/kexitableview.h>
 /*#include <kexidb/drivermanager.h>
diff --git a/kexi/tests/tableview/main.cpp b/kexi/tests/tableview/main.cpp
index 9e9b87c5..799294f6 100644
--- a/kexi/tests/tableview/main.cpp
+++ b/kexi/tests/tableview/main.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 
diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp
index eeb87d31..88de40e8 100644
--- a/kexi/tests/widgets/kexidbdrivercombotest.cpp
+++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp
@@ -25,8 +25,8 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kinstance.h>
 
 #include <kexidb/drivermanager.h>
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 5ec6ed06..4aa82bec 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -29,7 +29,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 6adfc94a..1917e8f3 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -24,7 +24,7 @@
 #include <tqtoolbutton.h>
 #include <tqdom.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kcombobox.h>
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 8fdac680..9a36dfad 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -40,7 +40,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>