diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
| commit | 038b18b2df1da40baab30d62171766048a948095 (patch) | |
| tree | ba99d50e3e7b3f2eccb63ba71aea4f6163ede37a | |
| parent | d0baf2961c379b31587c6542625018c6177474d0 (diff) | |
| download | koffice-038b18b2.tar.gz koffice-038b18b2.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
194 files changed, 332 insertions, 332 deletions
diff --git a/Doxyfile.temp b/Doxyfile.temp index 3d582048..2adeea1d 100644 --- a/Doxyfile.temp +++ b/Doxyfile.temp @@ -66,8 +66,8 @@ INPUT = example \ FILE_PATTERNS = *.h RECURSIVE = YES #EXCLUDE = \ -#arts/tests tdeprint/tests tdehtml/java/tests kio/kfile/tests kioslave/http/kcookiejar/tests tdewallet/backend/tests \ -#tdecore/tests tdeui/tests kinit/tests kio/tests tdeparts/tests libtdemid/tests +#arts/tests tdeprint/tests tdehtml/java/tests tdeio/tdefile/tests tdeioslave/http/kcookiejar/tests tdewallet/backend/tests \ +#tdecore/tests tdeui/tests kinit/tests tdeio/tests tdeparts/tests libtdemid/tests # */tests doesn't seem to work :( # If the value of the INPUT tag contains directories, you can use the diff --git a/acinclude.m4 b/acinclude.m4 index 2ce29ad6..b3e5f8dd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1779,7 +1779,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2085,7 +2085,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2095,7 +2095,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc index c0dbde97..7bc7ec1c 100644 --- a/chalk/chalkcolor/kis_abstract_colorspace.cc +++ b/chalk/chalkcolor/kis_abstract_colorspace.cc @@ -19,7 +19,7 @@ #include <tqimage.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kis_abstract_colorspace.h" #include "kis_global.h" diff --git a/chalk/chalkcolor/kis_profile.h b/chalk/chalkcolor/kis_profile.h index 5f732188..e17c36f8 100644 --- a/chalk/chalkcolor/kis_profile.h +++ b/chalk/chalkcolor/kis_profile.h @@ -29,7 +29,7 @@ #include <tqvaluevector.h> #include <tqcstring.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kis_annotation.h> diff --git a/chalk/core/kis_brush.h b/chalk/core/kis_brush.h index 5ee21881..9e29c232 100644 --- a/chalk/core/kis_brush.h +++ b/chalk/core/kis_brush.h @@ -26,7 +26,7 @@ #include <tqimage.h> #include <tqvaluevector.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_resource.h" #include "kis_types.h" diff --git a/chalk/core/kis_gradient.h b/chalk/core/kis_gradient.h index cbb2eb00..1fff95da 100644 --- a/chalk/core/kis_gradient.h +++ b/chalk/core/kis_gradient.h @@ -27,7 +27,7 @@ #include <tqvaluevector.h> #include <tqcolor.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_resource.h" #include "kis_global.h" diff --git a/chalk/core/kis_imagepipe_brush.h b/chalk/core/kis_imagepipe_brush.h index b43b950a..075071b9 100644 --- a/chalk/core/kis_imagepipe_brush.h +++ b/chalk/core/kis_imagepipe_brush.h @@ -25,7 +25,7 @@ #include <tqmap.h> #include <tqstring.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_resource.h" #include "kis_brush.h" diff --git a/chalk/core/kis_palette.h b/chalk/core/kis_palette.h index 4528c2bc..2e842b52 100644 --- a/chalk/core/kis_palette.h +++ b/chalk/core/kis_palette.h @@ -22,7 +22,7 @@ #include <tqcolor.h> #include <tqvaluevector.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kpalette.h> #include "kis_types.h" diff --git a/chalk/core/kis_pattern.h b/chalk/core/kis_pattern.h index 6209a432..5c76d6c6 100644 --- a/chalk/core/kis_pattern.h +++ b/chalk/core/kis_pattern.h @@ -21,7 +21,7 @@ #ifndef __kis_pattern_h__ #define __kis_pattern_h__ -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_debug_areas.h" #include "kis_resource.h" diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc index 9295915c..dad56a3a 100644 --- a/chalk/core/kis_thread_pool.cc +++ b/chalk/core/kis_thread_pool.cc @@ -18,7 +18,7 @@ #include "kis_thread_pool.h" #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> KisThreadPool * KisThreadPool::m_singleton = 0; diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc index 8f793d4a..d8064615 100644 --- a/chalk/core/tiles/kis_tilemanager.cc +++ b/chalk/core/tiles/kis_tilemanager.cc @@ -31,7 +31,7 @@ #include <kstaticdeleter.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kis_tileddatamanager.h" #include "kis_tile.h" diff --git a/chalk/doc/selections b/chalk/doc/selections index 37d78702..ad2c30db 100644 --- a/chalk/doc/selections +++ b/chalk/doc/selections @@ -37,7 +37,7 @@ particular rect is rendered as a separate step in KisImage::renderToProjection. I like the mask type rendering, but someone else might want to provide an optional marque-rendering. -TODO: * enable kconfig option to select between renderings. +TODO: * enable tdeconfig option to select between renderings. Selected pixels can be mangled -- for instance, filled with a gradient, moved, made brighter, lighter or sprightlier, cut and diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index f95fba85..cdc06ace 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -29,7 +29,7 @@ #include <tqslider.h> #include <kcolorbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <knuminput.h> diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index b10dc873..ad92dc92 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -13,12 +13,12 @@ #include <kapplication.h> #include <klocale.h> #include <kimageio.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimagefilepreview.h> #include <kmessagebox.h> #include <kdebug.h> #include <kprinter.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <ksavefile.h> #include <ktempfile.h> diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc index 5cbbb85d..1394c521 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cc +++ b/chalk/plugins/viewplugins/scripting/scripting.cc @@ -25,7 +25,7 @@ #include <tqpoint.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kgenericfactory.h> #include <kiconloader.h> #include <kinstance.h> diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc index 3315177c..b01d3e31 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc +++ b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc @@ -34,7 +34,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <knuminput.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <KoFilterManager.h> diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc index 91d31d5b..375b16ee 100644 --- a/chalk/ui/kis_config.cc +++ b/chalk/ui/kis_config.cc @@ -18,7 +18,7 @@ #include <limits.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> #include <config.h> diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index c876ab77..1314e0e6 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -43,7 +43,7 @@ #include <kcolorbutton.h> #include <kcombobox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klineedit.h> #include <klocale.h> diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index ee8c65a7..2cb2a606 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -35,7 +35,7 @@ #include <kcommand.h> #include <kdebug.h> #include <kimageio.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kmimetype.h> #include <knotifyclient.h> diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index 95a99bd5..8997af11 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -31,7 +31,7 @@ #include <klocale.h> #include <kglobalsettings.h> #include <kaccelmanager.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kis_paintop_registry.h> diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index 42c15aca..398c3b8a 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -38,7 +38,7 @@ #include <tqtimer.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index 5511ae09..2719fab2 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -35,7 +35,7 @@ #include <tqtimer.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index de34e26a..db24209b 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -48,7 +48,7 @@ #include <kaction.h> #include <kcolordialog.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> #include <knotifyclient.h> diff --git a/configure.in b/configure.in index 1cbe7208..bd9118ed 100644 --- a/configure.in +++ b/configure.in @@ -2224,11 +2224,11 @@ AC_CONFIG_FILES([ servicetypes/Makefile ]) AC_CONFIG_FILES([ templates/Makefile ]) AC_CONFIG_FILES([ tools/Makefile ]) AC_CONFIG_FILES([ tools/converter/Makefile ]) -AC_CONFIG_FILES([ tools/kfile-plugins/Makefile ]) -AC_CONFIG_FILES([ tools/kfile-plugins/abiword/Makefile ]) -AC_CONFIG_FILES([ tools/kfile-plugins/gnumeric/Makefile ]) -AC_CONFIG_FILES([ tools/kfile-plugins/koffice/Makefile ]) -AC_CONFIG_FILES([ tools/kfile-plugins/ooo/Makefile ]) +AC_CONFIG_FILES([ tools/tdefile-plugins/Makefile ]) +AC_CONFIG_FILES([ tools/tdefile-plugins/abiword/Makefile ]) +AC_CONFIG_FILES([ tools/tdefile-plugins/gnumeric/Makefile ]) +AC_CONFIG_FILES([ tools/tdefile-plugins/koffice/Makefile ]) +AC_CONFIG_FILES([ tools/tdefile-plugins/ooo/Makefile ]) AC_CONFIG_FILES([ tools/kthesaurus/Makefile ]) AC_CONFIG_FILES([ tools/quickprint/Makefile ]) AC_CONFIG_FILES([ tools/spell/Makefile ]) diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index 0fe8cf55..bb95c672 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -33,7 +33,7 @@ #include <kapplication.h> #include <klocale.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqcolor.h> diff --git a/filters/chalk/gmagick/kis_image_magick_converter.h b/filters/chalk/gmagick/kis_image_magick_converter.h index 1c193e8c..28b4ce30 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.h +++ b/filters/chalk/gmagick/kis_image_magick_converter.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include <tqvaluevector.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_types.h" #include "kis_global.h" diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc index 87289fbf..b27f98e5 100644 --- a/filters/chalk/jpeg/kis_jpeg_converter.cc +++ b/filters/chalk/jpeg/kis_jpeg_converter.cc @@ -33,7 +33,7 @@ extern "C" { #include <KoDocumentInfo.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kis_abstract_colorspace.h> #include <kis_colorspace_factory_registry.h> diff --git a/filters/chalk/jpeg/kis_jpeg_converter.h b/filters/chalk/jpeg/kis_jpeg_converter.h index 567204ee..da01be8b 100644 --- a/filters/chalk/jpeg/kis_jpeg_converter.h +++ b/filters/chalk/jpeg/kis_jpeg_converter.h @@ -28,7 +28,7 @@ extern "C" { #include <tqvaluevector.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kis_progress_subject.h> diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index 52c662a9..64c3de36 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -32,7 +32,7 @@ #include <kapplication.h> #include <klocale.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqcolor.h> diff --git a/filters/chalk/magick/kis_image_magick_converter.h b/filters/chalk/magick/kis_image_magick_converter.h index 1c193e8c..28b4ce30 100644 --- a/filters/chalk/magick/kis_image_magick_converter.h +++ b/filters/chalk/magick/kis_image_magick_converter.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include <tqvaluevector.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_types.h" #include "kis_global.h" diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp index 7eac5ef4..7ec09c97 100644 --- a/filters/chalk/pdf/kis_pdf_import.cpp +++ b/filters/chalk/pdf/kis_pdf_import.cpp @@ -35,7 +35,7 @@ #include <knuminput.h> #include <kpassdlg.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> // koffice's headers #include <KoFilterChain.h> diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc index f8ccd92b..b1bdeb71 100644 --- a/filters/chalk/png/kis_png_converter.cc +++ b/filters/chalk/png/kis_png_converter.cc @@ -30,7 +30,7 @@ #include <KoDocumentInfo.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kis_abstract_colorspace.h> #include <kis_colorspace_factory_registry.h> diff --git a/filters/chalk/png/kis_png_converter.h b/filters/chalk/png/kis_png_converter.h index 3877b692..4324f979 100644 --- a/filters/chalk/png/kis_png_converter.h +++ b/filters/chalk/png/kis_png_converter.h @@ -24,7 +24,7 @@ #include <tqvaluevector.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kis_progress_subject.h> diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index d030085e..1af33fd7 100644 --- a/filters/chalk/raw/kis_raw_import.cpp +++ b/filters/chalk/raw/kis_raw_import.cpp @@ -41,7 +41,7 @@ #include <tqtimer.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <kgenericfactory.h> #include <kdialogbase.h> diff --git a/filters/chalk/tiff/kis_tiff_converter.cc b/filters/chalk/tiff/kis_tiff_converter.cc index 7a0f5c5e..62de9253 100644 --- a/filters/chalk/tiff/kis_tiff_converter.cc +++ b/filters/chalk/tiff/kis_tiff_converter.cc @@ -29,7 +29,7 @@ #include <kapplication.h> #include <KoDocumentInfo.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kis_abstract_colorspace.h> #include <kis_colorspace_factory_registry.h> diff --git a/filters/chalk/tiff/kis_tiff_converter.h b/filters/chalk/tiff/kis_tiff_converter.h index 86b070fb..010ee3b7 100644 --- a/filters/chalk/tiff/kis_tiff_converter.h +++ b/filters/chalk/tiff/kis_tiff_converter.h @@ -25,7 +25,7 @@ #include <tqvaluevector.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kis_progress_subject.h> diff --git a/filters/chalk/tiff/kis_tiff_reader.h b/filters/chalk/tiff/kis_tiff_reader.h index 2ab573dd..244978df 100644 --- a/filters/chalk/tiff/kis_tiff_reader.h +++ b/filters/chalk/tiff/kis_tiff_reader.h @@ -27,7 +27,7 @@ #include <tiffio.h> // #include <tqvaluevector.h> -// #include <kio/job.h> +// #include <tdeio/job.h> // #include <kis_progress_subject.h> #include <kis_paint_device.h> diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index cf923207..28477dd3 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -34,7 +34,7 @@ #include <tqtextcodec.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kcombobox.h> diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index e27aee7a..6e96b804 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -39,7 +39,7 @@ #include <tqvalidator.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kdebug.h> #include <kcombobox.h> diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc index 00b097d6..9c6e0432 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc @@ -29,12 +29,12 @@ #include <kapplication.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <krecentdocument.h> #include <ktempfile.h> #include <kurlrequester.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <KoFilterManager.h> #include <kcombobox.h> diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc index 5f33dfc0..cbde5f5d 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cc +++ b/filters/kword/latex/export/kwordlatexexportdia.cc @@ -29,12 +29,12 @@ #include <kapplication.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <krecentdocument.h> #include <ktempfile.h> #include <kurlrequester.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <KoFilterManager.h> #include <kcombobox.h> diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index 76805f9b..aa16c723 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -27,12 +27,12 @@ #include <kapplication.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kstandarddirs.h> #include <krecentdocument.h> #include <ktempfile.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <KoFilterManager.h> #include <KoStoreDevice.h> diff --git a/filters/xsltfilter/import/xsltimportdia.h b/filters/xsltfilter/import/xsltimportdia.h index 763f4104..1261f27f 100644 --- a/filters/xsltfilter/import/xsltimportdia.h +++ b/filters/xsltfilter/import/xsltimportdia.h @@ -21,7 +21,7 @@ #define __XSLTIMPORTDIA_H__ #include "kapplication.h" -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <KoStore.h> #include "xsltdialog.h" diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc index 8c41704c..ca81d1b1 100644 --- a/karbon/dialogs/vconfiguredlg.cc +++ b/karbon/dialogs/vconfiguredlg.cc @@ -29,7 +29,7 @@ #include <tqgrid.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialogbase.h> #include <klocale.h> #include <knuminput.h> diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc index 672000ae..ff17fdfd 100644 --- a/karbon/dockers/vstyledocker.cc +++ b/karbon/dockers/vstyledocker.cc @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <KoMainWindow.h> #include <KoFilterManager.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "karbon_part.h" #include "karbon_view.h" diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index 53cb44de..47418a69 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 23a31b08..864f695d 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -38,7 +38,7 @@ #include <KoMainWindow.h> #include <KoFilterManager.h> #include <kstatusbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstdaction.h> #include <KoContextCelp.h> #include <KoUnitWidgets.h> diff --git a/karbon/plugins/imagetool/vimagetool.cc b/karbon/plugins/imagetool/vimagetool.cc index 40823e99..bc8c2001 100644 --- a/karbon/plugins/imagetool/vimagetool.cc +++ b/karbon/plugins/imagetool/vimagetool.cc @@ -20,7 +20,7 @@ #include <tqcursor.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include "vimagetool.h" diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc index 4abbb379..11421fcc 100644 --- a/karbon/tools/vpatterntool.cc +++ b/karbon/tools/vpatterntool.cc @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <koIconChooser.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <karbon_factory.h> diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc index 39ca1aae..798e27d5 100644 --- a/kchart/kchartBackgroundPixmapConfigPage.cc +++ b/kchart/kchartBackgroundPixmapConfigPage.cc @@ -23,10 +23,10 @@ #include <klocale.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kdebug.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <kstringhandler.h> #include <tqcombobox.h> diff --git a/kchart/kchart_part.h b/kchart/kchart_part.h index 8a50ad47..2eb4a75f 100644 --- a/kchart/kchart_part.h +++ b/kchart/kchart_part.h @@ -6,7 +6,7 @@ #define KCHART_PART_H -#include <kconfig.h> +#include <tdeconfig.h> #include <koChart.h> #include "kchart_params.h" diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc index cb94050c..2d1f0799 100644 --- a/kchart/kchart_view.cc +++ b/kchart/kchart_view.cc @@ -21,7 +21,7 @@ #include <ktempfile.h> #include <dcopobject.h> #include <kxmlguifactory.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <KoTemplateCreateDia.h> diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp index dbea9737..a5f7da07 100644 --- a/kexi/core/kexidbshortcutfile.cpp +++ b/kexi/core/kexidbshortcutfile.cpp @@ -22,7 +22,7 @@ #include <kexidb/connectiondata.h> #include <kexiutils/utils.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqstringlist.h> diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp index ce9dcbe1..1c9e17c3 100644 --- a/kexi/core/kexipartmanager.cpp +++ b/kexi/core/kexipartmanager.cpp @@ -21,7 +21,7 @@ #include <klibloader.h> #include <ktrader.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeparts/componentfactory.h> #include "kexipartmanager.h" diff --git a/kexi/core/kexiprojectconnectiondata.cpp b/kexi/core/kexiprojectconnectiondata.cpp index 7a3cc0cc..17ce3d89 100644 --- a/kexi/core/kexiprojectconnectiondata.cpp +++ b/kexi/core/kexiprojectconnectiondata.cpp @@ -28,7 +28,7 @@ #include <kglobal.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp index 9b9203c8..dd877873 100644 --- a/kexi/core/kexiprojectdata.cpp +++ b/kexi/core/kexiprojectdata.cpp @@ -29,7 +29,7 @@ #include <kglobal.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp index f8708b33..a4cdf54e 100644 --- a/kexi/core/kexitemplateloader.cpp +++ b/kexi/core/kexitemplateloader.cpp @@ -22,7 +22,7 @@ #include <kstandarddirs.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 90cdebc7..98582bfc 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -450,7 +450,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem - not convenient as user is forced to enlarge the window by hand (settings are stored though) - add "File->Save All" action - add settings dialog, TDEConfigXT based simple version - + about:config-like using kconfigeditor http://extragear.kde.org/apps/kconfigeditor/ + + about:config-like using tdeconfigeditor http://extragear.kde.org/apps/tdeconfigeditor/ (possible reuse of koproperty) TODO: add SharedAction::setVisible() and use QMenuData::setItemVisible() where needed diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 5fafc6ec..f90efddd 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -33,7 +33,7 @@ #include <tqlabel.h> #include <tqpainter.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kcommand.h> #include <kaccelmanager.h> diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 501d2769..f9849c35 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -39,7 +39,7 @@ #include <kxmlguiclient.h> #include <kmainwindow.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstyle.h> #include <kactionclasses.h> #include <kapplication.h> diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index 64f9e800..e6c09927 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -34,7 +34,7 @@ #include <kstdaction.h> #include <kapplication.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klibloader.h> #include <kmessagebox.h> diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index eeeec6dc..a6b24574 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -34,7 +34,7 @@ #include <kstdaction.h> #include <kapplication.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klibloader.h> #include <kmessagebox.h> diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp index ce6a3923..af82b583 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <ktempfile.h> #include <kmessagebox.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqfileinfo.h> #include <tqdir.h> diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index b3d36240..ce29b32e 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -41,7 +41,7 @@ #include <kaction.h> #include <klocale.h> #include <kstdaccel.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> #include <kkeydialog.h> @@ -57,7 +57,7 @@ #include <ktabwidget.h> #include <kimageio.h> #include <khelpmenu.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <krecentdocument.h> #include <kexidb/connection.h> diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp index 99ec8a31..7ca0ceb4 100644 --- a/kexi/main/kexinewstuff.cpp +++ b/kexi/main/kexinewstuff.cpp @@ -24,7 +24,7 @@ #include <tqdir.h> #include <kaction.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <tdeversion.h> @@ -33,7 +33,7 @@ KexiNewStuff::KexiNewStuff(TQWidget *parent) : KNewStuff( "kexi/template" #if KDE_IS_VERSION(3,3,0) - , "http://download.kde.org/khotnewstuff/kexi-providers.xml" + , "http://download.kde.org/tdehotnewstuff/kexi-providers.xml" #endif , parent) { diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index abbfac21..22b09eef 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -33,7 +33,7 @@ #include <kmimetype.h> #include <klocale.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurlcombobox.h> #include <ktoolbar.h> #include <kpopupmenu.h> diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 414fcfcd..3e59d937 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -37,7 +37,7 @@ #include <kmimetype.h> #include <klocale.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <kurlcombobox.h> #include <kmessagebox.h> diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index f6ded39a..5c281256 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -44,13 +44,13 @@ #include <kjanuswidget.h> #include <kglobalsettings.h> #include <ktextedit.h> -#include <kfileiconview.h> -#include <kfileitem.h> +#include <tdefileiconview.h> +#include <tdefileitem.h> #include <kmessagebox.h> #include <kapplication.h> #include <kmimetype.h> #include <ktextbrowser.h> -#include <kconfig.h> +#include <tdeconfig.h> #ifdef KEXI_SHOW_UNIMPLEMENTED #define KEXI_STARTUP_SHOW_TEMPLATES diff --git a/kexi/main/startup/KexiStartupDialog.h b/kexi/main/startup/KexiStartupDialog.h index 9ae922c6..4d1d342f 100644 --- a/kexi/main/startup/KexiStartupDialog.h +++ b/kexi/main/startup/KexiStartupDialog.h @@ -23,8 +23,8 @@ #include <kdialogbase.h> #include <kicondialog.h> #include <kiconview.h> -#include <kfileiconview.h> -#include <kfiledialog.h> +#include <tdefileiconview.h> +#include <tdefiledialog.h> #include <tqlabel.h> #include <tqsplitter.h> diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 71e4a317..1bccbf1e 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -32,7 +32,7 @@ #include <klocale.h> #include <kdebug.h> #include <kmimetype.h> -#include <kfile.h> +#include <tdefile.h> #include <kurlcombobox.h> KexiStartupFileDialog::KexiStartupFileDialog( diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h index 1b99391d..e27f200d 100644 --- a/kexi/main/startup/KexiStartupFileDialog.h +++ b/kexi/main/startup/KexiStartupFileDialog.h @@ -20,7 +20,7 @@ #ifndef _KexiStartupFileDialog_h_ #define _KexiStartupFileDialog_h_ -#include <kfiledialog.h> +#include <tdefiledialog.h> #ifdef TQ_WS_WIN # include "KexiStartupFileDialogBase_win.h" diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp index 24e9707e..ef8df97b 100644 --- a/kexi/migration/importoptionsdlg.cpp +++ b/kexi/migration/importoptionsdlg.cpp @@ -27,7 +27,7 @@ #include <tqcheckbox.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <klocale.h> #include <kglobal.h> diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 9d8017d8..911c3374 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <kcombobox.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kexiviewbase.h> #include <keximainwindow.h> diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index dd52f9f5..97d36055 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -34,7 +34,7 @@ #include <kpopupmenu.h> #include <klocale.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index eb1f1897..941f8eda 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -45,7 +45,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> #include <kglobalsettings.h> diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp index 21c8891f..08ec0b18 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <klocale.h> #include <kglobal.h> diff --git a/kexi/plugins/macros/kexipart/keximacropart.cpp b/kexi/plugins/macros/kexipart/keximacropart.cpp index ad9babd3..1459fffc 100644 --- a/kexi/plugins/macros/kexipart/keximacropart.cpp +++ b/kexi/plugins/macros/kexipart/keximacropart.cpp @@ -31,7 +31,7 @@ #include <kexipartitem.h> //#include <kxmlguiclient.h> //#include <kexidialogbase.h> -//#include <kconfig.h> +//#include <tdeconfig.h> //#include <kdebug.h> #include "../lib/manager.h" diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index 3dd90a68..0b096b82 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -34,7 +34,7 @@ #include <kexipartitem.h> #include <kxmlguiclient.h> #include <kexidialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> /// \internal diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 96a50350..472dd25c 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -38,7 +38,7 @@ #include <kmessagebox.h> #include <klineedit.h> #include <kimageeffect.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kexi.h> #include <kexipart.h> diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index c490111e..404bc746 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdeversion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 7316caeb..07a3f4ab 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdeversion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index c03d16e2..f3224c7e 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kcombobox.h> #include <kicondialog.h> #include <klineedit.h> diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 426edf71..a3ad0d5d 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdeversion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <kexidb/tableschema.h> diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 3502e15d..43ff7331 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -48,8 +48,8 @@ #include <kurl.h> #include <karrowbutton.h> #include <klocale.h> -#include <kfiledialog.h> -#include <kio/job.h> +#include <tdefiledialog.h> +#include <tdeio/job.h> #include <kglobal.h> #include <kiconloader.h> #include <kpopupmenu.h> diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index aeeec86d..30ecab17 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -22,7 +22,7 @@ #include <kactioncollection.h> #include <klocale.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc index 77152c45..e324c063 100644 --- a/kformula/kformula_factory.cc +++ b/kformula/kformula_factory.cc @@ -5,7 +5,7 @@ #include <kinstance.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kstandarddirs.h> #include <klocale.h> diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index a731869f..1245d707 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -72,7 +72,7 @@ #include <kmenubar.h> #include <kiconloader.h> #include <khelpmenu.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <KoTemplateChooseDia.h> #include <KoFilterManager.h> #include <KoStoreDevice.h> diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index ad378bf0..fd465151 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -43,7 +43,7 @@ #include <tqstringlist.h> #include <tqstrlist.h> #include <tqimage.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdialogbase.h> #include <kaction.h> diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp index 52cbb4c4..158a4415 100644 --- a/kivio/kiviopart/kiviostencilsetinstaller.cpp +++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <kurlrequester.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <kstandarddirs.h> #include <ktar.h> diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 3c8640ee..abd7eaa2 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -33,7 +33,7 @@ #include <kapplication.h> #include <ktempfile.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kplato/kptconfig.cc b/kplato/kptconfig.cc index 969f46ad..358b5797 100644 --- a/kplato/kptconfig.cc +++ b/kplato/kptconfig.cc @@ -21,7 +21,7 @@ #include "kptfactory.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> namespace KPlato diff --git a/kplato/kptconfigbehaviorpanel.cc b/kplato/kptconfigbehaviorpanel.cc index 45cbf64a..fe8d8e5d 100644 --- a/kplato/kptconfigbehaviorpanel.cc +++ b/kplato/kptconfigbehaviorpanel.cc @@ -29,7 +29,7 @@ #include <kdatetimewidget.h> #include <klocale.h> #include <kcommand.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc index 7ff06084..7b0dbd55 100644 --- a/kplato/kptpart.cc +++ b/kplato/kptpart.cc @@ -34,7 +34,7 @@ #include <tqfileinfo.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index f88c0c20..edf1019d 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -35,11 +35,11 @@ #include <kstandarddirs.h> #include <kurl.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kglobal.h> #include <kdesktopfile.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/kplato/kptview.cc b/kplato/kptview.cc index d4a84e68..8b669252 100644 --- a/kplato/kptview.cc +++ b/kplato/kptview.cc @@ -59,7 +59,7 @@ #include <kstandarddirs.h> #include <kdesktopfile.h> #include <kcommand.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "kptview.h" #include "kptaccountsview.h" diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index d8eb9f20..a6985239 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -36,7 +36,7 @@ #include <kcolorbutton.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kbuttonbox.h> #include <kurlrequester.h> diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp index b48d5b43..0bd3ce40 100644 --- a/kpresenter/KPrBgSpellCheck.cpp +++ b/kpresenter/KPrBgSpellCheck.cpp @@ -31,7 +31,7 @@ using namespace KSpell2; #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> KPrBgSpellCheck::KPrBgSpellCheck(KPrDocument *_doc) diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index dff09c73..8c1d244c 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -50,10 +50,10 @@ #include <kcursor.h> #include <kmessagebox.h> #include <tdemultipledrag.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> #include <kurldrag.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <KoParagCounter.h> #include <KoPoint.h> diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 5ef69958..e6e706cc 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <KoUnitWidgets.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialogbase.h> #include <kiconloader.h> #include <knuminput.h> @@ -71,7 +71,7 @@ #include <tdeversion.h> #include <kurlrequesterdlg.h> #include <klistview.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <KoEditPath.h> #include <tdespell2/configwidget.h> diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index 4a8083a9..d4503064 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -59,12 +59,12 @@ #include <kurldrag.h> #include <ktempfile.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <kprocess.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <KoTemplateChooseDia.h> #include <KoRuler.h> diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index c40059b5..b65b724b 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -46,7 +46,7 @@ #include <kurlrequester.h> #include <kurl.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<KPrObject>& _objs, KPrView *_view ) diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp index c2db00b4..1cd4d9ff 100644 --- a/kpresenter/KPrImportStyleDia.cpp +++ b/kpresenter/KPrImportStyleDia.cpp @@ -29,7 +29,7 @@ #include "KPrImportStyleDia.h" #include <KoStore.h> #include <tqfile.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <tqlabel.h> #include "KPrTextObject.h" diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index 7386bceb..e4db5e91 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -30,7 +30,7 @@ #include "KPrCanvas.h" #include "KPrPage.h" -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <ktempfile.h> #include <tqdir.h> diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp index 553a1df1..88d1c9ac 100644 --- a/kpresenter/KPrSlideTransitionDia.cpp +++ b/kpresenter/KPrSlideTransitionDia.cpp @@ -21,7 +21,7 @@ #include "KPrSlideTransitionDia.h" -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <knuminput.h> #include <kstandarddirs.h> diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index 859c0c7b..f1306594 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -52,7 +52,7 @@ #include <kiconloader.h> #include <kurl.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> KPrEffectPreview::KPrEffectPreview( TQWidget *parent, KPrDocument *_doc, KPrView *_view ) diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index a59b7a1a..e932bcdd 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -64,11 +64,11 @@ #include <KoCreateStyleDia.h> #include <dcopclient.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kstdaction.h> #include <kapplication.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "KPrView.h" #include "KPrDocument.h" @@ -78,7 +78,7 @@ #include <klocale.h> #include <kcolordialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kfontdialog.h> #include <kglobal.h> #include <kimageio.h> diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 2fbb7336..d87a82c4 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -56,7 +56,7 @@ #include <kdebug.h> #include <klocale.h> #include <kcolorbutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kbuttonbox.h> #include <ksimpleconfig.h> @@ -71,7 +71,7 @@ #include <knuminput.h> #include <kcombobox.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kdialog.h> #include "KoDocumentInfo.h" diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc index 6cd77574..b08fa858 100644 --- a/kspread/dialogs/kspread_dlg_csv.cc +++ b/kspread/dialogs/kspread_dlg_csv.cc @@ -35,7 +35,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cc index f4e03269..88496387 100644 --- a/kspread/dialogs/kspread_dlg_list.cc +++ b/kspread/dialogs/kspread_dlg_list.cc @@ -27,7 +27,7 @@ #include <tqpushbutton.h> #include <kbuttonbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index a64f2d69..b26e2816 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -32,7 +32,7 @@ #include <tqvgroupbox.h> #include <tqwhatsthis.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstatusbar.h> #include <knuminput.h> #include <tdespell.h> diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index 5ee35bb2..7292b25b 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -41,7 +41,7 @@ #include <tqwidget.h> #include <tqvbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kspread/kspread_autofill.cc b/kspread/kspread_autofill.cc index 8927d360..e110e1ad 100644 --- a/kspread/kspread_autofill.cc +++ b/kspread/kspread_autofill.cc @@ -32,7 +32,7 @@ #include <tqregexp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "kspread_doc.h" diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index f3c78e9f..09611b95 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -40,7 +40,7 @@ #include <kstandarddirs.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <ksconfig.h> #include <ktempfile.h> diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index 664edf4e..d709c6c0 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -50,7 +50,7 @@ #include <dcopclient.h> #include <dcopref.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kfind.h> #include <kfinddialog.h> diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index 7733cedf..c74c2f47 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -33,7 +33,7 @@ #include <kglobalsettings.h> #include <tqstyle.h> #include <kdialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include "kcalc.h" diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 807d62b1..134ab039 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -11,12 +11,12 @@ #include <kaction.h> #include <kstdaction.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfile.h> #include <kglobal.h> #include <kiconloader.h> #include <tqwidget.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <KoStore.h> diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index 2b5cc63b..e5c2f555 100644 --- a/kugar/part/kugar_view.cpp +++ b/kugar/part/kugar_view.cpp @@ -11,7 +11,7 @@ #include <kaction.h> #include <kstdaction.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfile.h> #include <kglobal.h> #include <kiconloader.h> diff --git a/kword/KWBgSpellCheck.cpp b/kword/KWBgSpellCheck.cpp index 53e74d02..7b352e09 100644 --- a/kword/KWBgSpellCheck.cpp +++ b/kword/KWBgSpellCheck.cpp @@ -31,7 +31,7 @@ using namespace KSpell2; #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 3bf00e2b..27f1320f 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -58,7 +58,7 @@ #include <tdemultipledrag.h> #include <kurl.h> #include <kurldrag.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmimetype.h> #include <assert.h> diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index e7aaff94..701dc900 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <klocale.h> #include <KoUnitWidgets.h> @@ -66,7 +66,7 @@ using namespace KSpell2; #include <kglobalsettings.h> #include <kglobal.h> #include <kurlrequesterdlg.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqtabwidget.h> #include <keditlistbox.h> #include <KoGlobal.h> diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index 93ec0334..cb1f40b5 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -30,7 +30,7 @@ #include <KoStore.h> #include <tqfile.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index 1194b052..9aad5b5b 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <KoPicture.h> #include <KoPictureFilePreview.h> diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index f219b086..d161ccf7 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 0b7f6c64..068e0da6 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -104,10 +104,10 @@ #include <kaccelgen.h> #include <kcolordialog.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kinputdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> #include <tdeparts/event.h> #include <kstandarddirs.h> diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp index 14222bf0..2f0c1a73 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp @@ -23,7 +23,7 @@ #include <klineedit.h> #include <kdebug.h> #include <tqlayout.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kpushbutton.h> #include <klineeditdlg.h> #include <kiconloader.h> diff --git a/lib/kformula/contextstyle.h b/lib/kformula/contextstyle.h index edf9cefa..1359f896 100644 --- a/lib/kformula/contextstyle.h +++ b/lib/kformula/contextstyle.h @@ -29,7 +29,7 @@ #include <tqvaluestack.h> //KDE Include -#include <kconfig.h> +#include <tdeconfig.h> #include <KoTextZoomHandler.h> //Formula include diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc index 94f3c241..8136965c 100644 --- a/lib/kformula/fontstyle.cc +++ b/lib/kformula/fontstyle.cc @@ -26,8 +26,8 @@ #include <kstaticdeleter.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> #include <kmessagebox.h> #include "fontstyle.h" diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index a803dbc2..3152c26b 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -34,7 +34,7 @@ //#include <algorithm> #include <kcolorbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> #include <kfontdialog.h> diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index 3cee9f0c..d541a4c5 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -29,7 +29,7 @@ #include <kaction.h> #include <kcommand.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <KoCommandHistory.h> //#include "KoCommandHistory.h" #include "kformuladefs.h" diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc index 19b534a0..ed5bb108 100644 --- a/lib/kformula/main.cc +++ b/lib/kformula/main.cc @@ -19,7 +19,7 @@ #include <kcmdlineargs.h> #include <kcommand.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "elementtype.h" #include "kformulacommand.h" diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc index 83de81c9..a9ca0641 100644 --- a/lib/kformula/symboltable.cc +++ b/lib/kformula/symboltable.cc @@ -26,7 +26,7 @@ #include <tqtextstream.h> #include <tqfontmetrics.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 8fb84589..91cdb4ad 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -34,10 +34,10 @@ #include <klocale.h> #include <klistview.h> #include <kpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> -#include <kfileitem.h> -#include <kio/previewjob.h> +#include <tdefileitem.h> +#include <tdeio/previewjob.h> #include <kdebug.h> #include <ktextbrowser.h> #include <kapplication.h> diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index b3e9a7b6..c657ee32 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -38,10 +38,10 @@ #include <kapplication.h> #include <kdebug.h> #include <tdeversion.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kiconloader.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <kmimetype.h> diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index eafda4b5..7bdc34e3 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -27,7 +27,7 @@ #include <KoStoreDevice.h> #include <KoXmlWriter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/lib/kofficecore/KoDocumentInfo.h b/lib/kofficecore/KoDocumentInfo.h index b113e75e..f6467768 100644 --- a/lib/kofficecore/KoDocumentInfo.h +++ b/lib/kofficecore/KoDocumentInfo.h @@ -23,7 +23,7 @@ #include <tqobject.h> #include <tqmap.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <koffice_export.h> class TQString; diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 9656aa84..1b1c98a8 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -20,7 +20,7 @@ #include "KoFileDialog.h" #include "KoDocument.h" -#include <kfilefiltercombo.h> +#include <tdefilefiltercombo.h> #include <klocale.h> #include <kdiroperator.h> #include <kdebug.h> diff --git a/lib/kofficecore/KoFileDialog.h b/lib/kofficecore/KoFileDialog.h index f419320c..c48169a3 100644 --- a/lib/kofficecore/KoFileDialog.h +++ b/lib/kofficecore/KoFileDialog.h @@ -21,7 +21,7 @@ #ifndef KOFILEDIALOG_H #define KOFILEDIALOG_H -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqvaluevector.h> /** diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index ccb25828..483ff683 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -39,7 +39,7 @@ #include <kapplication.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kkeydialog.h> #include <kedittoolbar.h> #include <kprogress.h> diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h index d7727025..6310deda 100644 --- a/lib/kofficecore/KoMainWindow.h +++ b/lib/kofficecore/KoMainWindow.h @@ -22,7 +22,7 @@ #define __ko_main_window_h__ #include <tdeparts/mainwindow.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <koffice_export.h> #include "KoDocument.h" diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index a8fa0f93..5d23b113 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -30,7 +30,7 @@ #include <tqpen.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinstance.h> #include <kpushbutton.h> #include <kiconloader.h> diff --git a/lib/kofficecore/KoPicture.cpp b/lib/kofficecore/KoPicture.cpp index 2dd6f730..58ef2fbf 100644 --- a/lib/kofficecore/KoPicture.cpp +++ b/lib/kofficecore/KoPicture.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "KoPictureKey.h" #include "KoPictureBase.h" diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp index 1d476f74..ff30802e 100644 --- a/lib/kofficecore/KoPictureBase.cpp +++ b/lib/kofficecore/KoPictureBase.cpp @@ -23,7 +23,7 @@ #include <KoXmlWriter.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kmdcodec.h> diff --git a/lib/kofficecore/KoPictureShared.cpp b/lib/kofficecore/KoPictureShared.cpp index 6bc69345..57d95f65 100644 --- a/lib/kofficecore/KoPictureShared.cpp +++ b/lib/kofficecore/KoPictureShared.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kurl.h> #include <kfilterdev.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "KoPictureKey.h" #include "KoPictureBase.h" diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index d81cffec..4599927b 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -47,7 +47,7 @@ #include <klocale.h> #include <kglobal.h> #include <dcopclient.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ktrader.h> #include <kdebug.h> diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index 5acc72a7..2d65368e 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -31,7 +31,7 @@ #include <ksavefile.h> #include <kstandarddirs.h> #include <kiconloader.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <stdlib.h> diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index 51afb24b..1a2b2668 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -24,7 +24,7 @@ #include <tqlistbox.h> #include "KoEditPath.h" #include <keditlistbox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kurlrequester.h> #include <tqhbox.h> #include <klineedit.h> diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 991ffff8..7fa49228 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -28,7 +28,7 @@ #include <klocale.h> #include <tdeversion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinstance.h> #include <KoFilterManager.h> #include <KoTemplates.h> @@ -40,8 +40,8 @@ #include <kjanuswidget.h> #include <kglobalsettings.h> #include <ktextedit.h> -#include <kfileiconview.h> -#include <kfileitem.h> +#include <tdefileiconview.h> +#include <tdefileitem.h> #include <kmessagebox.h> #include <kapplication.h> #include <kaboutdata.h> diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h index d39bc7ee..ba6f17e1 100644 --- a/lib/kofficeui/KoTemplateChooseDia.h +++ b/lib/kofficeui/KoTemplateChooseDia.h @@ -85,7 +85,7 @@ class KoTCDIconViewItem : public KIconViewItem }; -#include <kfileiconview.h> +#include <tdefileiconview.h> #include <tqlabel.h> /** * Our reimplementation of KFileIconView used as the "recent files" view diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 3b4975f0..2e939954 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -43,11 +43,11 @@ #include <kimageio.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kiconloader.h> #include <kaboutdata.h> -#include <kconfigbase.h> -#include <kconfig.h> +#include <tdeconfigbase.h> +#include <tdeconfig.h> #include <stdlib.h> #include <kinstance.h> diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 8084068c..c84d6b5e 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -33,7 +33,7 @@ #include <klocale.h> #include <kglobalsettings.h> #include <kaccelmanager.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <KoView.h> diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 265ee16d..30fd5dbd 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -44,9 +44,9 @@ #endif #ifndef PURE_QT -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #endif using namespace KoProperty; diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index 32efad60..95bc2553 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -43,7 +43,7 @@ #include <kapplication.h> #include <kcharsets.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <kglobal.h> #include <kglobalsettings.h> diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index 84ec27d5..b46973b3 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <klocale.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kglobal.h> #include <kcommand.h> diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 8464bf4d..031a8122 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -23,7 +23,7 @@ #include <kmessagebox.h> #include <kinputdialog.h> #include <kcompletion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqlayout.h> #include <tqvbox.h> diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 770c1da2..8ee25c19 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <kglobal.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kinstance.h> #include <kcalendarsystem.h> diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index a90c3d9d..eaf31101 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -27,13 +27,13 @@ #include <kstandarddirs.h> #include <kmimetype.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kurl.h> #include <ktar.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> using namespace Kross::Api; diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 99b2d058..c63b7603 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <tdeversion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klistview.h> #include <klocale.h> @@ -336,7 +336,7 @@ void WdgScriptsManager::slotGetNewScript() TQObject::connect(p, TQT_SIGNAL(providersLoaded(Provider::List*)), d, TQT_SLOT(slotProviders(Provider::List*))); - p->load(type, TQString("http://download.kde.org/khotnewstuff/%1scripts-providers.xml").arg(appname)); + p->load(type, TQString("http://download.kde.org/tdehotnewstuff/%1scripts-providers.xml").arg(appname)); d->exec(); #endif } diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index 9b8e0f8c..eda671cc 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -289,10 +289,10 @@ class QtDialog: filename = None try: - print "QtDialog.FileChooser.browseButtonClicked() kfile.KFileDialog" - # try to use the kfile module included in pytde - import kfile - filename = kfile.KFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file") + print "QtDialog.FileChooser.browseButtonClicked() tdefile.KFileDialog" + # try to use the tdefile module included in pytde + import tdefile + filename = tdefile.KFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file") except: print "QtDialog.FileChooser.browseButtonClicked() qt.QFileDialog" # fallback to Qt filedialog diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py index 22b6f04b..b6f6a28e 100644 --- a/lib/kross/test/testgui.py +++ b/lib/kross/test/testgui.py @@ -75,9 +75,9 @@ class QtTest: def browseButtonClicked(self): filename = None try: - # try to use the kfile module included in pytde - import kfile - filename = kfile.KFileDialog.getOpenFileName(self.defaultfilename, "*.html", self, "Save to file") + # try to use the tdefile module included in pytde + import tdefile + filename = tdefile.KFileDialog.getOpenFileName(self.defaultfilename, "*.html", self, "Save to file") except: # fallback to Qt filedialog filename = qt.QFileDialog.getOpenFileName(self.defaultfilename, "*.html", self, "Save to file") diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp index f87dfef7..64b01a44 100644 --- a/lib/store/KoStore.cpp +++ b/lib/store/KoStore.cpp @@ -37,7 +37,7 @@ #include <tdeversion.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> //#define DefaultFormat KoStore::Tar #define DefaultFormat KoStore::Zip diff --git a/lib/store/KoTarStore.cpp b/lib/store/KoTarStore.cpp index 5d131a90..d4e6667a 100644 --- a/lib/store/KoTarStore.cpp +++ b/lib/store/KoTarStore.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <kurl.h> #include <tdeversion.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> KoTarStore::KoTarStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification ) { diff --git a/lib/store/KoZipStore.cpp b/lib/store/KoZipStore.cpp index 635ad248..b58829c0 100644 --- a/lib/store/KoZipStore.cpp +++ b/lib/store/KoZipStore.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdeversion.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #if ! KDE_IS_VERSION( 3, 4, 1 ) #include <tqdir.h> #include <tqfileinfo.h> diff --git a/lib/store/SPEC b/lib/store/SPEC index 4010e33f..9cbec599 100644 --- a/lib/store/SPEC +++ b/lib/store/SPEC @@ -21,7 +21,7 @@ The purpose of this document is to define a common KOffice Storage Structure. Torben, Reggie, and all the others agreed on storing embedded KOffice Parts and binary data (e.g. pictures, movies, sounds) via a simple tar.gz-structure. -The support class for the tar format is tdelibs/kio/ktar.*, written by Torben +The support class for the tar format is tdelibs/tdeio/ktar.*, written by Torben and finished by David. The obvious benefits of this type of storage are: diff --git a/lib/store/update_kzip.sh b/lib/store/update_kzip.sh index 3c63626a..ecf7dad3 100644 --- a/lib/store/update_kzip.sh +++ b/lib/store/update_kzip.sh @@ -1,15 +1,15 @@ #!/bin/sh header="// GENERATED FILE. Do not edit! Generated from kzip.cpp by $0" echo "$header" > kozip.cpp -cat ../../../tdelibs/kio/kio/kzip.cpp >> kozip.cpp || exit 1 +cat ../../../tdelibs/tdeio/tdeio/kzip.cpp >> kozip.cpp || exit 1 echo "$header" > kozip.h -cat ../../../tdelibs/kio/kio/kzip.h >> kozip.h || exit 1 +cat ../../../tdelibs/tdeio/tdeio/kzip.h >> kozip.h || exit 1 echo "$header" > kofilterdev.cpp -cat ../../../tdelibs/kio/kio/kfilterdev.cpp >> kofilterdev.cpp || exit 1 +cat ../../../tdelibs/tdeio/tdeio/kfilterdev.cpp >> kofilterdev.cpp || exit 1 echo "$header" > kofilterdev.h -cat ../../../tdelibs/kio/kio/kfilterdev.h >> kofilterdev.h || exit 1 +cat ../../../tdelibs/tdeio/tdeio/kfilterdev.h >> kofilterdev.h || exit 1 echo "$header" > kolimitediodevice.h -cat ../../../tdelibs/kio/kio/klimitediodevice.h >> kolimitediodevice.h || exit 1 +cat ../../../tdelibs/tdeio/tdeio/klimitediodevice.h >> kolimitediodevice.h || exit 1 perl -pi -e 's/KZip/KoZip/g' kozip.cpp kozip.h perl -pi -e 's/kzip\.h/kozip\.h/' kozip.cpp diff --git a/tools/Makefile.am b/tools/Makefile.am index 91a9b708..81cd32d9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = converter thumbnail thesaurus kthesaurus kfile-plugins quickprint +SUBDIRS = converter thumbnail thesaurus kthesaurus tdefile-plugins quickprint # Not ported to tdespell2: spell. But do we really want a separate tool for this? diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp index 973b521b..e937bb02 100644 --- a/tools/converter/koconverter.cpp +++ b/tools/converter/koconverter.cpp @@ -28,7 +28,7 @@ #include <kmimetype.h> #include <kapplication.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <KoFilterManager.h> diff --git a/tools/kfile-plugins/abiword/Makefile.am b/tools/kfile-plugins/abiword/Makefile.am deleted file mode 100644 index 1242f21b..00000000 --- a/tools/kfile-plugins/abiword/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for gnumeric file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_abiword.h - -kde_module_LTLIBRARIES = kfile_abiword.la - -kfile_abiword_la_SOURCES = kfile_abiword.cpp -kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -kfile_abiword_la_LIBADD = $(KOFFICE_LIBS) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -services_DATA = kfile_abiword.desktop -servicesdir = $(kde_servicesdir) - -messages: - $(XGETTEXT) *.cpp -o $(podir)/kfile_abiword.pot diff --git a/tools/kfile-plugins/gnumeric/Makefile.am b/tools/kfile-plugins/gnumeric/Makefile.am deleted file mode 100644 index 85ca467b..00000000 --- a/tools/kfile-plugins/gnumeric/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for gnumeric file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_gnumeric.h - -kde_module_LTLIBRARIES = kfile_gnumeric.la - -kfile_gnumeric_la_SOURCES = kfile_gnumeric.cpp -kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -kfile_gnumeric_la_LIBADD = $(KOFFICE_LIBS) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -services_DATA = kfile_gnumeric.desktop -servicesdir = $(kde_servicesdir) - -messages: - $(XGETTEXT) *.cpp -o $(podir)/kfile_gnumeric.pot diff --git a/tools/kfile-plugins/koffice/Makefile.am b/tools/kfile-plugins/koffice/Makefile.am deleted file mode 100644 index dfbd4080..00000000 --- a/tools/kfile-plugins/koffice/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for koffice file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_koffice.h - -kde_module_LTLIBRARIES = kfile_koffice.la - -kfile_koffice_la_SOURCES = kfile_koffice.cpp -kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -kfile_koffice_la_LIBADD = $(KOFFICE_LIBS) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -services_DATA = kfile_koffice.desktop -servicesdir = $(kde_servicesdir) - -messages: - $(XGETTEXT) *.cpp -o $(podir)/kfile_koffice.pot diff --git a/tools/kfile-plugins/ooo/Makefile.am b/tools/kfile-plugins/ooo/Makefile.am deleted file mode 100644 index d72dd705..00000000 --- a/tools/kfile-plugins/ooo/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for OpenOffice.org file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_ooo.h - -kde_module_LTLIBRARIES = kfile_ooo.la - -kfile_ooo_la_SOURCES = kfile_ooo.cpp -kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -kfile_ooo_la_LIBADD = $(KOFFICE_LIBS) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -services_DATA = kfile_ooo.desktop -servicesdir = $(kde_servicesdir) - -messages: - $(XGETTEXT) *.cpp -o $(podir)/kfile_ooo.pot diff --git a/tools/spell/main.cc b/tools/spell/main.cc index 6f152f03..5686b06a 100644 --- a/tools/spell/main.cc +++ b/tools/spell/main.cc @@ -23,7 +23,7 @@ #include <klocale.h> #include <kdebug.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kgenericfactory.h> #include <klibloader.h> diff --git a/tools/kfile-plugins/Makefile.am b/tools/tdefile-plugins/Makefile.am index 9632d298..9632d298 100644 --- a/tools/kfile-plugins/Makefile.am +++ b/tools/tdefile-plugins/Makefile.am diff --git a/tools/kfile-plugins/RETURNED_ITEMS b/tools/tdefile-plugins/RETURNED_ITEMS index 62aea9bd..62aea9bd 100644 --- a/tools/kfile-plugins/RETURNED_ITEMS +++ b/tools/tdefile-plugins/RETURNED_ITEMS diff --git a/tools/tdefile-plugins/abiword/Makefile.am b/tools/tdefile-plugins/abiword/Makefile.am new file mode 100644 index 00000000..4bd75a15 --- /dev/null +++ b/tools/tdefile-plugins/abiword/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for gnumeric file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_abiword.h + +kde_module_LTLIBRARIES = tdefile_abiword.la + +tdefile_abiword_la_SOURCES = tdefile_abiword.cpp +tdefile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts +tdefile_abiword_la_LIBADD = $(KOFFICE_LIBS) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +services_DATA = tdefile_abiword.desktop +servicesdir = $(kde_servicesdir) + +messages: + $(XGETTEXT) *.cpp -o $(podir)/tdefile_abiword.pot diff --git a/tools/kfile-plugins/abiword/kfile_abiword.cpp b/tools/tdefile-plugins/abiword/tdefile_abiword.cpp index 2f9bb418..59a645f7 100644 --- a/tools/kfile-plugins/abiword/kfile_abiword.cpp +++ b/tools/tdefile-plugins/abiword/tdefile_abiword.cpp @@ -18,7 +18,7 @@ */ #include <config.h> -#include "kfile_abiword.h" +#include "tdefile_abiword.h" #include <klocale.h> #include <kgenericfactory.h> @@ -31,7 +31,7 @@ typedef KGenericFactory<AbiwordPlugin> AbiwordFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_abiword, AbiwordFactory( "kfile_abiword" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_abiword, AbiwordFactory( "tdefile_abiword" )) AbiwordPlugin::AbiwordPlugin(TQObject *parent, const char *name, const TQStringList &args) @@ -142,4 +142,4 @@ TQString AbiwordPlugin::stringItem( const TQString &name ) } -#include "kfile_abiword.moc" +#include "tdefile_abiword.moc" diff --git a/tools/kfile-plugins/abiword/kfile_abiword.desktop b/tools/tdefile-plugins/abiword/tdefile_abiword.desktop index a522452b..eb22207d 100644 --- a/tools/kfile-plugins/abiword/kfile_abiword.desktop +++ b/tools/tdefile-plugins/abiword/tdefile_abiword.desktop @@ -43,7 +43,7 @@ Name[uz@cyrillic]=Abiword ҳужжати ҳақида маълумот Name[zh_CN]=Abiword 信息 Name[zh_TW]=Abiword 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_abiword +X-TDE-Library=tdefile_abiword MimeType=application/x-abiword PreferredGroups=DocumentInfo PreferredItems=Author,Title,Abstract diff --git a/tools/kfile-plugins/abiword/kfile_abiword.h b/tools/tdefile-plugins/abiword/tdefile_abiword.h index 147516fc..0b09acb8 100644 --- a/tools/kfile-plugins/abiword/kfile_abiword.h +++ b/tools/tdefile-plugins/abiword/tdefile_abiword.h @@ -20,7 +20,7 @@ #ifndef __KFILE_ABIWORD_H__ #define __KFILE_ABIWORD_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; class TQDomNode; diff --git a/tools/tdefile-plugins/gnumeric/Makefile.am b/tools/tdefile-plugins/gnumeric/Makefile.am new file mode 100644 index 00000000..407a15f4 --- /dev/null +++ b/tools/tdefile-plugins/gnumeric/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for gnumeric file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_gnumeric.h + +kde_module_LTLIBRARIES = tdefile_gnumeric.la + +tdefile_gnumeric_la_SOURCES = tdefile_gnumeric.cpp +tdefile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts +tdefile_gnumeric_la_LIBADD = $(KOFFICE_LIBS) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +services_DATA = tdefile_gnumeric.desktop +servicesdir = $(kde_servicesdir) + +messages: + $(XGETTEXT) *.cpp -o $(podir)/tdefile_gnumeric.pot diff --git a/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp index 145f318b..29686663 100644 --- a/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp +++ b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp @@ -18,7 +18,7 @@ */ #include <config.h> -#include "kfile_gnumeric.h" +#include "tdefile_gnumeric.h" #include <klocale.h> #include <kgenericfactory.h> @@ -31,7 +31,7 @@ typedef KGenericFactory<GnumericPlugin> GnumericFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_gnumeric, GnumericFactory( "kfile_gnumeric" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_gnumeric, GnumericFactory( "tdefile_gnumeric" )) GnumericPlugin::GnumericPlugin(TQObject *parent, const char *name, const TQStringList &args) @@ -120,4 +120,4 @@ TQString GnumericPlugin::stringItem( const TQString &name ) } -#include "kfile_gnumeric.moc" +#include "tdefile_gnumeric.moc" diff --git a/tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop index a1372f31..d4e83866 100644 --- a/tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop +++ b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop @@ -43,7 +43,7 @@ Name[uz@cyrillic]=Gnumeric ҳужжати ҳақида маълумот Name[zh_CN]=Gnumeric 信息 Name[zh_TW]=Gnumeric 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_gnumeric +X-TDE-Library=tdefile_gnumeric MimeType=application/x-gnumeric PreferredGroups=DocumentInfo PreferredItems=Author,Title,Abstract diff --git a/tools/kfile-plugins/gnumeric/kfile_gnumeric.h b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.h index 996e49a8..c48c08ab 100644 --- a/tools/kfile-plugins/gnumeric/kfile_gnumeric.h +++ b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.h @@ -20,7 +20,7 @@ #ifndef __KFILE_GNUMERIC_H__ #define __KFILE_GNUMERIC_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; class TQDomNode; diff --git a/tools/tdefile-plugins/koffice/Makefile.am b/tools/tdefile-plugins/koffice/Makefile.am new file mode 100644 index 00000000..645869ec --- /dev/null +++ b/tools/tdefile-plugins/koffice/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for koffice file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_koffice.h + +kde_module_LTLIBRARIES = tdefile_koffice.la + +tdefile_koffice_la_SOURCES = tdefile_koffice.cpp +tdefile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts +tdefile_koffice_la_LIBADD = $(KOFFICE_LIBS) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +services_DATA = tdefile_koffice.desktop +servicesdir = $(kde_servicesdir) + +messages: + $(XGETTEXT) *.cpp -o $(podir)/tdefile_koffice.pot diff --git a/tools/kfile-plugins/koffice/kfile_koffice.cpp b/tools/tdefile-plugins/koffice/tdefile_koffice.cpp index 05cd22ef..e4c89778 100644 --- a/tools/kfile-plugins/koffice/kfile_koffice.cpp +++ b/tools/tdefile-plugins/koffice/tdefile_koffice.cpp @@ -18,7 +18,7 @@ */ #include <config.h> -#include "kfile_koffice.h" +#include "tdefile_koffice.h" #include <klocale.h> #include <kgenericfactory.h> @@ -31,7 +31,7 @@ typedef KGenericFactory<KOfficePlugin> KOfficeFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_koffice, KOfficeFactory( "kfile_koffice" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_koffice, KOfficeFactory( "tdefile_koffice" )) KOfficePlugin::KOfficePlugin(TQObject *parent, const char *name, const TQStringList &args) @@ -113,4 +113,4 @@ TQString KOfficePlugin::stringFromNode(const TQDomNode &node, const TQString &na } -#include "kfile_koffice.moc" +#include "tdefile_koffice.moc" diff --git a/tools/kfile-plugins/koffice/kfile_koffice.desktop b/tools/tdefile-plugins/koffice/tdefile_koffice.desktop index 8e653180..02a0502d 100644 --- a/tools/kfile-plugins/koffice/kfile_koffice.desktop +++ b/tools/tdefile-plugins/koffice/tdefile_koffice.desktop @@ -60,7 +60,7 @@ Name[xh]=Ulwazi lwe KOffice Name[zh_CN]=KOffice 信息 Name[zh_TW]=KOffice 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_koffice +X-TDE-Library=tdefile_koffice MimeType=application/x-kword;application/x-kpresenter;application/x-kspread;application/x-karbon PreferredGroups=DocumentInfo PreferredItems=Author,Title,Abstract diff --git a/tools/kfile-plugins/koffice/kfile_koffice.h b/tools/tdefile-plugins/koffice/tdefile_koffice.h index 607225a4..9ac50178 100644 --- a/tools/kfile-plugins/koffice/kfile_koffice.h +++ b/tools/tdefile-plugins/koffice/tdefile_koffice.h @@ -20,7 +20,7 @@ #ifndef __KFILE_KOFFICE_H__ #define __KFILE_KOFFICE_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; class TQDomNode; diff --git a/tools/tdefile-plugins/ooo/Makefile.am b/tools/tdefile-plugins/ooo/Makefile.am new file mode 100644 index 00000000..8aa7d404 --- /dev/null +++ b/tools/tdefile-plugins/ooo/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for OpenOffice.org file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_ooo.h + +kde_module_LTLIBRARIES = tdefile_ooo.la + +tdefile_ooo_la_SOURCES = tdefile_ooo.cpp +tdefile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts +tdefile_ooo_la_LIBADD = $(KOFFICE_LIBS) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +services_DATA = tdefile_ooo.desktop +servicesdir = $(kde_servicesdir) + +messages: + $(XGETTEXT) *.cpp -o $(podir)/tdefile_ooo.pot diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp index c66e3682..358bc876 100644 --- a/tools/kfile-plugins/ooo/kfile_ooo.cpp +++ b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp @@ -37,7 +37,7 @@ */ #include <config.h> -#include "kfile_ooo.h" +#include "tdefile_ooo.h" #include <klocale.h> #include <kgenericfactory.h> @@ -52,11 +52,11 @@ #include <tqdatetime.h> #include <tqvalidator.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> typedef KGenericFactory<KOfficePlugin> KOfficeFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_ooo, KOfficeFactory( "kfile_ooo" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_ooo, KOfficeFactory( "tdefile_ooo" )) static const char * const mimetypes[] = { "application/vnd.sun.xml.calc", "application/vnd.sun.xml.calc.template", @@ -585,4 +585,4 @@ TQValidator * KOfficePlugin::createValidator(const TQString &, /* mimetype return 0; } -#include "kfile_ooo.moc" +#include "tdefile_ooo.moc" diff --git a/tools/kfile-plugins/ooo/kfile_ooo.desktop b/tools/tdefile-plugins/ooo/tdefile_ooo.desktop index 99039aa9..94866b74 100644 --- a/tools/kfile-plugins/ooo/kfile_ooo.desktop +++ b/tools/tdefile-plugins/ooo/tdefile_ooo.desktop @@ -51,7 +51,7 @@ Name[wa]=Informåcion OpenOffice.org Name[zh_CN]=OpenOffice.org 信息 Name[zh_TW]=OpenOffice.org 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_ooo +X-TDE-Library=tdefile_ooo MimeType=application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.math;application/vnd.sun.xml.writer.template;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.oasis.opendocument.image;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template PreferredGroups=DocumentInfo PreferredItems=Author,Title,Abstract diff --git a/tools/kfile-plugins/ooo/kfile_ooo.h b/tools/tdefile-plugins/ooo/tdefile_ooo.h index e9cea14d..9cb9f12a 100644 --- a/tools/kfile-plugins/ooo/kfile_ooo.h +++ b/tools/tdefile-plugins/ooo/tdefile_ooo.h @@ -20,7 +20,7 @@ #ifndef __KFILE_OOO_H__ #define __KFILE_OOO_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <tqiodevice.h> #include <tqdom.h> #include <karchive.h> diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc index 273c5d20..6ca3f73f 100644 --- a/tools/thesaurus/main.cc +++ b/tools/thesaurus/main.cc @@ -45,7 +45,7 @@ NOT TODO: #include <tqfile.h> #include <tqtoolbutton.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tdeversion.h> /*************************************************** diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h index c69824b1..698ea4c7 100644 --- a/tools/thesaurus/main.h +++ b/tools/thesaurus/main.h @@ -42,7 +42,7 @@ #include <kapplication.h> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcursor.h> #include <kdatatool.h> #include <kdebug.h> diff --git a/tools/thumbnail/clipartcreator.h b/tools/thumbnail/clipartcreator.h index 8f33e623..ada086c1 100644 --- a/tools/thumbnail/clipartcreator.h +++ b/tools/thumbnail/clipartcreator.h @@ -20,7 +20,7 @@ #ifndef CLIPARTCREATOR_H #define CLIPARTCREATOR_H -#include <kio/thumbcreator.h> +#include <tdeio/thumbcreator.h> class ClipartCreator : public ThumbCreator { diff --git a/tools/thumbnail/kofficecreator.cpp b/tools/thumbnail/kofficecreator.cpp index 60eef551..59a5f9d3 100644 --- a/tools/thumbnail/kofficecreator.cpp +++ b/tools/thumbnail/kofficecreator.cpp @@ -26,7 +26,7 @@ #include <tqpainter.h> #include <kapplication.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <ktrader.h> #include <klibloader.h> #include <tdeparts/part.h> diff --git a/tools/thumbnail/kofficecreator.h b/tools/thumbnail/kofficecreator.h index 3188cff9..43f09bf2 100644 --- a/tools/thumbnail/kofficecreator.h +++ b/tools/thumbnail/kofficecreator.h @@ -20,7 +20,7 @@ #ifndef _KWORDCREATOR_H_ #define _KWORDCREATOR_H_ "$Id: kofficecreator.h 508787 2006-02-12 18:28:12Z ingwa $" -#include <kio/thumbcreator.h> +#include <tdeio/thumbcreator.h> #include <tdeparts/part.h> #include "../../lib/kofficecore/KoDocument.h" |