diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-14 17:07:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-14 17:07:29 -0600 |
| commit | 3b6870c6e1177574772803b5b09416903ee40fc0 (patch) | |
| tree | 03b48b993d5dcf6f87b5f76824fd215f1ae98b67 | |
| parent | a5df607029e00ab0240203fc24083723a23fb720 (diff) | |
| download | koffice-3b6870c6e1177574772803b5b09416903ee40fc0.tar.gz koffice-3b6870c6e1177574772803b5b09416903ee40fc0.zip | |
Rename common header files for consistency with class renaming
269 files changed, 315 insertions, 315 deletions
diff --git a/chalk/chalkcolor/kis_colorspace_iface.cc b/chalk/chalkcolor/kis_colorspace_iface.cc index d2462c0c9..bde82ff3a 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 2356a8c4a..ef7acc5ef 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 a52cc8a45..2cc16e27e 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 f93899974..1a66318e5 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 220c716b4..c8afa80a3 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 33f59e5a7..592c1368f 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 276ff3dba..dca2b7c9a 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 acaddb7c5..e63fb48f6 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 bcb0bf030..edb089d45 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 66f66812b..48ca93956 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 09955e9e3..5e74c8fe8 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 dc083850b..059f3d3c7 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 2cb2a6063..dafb63dda 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 50af9898a..ae5a4a581 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 d58e4b4be..492548ef7 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 4fdd9f1f0..756ab60e1 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 487195ddf..1a0de3db3 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 ec3558b82..5585a9a97 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 6db5a21ad..6b3ea4632 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 895368761..a1f69b7fd 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 d8b8a537d..dd4b01290 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 bb95c6725..e8d4d0d6b 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 b27f98e55..efdb061a8 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 5a5c6439f..042a3c8ef 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 64c3de363..5b4b56a05 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 7ec09c97f..6d668f4a8 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 b1bdeb711..795eb92e0 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 ace659541..bb071ff2e 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 597840090..becda194c 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 62de92532..ea39dec28 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 28495ff43..41f38fc80 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 a212e0afc..589c1168a 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 dc0c5689d..5f4735a11 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 eb882e0bf..42143fa5e 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 d1c42111b..ec605aff6 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 21d321ca1..490787a8a 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 328f1518e..e63aca887 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 8ce557f62..957bda633 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 28477dd36..d4173bd32 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 6e96b804b..c136fd91f 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 e9852c61f..f5c4262a1 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 1bec3b5f4..cff62773f 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 98af42516..1d805a2a3 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 07957af9f..6a53ee95a 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 e77f58c7b..eb408d175 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 6f813b102..45eaf0bfb 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 70243ca5d..e52f85c5a 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 de5f7177c..e800820aa 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 f461a6f0f..98f173797 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 eac7cd6ff..a0da3ee46 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 8354b9ab1..6a8d201b8 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 d26087fe4..004b5cc3c 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 62c4d2a8a..68654cc6e 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 a5f76d322..3cd6a01dc 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 923b2deed..be32e432c 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 67d6aec03..a29638e6f 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 1261f27f7..bb2bc9850 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 9de952b36..8a22343a8 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 c93b68d60..25f9959f7 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 c293baaf2..aee04a230 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 9edc8b37d..32d5e2de0 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 3c7f30acf..a87b454b3 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 3434e6b55..a02c04ded 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 814dcc539..5f404eb33 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 38cd56225..faaa81d23 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 a64765306..85313c0ed 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 d5c9a72ab..e92d20f9b 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 5105b0f77..d31e47991 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 bc0083a97..2b23b22fc 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 30a354091..8730063f4 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 7f516542f..e0baf9431 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 f486053bd..6308fe43d 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 9bce7b5f7..a74878d25 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 ea9874d5a..2025be3bb 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 632e46d14..99bfb6ff0 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 807cd54e5..32775fc01 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 5c945a13b..cf96654ad 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 7f8da82fe..e171da847 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 0cdefae83..abf8b2f77 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 2d20e2070..a82f44dd9 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 95b14e676..5ce1bc849 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 06e3497d6..ca13e6c6e 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 c1bf80b38..5c31f63f9 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 63f72d87e..ac2ed1014 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 d9b5d884f..340576960 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 a4cdf54eb..7ced2d6f4 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 b38751698..9ab98f4a4 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 83b63cc8a..4445e9ec7 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 87f78c4ce..d1a3edfd2 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 176db0169..649c2fe97 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 1120acce7..3f0727b7f 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 c1fdb8615..72507c6c2 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 fc189198a..91dfee42b 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 052f149a1..f9fd3cd09 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 417efd050..dd629780d 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 49ebd9fde..1d81f9f8c 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 365609599..05c5f3ab5 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 56675be85..4b15b16d8 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 0d6634ab9..acd0d709b 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 870d6f243..f09f911f6 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 29b4c2ca6..2ce058707 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 b3ee1ce7f..cdc770d96 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 07cb71850..9bbe7a13d 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 7d06dd2e0..4288ef781 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 ef8df97b7..474dc98ad 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 0c60c5b7d..d8eb0dfc8 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 5783d11c1..c7d519ba7 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 e81e8d806..a1b03c687 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 d0db5f941..69ca66022 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 5d2a24fd5..cf6e5cc3b 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 8967258ba..6352f3348 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 c5c465602..2e49660d9 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 72292afc6..070ea2349 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 3c96cd09d..2bbe979ca 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 08ec0b189..642c2b3a1 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 afc9c98b8..c1754ef34 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 a0814f1f3..f0bc50c18 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 650e90a6d..0f39cb59e 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 85ee5ce67..3328e42fc 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 838fd5eac..8c86cfb52 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 fb0bd6298..d0099ffc4 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 d7429cf4c..24869f318 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 9e9b87c59..799294f6f 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 eeb87d316..88de40e8b 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 5ec6ed068..4aa82bec2 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 6adfc94a8..1917e8f3f 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 8fdac6801..9a36dfada 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 400fdd669..5730975ff 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 b7e98cd8b..70941c482 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 ac8c8bcd7..fa2a9bd49 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 dc2772077..4c773b747 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 c8d4a2843..b505d817d 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 53fc878b8..5d137adda 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 b93df9ccd..e9ab089f1 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 2caea7574..99397692e 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 c85e26712..26ba9a2e4 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 9d742905c..e80fa73cf 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 f8b2f78cf..181d34ae0 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 6381d76bf..6e761d062 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 351085a59..16b2f8aa3 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 a52f522b7..8e82a521a 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 d19b46504..223fcd563 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 9d84d94f0..870d3190a 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 534d69920..37b342e61 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 500c1b712..708bd28b6 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 78d77d0d6..747618c1c 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 61b890be5..dc43a8d9e 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 ecfd34f09..f405d81ad 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 772b8f376..46453c1c7 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 a7e298d64..a776cd3ee 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 e9a9e3327..dafd718d3 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 28bacafd7..a8b7baf14 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 fec4088be..73c94c8b5 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 8bb467a8f..36add001d 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 da47b4929..ad8966dd1 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 c7c04ae77..75af7b84b 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 c5bb8a9aa..53e8365e3 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 111a88e45..3094f58c8 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 5a6da29e9..4b09382a4 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 0089caf83..f98ddb0f9 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 a8f6ff828..23b121a25 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 bcf02ad9c..fec432589 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 d4503064d..098c7eb07 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 aa4d154a6..27b66cad0 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 acbdf7a78..91aeab493 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 25ff29630..16bdc58c4 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 8fa03726c..e5f45bd27 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 e4db5e915..f362f03d2 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 52b673966..bea860bf2 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 729d8587c..feac50f1c 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 25aba98c0..544ea0952 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 b358fd550..e5aa4c56c 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 36798a0a1..e07333fb6 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 e5a3d4f4f..ad0ee2519 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 e84e3c526..d09f5fee1 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 8283a4c56..1533650a4 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 fa9c13274..0b9b47768 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 361060c59..6af16fdf1 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 a9e5b3e7d..7b32b8730 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 01478ef2d..7cf470a9e 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 e9180d35c..51cdac64e 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 90e8537e7..6f2e23588 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 49c2d8877..6d1e2b909 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 f4bf8fedf..6f93acbab 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 2425fb1ce..4113d3411 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 8ebc978c3..6f0c8362e 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 a4374800c..e8f1df462 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 046f4c445..ba8071f9c 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 e60676392..cbf37f202 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 4b7f2a663..1fb76f460 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 b08fa858d..653587fc5 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 91cec3e47..44d81ebcd 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 9eb92a451..49ec24611 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 b9e20054f..fcbbba78a 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 f51a6e4ce..85b9797e0 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 2a3bffb0e..2fce26968 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 64d6aa5bf..b43dac6c0 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 3be6eb28b..dd5962781 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 0841092fb..b6c71ca1c 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 f2ea90a2e..dc4c169ed 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 45538e794..433efab3e 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 b9682fde3..6a52781c6 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 199cbd64b..b78a88da1 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 a38f94608..2a47f768c 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 602e5dc2e..f32c1b956 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 3ee962f8b..b93f5fce9 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 d61e405f7..14e8e059e 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 c90486e9c..55403d415 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 a81cf192f..640769c22 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 849aecf4b..d9b3b6f62 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 972d9a431..dcb3b197a 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 d9ce57068..4ae071870 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 e3b68fa97..845297ba9 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 f8263d8e8..e19c69ddd 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 ea88e8bb6..88e58636b 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 5f117c89a..930f30aee 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 ab814900d..4dcb836cc 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 24daac3f1..c9c221dc1 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 6d2cf3911..41f8ba700 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 f4385b38d..1e50694da 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 1014a66ef..39aff864a 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 0fd9723cc..c92adfd74 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 8591eb04a..aee6f6705 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 25fe00dc9..efa73850a 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 87a711f2d..158f107b5 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 75910944e..9762f292d 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 184dcefd4..292e16e9d 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 e4275d758..e0196fdf3 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 5a8c0d262..97905af4b 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 08b3fdaad..146831880 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 f0e163e0c..0ed86896c 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 b78b937c8..2964bcafd 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 b52b9f0a8..ae5449b9f 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 212d02605..b5baad998 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 6866e1766..8a2455bfb 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 e6ae509d9..f85e1937e 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 1329f8a9e..eda24051e 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 0c6abfaa8..5960c2e6f 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 e10fc78cf..047a701a2 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 09e7833e7..e3d6f9f76 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 1d1525cda..50566d5a2 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 0bbf4ff8d..aec1aab28 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 d0b81f622..c7287a720 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 c7b2a8b2a..592e3856a 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 729562757..9befb976f 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 688e1450f..2bb6a0393 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 13638119e..22f81fe7c 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 aad5f0bce..07c972638 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 dcebcaf5e..4c21bff2c 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 06277aa48..236936e2c 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 2ce575cad..0b8d9ab59 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 8338ecde6..dec0e0320 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 856c05f10..089b09d10 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 cf41b3b42..fdf7c568d 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 abb00a297..bbb3ebb98 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 f756b4216..0f083631e 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 c4e59ffc0..b19513e6f 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 c75d8c894..a02866460 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 <faure@kde.org> -#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 ae449a420..7b8fe2af0 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 a29c9676e..ea870f954 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 8887e13d9..5c2dec8ba 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 436d7a7aa..ebb812f99 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 449116cb6..90665a722 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 baef1b837..076f5b922 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 30f756a81..bc7dec00b 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 bf9b3994f..82779c445 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 9dd91a6e1..b802985d7 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 698ea4c72..00fb732e3 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 59a5f9d31..281f04308 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> |