summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chalk/chalkcolor/kis_colorspace_iface.cc2
-rwxr-xr-xchalk/core/createdcop.py2
-rw-r--r--chalk/core/kis_image_iface.cc2
-rw-r--r--chalk/core/kis_imagepipe_brush.cc2
-rw-r--r--chalk/core/kis_paint_device_iface.cc2
-rw-r--r--chalk/main.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_zoom.cc2
-rw-r--r--chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc2
-rw-r--r--chalk/plugins/viewplugins/screenshot/ksnapshot.cpp2
-rw-r--r--chalk/plugins/viewplugins/screenshot/main.cpp6
-rw-r--r--chalk/ui/imageviewer.cc2
-rw-r--r--chalk/ui/kis_aboutdata.h2
-rw-r--r--chalk/ui/kis_doc.cc2
-rw-r--r--chalk/ui/kis_doc_iface.cc2
-rw-r--r--chalk/ui/kis_label_progress.cc2
-rw-r--r--chalk/ui/kis_layerlist.cc2
-rw-r--r--chalk/ui/kis_palette_view.cc2
-rw-r--r--chalk/ui/kis_palette_widget.cc2
-rw-r--r--chalk/ui/layerlist.cpp2
-rw-r--r--example/example_aboutdata.h2
-rw-r--r--example/main.cc2
-rw-r--r--filters/chalk/gmagick/kis_image_magick_converter.cc2
-rw-r--r--filters/chalk/jpeg/kis_jpeg_converter.cc2
-rw-r--r--filters/chalk/jpeg/kis_jpeg_export.cc2
-rw-r--r--filters/chalk/magick/kis_image_magick_converter.cc2
-rw-r--r--filters/chalk/pdf/kis_pdf_import.cpp2
-rw-r--r--filters/chalk/png/kis_png_converter.cc2
-rw-r--r--filters/chalk/png/kis_png_export.cc2
-rw-r--r--filters/chalk/tiff/kis_dlg_options_tiff.cpp2
-rw-r--r--filters/chalk/tiff/kis_tiff_converter.cc2
-rw-r--r--filters/chalk/tiff/kis_tiff_export.cc2
-rw-r--r--filters/kformula/latex/latexexport.cc2
-rw-r--r--filters/kformula/mathml/mathmlexport.cc2
-rw-r--r--filters/kformula/mathml/mathmlimport.cc2
-rw-r--r--filters/kformula/png/pngexport.cc2
-rw-r--r--filters/kformula/png/pngexportdia.cc2
-rw-r--r--filters/kformula/svg/svgexport.cc2
-rw-r--r--filters/kivio/imageexport/kivio_imageexportdialog.cpp2
-rw-r--r--filters/kspread/csv/csvdialog.cpp2
-rw-r--r--filters/kspread/csv/csvexportdialog.cpp2
-rw-r--r--filters/kspread/csv/csvimport.cc2
-rw-r--r--filters/kspread/html/exportdialog.cc2
-rw-r--r--filters/kspread/latex/export/formula.cc2
-rw-r--r--filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc2
-rw-r--r--filters/kword/ascii/ExportDialog.cc2
-rw-r--r--filters/kword/ascii/ImportDialog.cc2
-rw-r--r--filters/kword/html/export/ExportDialog.cc2
-rw-r--r--filters/kword/html/import/tdehtmlreader.cpp2
-rw-r--r--filters/kword/latex/export/formula.cc2
-rw-r--r--filters/kword/latex/export/kwordlatexexportdia.cc2
-rw-r--r--filters/kword/latex/import/lateximportdia.cc2
-rw-r--r--filters/kword/mswrite/ImportDialog.cc2
-rw-r--r--filters/kword/pdf/pdfimport.cpp2
-rw-r--r--filters/libdialogfilter/exportsizedia.cpp2
-rw-r--r--filters/xsltfilter/export/xsltexportdia.cc2
-rw-r--r--filters/xsltfilter/import/xsltimportdia.cc2
-rw-r--r--filters/xsltfilter/import/xsltimportdia.h2
-rw-r--r--karbon/core/vgroup_iface.cc2
-rw-r--r--karbon/core/vobject_iface.cc2
-rw-r--r--karbon/karbon_aboutdata.h2
-rw-r--r--karbon/karbon_factory.cc2
-rw-r--r--karbon/karbon_part_iface.cc2
-rw-r--r--karbon/main.cc4
-rw-r--r--kchart/csvimportdialog.cc2
-rw-r--r--kchart/kchartColorConfigPage.cc2
-rw-r--r--kchart/kchartComboConfigPage.cc2
-rw-r--r--kchart/kchartConfigDialog.cc2
-rw-r--r--kchart/kchartDataConfigPage.cc2
-rw-r--r--kchart/kchartFontConfigPage.cc2
-rw-r--r--kchart/kchartHeaderFooterConfigPage.cc2
-rw-r--r--kchart/kchartLegendConfigPage.cc2
-rw-r--r--kchart/kchartLine3dConfigPage.cc2
-rw-r--r--kchart/kchartParameter3dConfigPage.cc2
-rw-r--r--kchart/kchartParameterConfigPage.cc2
-rw-r--r--kchart/kchartParameterPieConfigPage.cc2
-rw-r--r--kchart/kchartParameterPolarConfigPage.cc2
-rw-r--r--kchart/kchartPieConfigPage.cc2
-rw-r--r--kchart/kchartSubTypeChartPage.cc2
-rw-r--r--kchart/kchart_aboutdata.h2
-rw-r--r--kchart/main.cc2
-rw-r--r--kexi/core/kexi.cpp2
-rw-r--r--kexi/core/kexiaboutdata.h2
-rw-r--r--kexi/core/kexicmdlineargs.h2
-rw-r--r--kexi/core/kexicontexthelp.cpp2
-rw-r--r--kexi/core/kexidialogbase.cpp2
-rw-r--r--kexi/core/kexitemplateloader.cpp2
-rw-r--r--kexi/formeditor/formmanager.cpp4
-rw-r--r--kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp4
-rw-r--r--kexi/formeditor/test/kfd_mainwindow.cpp2
-rw-r--r--kexi/formeditor/test/kfd_part.cpp4
-rw-r--r--kexi/formeditor/test/main.cpp6
-rw-r--r--kexi/kexidb/simplecommandlineapp.cpp2
-rw-r--r--kexi/kexidb/simplecommandlineapp.h2
-rw-r--r--kexi/kexiutils/utils.cpp2
-rw-r--r--kexi/main/keximainwindowimpl.cpp8
-rw-r--r--kexi/main/kexinewstuff.cpp2
-rw-r--r--kexi/main/printing/kexisimpleprintingengine.cpp2
-rw-r--r--kexi/main/printing/kexisimpleprintingpagesetup.cpp2
-rw-r--r--kexi/main/printing/kexisimpleprintpreviewwindow.cpp2
-rw-r--r--kexi/main/startup/KexiConnSelector.cpp2
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.cpp2
-rw-r--r--kexi/main/startup/KexiProjectSelector.cpp2
-rw-r--r--kexi/main/startup/KexiStartup.cpp2
-rw-r--r--kexi/main/startup/KexiStartupDialog.cpp2
-rw-r--r--kexi/migration/importoptionsdlg.cpp2
-rw-r--r--kexi/migration/importwizard.h2
-rw-r--r--kexi/migration/keximigrate.cpp2
-rw-r--r--kexi/migration/keximigratetest.cpp2
-rw-r--r--kexi/plugins/forms/kexiformpart.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbcombobox.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbtextedit.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvexport.cpp4
-rw-r--r--kexi/plugins/importexport/csv/kexicsvexportwizard.cpp4
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp2
-rw-r--r--kexi/plugins/macros/tests/komacrotest.cpp6
-rw-r--r--kexi/plugins/macros/tests/komacrotestgui.cpp6
-rw-r--r--kexi/plugins/queries/kexiquerydesignersql.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.cpp2
-rw-r--r--kexi/tests/gui/finddialog/main.cpp6
-rw-r--r--kexi/tests/newapi/main.cpp6
-rw-r--r--kexi/tests/startup/main.cpp2
-rw-r--r--kexi/tests/tableview/main.cpp2
-rw-r--r--kexi/tests/widgets/kexidbdrivercombotest.cpp4
-rw-r--r--kexi/widget/kexibrowser.cpp2
-rw-r--r--kexi/widget/pixmapcollection.cpp2
-rw-r--r--kexi/widget/tableview/kexitableview.cpp2
-rw-r--r--kformula/formulastring.cc2
-rw-r--r--kformula/kformula_aboutdata.h2
-rw-r--r--kformula/kformula_doc.cc4
-rw-r--r--kformula/kformula_factory.h2
-rw-r--r--kformula/kformulawidget.cc2
-rw-r--r--kformula/main.cc2
-rw-r--r--kivio/kiviopart/KIvioDocIface.cc2
-rw-r--r--kivio/kiviopart/KIvioMapIface.cc2
-rw-r--r--kivio/kiviopart/KIvioPageIface.cc2
-rw-r--r--kivio/kiviopart/kivio_aboutdata.h2
-rw-r--r--kivio/kiviopart/kivio_canvas.cpp2
-rw-r--r--kivio/kiviopart/kivio_dlg_pageshow.cpp2
-rw-r--r--kivio/kiviopart/kivio_doc.cpp2
-rw-r--r--kivio/kiviopart/kivio_page.cpp2
-rw-r--r--kivio/kiviopart/kivio_view.cpp2
-rw-r--r--kivio/kiviopart/kivioarrowheadaction.cpp2
-rw-r--r--kivio/kiviopart/kiviostencilsetaction.cpp2
-rw-r--r--kivio/kiviopart/main.cpp2
-rw-r--r--kivio/kiviopart/ui/kivio_birdeye_panel.cpp2
-rw-r--r--koshell/iconsidepane.cpp2
-rw-r--r--koshell/koshell_main.cc4
-rw-r--r--koshell/koshell_shell.cc4
-rw-r--r--kounavail/kounavail.cc2
-rw-r--r--kplato/KPtViewIface.cc2
-rw-r--r--kplato/kptaboutdata.h2
-rw-r--r--kplato/kptcalendarpanel.cc2
-rw-r--r--kplato/kptdatetable.cc2
-rw-r--r--kplato/kptpertcanvas.cc2
-rw-r--r--kplato/main.cc2
-rw-r--r--kpresenter/KPrAboutData.h2
-rw-r--r--kpresenter/KPrAutoFormObjectIface.cpp2
-rw-r--r--kpresenter/KPrBackground.cpp2
-rw-r--r--kpresenter/KPrCanvas.cpp2
-rw-r--r--kpresenter/KPrConfig.cpp2
-rw-r--r--kpresenter/KPrCubicBezierCurveObjectIface.cpp2
-rw-r--r--kpresenter/KPrDocument.cpp2
-rw-r--r--kpresenter/KPrDocumentIface.cpp2
-rw-r--r--kpresenter/KPrEffectHandler.cpp2
-rw-r--r--kpresenter/KPrFreehandObjectIface.cpp2
-rw-r--r--kpresenter/KPrLineObjectIface.cpp2
-rw-r--r--kpresenter/KPrMSPresentationSetup.cpp2
-rw-r--r--kpresenter/KPrObject.cpp2
-rw-r--r--kpresenter/KPrObject2DIface.cpp2
-rw-r--r--kpresenter/KPrObjectIface.cpp2
-rw-r--r--kpresenter/KPrPageEffects.cpp2
-rw-r--r--kpresenter/KPrPageIface.cpp2
-rw-r--r--kpresenter/KPrPieObjectIface.cpp2
-rw-r--r--kpresenter/KPrPixmapObjectIface.cpp2
-rw-r--r--kpresenter/KPrPolyLineObjectIface.cpp2
-rw-r--r--kpresenter/KPrPolygonObjectIface.cpp2
-rw-r--r--kpresenter/KPrQuadricBezierCurveObjectIface.cpp2
-rw-r--r--kpresenter/KPrRectObjectIface.cpp2
-rw-r--r--kpresenter/KPrTextObjectIface.cpp2
-rw-r--r--kpresenter/KPrTextViewIface.cpp2
-rw-r--r--kpresenter/KPrView.cpp2
-rw-r--r--kpresenter/KPrViewIface.cpp2
-rw-r--r--kpresenter/KPrWebPresentation.cpp2
-rw-r--r--kpresenter/main.cpp2
-rw-r--r--kspread/KSpreadAppIface.cc2
-rw-r--r--kspread/KSpreadDocIface.cc2
-rw-r--r--kspread/KSpreadMapIface.cc2
-rw-r--r--kspread/KSpreadTableIface.cc2
-rw-r--r--kspread/KSpreadViewIface.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_csv.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_formula.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_goalseek.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_paperlayout.cc2
-rw-r--r--kspread/kspread_aboutdata.h2
-rw-r--r--kspread/kspread_object.cc2
-rw-r--r--kspread/kspread_view.cc2
-rw-r--r--kspread/main.cc2
-rw-r--r--kspread/plugins/calculator/kcalc.cpp2
-rw-r--r--kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc2
-rw-r--r--kspread/tests/test_formula.cc4
-rw-r--r--kugar/kudesigner/kudesigner_aboutdata.h2
-rw-r--r--kugar/kudesigner/main.cpp2
-rw-r--r--kugar/part/kugar_about.h2
-rw-r--r--kugar/part/kugar_factory.cpp2
-rw-r--r--kugar/part/kugar_factory.h2
-rw-r--r--kugar/part/kugar_part.cpp4
-rw-r--r--kugar/part/kugar_view.cpp4
-rw-r--r--kugar/part/main.cpp2
-rw-r--r--kword/KWAboutData.h2
-rw-r--r--kword/KWMailMergeLabelAction.cpp2
-rw-r--r--kword/KWPartFrameSet.cpp2
-rw-r--r--kword/KWordDocIface.cpp2
-rw-r--r--kword/KWordFormulaFrameSetIface.cpp2
-rw-r--r--kword/KWordPartFrameSetIface.cpp2
-rw-r--r--kword/KWordTableFrameSetIface.cpp2
-rw-r--r--kword/KWordTextFrameSetIface.cpp2
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp2
-rw-r--r--kword/main.cpp2
-rw-r--r--lib/kformula/kformulaview.cc2
-rw-r--r--lib/kformula/kformulawidget.cc2
-rw-r--r--lib/kformula/main.cc6
-rw-r--r--lib/kformula/symbolaction.cc2
-rw-r--r--lib/kofficecore/KoApplication.cpp2
-rw-r--r--lib/kofficecore/KoApplication.h2
-rw-r--r--lib/kofficecore/KoDetailsPane.cpp2
-rw-r--r--lib/kofficecore/KoDocument.cpp2
-rw-r--r--lib/kofficecore/KoDocumentIface.cc2
-rw-r--r--lib/kofficecore/KoMainWindow.cpp4
-rw-r--r--lib/kofficecore/KoMainWindowIface.cc2
-rw-r--r--lib/kofficecore/KoSpeaker.cpp2
-rw-r--r--lib/kofficecore/KoView.cpp2
-rw-r--r--lib/kofficecore/KoViewIface.cc2
-rw-r--r--lib/kofficecore/kkbdaccessextensions.cpp2
-rw-r--r--lib/kofficecore/tests/korecttest.cpp2
-rw-r--r--lib/kofficeui/KoContextCelp.cpp2
-rw-r--r--lib/kofficeui/KoInsertLink.cpp2
-rw-r--r--lib/kofficeui/KoSelectAction.cpp2
-rw-r--r--lib/kofficeui/KoTemplateChooseDia.cpp4
-rw-r--r--lib/kofficeui/KoTemplateCreateDia.cpp2
-rw-r--r--lib/kofficeui/Kolinewidthaction.cpp2
-rw-r--r--lib/kofficeui/kcoloractions.cpp2
-rw-r--r--lib/kofficeui/tests/coloraction_test.cpp2
-rw-r--r--lib/kofficeui/tkcombobox.cpp2
-rw-r--r--lib/kofficeui/ttdetoolbarbutton.cpp2
-rw-r--r--lib/kopalette/kopalettemanager.cc2
-rw-r--r--lib/koproperty/editor.cpp2
-rw-r--r--lib/koproperty/editoritem.cpp4
-rw-r--r--lib/koproperty/test/main.cpp6
-rw-r--r--lib/koproperty/test/test.cpp2
-rw-r--r--lib/kotext/KoTextObject.cpp2
-rw-r--r--lib/kotext/KoTextViewIface.cc2
-rw-r--r--lib/kotext/KoVariable.cpp2
-rw-r--r--lib/kotext/TDEFontDialog_local.cpp2
-rw-r--r--lib/kotext/kohyphen/kohyphen.cpp2
-rw-r--r--lib/kotext/kohyphen/kohyphentest.cpp2
-rw-r--r--lib/kotext/tests/kobordertest.cpp4
-rw-r--r--lib/kotext/tests/kotextformattertest.cpp2
-rw-r--r--lib/kross/main/scriptguiclient.cpp2
-rw-r--r--lib/kross/main/wdgscriptsmanager.cpp2
-rw-r--r--lib/kross/python/pythonscript.cpp2
-rw-r--r--lib/kross/runner/main.cpp6
-rw-r--r--lib/kross/test/main.cpp6
-rw-r--r--lib/store/tests/storage_test.cpp4
-rw-r--r--lib/store/tests/storedroptest.cpp4
-rw-r--r--tools/converter/koconverter.cpp6
-rw-r--r--tools/kthesaurus/main.cc6
-rw-r--r--tools/thesaurus/main.h2
-rw-r--r--tools/thumbnail/kofficecreator.cpp2
269 files changed, 315 insertions, 315 deletions
diff --git a/chalk/chalkcolor/kis_colorspace_iface.cc b/chalk/chalkcolor/kis_colorspace_iface.cc
index d2462c0c..bde82ff3 100644
--- a/chalk/chalkcolor/kis_colorspace_iface.cc
+++ b/chalk/chalkcolor/kis_colorspace_iface.cc
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kis_colorspace_iface.h"
#include "kis_colorspace.h"
diff --git a/chalk/core/createdcop.py b/chalk/core/createdcop.py
index 2356a8c4..ef7acc5e 100755
--- a/chalk/core/createdcop.py
+++ b/chalk/core/createdcop.py
@@ -64,7 +64,7 @@ dcopiface_template = """/*
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "%(ifaceheader)s"
diff --git a/chalk/core/kis_image_iface.cc b/chalk/core/kis_image_iface.cc
index a52cc8a4..2cc16e27 100644
--- a/chalk/core/kis_image_iface.cc
+++ b/chalk/core/kis_image_iface.cc
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kis_image_iface.h"
#include "kis_types.h"
diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc
index f9389997..1a66318e 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cc
@@ -41,7 +41,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kis_global.h"
#include "kis_paint_device.h"
diff --git a/chalk/core/kis_paint_device_iface.cc b/chalk/core/kis_paint_device_iface.cc
index 220c716b..c8afa80a 100644
--- a/chalk/core/kis_paint_device_iface.cc
+++ b/chalk/core/kis_paint_device_iface.cc
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
diff --git a/chalk/main.cc b/chalk/main.cc
index 33f59e5a..592c1368 100644
--- a/chalk/main.cc
+++ b/chalk/main.cc
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
*/
#include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <KoApplication.h>
#include "ui/kis_aboutdata.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
index 276ff3db..dca2b7c9 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
@@ -19,7 +19,7 @@
#include <tdeaction.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kis_image.h"
#include "kis_paint_device.h"
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
index acaddb7c..e63fb48f 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
@@ -25,7 +25,7 @@
#include <tqcombobox.h>
#include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeaction.h>
#include <klocale.h>
#include <knuminput.h>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index bcb0bf03..edb089d4 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -10,7 +10,7 @@
* Released under the GPL see file LICENSE for details.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kimageio.h>
#include <tdefiledialog.h>
diff --git a/chalk/plugins/viewplugins/screenshot/main.cpp b/chalk/plugins/viewplugins/screenshot/main.cpp
index 66f66812..48ca9395 100644
--- a/chalk/plugins/viewplugins/screenshot/main.cpp
+++ b/chalk/plugins/viewplugins/screenshot/main.cpp
@@ -1,9 +1,9 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "ksnapshot.h"
#include <kimageio.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <kiconloader.h>
static const char description[] =
diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cc
index 09955e9e..5e74c8fe 100644
--- a/chalk/ui/imageviewer.cc
+++ b/chalk/ui/imageviewer.cc
@@ -25,7 +25,7 @@
#include <tqimage.h>
#include <tqcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kis_cursor.h>
diff --git a/chalk/ui/kis_aboutdata.h b/chalk/ui/kis_aboutdata.h
index dc083850..059f3d3c 100644
--- a/chalk/ui/kis_aboutdata.h
+++ b/chalk/ui/kis_aboutdata.h
@@ -20,7 +20,7 @@
#ifndef KIS_ABOUT_DATA_H_
#define KIS_ABOUT_DATA_H_
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kofficeversion.h>
#include <config.h>
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index 2cb2a606..dafb63dd 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cc
@@ -31,7 +31,7 @@
// KDE
#include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcommand.h>
#include <kdebug.h>
#include <kimageio.h>
diff --git a/chalk/ui/kis_doc_iface.cc b/chalk/ui/kis_doc_iface.cc
index 50af9898..ae5a4a58 100644
--- a/chalk/ui/kis_doc_iface.cc
+++ b/chalk/ui/kis_doc_iface.cc
@@ -17,7 +17,7 @@
*/
#include "kis_doc_iface.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kis_doc.h"
#include "kis_image.h"
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc
index d58e4b4b..492548ef 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cc
@@ -23,7 +23,7 @@
#include <tqeventloop.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kprogress.h>
#include <kiconloader.h>
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc
index 4fdd9f1f..756ab60e 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cc
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc
index 487195dd..1a0de3db 100644
--- a/chalk/ui/kis_palette_view.cc
+++ b/chalk/ui/kis_palette_view.cc
@@ -37,7 +37,7 @@
#include <tqspinbox.h>
#include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc
index ec3558b8..5585a9a9 100644
--- a/chalk/ui/kis_palette_widget.cc
+++ b/chalk/ui/kis_palette_widget.cc
@@ -34,7 +34,7 @@
#include <tqspinbox.h>
#include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 6db5a21a..6b3ea463 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -30,7 +30,7 @@
#include <tqsimplerichtext.h>
#include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/example/example_aboutdata.h b/example/example_aboutdata.h
index 89536876..a1f69b7f 100644
--- a/example/example_aboutdata.h
+++ b/example/example_aboutdata.h
@@ -20,7 +20,7 @@
#ifndef EXAMPLE_ABOUTDATA
#define EXAMPLE_ABOUTDATA
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
static const char* description=I18N_NOOP("Example KOffice Program");
diff --git a/example/main.cc b/example/main.cc
index d8b8a537..dd4b0129 100644
--- a/example/main.cc
+++ b/example/main.cc
@@ -20,7 +20,7 @@
#include <KoApplication.h>
#include <KoDocument.h>
#include <KoMainWindow.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <dcopclient.h>
#include "example_aboutdata.h"
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index bb95c672..e8d4d0d6 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
@@ -30,7 +30,7 @@
#include <tdeversion.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kurl.h>
#include <tdeio/netaccess.h>
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc
index b27f98e5..efdb061a 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.cc
+++ b/filters/chalk/jpeg/kis_jpeg_converter.cc
@@ -27,7 +27,7 @@ extern "C" {
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <klocale.h>
diff --git a/filters/chalk/jpeg/kis_jpeg_export.cc b/filters/chalk/jpeg/kis_jpeg_export.cc
index 5a5c6439..042a3c8e 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.cc
+++ b/filters/chalk/jpeg/kis_jpeg_export.cc
@@ -22,7 +22,7 @@
#include <tqcheckbox.h>
#include <tqslider.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialogbase.h>
#include <kgenericfactory.h>
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index 64c3de36..5b4b56a0 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cc
@@ -29,7 +29,7 @@
#include <tdeversion.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kurl.h>
#include <tdeio/netaccess.h>
diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp
index 7ec09c97..6d668f4a 100644
--- a/filters/chalk/pdf/kis_pdf_import.cpp
+++ b/filters/chalk/pdf/kis_pdf_import.cpp
@@ -28,7 +28,7 @@
#include <tqradiobutton.h>
// KDE's headers
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <kgenericfactory.h>
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc
index b1bdeb71..795eb92e 100644
--- a/filters/chalk/png/kis_png_converter.cc
+++ b/filters/chalk/png/kis_png_converter.cc
@@ -24,7 +24,7 @@
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <klocale.h>
diff --git a/filters/chalk/png/kis_png_export.cc b/filters/chalk/png/kis_png_export.cc
index ace65954..bb071ff2 100644
--- a/filters/chalk/png/kis_png_export.cc
+++ b/filters/chalk/png/kis_png_export.cc
@@ -22,7 +22,7 @@
#include <tqcheckbox.h>
#include <tqslider.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialogbase.h>
#include <kgenericfactory.h>
diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
index 59784009..becda194 100644
--- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp
+++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
@@ -24,7 +24,7 @@
#include <tqslider.h>
#include <tqwidgetstack.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <klocale.h>
diff --git a/filters/chalk/tiff/kis_tiff_converter.cc b/filters/chalk/tiff/kis_tiff_converter.cc
index 62de9253..ea39dec2 100644
--- a/filters/chalk/tiff/kis_tiff_converter.cc
+++ b/filters/chalk/tiff/kis_tiff_converter.cc
@@ -26,7 +26,7 @@
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <KoDocumentInfo.h>
#include <tdeio/netaccess.h>
diff --git a/filters/chalk/tiff/kis_tiff_export.cc b/filters/chalk/tiff/kis_tiff_export.cc
index 28495ff4..41f38fc8 100644
--- a/filters/chalk/tiff/kis_tiff_export.cc
+++ b/filters/chalk/tiff/kis_tiff_export.cc
@@ -22,7 +22,7 @@
#include <tqcheckbox.h>
#include <tqslider.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <kdialogbase.h>
#include <kgenericfactory.h>
diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc
index a212e0af..589c1168 100644
--- a/filters/kformula/latex/latexexport.cc
+++ b/filters/kformula/latex/latexexport.cc
@@ -21,7 +21,7 @@
#include <tqtextstream.h>
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kmessagebox.h>
diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc
index dc0c5689..5f4735a1 100644
--- a/filters/kformula/mathml/mathmlexport.cc
+++ b/filters/kformula/mathml/mathmlexport.cc
@@ -21,7 +21,7 @@
#include <tqtextstream.h>
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kmessagebox.h>
diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc
index eb882e0b..42143fa5 100644
--- a/filters/kformula/mathml/mathmlimport.cc
+++ b/filters/kformula/mathml/mathmlimport.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kglobal.h>
diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc
index d1c42111..ec605aff 100644
--- a/filters/kformula/png/pngexport.cc
+++ b/filters/kformula/png/pngexport.cc
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <tqobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kmessagebox.h>
diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc
index 21d321ca..490787a8 100644
--- a/filters/kformula/png/pngexportdia.cc
+++ b/filters/kformula/png/pngexportdia.cc
@@ -27,7 +27,7 @@
#include <tqvbuttongroup.h>
#include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cc
index 328f1518..e63aca88 100644
--- a/filters/kformula/svg/svgexport.cc
+++ b/filters/kformula/svg/svgexport.cc
@@ -21,7 +21,7 @@
#include <tqpicture.h>
#include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <KoFilterChain.h>
diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.cpp b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
index 8ce557f6..957bda63 100644
--- a/filters/kivio/imageexport/kivio_imageexportdialog.cpp
+++ b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
@@ -24,7 +24,7 @@
#include <kcombobox.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kivio_imageexportwidget.h"
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index 28477dd3..d4173bd3 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -33,7 +33,7 @@
#include <tqradiobutton.h>
#include <tqtextcodec.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index 6e96b804..c136fd91 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -38,7 +38,7 @@
#include <tqtextcodec.h>
#include <tqvalidator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc
index e9852c61..f5c4262a 100644
--- a/filters/kspread/csv/csvimport.cc
+++ b/filters/kspread/csv/csvimport.cc
@@ -23,7 +23,7 @@
#include <tqfile.h>
#include <tqregexp.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc
index 1bec3b5f..cff62773 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cc
@@ -24,7 +24,7 @@
#include <tqspinbox.h>
#include <tqtextcodec.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <klocale.h>
#include <kurlrequester.h>
diff --git a/filters/kspread/latex/export/formula.cc b/filters/kspread/latex/export/formula.cc
index 98af4251..1d805a2a 100644
--- a/filters/kspread/latex/export/formula.cc
+++ b/filters/kspread/latex/export/formula.cc
@@ -24,7 +24,7 @@
#include <tqptrstack.h> /* for getFormula() */
#include <tqdom.h>
#include "formula.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kformuladocument.h>
#include <kformulamimesource.h>
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index 07957af9..6a53ee95 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -26,7 +26,7 @@
#include <tqradiobutton.h>
#include <tqcheckbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <klocale.h>
#include <tdeconfig.h>
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc
index e77f58c7..eb408d17 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cc
@@ -26,7 +26,7 @@
#include <klocale.h>
#include <kcharsets.h>
#include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <kmessagebox.h>
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc
index 6f813b10..45eaf0bf 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cc
@@ -26,7 +26,7 @@
#include <kcharsets.h>
#include <kglobal.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <kmessagebox.h>
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc
index 70243ca5..e52f85c5 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cc
@@ -24,7 +24,7 @@
#include <kcharsets.h>
#include <kglobal.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <kmessagebox.h>
#include <tqlabel.h>
diff --git a/filters/kword/html/import/tdehtmlreader.cpp b/filters/kword/html/import/tdehtmlreader.cpp
index de5f7177..e800820a 100644
--- a/filters/kword/html/import/tdehtmlreader.cpp
+++ b/filters/kword/html/import/tdehtmlreader.cpp
@@ -28,7 +28,7 @@
#include <dom/html_table.h>
#include <tdehtmlview.h>
#include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dom/html_misc.h>
#include <tqregexp.h>
diff --git a/filters/kword/latex/export/formula.cc b/filters/kword/latex/export/formula.cc
index f461a6f0..98f17379 100644
--- a/filters/kword/latex/export/formula.cc
+++ b/filters/kword/latex/export/formula.cc
@@ -24,7 +24,7 @@
#include <tqptrstack.h> /* for getFormula() */
#include <tqdom.h>
#include "formula.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kformuladocument.h>
#include <kformulamimesource.h>
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index eac7cd6f..a0da3ee4 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -26,7 +26,7 @@
#include <tqradiobutton.h>
#include <tqcheckbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <klocale.h>
#include <tdeconfig.h>
diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc
index 8354b9ab..6a8d201b 100644
--- a/filters/kword/latex/import/lateximportdia.cc
+++ b/filters/kword/latex/import/lateximportdia.cc
@@ -32,7 +32,7 @@
License version 2.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <lateximportdia.h>
#include <lateximportdia.moc>
#include <dcopclient.h>
diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc
index d26087fe..004b5cc3 100644
--- a/filters/kword/mswrite/ImportDialog.cc
+++ b/filters/kword/mswrite/ImportDialog.cc
@@ -24,7 +24,7 @@
#include <kcharsets.h>
#include <kglobal.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <ImportDialogUI.h>
#include <ImportDialog.h>
diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp
index 62c4d2a8..68654cc6 100644
--- a/filters/kword/pdf/pdfimport.cpp
+++ b/filters/kword/pdf/pdfimport.cpp
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <KoGlobal.h>
#include <KoStore.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kprogress.h>
#include "data.h"
diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp
index a5f76d32..3cd6a01d 100644
--- a/filters/libdialogfilter/exportsizedia.cpp
+++ b/filters/libdialogfilter/exportsizedia.cpp
@@ -27,7 +27,7 @@
#include <tqvbuttongroup.h>
#include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index 923b2dee..be32e432 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cc
@@ -24,7 +24,7 @@
#include <tqdir.h>
#include <tqcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <klocale.h>
#include <tdeconfig.h>
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc
index 67d6aec0..a29638e6 100644
--- a/filters/xsltfilter/import/xsltimportdia.cc
+++ b/filters/xsltfilter/import/xsltimportdia.cc
@@ -27,7 +27,7 @@
#include <tqstringlist.h>
#include <tqdir.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kglobal.h>
diff --git a/filters/xsltfilter/import/xsltimportdia.h b/filters/xsltfilter/import/xsltimportdia.h
index 1261f27f..bb2bc985 100644
--- a/filters/xsltfilter/import/xsltimportdia.h
+++ b/filters/xsltfilter/import/xsltimportdia.h
@@ -20,7 +20,7 @@
#ifndef __XSLTIMPORTDIA_H__
#define __XSLTIMPORTDIA_H__
-#include "kapplication.h"
+#include "tdeapplication.h"
#include <tdefiledialog.h>
#include <KoStore.h>
#include "xsltdialog.h"
diff --git a/karbon/core/vgroup_iface.cc b/karbon/core/vgroup_iface.cc
index 9de952b3..8a22343a 100644
--- a/karbon/core/vgroup_iface.cc
+++ b/karbon/core/vgroup_iface.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include "vgroup_iface.h"
diff --git a/karbon/core/vobject_iface.cc b/karbon/core/vobject_iface.cc
index c93b68d6..25f9959f 100644
--- a/karbon/core/vobject_iface.cc
+++ b/karbon/core/vobject_iface.cc
@@ -20,7 +20,7 @@
#include "vobject_iface.h"
#include "vobject.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
VObjectIface::VObjectIface( VObject* obj )
diff --git a/karbon/karbon_aboutdata.h b/karbon/karbon_aboutdata.h
index c293baaf..aee04a23 100644
--- a/karbon/karbon_aboutdata.h
+++ b/karbon/karbon_aboutdata.h
@@ -1,7 +1,7 @@
#ifndef KARBON_ABOUTDATA_H
#define KARBON_ABOUTDATA_H
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <config.h>
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 9edc8b37..32d5e2de 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -18,7 +18,7 @@
*/
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kinstance.h>
diff --git a/karbon/karbon_part_iface.cc b/karbon/karbon_part_iface.cc
index 3c7f30ac..a87b454b 100644
--- a/karbon/karbon_part_iface.cc
+++ b/karbon/karbon_part_iface.cc
@@ -20,7 +20,7 @@
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "karbon_part.h"
#include "karbon_part_iface.h"
diff --git a/karbon/main.cc b/karbon/main.cc
index 3434e6b5..a02c04de 100644
--- a/karbon/main.cc
+++ b/karbon/main.cc
@@ -20,8 +20,8 @@
#include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <KoApplication.h>
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc
index 814dcc53..5f404eb3 100644
--- a/kchart/csvimportdialog.cc
+++ b/kchart/csvimportdialog.cc
@@ -33,7 +33,7 @@
#include <tqradiobutton.h>
#include <tqtextcodec.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kcombobox.h>
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc
index 38cd5622..faaa81d2 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cc
@@ -20,7 +20,7 @@
#include "kchartColorConfigPage.h"
#include "kchartColorConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialog.h>
#include <klocale.h>
#include <kcolorbutton.h>
diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc
index a6476530..85313c0e 100644
--- a/kchart/kchartComboConfigPage.cc
+++ b/kchart/kchartComboConfigPage.cc
@@ -20,7 +20,7 @@
#include "kchartComboConfigPage.h"
#include "kchartComboConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/kchart/kchartConfigDialog.cc b/kchart/kchartConfigDialog.cc
index d5c9a72a..e92d20f9 100644
--- a/kchart/kchartConfigDialog.cc
+++ b/kchart/kchartConfigDialog.cc
@@ -37,7 +37,7 @@
#include "kchartLine3dConfigPage.h"
#include "kchartParameterPolarConfigPage.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc
index 5105b0f7..d31e4799 100644
--- a/kchart/kchartDataConfigPage.cc
+++ b/kchart/kchartDataConfigPage.cc
@@ -21,7 +21,7 @@
#include "kchartDataConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kcolorbutton.h>
#include <kdebug.h>
diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc
index bc0083a9..2b23b22f 100644
--- a/kchart/kchartFontConfigPage.cc
+++ b/kchart/kchartFontConfigPage.cc
@@ -22,7 +22,7 @@
#include "kchartFontConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kcolorbutton.h>
#include <kdebug.h>
diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc
index 30a35409..8730063f 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cc
@@ -20,7 +20,7 @@
#include "kchartHeaderFooterConfigPage.h"
#include "kchartHeaderFooterConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialog.h>
#include <klocale.h>
#include <tqlayout.h>
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index 7f516542..e0baf943 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -20,7 +20,7 @@
#include "kchartLegendConfigPage.h"
#include "kchartLegendConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kcolorbutton.h>
#include <tdefontdialog.h>
diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc
index f486053b..6308fe43 100644
--- a/kchart/kchartLine3dConfigPage.cc
+++ b/kchart/kchartLine3dConfigPage.cc
@@ -20,7 +20,7 @@
#include "kchartLine3dConfigPage.h"
#include "kchartLine3dConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kdialog.h>
#include <tqlayout.h>
diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc
index 9bce7b5f..a74878d2 100644
--- a/kchart/kchartParameter3dConfigPage.cc
+++ b/kchart/kchartParameter3dConfigPage.cc
@@ -20,7 +20,7 @@
#include "kchartParameter3dConfigPage.h"
#include "kchartParameter3dConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialog.h>
#include <klocale.h>
#include <tqlayout.h>
diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc
index ea9874d5..2025be3b 100644
--- a/kchart/kchartParameterConfigPage.cc
+++ b/kchart/kchartParameterConfigPage.cc
@@ -21,7 +21,7 @@
#include "kchartParameterConfigPage.h"
#include "kchartParameterConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kchart/kchartParameterPieConfigPage.cc b/kchart/kchartParameterPieConfigPage.cc
index 632e46d1..99bfb6ff 100644
--- a/kchart/kchartParameterPieConfigPage.cc
+++ b/kchart/kchartParameterPieConfigPage.cc
@@ -21,7 +21,7 @@
#include "kchartParameterPieConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/kchart/kchartParameterPolarConfigPage.cc b/kchart/kchartParameterPolarConfigPage.cc
index 807cd54e..32775fc0 100644
--- a/kchart/kchartParameterPolarConfigPage.cc
+++ b/kchart/kchartParameterPolarConfigPage.cc
@@ -21,7 +21,7 @@
#include "kchartParameterPolarConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc
index 5c945a13..cf96654a 100644
--- a/kchart/kchartPieConfigPage.cc
+++ b/kchart/kchartPieConfigPage.cc
@@ -20,7 +20,7 @@
#include "kchartPieConfigPage.h"
#include "kchartPieConfigPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc
index 7f8da82f..e171da84 100644
--- a/kchart/kchartSubTypeChartPage.cc
+++ b/kchart/kchartSubTypeChartPage.cc
@@ -22,7 +22,7 @@
#include "kchartSubTypeChartPage.h"
#include "kchartSubTypeChartPage.moc"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kchart/kchart_aboutdata.h b/kchart/kchart_aboutdata.h
index 0cdefae8..abf8b2f7 100644
--- a/kchart/kchart_aboutdata.h
+++ b/kchart/kchart_aboutdata.h
@@ -20,7 +20,7 @@
#ifndef KCHART_ABOUTDATA
#define KCHART_ABOUTDATA
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <config.h>
diff --git a/kchart/main.cc b/kchart/main.cc
index 2d20e207..a82f44dd 100644
--- a/kchart/main.cc
+++ b/kchart/main.cc
@@ -18,7 +18,7 @@
*/
#include <KoApplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include "kchart_aboutdata.h"
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>
diff --git a/kformula/formulastring.cc b/kformula/formulastring.cc
index 400fdd66..5730975f 100644
--- a/kformula/formulastring.cc
+++ b/kformula/formulastring.cc
@@ -25,7 +25,7 @@
#include <tqvariant.h>
#include <tqwhatsthis.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kstdguiitem.h>
diff --git a/kformula/kformula_aboutdata.h b/kformula/kformula_aboutdata.h
index b7e98cd8..70941c48 100644
--- a/kformula/kformula_aboutdata.h
+++ b/kformula/kformula_aboutdata.h
@@ -22,7 +22,7 @@
#ifndef KFORMULA_ABOUTDATA
#define KFORMULA_ABOUTDATA
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <config.h>
diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc
index ac8c8bcd..fa2a9bd4 100644
--- a/kformula/kformula_doc.cc
+++ b/kformula/kformula_doc.cc
@@ -36,9 +36,9 @@
#include <config.h>
#include <unistd.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <KoGlobal.h>
#include <kiconloader.h>
diff --git a/kformula/kformula_factory.h b/kformula/kformula_factory.h
index dc277207..4c773b74 100644
--- a/kformula/kformula_factory.h
+++ b/kformula/kformula_factory.h
@@ -2,7 +2,7 @@
#define KFORMULA_FACTORY_H
#include <KoFactory.h>
-//#include <kaboutdata.h>
+//#include <tdeaboutdata.h>
class TDEInstance;
class TDEInstance;
diff --git a/kformula/kformulawidget.cc b/kformula/kformulawidget.cc
index c8d4a284..b505d817 100644
--- a/kformula/kformulawidget.cc
+++ b/kformula/kformulawidget.cc
@@ -22,7 +22,7 @@
#include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <basicelement.h>
diff --git a/kformula/main.cc b/kformula/main.cc
index 53fc878b..5d137add 100644
--- a/kformula/main.cc
+++ b/kformula/main.cc
@@ -19,7 +19,7 @@
*/
#include <KoApplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <dcopclient.h>
diff --git a/kivio/kiviopart/KIvioDocIface.cc b/kivio/kiviopart/KIvioDocIface.cc
index b93df9cc..e9ab089f 100644
--- a/kivio/kiviopart/KIvioDocIface.cc
+++ b/kivio/kiviopart/KIvioDocIface.cc
@@ -22,7 +22,7 @@
#include "kivio_doc.h"
#include "kivio_map.h"
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdemainwindow.h>
#include "kivio_grid_data.h"
#include "kivio_config.h"
diff --git a/kivio/kiviopart/KIvioMapIface.cc b/kivio/kiviopart/KIvioMapIface.cc
index 2caea757..99397692 100644
--- a/kivio/kiviopart/KIvioMapIface.cc
+++ b/kivio/kiviopart/KIvioMapIface.cc
@@ -23,7 +23,7 @@
#include "kivio_doc.h"
#include "kivio_page.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <kdebug.h>
diff --git a/kivio/kiviopart/KIvioPageIface.cc b/kivio/kiviopart/KIvioPageIface.cc
index c85e2671..26ba9a2e 100644
--- a/kivio/kiviopart/KIvioPageIface.cc
+++ b/kivio/kiviopart/KIvioPageIface.cc
@@ -21,7 +21,7 @@
#include "kivio_page.h"
#include "kivio_layer.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KIvioPageIface::KIvioPageIface( KivioPage *page_ )
diff --git a/kivio/kiviopart/kivio_aboutdata.h b/kivio/kiviopart/kivio_aboutdata.h
index 9d742905..e80fa73c 100644
--- a/kivio/kiviopart/kivio_aboutdata.h
+++ b/kivio/kiviopart/kivio_aboutdata.h
@@ -21,7 +21,7 @@
#ifndef KIVIO_ABOUTDATA
#define KIVIO_ABOUTDATA
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kofficeversion.h>
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index f8b2f78c..181d34ae 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -43,7 +43,7 @@
#include <KoRuler.h>
#include <KoPoint.h>
#include <KoTabBar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <assert.h>
#include <stdio.h>
diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp
index 6381d76b..6e761d06 100644
--- a/kivio/kiviopart/kivio_dlg_pageshow.cpp
+++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp
@@ -23,7 +23,7 @@
#include "kivio_command.h"
#include "kivio_doc.h"
#include "kivio_map.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <tqstringlist.h>
#include <tqlayout.h>
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index 351085a5..16b2f8aa 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -49,7 +49,7 @@
#include <kprinter.h>
#include <kdebug.h>
#include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <assert.h>
#include <tqdatetime.h>
#include <sys/types.h>
diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp
index a52f522b..8e82a521 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -47,7 +47,7 @@
#include <KoPoint.h>
#include <KoRect.h>
#include <KoZoomHandler.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <KoXmlWriter.h>
#include <KoXmlNS.h>
#include <KoDom.h>
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index d19b4650..223fcd56 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -48,7 +48,7 @@
#include <kdialogbase.h>
#include <tdeaction.h>
#include <kcolorbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kiconloader.h>
#include <tdestdaccel.h>
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index 9d84d94f..870d3190 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -32,7 +32,7 @@
#include <tdetoolbar.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdetoolbarbutton.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 534d6992..37b342e6 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -22,7 +22,7 @@
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
diff --git a/kivio/kiviopart/main.cpp b/kivio/kiviopart/main.cpp
index 500c1b71..708bd28b 100644
--- a/kivio/kiviopart/main.cpp
+++ b/kivio/kiviopart/main.cpp
@@ -18,7 +18,7 @@
*/
#include <koffice_export.h>
#include <KoApplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <dcopclient.h>
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 78d77d0d..747618c1 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -16,7 +16,7 @@
#include <KoZoomHandler.h>
#include <tdeversion.h>
#include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqpixmap.h>
#include <tqslider.h>
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp
index 61b890be..dc43a8d9 100644
--- a/koshell/iconsidepane.cpp
+++ b/koshell/iconsidepane.cpp
@@ -34,7 +34,7 @@
#include <tqwidgetstack.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc
index ecfd34f0..f405d81a 100644
--- a/koshell/koshell_main.cc
+++ b/koshell/koshell_main.cc
@@ -19,8 +19,8 @@
*/
#include <kofficeversion.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <klocale.h>
#include <kuniqueapplication.h>
diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc
index 772b8f37..46453c1c 100644
--- a/koshell/koshell_shell.cc
+++ b/koshell/koshell_shell.cc
@@ -31,7 +31,7 @@
#include "koshell_shell.h"
#include "koshellsettings.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <ktempfile.h>
#include <tdefiledialog.h>
#include <klocale.h>
@@ -47,7 +47,7 @@
#include <tdeparts/partmanager.h>
#include <tdeaction.h>
#include <tdeversion.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <KoQueryTrader.h>
#include <KoDocumentInfo.h>
diff --git a/kounavail/kounavail.cc b/kounavail/kounavail.cc
index a7e298d6..a776cd3e 100644
--- a/kounavail/kounavail.cc
+++ b/kounavail/kounavail.cc
@@ -25,7 +25,7 @@
#include <kinstance.h>
#include <kstdaction.h>
#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kdebug.h>
#include <kglobalsettings.h>
#include <tqapplication.h>
diff --git a/kplato/KPtViewIface.cc b/kplato/KPtViewIface.cc
index e9a9e332..dafd718d 100644
--- a/kplato/KPtViewIface.cc
+++ b/kplato/KPtViewIface.cc
@@ -2,7 +2,7 @@
#include "KPtViewIface.h"
#include "kptview.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <dcopref.h>
diff --git a/kplato/kptaboutdata.h b/kplato/kptaboutdata.h
index 28bacafd..a8b7baf1 100644
--- a/kplato/kptaboutdata.h
+++ b/kplato/kptaboutdata.h
@@ -21,7 +21,7 @@
#ifndef KPLATO_ABOUTDATA
#define KPLATO_ABOUTDATA
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
namespace KPlato
diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc
index fec4088b..73c94c8b 100644
--- a/kplato/kptcalendarpanel.cc
+++ b/kplato/kptcalendarpanel.cc
@@ -27,7 +27,7 @@
#include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kcalendarsystem.h>
#include <kiconloader.h>
diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc
index 8bb467a8..36add001 100644
--- a/kplato/kptdatetable.cc
+++ b/kplato/kptdatetable.cc
@@ -22,7 +22,7 @@
#include "kptdatetable.h"
#include "kptmap.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <knotifyclient.h>
#include <kcalendarsystem.h>
diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc
index da47b492..ad8966dd 100644
--- a/kplato/kptpertcanvas.cc
+++ b/kplato/kptpertcanvas.cc
@@ -39,7 +39,7 @@
#include <ktempfile.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <assert.h>
#include <tdemultipledrag.h>
diff --git a/kplato/main.cc b/kplato/main.cc
index c7c04ae7..75af7b84 100644
--- a/kplato/main.cc
+++ b/kplato/main.cc
@@ -21,7 +21,7 @@
#include <koffice_export.h>
#include <KoApplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <dcopclient.h>
namespace KPlato
diff --git a/kpresenter/KPrAboutData.h b/kpresenter/KPrAboutData.h
index c5bb8a9a..53e8365e 100644
--- a/kpresenter/KPrAboutData.h
+++ b/kpresenter/KPrAboutData.h
@@ -20,7 +20,7 @@
#ifndef KPRESENTER_ABOUTDATA
#define KPRESENTER_ABOUTDATA
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kofficeversion.h>
diff --git a/kpresenter/KPrAutoFormObjectIface.cpp b/kpresenter/KPrAutoFormObjectIface.cpp
index 111a88e4..3094f58c 100644
--- a/kpresenter/KPrAutoFormObjectIface.cpp
+++ b/kpresenter/KPrAutoFormObjectIface.cpp
@@ -24,7 +24,7 @@
#include "KPrObject.h"
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrAutoFormObjectIface::KPrAutoFormObjectIface( KPrAutoformObject *_obj )
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index 5a6da29e..4b09382a 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -21,7 +21,7 @@
#include "KPrBackground.h"
#include "KPrDocument.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "KPrGradientCollection.h"
#include "KPrTextObject.h"
#include "KPrPage.h"
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index 0089caf8..f98ddb0f 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -38,7 +38,7 @@
#include <tqpoint.h>
#include <tqclipboard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmimemagic.h>
#include <klocale.h>
#include <kiconloader.h>
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index a8f6ff82..23b121a2 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -23,7 +23,7 @@
#endif
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <KoUnitWidgets.h>
#include <klocale.h>
#include <tdeconfig.h>
diff --git a/kpresenter/KPrCubicBezierCurveObjectIface.cpp b/kpresenter/KPrCubicBezierCurveObjectIface.cpp
index bcf02ad9..fec43258 100644
--- a/kpresenter/KPrCubicBezierCurveObjectIface.cpp
+++ b/kpresenter/KPrCubicBezierCurveObjectIface.cpp
@@ -23,7 +23,7 @@
#include "KPrUtils.h"
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrCubicBezierCurveObjectIface::KPrCubicBezierCurveObjectIface( KPrCubicBezierCurveObject *_obj )
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index d4503064..098c7eb0 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -55,7 +55,7 @@
#include <kurl.h>
#include <kdebug.h>
#include <KoGlobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kurldrag.h>
#include <ktempfile.h>
#include <klocale.h>
diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp
index aa4d154a..27b66cad 100644
--- a/kpresenter/KPrDocumentIface.cpp
+++ b/kpresenter/KPrDocumentIface.cpp
@@ -24,7 +24,7 @@
#include "KPrView.h"
#include "KPrPage.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <KoVariable.h>
#include "KPrVariableCollection.h"
diff --git a/kpresenter/KPrEffectHandler.cpp b/kpresenter/KPrEffectHandler.cpp
index acbdf7a7..91aeab49 100644
--- a/kpresenter/KPrEffectHandler.cpp
+++ b/kpresenter/KPrEffectHandler.cpp
@@ -26,7 +26,7 @@
#include "KPrCanvas.h"
#include <KoZoomHandler.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqpainter.h>
#include <tqpaintdevice.h>
diff --git a/kpresenter/KPrFreehandObjectIface.cpp b/kpresenter/KPrFreehandObjectIface.cpp
index 25ff2963..16bdc58c 100644
--- a/kpresenter/KPrFreehandObjectIface.cpp
+++ b/kpresenter/KPrFreehandObjectIface.cpp
@@ -23,7 +23,7 @@
#include "KPrUtils.h"
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrFreehandObjectIface::KPrFreehandObjectIface( KPrFreehandObject *_obj )
diff --git a/kpresenter/KPrLineObjectIface.cpp b/kpresenter/KPrLineObjectIface.cpp
index 8fa03726..e5f45bd2 100644
--- a/kpresenter/KPrLineObjectIface.cpp
+++ b/kpresenter/KPrLineObjectIface.cpp
@@ -24,7 +24,7 @@
#include "KPrObject.h"
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrLineObjectIface::KPrLineObjectIface( KPrLineObject *_obj )
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index e4db5e91..f362f03d 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -45,7 +45,7 @@
#include <tqvbox.h>
#include <tqwhatsthis.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <kcolorbutton.h>
#include <kglobal.h>
diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp
index 52b67396..bea860bf 100644
--- a/kpresenter/KPrObject.cpp
+++ b/kpresenter/KPrObject.cpp
@@ -33,7 +33,7 @@
#include <tqbuffer.h>
#include <tqregexp.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <KoOasisContext.h>
#include "KoOasisStyles.h"
diff --git a/kpresenter/KPrObject2DIface.cpp b/kpresenter/KPrObject2DIface.cpp
index 729d8587..feac50f1 100644
--- a/kpresenter/KPrObject2DIface.cpp
+++ b/kpresenter/KPrObject2DIface.cpp
@@ -23,7 +23,7 @@
#include "KPrObject.h"
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrObject2DIface::KPrObject2DIface(KPr2DObject *obj_)
diff --git a/kpresenter/KPrObjectIface.cpp b/kpresenter/KPrObjectIface.cpp
index 25aba98c..544ea095 100644
--- a/kpresenter/KPrObjectIface.cpp
+++ b/kpresenter/KPrObjectIface.cpp
@@ -23,7 +23,7 @@
#include "KPrObject.h"
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrObjectIface::KPrObjectIface( KPrObject *obj_ )
diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp
index b358fd55..e5aa4c56 100644
--- a/kpresenter/KPrPageEffects.cpp
+++ b/kpresenter/KPrPageEffects.cpp
@@ -27,7 +27,7 @@
#include <tqwidget.h>
#include <tqwmatrix.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <krandomsequence.h>
diff --git a/kpresenter/KPrPageIface.cpp b/kpresenter/KPrPageIface.cpp
index 36798a0a..e07333fb 100644
--- a/kpresenter/KPrPageIface.cpp
+++ b/kpresenter/KPrPageIface.cpp
@@ -24,7 +24,7 @@
#include "KPrTextObject.h"
#include "KPrView.h"
#include "KPrBackground.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include "KPrDocument.h"
#include "KPrCanvas.h"
diff --git a/kpresenter/KPrPieObjectIface.cpp b/kpresenter/KPrPieObjectIface.cpp
index e5a3d4f4..ad0ee251 100644
--- a/kpresenter/KPrPieObjectIface.cpp
+++ b/kpresenter/KPrPieObjectIface.cpp
@@ -22,7 +22,7 @@
#include "KPrPieObject.h"
#include "KPrObject.h"
#include "KPrUtils.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <kdebug.h>
diff --git a/kpresenter/KPrPixmapObjectIface.cpp b/kpresenter/KPrPixmapObjectIface.cpp
index e84e3c52..d09f5fee 100644
--- a/kpresenter/KPrPixmapObjectIface.cpp
+++ b/kpresenter/KPrPixmapObjectIface.cpp
@@ -22,7 +22,7 @@
#include "KPrPixmapObject.h"
#include "KPrObject.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrPixmapObjectIface::KPrPixmapObjectIface( KPrPixmapObject *_obj )
diff --git a/kpresenter/KPrPolyLineObjectIface.cpp b/kpresenter/KPrPolyLineObjectIface.cpp
index 8283a4c5..1533650a 100644
--- a/kpresenter/KPrPolyLineObjectIface.cpp
+++ b/kpresenter/KPrPolyLineObjectIface.cpp
@@ -22,7 +22,7 @@
#include "KPrPolylineObject.h"
#include "KPrObject.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrPolyLineObjectIface::KPrPolyLineObjectIface( KPrPolylineObject *_obj )
diff --git a/kpresenter/KPrPolygonObjectIface.cpp b/kpresenter/KPrPolygonObjectIface.cpp
index fa9c1327..0b9b4776 100644
--- a/kpresenter/KPrPolygonObjectIface.cpp
+++ b/kpresenter/KPrPolygonObjectIface.cpp
@@ -22,7 +22,7 @@
#include "KPrPolygonObject.h"
#include "KPrObject.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrPolygonObjectIface::KPrPolygonObjectIface( KPrPolygonObject *_obj )
diff --git a/kpresenter/KPrQuadricBezierCurveObjectIface.cpp b/kpresenter/KPrQuadricBezierCurveObjectIface.cpp
index 361060c5..6af16fdf 100644
--- a/kpresenter/KPrQuadricBezierCurveObjectIface.cpp
+++ b/kpresenter/KPrQuadricBezierCurveObjectIface.cpp
@@ -24,7 +24,7 @@
#include "KPrObject.h"
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrQuadricBezierCurveObjectIface::KPrQuadricBezierCurveObjectIface( KPrQuadricBezierCurveObject *_obj )
diff --git a/kpresenter/KPrRectObjectIface.cpp b/kpresenter/KPrRectObjectIface.cpp
index a9e5b3e7..7b32b873 100644
--- a/kpresenter/KPrRectObjectIface.cpp
+++ b/kpresenter/KPrRectObjectIface.cpp
@@ -22,7 +22,7 @@
#include "KPrRectObject.h"
#include "KPrObject.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrRectObjectIface::KPrRectObjectIface( KPrRectObject *_obj )
diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp
index 01478ef2..7cf470a9 100644
--- a/kpresenter/KPrTextObjectIface.cpp
+++ b/kpresenter/KPrTextObjectIface.cpp
@@ -24,7 +24,7 @@
#include "KPrDocument.h"
#include "KPrView.h"
#include <KoTextObject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include "KPrCanvas.h"
#include <kdebug.h>
diff --git a/kpresenter/KPrTextViewIface.cpp b/kpresenter/KPrTextViewIface.cpp
index e9180d35..51cdac64 100644
--- a/kpresenter/KPrTextViewIface.cpp
+++ b/kpresenter/KPrTextViewIface.cpp
@@ -21,7 +21,7 @@
#include "KPrTextViewIface.h"
#include "KPrTextObject.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrTextViewIface::KPrTextViewIface( KPrTextView *_textview )
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 90e8537e..6f2e2358 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -67,7 +67,7 @@
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <kstdaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeio/netaccess.h>
#include "KPrView.h"
diff --git a/kpresenter/KPrViewIface.cpp b/kpresenter/KPrViewIface.cpp
index 49c2d887..6d1e2b90 100644
--- a/kpresenter/KPrViewIface.cpp
+++ b/kpresenter/KPrViewIface.cpp
@@ -25,7 +25,7 @@
#include "KPrPage.h"
#include "KPrDocument.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
KPrViewIface::KPrViewIface( KPrView *view_ )
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index f4bf8fed..6f93acba 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -60,7 +60,7 @@
#include <kmessagebox.h>
#include <kbuttonbox.h>
#include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kprogress.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/kpresenter/main.cpp b/kpresenter/main.cpp
index 2425fb1c..4113d341 100644
--- a/kpresenter/main.cpp
+++ b/kpresenter/main.cpp
@@ -22,7 +22,7 @@
#include <KoApplication.h>
#include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
diff --git a/kspread/KSpreadAppIface.cc b/kspread/KSpreadAppIface.cc
index 8ebc978c..6f0c8362 100644
--- a/kspread/KSpreadAppIface.cc
+++ b/kspread/KSpreadAppIface.cc
@@ -29,7 +29,7 @@
#include "kspread_doc.h"
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
using namespace KSpread;
diff --git a/kspread/KSpreadDocIface.cc b/kspread/KSpreadDocIface.cc
index a4374800..e8f1df46 100644
--- a/kspread/KSpreadDocIface.cc
+++ b/kspread/KSpreadDocIface.cc
@@ -31,7 +31,7 @@
#include "kspread_doc.h"
#include "kspread_map.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <tqcolor.h>
#include <kdebug.h>
diff --git a/kspread/KSpreadMapIface.cc b/kspread/KSpreadMapIface.cc
index 046f4c44..ba8071f9 100644
--- a/kspread/KSpreadMapIface.cc
+++ b/kspread/KSpreadMapIface.cc
@@ -23,7 +23,7 @@
*/
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include "kspread_doc.h"
diff --git a/kspread/KSpreadTableIface.cc b/kspread/KSpreadTableIface.cc
index e6067639..cbf37f20 100644
--- a/kspread/KSpreadTableIface.cc
+++ b/kspread/KSpreadTableIface.cc
@@ -33,7 +33,7 @@
#include "kspread_doc.h"
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include "KSpreadCellIface.h"
diff --git a/kspread/KSpreadViewIface.cc b/kspread/KSpreadViewIface.cc
index 4b7f2a66..1fb76f46 100644
--- a/kspread/KSpreadViewIface.cc
+++ b/kspread/KSpreadViewIface.cc
@@ -26,7 +26,7 @@
#include <dcopclient.h>
#include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kspread_doc.h"
#include "kspread_map.h"
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index b08fa858..653587fc 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -32,7 +32,7 @@
#include <tqtable.h>
#include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <tdefiledialog.h>
diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc
index 91cec3e4..44d81ebc 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cc
@@ -39,7 +39,7 @@
#include "kspread_view.h"
#include "functions.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kbuttonbox.h>
#include <knumvalidator.h>
diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc
index 9eb92a45..49ec2461 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cc
@@ -35,7 +35,7 @@
#include "kspread_util.h"
#include "kspread_view.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index b9e20054..fcbbba78 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -40,7 +40,7 @@
#include <tqlayout.h>
#include <tqhgroupbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kspread/kspread_aboutdata.h b/kspread/kspread_aboutdata.h
index f51a6e4c..85b9797e 100644
--- a/kspread/kspread_aboutdata.h
+++ b/kspread/kspread_aboutdata.h
@@ -20,7 +20,7 @@
#ifndef KSPREAD_ABOUTDATA
#define KSPREAD_ABOUTDATA
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kofficeversion.h>
diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc
index 2a3bffb0..2fce2696 100644
--- a/kspread/kspread_object.cc
+++ b/kspread/kspread_object.cc
@@ -23,7 +23,7 @@
#include "kspread_view.h"
#include <assert.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kimageeffect.h>
#include <tdeparts/partmanager.h>
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index 64d6aa5b..b43dac6c 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -49,7 +49,7 @@
// KDE includes
#include <dcopclient.h>
#include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kfind.h>
diff --git a/kspread/main.cc b/kspread/main.cc
index 3be6eb28..dd596278 100644
--- a/kspread/main.cc
+++ b/kspread/main.cc
@@ -18,7 +18,7 @@
*/
#include <KoApplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <dcopclient.h>
#include "kspread_aboutdata.h"
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index 0841092f..b6c71ca1 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -29,7 +29,7 @@
#include <tqlayout.h>
#include <tqobjectlist.h>
#include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobalsettings.h>
#include <tqstyle.h>
#include <kdialog.h>
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
index f2ea90a2..dc4c169e 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
@@ -33,7 +33,7 @@
#include <kcalendarsystem.h>
#include <kcalendarsystemfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kgenericfactory.h>
#include <klocale.h>
#include <kofficeversion.h>
diff --git a/kspread/tests/test_formula.cc b/kspread/tests/test_formula.cc
index 45538e79..433efab3 100644
--- a/kspread/tests/test_formula.cc
+++ b/kspread/tests/test_formula.cc
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include "formula_tester.h"
diff --git a/kugar/kudesigner/kudesigner_aboutdata.h b/kugar/kudesigner/kudesigner_aboutdata.h
index b9682fde..6a52781c 100644
--- a/kugar/kudesigner/kudesigner_aboutdata.h
+++ b/kugar/kudesigner/kudesigner_aboutdata.h
@@ -20,7 +20,7 @@
#ifndef KUDESIGNER_ABOUTDATA
#define KUDESIGNER_ABOUTDATA
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kofficeversion.h>
diff --git a/kugar/kudesigner/main.cpp b/kugar/kudesigner/main.cpp
index 199cbd64..b78a88da 100644
--- a/kugar/kudesigner/main.cpp
+++ b/kugar/kudesigner/main.cpp
@@ -20,7 +20,7 @@
#include <KoApplication.h>
#include <KoDocument.h>
#include <KoMainWindow.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <dcopclient.h>
#include "kudesigner_aboutdata.h"
diff --git a/kugar/part/kugar_about.h b/kugar/part/kugar_about.h
index a38f9460..2a47f768 100644
--- a/kugar/part/kugar_about.h
+++ b/kugar/part/kugar_about.h
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
TDEAboutData *newKugarAboutData()
diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp
index 602e5dc2..f32c1b95 100644
--- a/kugar/part/kugar_factory.cpp
+++ b/kugar/part/kugar_factory.cpp
@@ -6,7 +6,7 @@
#include <klocale.h>
#include <kstandarddirs.h>
#include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kglobal.h>
#include <kiconloader.h>
diff --git a/kugar/part/kugar_factory.h b/kugar/part/kugar_factory.h
index 3ee962f8..b93f5fce 100644
--- a/kugar/part/kugar_factory.h
+++ b/kugar/part/kugar_factory.h
@@ -8,7 +8,7 @@
#include <KoFactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
class TDEInstance;
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index d61e405f..14e8e059 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -3,11 +3,11 @@
// This file contains the implementation of the Kugar KPart.
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kmessagebox.h>
diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp
index c90486e9..55403d41 100644
--- a/kugar/part/kugar_view.cpp
+++ b/kugar/part/kugar_view.cpp
@@ -3,11 +3,11 @@
// This file contains the implementation of the Kugar KPart.
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kmessagebox.h>
diff --git a/kugar/part/main.cpp b/kugar/part/main.cpp
index a81cf192..640769c2 100644
--- a/kugar/part/main.cpp
+++ b/kugar/part/main.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include <KoApplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <dcopclient.h>
#include "kugar_about.h"
diff --git a/kword/KWAboutData.h b/kword/KWAboutData.h
index 849aecf4..d9b3b6f6 100644
--- a/kword/KWAboutData.h
+++ b/kword/KWAboutData.h
@@ -20,7 +20,7 @@
#ifndef KWORD_ABOUTDATA
#define KWORD_ABOUTDATA
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kofficeversion.h>
diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp
index 972d9a43..dcb3b197 100644
--- a/kword/KWMailMergeLabelAction.cpp
+++ b/kword/KWMailMergeLabelAction.cpp
@@ -24,7 +24,7 @@
#include "KWMailMergeLabelAction.h"
#include "KWMailMergeLabelAction.moc"
#include <KoMainWindow.h>
-#include <kstyle.h>
+#include <tdestyle.h>
#include <tdepopupmenu.h>
class MailMergeDraggableLabel : public TQToolButton
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index d9ce5706..4ae07187 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -31,7 +31,7 @@
#include <KoXmlNS.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <assert.h>
diff --git a/kword/KWordDocIface.cpp b/kword/KWordDocIface.cpp
index e3b68fa9..845297ba 100644
--- a/kword/KWordDocIface.cpp
+++ b/kword/KWordDocIface.cpp
@@ -23,7 +23,7 @@
#include "KWVariable.h"
#include "KWPageManager.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <KoVariable.h>
#include <KoAutoFormat.h>
diff --git a/kword/KWordFormulaFrameSetIface.cpp b/kword/KWordFormulaFrameSetIface.cpp
index f8263d8e..e19c69dd 100644
--- a/kword/KWordFormulaFrameSetIface.cpp
+++ b/kword/KWordFormulaFrameSetIface.cpp
@@ -24,7 +24,7 @@
#include "KWView.h"
#include "KWCanvas.h"
#include "KWDocument.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include "KWordFrameSetIface.h"
diff --git a/kword/KWordPartFrameSetIface.cpp b/kword/KWordPartFrameSetIface.cpp
index ea88e8bb..88e58636 100644
--- a/kword/KWordPartFrameSetIface.cpp
+++ b/kword/KWordPartFrameSetIface.cpp
@@ -23,7 +23,7 @@
#include "KWView.h"
#include "KWCanvas.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeparts/partmanager.h>
#include <dcopclient.h>
diff --git a/kword/KWordTableFrameSetIface.cpp b/kword/KWordTableFrameSetIface.cpp
index 5f117c89..930f30ae 100644
--- a/kword/KWordTableFrameSetIface.cpp
+++ b/kword/KWordTableFrameSetIface.cpp
@@ -23,7 +23,7 @@
#include "KWFrame.h"
#include "KWTableFrameSet.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include "KWView.h"
#include "KWDocument.h"
diff --git a/kword/KWordTextFrameSetIface.cpp b/kword/KWordTextFrameSetIface.cpp
index ab814900..4dcb836c 100644
--- a/kword/KWordTextFrameSetIface.cpp
+++ b/kword/KWordTextFrameSetIface.cpp
@@ -25,7 +25,7 @@
#include <KoTextObject.h>
#include "KWCanvas.h"
#include "KWDocument.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include "KWordFrameSetIface.h"
#include <kdebug.h>
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index 24daac3f..c9c221dc 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <tqlineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kinputdialog.h>
diff --git a/kword/main.cpp b/kword/main.cpp
index 6d2cf391..41f8ba70 100644
--- a/kword/main.cpp
+++ b/kword/main.cpp
@@ -18,7 +18,7 @@
*/
#include <KoApplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <dcopclient.h>
#include "KWAboutData.h"
diff --git a/lib/kformula/kformulaview.cc b/lib/kformula/kformulaview.cc
index f4385b38..1e50694d 100644
--- a/lib/kformula/kformulaview.cc
+++ b/lib/kformula/kformulaview.cc
@@ -23,7 +23,7 @@
#include <tqpainter.h>
#include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include "basicelement.h"
diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc
index 1014a66e..39aff864 100644
--- a/lib/kformula/kformulawidget.cc
+++ b/lib/kformula/kformulawidget.cc
@@ -22,7 +22,7 @@
#include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
//#include <klocale.h>
//#include <kstdaction.h>
diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc
index 0fd9723c..c92adfd7 100644
--- a/lib/kformula/main.cc
+++ b/lib/kformula/main.cc
@@ -14,9 +14,9 @@
#include <tqwidget.h>
#include <tqfileinfo.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kcommand.h>
#include <kdebug.h>
#include <tdefiledialog.h>
diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc
index 8591eb04..aee6f670 100644
--- a/lib/kformula/symbolaction.cc
+++ b/lib/kformula/symbolaction.cc
@@ -20,7 +20,7 @@
#include <tqlistbox.h>
#include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <kglobalsettings.h>
#include <tdetoolbar.h>
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index 25fe00dc..efa73850 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -27,7 +27,7 @@
#include <KoDocument.h>
#include <KoMainWindow.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kdesktopfile.h>
#include <kmessagebox.h>
diff --git a/lib/kofficecore/KoApplication.h b/lib/kofficecore/KoApplication.h
index 87a711f2..158f107b 100644
--- a/lib/kofficecore/KoApplication.h
+++ b/lib/kofficecore/KoApplication.h
@@ -22,7 +22,7 @@
namespace std { }
using namespace std;
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <koffice_export.h>
class KoApplicationPrivate;
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 75910944..9762f292 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -40,7 +40,7 @@
#include <tdeio/previewjob.h>
#include <kdebug.h>
#include <ktextbrowser.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "KoTemplates.h"
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 184dcefd..292e16e9 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -35,7 +35,7 @@
#include <KoStoreDevice.h>
#include <KoXmlWriter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <tdefileitem.h>
diff --git a/lib/kofficecore/KoDocumentIface.cc b/lib/kofficecore/KoDocumentIface.cc
index e4275d75..e0196fdf 100644
--- a/lib/kofficecore/KoDocumentIface.cc
+++ b/lib/kofficecore/KoDocumentIface.cc
@@ -22,7 +22,7 @@
#include "KoDocumentInfoDlg.h"
#include "KoDocumentInfo.h"
#include "KoView.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <kdcopactionproxy.h>
#include <tdeaction.h>
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 5a8c0d26..97905af4 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -32,11 +32,11 @@
#include "kkbdaccessextensions.h"
#include "KoSpeaker.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kprinter.h>
#include <tdeversion.h>
#include <kstdaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <tdeio/netaccess.h>
diff --git a/lib/kofficecore/KoMainWindowIface.cc b/lib/kofficecore/KoMainWindowIface.cc
index 08b3fdaa..14683188 100644
--- a/lib/kofficecore/KoMainWindowIface.cc
+++ b/lib/kofficecore/KoMainWindowIface.cc
@@ -22,7 +22,7 @@
#include "KoMainWindow.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <kdcopactionproxy.h>
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index f0e163e0..0ed86896 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -43,7 +43,7 @@
#include <tqstylesheet.h>
// KDE includes.
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kglobal.h>
#include <dcopclient.h>
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index b78b937c..2964bcaf 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -32,7 +32,7 @@
#include <kcursor.h>
#include <assert.h>
#include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqtimer.h>
class KoViewPrivate
diff --git a/lib/kofficecore/KoViewIface.cc b/lib/kofficecore/KoViewIface.cc
index b52b9f0a..ae5449b9 100644
--- a/lib/kofficecore/KoViewIface.cc
+++ b/lib/kofficecore/KoViewIface.cc
@@ -22,7 +22,7 @@
#include "KoView.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <kdcopactionproxy.h>
#include <tdeaction.h>
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 212d0260..b5baad99 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -31,7 +31,7 @@
// KDE includes
#include <klocale.h>
#include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdemainwindow.h>
#include <tdeaction.h>
#include <kdebug.h>
diff --git a/lib/kofficecore/tests/korecttest.cpp b/lib/kofficecore/tests/korecttest.cpp
index 6866e176..8a2455bf 100644
--- a/lib/kofficecore/tests/korecttest.cpp
+++ b/lib/kofficecore/tests/korecttest.cpp
@@ -1,6 +1,6 @@
#include <KoRect.h>
#include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <stdlib.h>
#include <kdebug.h>
#include <kglobal.h>
diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index e6ae509d..f85e1937 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqstring.h>
KoVerticalLabel::KoVerticalLabel( TQWidget* parent, const char* name )
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index 1329f8a9..eda24051 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <tqlayout.h>
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 0c6abfaa..5960c2e6 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -25,7 +25,7 @@
#include <tqmenubar.h>
#include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index e10fc78c..047a701a 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -43,8 +43,8 @@
#include <tdefileiconview.h>
#include <tdefileitem.h>
#include <kmessagebox.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
#include <tqapplication.h>
#include <tqlayout.h>
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 09e7833e..e3d6f9f7 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -45,7 +45,7 @@
#include <kdebug.h>
#include <tdeio/netaccess.h>
#include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeconfigbase.h>
#include <tdeconfig.h>
diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp
index 1d1525cd..50566d5a 100644
--- a/lib/kofficeui/Kolinewidthaction.cpp
+++ b/lib/kofficeui/Kolinewidthaction.cpp
@@ -28,7 +28,7 @@
#include <tqlabel.h>
#include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index 0bbf4ff8..aec1aab2 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -23,7 +23,7 @@
#include <tqwhatsthis.h>
#include <tqtooltip.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
#include <kdebug.h>
diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp
index d0b81f62..c7287a72 100644
--- a/lib/kofficeui/tests/coloraction_test.cpp
+++ b/lib/kofficeui/tests/coloraction_test.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <tdetoolbar.h>
#include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <KoTooluButton.h>
#include <coloraction_test.h>
diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp
index c7b2a8b2..592e3856 100644
--- a/lib/kofficeui/tkcombobox.cpp
+++ b/lib/kofficeui/tkcombobox.cpp
@@ -24,7 +24,7 @@
#include <tqstyle.h>
#include <tqdrawutil.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
TKComboBox::TKComboBox(TQWidget* parent, const char* name)
: TQComboBox(false,parent,name)
diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp
index 72956275..9befb976 100644
--- a/lib/kofficeui/ttdetoolbarbutton.cpp
+++ b/lib/kofficeui/ttdetoolbarbutton.cpp
@@ -28,7 +28,7 @@
#include <tqstyle.h>
#include <tdeversion.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kiconeffect.h>
#include <kiconloader.h>
#include <kglobalsettings.h>
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index 688e1450..2bb6a039 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cc
@@ -24,7 +24,7 @@
#include <tqevent.h>
#include <tdeparts/event.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <tdeactionclasses.h>
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 13638119..22f81fe7 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -42,7 +42,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <tdeversion.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
namespace KoProperty {
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index aad5f0bc..07c97263 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -35,9 +35,9 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <kstyle.h>
+#include <tdestyle.h>
#include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#define BRANCHBOX_SIZE 9
diff --git a/lib/koproperty/test/main.cpp b/lib/koproperty/test/main.cpp
index dcebcaf5..4c21bff2 100644
--- a/lib/koproperty/test/main.cpp
+++ b/lib/koproperty/test/main.cpp
@@ -18,9 +18,9 @@
*/
#include "test.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
static const char description[] = "A test application for the KoProperty library";
diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp
index 06277aa4..236936e2 100644
--- a/lib/koproperty/test/test.cpp
+++ b/lib/koproperty/test/test.cpp
@@ -20,7 +20,7 @@
#include <tdemainwindow.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kiconloader.h>
#include <tqpixmap.h>
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index 2ce575ca..0b8d9ab5 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -33,7 +33,7 @@
#include <klocale.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqtimer.h>
#include <tqregexp.h>
diff --git a/lib/kotext/KoTextViewIface.cc b/lib/kotext/KoTextViewIface.cc
index 8338ecde..dec0e032 100644
--- a/lib/kotext/KoTextViewIface.cc
+++ b/lib/kotext/KoTextViewIface.cc
@@ -21,7 +21,7 @@
#include "KoTextView.h"
#include "KoTextParag.h"
#include "KoBorder.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <kdebug.h>
#include <KoVariable.h>
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 856c05f1..089b09d1 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -44,7 +44,7 @@
#include <tdeversion.h>
#include <kinstance.h>
#include <kcalendarsystem.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tqstringlist.h>
#include <tqcombobox.h>
diff --git a/lib/kotext/TDEFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp
index cf41b3b4..fdf7c568 100644
--- a/lib/kotext/TDEFontDialog_local.cpp
+++ b/lib/kotext/TDEFontDialog_local.cpp
@@ -41,7 +41,7 @@
#include <tqwhatsthis.h>
#include <tqtooltip.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcharsets.h>
#include <tdeconfig.h>
#include <kdialog.h>
diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp
index abb00a29..bbb3ebb9 100644
--- a/lib/kotext/kohyphen/kohyphen.cpp
+++ b/lib/kotext/kohyphen/kohyphen.cpp
@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
diff --git a/lib/kotext/kohyphen/kohyphentest.cpp b/lib/kotext/kohyphen/kohyphentest.cpp
index f756b421..0f083631 100644
--- a/lib/kotext/kohyphen/kohyphentest.cpp
+++ b/lib/kotext/kohyphen/kohyphentest.cpp
@@ -5,7 +5,7 @@
#include <tqstringlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kohyphen.h"
#include <kdebug.h>
diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp
index c4e59ffc..b19513e6 100644
--- a/lib/kotext/tests/kobordertest.cpp
+++ b/lib/kotext/tests/kobordertest.cpp
@@ -1,7 +1,7 @@
#include <KoBorder.h>
#include <KoZoomHandler.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <tqpainter.h>
#include <tqwidget.h>
#include <tqgrid.h>
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index c75d8c89..a0286646 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -1,6 +1,6 @@
//KoTextFormatter test (also for profiling purposes), GPL v2, David Faure <[email protected]>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index ae449a42..7b8fe2af 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -22,7 +22,7 @@
#include "../api/interpreter.h"
#include "wdgscriptsmanager.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <kmimetype.h>
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index a29c9676..ea870f95 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -24,7 +24,7 @@
#include <tqobjectlist.h>
#include <tqtooltip.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeversion.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
diff --git a/lib/kross/python/pythonscript.cpp b/lib/kross/python/pythonscript.cpp
index 8887e13d..5c2dec8b 100644
--- a/lib/kross/python/pythonscript.cpp
+++ b/lib/kross/python/pythonscript.cpp
@@ -23,7 +23,7 @@
#include "pythonsecurity.h"
#include "../main/scriptcontainer.h"
-//#include <kapplication.h>
+//#include <tdeapplication.h>
using namespace Kross::Python;
diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp
index 436d7a7a..ebb812f9 100644
--- a/lib/kross/runner/main.cpp
+++ b/lib/kross/runner/main.cpp
@@ -27,9 +27,9 @@
// KDE
#include <kinstance.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <ksharedptr.h>
// Kross
diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp
index 449116cb..90665a72 100644
--- a/lib/kross/test/main.cpp
+++ b/lib/kross/test/main.cpp
@@ -40,9 +40,9 @@
// KDE
#include <kinstance.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <ksharedptr.h>
// for std namespace
diff --git a/lib/store/tests/storage_test.cpp b/lib/store/tests/storage_test.cpp
index baef1b83..076f5b92 100644
--- a/lib/store/tests/storage_test.cpp
+++ b/lib/store/tests/storage_test.cpp
@@ -19,8 +19,8 @@
#include <tqfile.h>
#include <tqdir.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
#include <KoStore.h>
#include <kdebug.h>
diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp
index 30f756a8..bc7dec00 100644
--- a/lib/store/tests/storedroptest.cpp
+++ b/lib/store/tests/storedroptest.cpp
@@ -1,5 +1,5 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <KoStore.h>
#include <tqtextbrowser.h>
#include <tqstringlist.h>
diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index bf9b3994..82779c44 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -20,13 +20,13 @@
#include <tqfile.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kimageio.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <kglobal.h>
#include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc
index 9dd91a6e..b802985d 100644
--- a/tools/kthesaurus/main.cc
+++ b/tools/kthesaurus/main.cc
@@ -18,9 +18,9 @@
#include <tqstring.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kdatatool.h>
#include <kdebug.h>
#include <kglobal.h>
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index 698ea4c7..00fb732e 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -40,7 +40,7 @@
#include <tqwidget.h>
#include <tqvbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <tdeconfig.h>
#include <kcursor.h>
diff --git a/tools/thumbnail/kofficecreator.cpp b/tools/thumbnail/kofficecreator.cpp
index 59a5f9d3..281f0430 100644
--- a/tools/thumbnail/kofficecreator.cpp
+++ b/tools/thumbnail/kofficecreator.cpp
@@ -25,7 +25,7 @@
#include <tqimage.h>
#include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdefileitem.h>
#include <ktrader.h>
#include <klibloader.h>