Rename common header files for consistency with class renaming

12 years ago · 3b6870c6e1
parent a5df607029
commit 3b6870c6e1
269 changed files with 315 additions and 315 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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>

--- 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"
--- 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"
--- 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>
--- 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>
--- 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[] =
--- 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>

--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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");
--- 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"
--- 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>
--- 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>

--- 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>

--- 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>
--- 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>
--- 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>

--- 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>

--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>

--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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"
--- 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"
--- 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 )
--- 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>

--- 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>
--- 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"
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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"

--- 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>
--- 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 {

--- 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[] =
--- 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>
--- 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)
--- 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>

--- 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>
--- 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>
--- 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"

--- 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>
--- 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 =
--- 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>
--- 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;

--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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)
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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
--- 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>
--- 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>
--- 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>

--- 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>

--- 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>

--- 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>
--- 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>
--- 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>

--- 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"
--- 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>
--- 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"

--- 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"

--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>

--- 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>
--- 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;
--- 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>
--- 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>

--- 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"
--- 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>

--- 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_ )
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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
--- 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>
--- 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>

--- 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>
--- 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
--- 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>

--- 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 )
--- 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"
--- 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>
--- 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>
--- 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 )
--- 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>
--- 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"
--- 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>
--- 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 )
--- 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 )
--- 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>
--- 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"

--- 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_)
--- 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_ )
--- 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>

--- 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"
--- 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>

--- 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 )
--- 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 )
--- 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 )
--- 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 )
--- 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 )
--- 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>
--- 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 )
--- 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"
--- 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_ )
--- 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>
--- 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>


--- 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;

--- 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>
--- 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"
--- 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"
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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"
--- 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>

--- 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"
--- 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()
--- 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>

--- 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;

--- 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>
--- 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>
--- 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"
--- 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>

--- 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
--- 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>

--- 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>
--- 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"

--- 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>

--- 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"
--- 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>
--- 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>
--- 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"

--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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"

--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- 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 )
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>

--- 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)
--- 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>
--- 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>
--- 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 {

--- 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

--- 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";
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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 <faure@kde.org>

-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
--- 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>
--- 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>
--- 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;

--- 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
--- 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
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>