diff options
| author | Automated System <[email protected]> | 2013-01-27 01:08:56 -0600 |
|---|---|---|
| committer | Automated System <[email protected]> | 2013-01-27 01:08:56 -0600 |
| commit | 372574225b522c229fb8bfb79875b199d231bfb9 (patch) | |
| tree | b60d859b7e7be33d6782ed1a2dc3b85bebca228f | |
| parent | dbe905cd0350f4722f69e0e56e4ada2f7c109ff0 (diff) | |
| parent | 8c1f69b6dc559d1482ee597522544283f2452729 (diff) | |
| download | kipi-plugins-372574225b522c229fb8bfb79875b199d231bfb9.tar.gz kipi-plugins-372574225b522c229fb8bfb79875b199d231bfb9.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kipi-plugins
106 files changed, 165 insertions, 165 deletions
@@ -3736,7 +3736,7 @@ V 0.1.4 - 2007-06-28 2007-06-20 17:06 vfuoglio * [r678081] kipi-plugins/slideshow/Makefile.am: - Fixed problem with libkio linking into Makefile.am. + Fixed problem with libtdeio linking into Makefile.am. Thanks to Rex Dieter for the patch. CCMAIL: [email protected] @@ -3747,7 +3747,7 @@ V 0.1.4-beta2 - 2007-06-20 2007-06-20 17:06 vfuoglio * [r678081] kipi-plugins/slideshow/Makefile.am: - Fixed problem with libkio linking into Makefile.am. + Fixed problem with libtdeio linking into Makefile.am. Thanks to Rex Dieter for the patch. CCMAIL: [email protected] diff --git a/acinclude.m4 b/acinclude.m4 index 235078b..657f827 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 @@ -1812,7 +1812,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 @@ -2118,7 +2118,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") @@ -2128,7 +2128,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/kipi-plugins/ChangeLog b/kipi-plugins/ChangeLog index 4f05eef..afc2786 100644 --- a/kipi-plugins/ChangeLog +++ b/kipi-plugins/ChangeLog @@ -3862,7 +3862,7 @@ V 0.1.4 - 2007-06-28 2007-06-20 17:06 vfuoglio * [r678081] kipi-plugins/slideshow/Makefile.am: - Fixed problem with libkio linking into Makefile.am. + Fixed problem with libtdeio linking into Makefile.am. Thanks to Rex Dieter for the patch. CCMAIL: [email protected] @@ -3873,7 +3873,7 @@ V 0.1.4-beta2 - 2007-06-20 2007-06-20 17:06 vfuoglio * [r678081] kipi-plugins/slideshow/Makefile.am: - Fixed problem with libkio linking into Makefile.am. + Fixed problem with libtdeio linking into Makefile.am. Thanks to Rex Dieter for the patch. CCMAIL: [email protected] diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp index cac0997..fef56b7 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.cpp +++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp @@ -59,20 +59,20 @@ extern "C" #include <klocale.h> #include <klineedit.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <knuminput.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistbox.h> #include <klineeditdlg.h> #include <ksqueezedtextlabel.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kimageio.h> #include <ktempfile.h> #include <tdeversion.h> #include <kdebug.h> -#include <kfiletreeview.h> +#include <tdefiletreeview.h> #include <kapplication.h> #include <kaboutdata.h> #include <khelpmenu.h> diff --git a/kipi-plugins/acquireimages/acquireimagedialog.h b/kipi-plugins/acquireimages/acquireimagedialog.h index 990ff23..4f4d6b4 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.h +++ b/kipi-plugins/acquireimages/acquireimagedialog.h @@ -33,7 +33,7 @@ // Include files for KDE #include <kdialogbase.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kurl.h> // Include files for KIPI diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.cpp b/kipi-plugins/acquireimages/plugin_acquireimages.cpp index 7895593..97e3e4d 100644 --- a/kipi-plugins/acquireimages/plugin_acquireimages.cpp +++ b/kipi-plugins/acquireimages/plugin_acquireimages.cpp @@ -30,7 +30,7 @@ #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kinstance.h> diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp index 3a4ec1c..b62793f 100644 --- a/kipi-plugins/acquireimages/screenshotdialog.cpp +++ b/kipi-plugins/acquireimages/screenshotdialog.cpp @@ -47,7 +47,7 @@ extern "C" #include <klocale.h> #include <knotifyclient.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <knuminput.h> #include <kapplication.h> diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp index bc0bc0a..a2c71b0 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp @@ -57,12 +57,12 @@ extern "C" #include <kcolorbutton.h> #include <klocale.h> #include <kprogress.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <kmessagebox.h> #include <knuminput.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kdebug.h> #include <kdialogbase.h> @@ -70,10 +70,10 @@ extern "C" #include <kimageio.h> #include <kprocess.h> #include <klineeditdlg.h> -#include <kio/jobclasses.h> -#include <kio/netaccess.h> -#include <kio/global.h> -#include <kio/previewjob.h> +#include <tdeio/jobclasses.h> +#include <tdeio/netaccess.h> +#include <tdeio/global.h> +#include <tdeio/previewjob.h> #include <kbuttonbox.h> #include <kdiroperator.h> #include <tdeversion.h> diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h index 0353942..0d0036e 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h @@ -41,7 +41,7 @@ // Include files for KDE -#include <kio/job.h> +#include <tdeio/job.h> #include <kdialogbase.h> #include <kdebug.h> #include <kurl.h> diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp index bfedb4a..97e8ccc 100644 --- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp @@ -32,7 +32,7 @@ // Include files for KDE #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <knuminput.h> #include <kprocess.h> diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp index 8e7a01d..322c93e 100644 --- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp @@ -32,7 +32,7 @@ // Include files for KDE #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <knuminput.h> #include <kprocess.h> diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp index 78ea95c..74e5b92 100644 --- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp @@ -34,7 +34,7 @@ // Include files for KDE #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <knuminput.h> #include <kprocess.h> diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp index 5e9aa22..19bc545 100644 --- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp @@ -32,7 +32,7 @@ // Include files for KDE #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <knuminput.h> #include <kprocess.h> diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp index 5a1d441..f39c6a0 100644 --- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp @@ -32,7 +32,7 @@ // Include files for KDE #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <knuminput.h> #include <kprocess.h> diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp index 930d255..c86cf6d 100644 --- a/kipi-plugins/batchprocessimages/imagepreview.cpp +++ b/kipi-plugins/batchprocessimages/imagepreview.cpp @@ -51,10 +51,10 @@ extern "C" #include <kprocess.h> #include <kmessagebox.h> #include <kurl.h> -#include <kio/job.h> -#include <kio/jobclasses.h> -#include <kio/netaccess.h> -#include <kio/global.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/netaccess.h> +#include <tdeio/global.h> #include <klocale.h> #include <kstandarddirs.h> #include <kcursor.h> diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp index 8e3c330..92bcb4f 100644 --- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp +++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp @@ -39,7 +39,7 @@ extern "C" #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kinstance.h> diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp index 68efb0a..955820f 100644 --- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp @@ -32,7 +32,7 @@ // Include files for KDE #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <knuminput.h> #include <kprocess.h> diff --git a/kipi-plugins/batchprocessimages/renameimageswidget.cpp b/kipi-plugins/batchprocessimages/renameimageswidget.cpp index cbe4bfb..8884507 100644 --- a/kipi-plugins/batchprocessimages/renameimageswidget.cpp +++ b/kipi-plugins/batchprocessimages/renameimageswidget.cpp @@ -54,9 +54,9 @@ extern "C" // KDE includes. #include <klocale.h> -#include <kconfig.h> -#include <kio/previewjob.h> -#include <kio/renamedlg.h> +#include <tdeconfig.h> +#include <tdeio/previewjob.h> +#include <tdeio/renamedlg.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp index 58c2025..4ac6265 100644 --- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp @@ -33,7 +33,7 @@ // Include files for KDE #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <knuminput.h> #include <kprocess.h> diff --git a/kipi-plugins/calendar/calevents.cpp b/kipi-plugins/calendar/calevents.cpp index cf6e847..7744fff 100644 --- a/kipi-plugins/calendar/calevents.cpp +++ b/kipi-plugins/calendar/calevents.cpp @@ -23,7 +23,7 @@ #include <tqpushbutton.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <klocale.h> #include <kdebug.h> diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp index e3542bf..687c01a 100644 --- a/kipi-plugins/calendar/monthwidget.cpp +++ b/kipi-plugins/calendar/monthwidget.cpp @@ -36,14 +36,14 @@ #include <kurl.h> #include <kurldrag.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <klocale.h> #include <kglobal.h> #include <kapplication.h> #include <kiconloader.h> #include <kdebug.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> #include <tdeversion.h> #include <kcalendarsystem.h> diff --git a/kipi-plugins/calendar/plugin_calendar.cpp b/kipi-plugins/calendar/plugin_calendar.cpp index 66b32f4..434c887 100644 --- a/kipi-plugins/calendar/plugin_calendar.cpp +++ b/kipi-plugins/calendar/plugin_calendar.cpp @@ -30,7 +30,7 @@ #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kurl.h> #include <kapplication.h> diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp index 37c0cc2..9a664d1 100644 --- a/kipi-plugins/cdarchiving/cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/cdarchiving.cpp @@ -45,15 +45,15 @@ extern "C" #include <kaboutdata.h> #include <kapplication.h> #include <kcharsets.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kglobal.h> #include <kimageio.h> #include <kinstance.h> -#include <kio/global.h> -#include <kio/job.h> -#include <kio/jobclasses.h> +#include <tdeio/global.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> #include <klocale.h> #include <kprocess.h> #include <krun.h> diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp index 7f285e2..91c66e2 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp @@ -48,7 +48,7 @@ #include <kapplication.h> #include <kbuttonbox.h> #include <kcolorbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdirsize.h> #include <kfontdialog.h> diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.h b/kipi-plugins/cdarchiving/cdarchivingdialog.h index d11ae64..9b5a60e 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.h +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.h @@ -35,7 +35,7 @@ // KDE includes #include <kdialogbase.h> -#include <kio/global.h> +#include <tdeio/global.h> // KIPI includes diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp index 5d70cc9..b15e35a 100644 --- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp @@ -24,7 +24,7 @@ #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tdeversion.h> #include <kgenericfactory.h> diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp index 605ca46..6be62ad 100644 --- a/kipi-plugins/findimages/displaycompare.cpp +++ b/kipi-plugins/findimages/displaycompare.cpp @@ -49,12 +49,12 @@ #include <ksqueezedtextlabel.h> #include <kapplication.h> #include <kurl.h> -#include <kio/job.h> -#include <kio/jobclasses.h> -#include <kio/netaccess.h> -#include <kio/global.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/netaccess.h> +#include <tdeio/global.h> #include <kimageio.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> #include <khelpmenu.h> #include <kpopupmenu.h> #include <kstandarddirs.h> diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp index 2f1d39f..82ccc9e 100644 --- a/kipi-plugins/findimages/finddupplicatedialog.cpp +++ b/kipi-plugins/findimages/finddupplicatedialog.cpp @@ -53,7 +53,7 @@ #include <kbuttonbox.h> #include <kapplication.h> #include <ksqueezedtextlabel.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <klistview.h> #include <khelpmenu.h> #include <kpopupmenu.h> diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp index 86d146d..9a614bf 100644 --- a/kipi-plugins/findimages/finddupplicateimages.cpp +++ b/kipi-plugins/findimages/finddupplicateimages.cpp @@ -43,7 +43,7 @@ extern "C" #include <klocale.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kimageeffect.h> #include <kdebug.h> @@ -51,10 +51,10 @@ extern "C" #include <kmessagebox.h> #include <kstandarddirs.h> #include <kurl.h> -#include <kio/job.h> -#include <kio/jobclasses.h> -#include <kio/netaccess.h> -#include <kio/global.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/netaccess.h> +#include <tdeio/global.h> #include <kimageio.h> // Local include files diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp index 91a650a..d0e5d49 100644 --- a/kipi-plugins/findimages/plugin_findimages.cpp +++ b/kipi-plugins/findimages/plugin_findimages.cpp @@ -31,7 +31,7 @@ #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> #include <kapplication.h> diff --git a/kipi-plugins/flickrexport/flickrtalker.h b/kipi-plugins/flickrexport/flickrtalker.h index a4aa65e..1fb2315 100644 --- a/kipi-plugins/flickrexport/flickrtalker.h +++ b/kipi-plugins/flickrexport/flickrtalker.h @@ -34,7 +34,7 @@ // KDE includes. #include <kurl.h> -#include <kio/job.h> +#include <tdeio/job.h> class TQProgressDialog; diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp index 8741b77..5de3979 100644 --- a/kipi-plugins/flickrexport/flickrwindow.cpp +++ b/kipi-plugins/flickrexport/flickrwindow.cpp @@ -47,7 +47,7 @@ #include <ktabwidget.h> #include <krun.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #if KDE_IS_VERSION(3,2,0) #include <tdewallet.h> diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp index 8da8f03..19b7d5b 100644 --- a/kipi-plugins/flickrexport/imageslist.cpp +++ b/kipi-plugins/flickrexport/imageslist.cpp @@ -39,7 +39,7 @@ #include <knuminput.h> #include <kiconloader.h> #include <kdebug.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> // Libkipi includes. diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.cpp b/kipi-plugins/flickrexport/plugin_flickrexport.cpp index 269875d..0587e97 100644 --- a/kipi-plugins/flickrexport/plugin_flickrexport.cpp +++ b/kipi-plugins/flickrexport/plugin_flickrexport.cpp @@ -33,7 +33,7 @@ extern "C" #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kapplication.h> #include <kstandarddirs.h> diff --git a/kipi-plugins/galleryexport/galleries.cpp b/kipi-plugins/galleryexport/galleries.cpp index eeb699b..8d2f11c 100644 --- a/kipi-plugins/galleryexport/galleries.cpp +++ b/kipi-plugins/galleryexport/galleries.cpp @@ -21,7 +21,7 @@ #include <tqwidget.h> #include <kapplication.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tdeversion.h> #if KDE_IS_VERSION(3,2,0) diff --git a/kipi-plugins/galleryexport/galleryconfig.cpp b/kipi-plugins/galleryexport/galleryconfig.cpp index f40db0c..32ffa87 100644 --- a/kipi-plugins/galleryexport/galleryconfig.cpp +++ b/kipi-plugins/galleryexport/galleryconfig.cpp @@ -40,7 +40,7 @@ #include <tdehtmlview.h> #include <krun.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> // KIPI include files diff --git a/kipi-plugins/galleryexport/gallerytalker.cpp b/kipi-plugins/galleryexport/gallerytalker.cpp index 2c97a9a..c019939 100644 --- a/kipi-plugins/galleryexport/gallerytalker.cpp +++ b/kipi-plugins/galleryexport/gallerytalker.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <klocale.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> #include <kmimetype.h> #include <kstandarddirs.h> diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp index 83b5b23..097d9df 100644 --- a/kipi-plugins/galleryexport/gallerywindow.cpp +++ b/kipi-plugins/galleryexport/gallerywindow.cpp @@ -44,7 +44,7 @@ #include <tdehtmlview.h> #include <krun.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> // KIPI include files diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp index 1bacc9d..917dcc8 100644 --- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp +++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp @@ -26,7 +26,7 @@ #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kapplication.h> #include <kmessagebox.h> diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp index 83c7be8..bb80c9f 100644 --- a/kipi-plugins/gpssync/gpseditdialog.cpp +++ b/kipi-plugins/gpssync/gpseditdialog.cpp @@ -32,7 +32,7 @@ #include <klocale.h> #include <khelpmenu.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp index 7a90d9c..fa9e844 100644 --- a/kipi-plugins/gpssync/gpssyncdialog.cpp +++ b/kipi-plugins/gpssync/gpssyncdialog.cpp @@ -43,13 +43,13 @@ #include <kpopupmenu.h> #include <kstandarddirs.h> #include <klistview.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kglobalsettings.h> #include <knuminput.h> #include <kseparator.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> // Local includes. diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp index 206e7c4..8831a77 100644 --- a/kipi-plugins/gpssync/kmlexport.cpp +++ b/kipi-plugins/gpssync/kmlexport.cpp @@ -33,8 +33,8 @@ extern "C" // KDE includes. #include <kapplication.h> -#include <kconfig.h> -#include <kio/job.h> +#include <tdeconfig.h> +#include <tdeio/job.h> #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp index 276aa91..362fea3 100644 --- a/kipi-plugins/gpssync/kmlexportconfig.cpp +++ b/kipi-plugins/gpssync/kmlexportconfig.cpp @@ -37,7 +37,7 @@ // KDE includes. #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcolorbutton.h> #include <kdialog.h> #include <khelpmenu.h> diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp index 0adba49..71b73d7 100644 --- a/kipi-plugins/gpssync/plugin_gpssync.cpp +++ b/kipi-plugins/gpssync/plugin_gpssync.cpp @@ -33,7 +33,7 @@ #include <kapplication.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kipi-plugins/helloworld/plugin_helloworld.cpp b/kipi-plugins/helloworld/plugin_helloworld.cpp index 992d906..236ad66 100644 --- a/kipi-plugins/helloworld/plugin_helloworld.cpp +++ b/kipi-plugins/helloworld/plugin_helloworld.cpp @@ -24,7 +24,7 @@ #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> // LibKIPi includes. diff --git a/kipi-plugins/htmlexport/abstractthemeparameter.cpp b/kipi-plugins/htmlexport/abstractthemeparameter.cpp index 90b84f9..373f0f0 100644 --- a/kipi-plugins/htmlexport/abstractthemeparameter.cpp +++ b/kipi-plugins/htmlexport/abstractthemeparameter.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA #include "abstractthemeparameter.h" // KDE -#include <kconfigbase.h> +#include <tdeconfigbase.h> static const char* NAME_KEY = "Name"; static const char* DEFAULT_VALUE_KEY = "Default"; diff --git a/kipi-plugins/htmlexport/galleryinfo.cpp b/kipi-plugins/htmlexport/galleryinfo.cpp index e84c008..ace6406 100644 --- a/kipi-plugins/htmlexport/galleryinfo.cpp +++ b/kipi-plugins/htmlexport/galleryinfo.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA // TQt // KDE -#include <kconfigbase.h> +#include <tdeconfigbase.h> // Local diff --git a/kipi-plugins/htmlexport/generator.cpp b/kipi-plugins/htmlexport/generator.cpp index 96dd4c2..5db5ffc 100644 --- a/kipi-plugins/htmlexport/generator.cpp +++ b/kipi-plugins/htmlexport/generator.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kapplication.h> #include <kdebug.h> #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <kurl.h> diff --git a/kipi-plugins/htmlexport/intthemeparameter.cpp b/kipi-plugins/htmlexport/intthemeparameter.cpp index cf5b2f5..493ead2 100644 --- a/kipi-plugins/htmlexport/intthemeparameter.cpp +++ b/kipi-plugins/htmlexport/intthemeparameter.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA #include <tqspinbox.h> // KDE -#include <kconfigbase.h> +#include <tdeconfigbase.h> // Local diff --git a/kipi-plugins/htmlexport/listthemeparameter.cpp b/kipi-plugins/htmlexport/listthemeparameter.cpp index 27111a1..e8b008f 100644 --- a/kipi-plugins/htmlexport/listthemeparameter.cpp +++ b/kipi-plugins/htmlexport/listthemeparameter.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA #include <tqcombobox.h> // KDE -#include <kconfigbase.h> +#include <tdeconfigbase.h> namespace KIPIHTMLExport { diff --git a/kipi-plugins/htmlexport/stringthemeparameter.cpp b/kipi-plugins/htmlexport/stringthemeparameter.cpp index 1be630e..f5d320a 100644 --- a/kipi-plugins/htmlexport/stringthemeparameter.cpp +++ b/kipi-plugins/htmlexport/stringthemeparameter.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA #include <tqlineedit.h> // KDE -#include <kconfigbase.h> +#include <tdeconfigbase.h> namespace KIPIHTMLExport { diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp index 0ff604f..c96cc1c 100644 --- a/kipi-plugins/htmlexport/wizard.cpp +++ b/kipi-plugins/htmlexport/wizard.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA #include <tqspinbox.h> // KDE -#include <kconfigdialogmanager.h> +#include <tdeconfigdialogmanager.h> #include <kdebug.h> #include <kdialog.h> #include <klistbox.h> diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp index f527d6d..b140194 100644 --- a/kipi-plugins/ipodexport/ipodexportdialog.cpp +++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp @@ -32,11 +32,11 @@ #include <tqwmatrix.h> #include <kdebug.h> -#include <kfileitem.h> -#include <kfiledialog.h> // add images +#include <tdefileitem.h> +#include <tdefiledialog.h> // add images #include <kiconloader.h> #include <kinputdialog.h> //new album -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> #include <klocale.h> #include <kmessagebox.h> #include <kmountpoint.h> diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.cpp b/kipi-plugins/ipodexport/plugin_ipodexport.cpp index 2c4b240..fcf8df2 100644 --- a/kipi-plugins/ipodexport/plugin_ipodexport.cpp +++ b/kipi-plugins/ipodexport/plugin_ipodexport.cpp @@ -23,7 +23,7 @@ extern "C" { #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp index 6b50023..682e94b 100644 --- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp +++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp @@ -36,7 +36,7 @@ #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kurl.h> #include <kmessagebox.h> diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp index 9a8bd20..0def156 100644 --- a/kipi-plugins/kameraklient/cameraui.cpp +++ b/kipi-plugins/kameraklient/cameraui.cpp @@ -50,14 +50,14 @@ #include <kaccel.h> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdirlister.h> -#include <kfiledialog.h> -#include <kfileitem.h> +#include <tdefiledialog.h> +#include <tdefileitem.h> #include <klocale.h> #include <kedittoolbar.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kkeydialog.h> #include <klineeditdlg.h> #include <kmessagebox.h> diff --git a/kipi-plugins/kameraklient/cameraui.h b/kipi-plugins/kameraklient/cameraui.h index 09faa31..bcfe148 100644 --- a/kipi-plugins/kameraklient/cameraui.h +++ b/kipi-plugins/kameraklient/cameraui.h @@ -31,7 +31,7 @@ // KDE includes. -#include <kfileitem.h> +#include <tdefileitem.h> // Local includes. diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp index 8f224b9..798b05e 100644 --- a/kipi-plugins/metadataedit/commenteditdialog.cpp +++ b/kipi-plugins/metadataedit/commenteditdialog.cpp @@ -32,7 +32,7 @@ // KDE includes. #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <ktextedit.h> #include <kiconloader.h> diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp index 2573d33..488cfc9 100644 --- a/kipi-plugins/metadataedit/commentremovedialog.cpp +++ b/kipi-plugins/metadataedit/commentremovedialog.cpp @@ -32,7 +32,7 @@ // KDE includes. #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp index fa84cde..7f9a4b9 100644 --- a/kipi-plugins/metadataedit/exifeditdialog.cpp +++ b/kipi-plugins/metadataedit/exifeditdialog.cpp @@ -30,7 +30,7 @@ // KDE includes. #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp index 5107247..5a83794 100644 --- a/kipi-plugins/metadataedit/iptceditdialog.cpp +++ b/kipi-plugins/metadataedit/iptceditdialog.cpp @@ -30,7 +30,7 @@ // KDE includes. #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp index 7705261..0e01554 100644 --- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp +++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp @@ -27,11 +27,11 @@ #include <kapplication.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kpopupmenu.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobalsettings.h> // LibKIPI includes. diff --git a/kipi-plugins/mpegencoder/checkbinprog.cpp b/kipi-plugins/mpegencoder/checkbinprog.cpp index 23aeb01..9f620cf 100644 --- a/kipi-plugins/mpegencoder/checkbinprog.cpp +++ b/kipi-plugins/mpegencoder/checkbinprog.cpp @@ -32,7 +32,7 @@ // KDElib includes #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kurl.h> #include <kmessagebox.h> diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp index 2763354..3da82dd 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.cpp +++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp @@ -67,8 +67,8 @@ extern "C" #include <kprogress.h> #include <kprocess.h> #include <klocale.h> -#include <kconfig.h> -#include <kfiledialog.h> +#include <tdeconfig.h> +#include <tdefiledialog.h> #include <kcolordialog.h> #include <klineedit.h> #include <kcolorbutton.h> diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h index f4cc783..9d1f177 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.h +++ b/kipi-plugins/mpegencoder/kimg2mpg.h @@ -37,7 +37,7 @@ #include <kdialog.h> #include <klistbox.h> #include <kprocess.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> // Include files for KIPI diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui index cd4563d..3d9408a 100644 --- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui +++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui @@ -1288,12 +1288,12 @@ The program uses the 'images2mpg' bash script.</string> <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in declaration">libkipi/interface.h</include> <include location="global" impldecl="in declaration">kprocess.h</include> - <include location="global" impldecl="in declaration">kio/previewjob.h</include> + <include location="global" impldecl="in declaration">tdeio/previewjob.h</include> <include location="global" impldecl="in declaration">klistbox.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">libkipi/interface.h</include> <include location="global" impldecl="in implementation">kprocess.h</include> - <include location="global" impldecl="in implementation">kio/previewjob.h</include> + <include location="global" impldecl="in implementation">tdeio/previewjob.h</include> <include location="global" impldecl="in implementation">klistbox.h</include> </includes> <Q_SLOTS> diff --git a/kipi-plugins/mpegencoder/optionsdialog.cpp b/kipi-plugins/mpegencoder/optionsdialog.cpp index d657a86..b0fa30c 100644 --- a/kipi-plugins/mpegencoder/optionsdialog.cpp +++ b/kipi-plugins/mpegencoder/optionsdialog.cpp @@ -35,7 +35,7 @@ #include <klocale.h> #include <klineedit.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> // Local includes. diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp index cd562b5..fe8732b 100644 --- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp +++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp @@ -33,7 +33,7 @@ #include <kapplication.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp index edbfc72..5ea3db8 100644 --- a/kipi-plugins/picasawebexport/picasawebtalker.cpp +++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp @@ -44,14 +44,14 @@ // KDE includes. #include <klocale.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> #include <kmimetype.h> #include <kstandarddirs.h> #include <kmdcodec.h> #include <kapplication.h> #include <kmessagebox.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <kurl.h> // LibKExiv2 includes. diff --git a/kipi-plugins/picasawebexport/picasawebtalker.h b/kipi-plugins/picasawebexport/picasawebtalker.h index 26d1be8..89b2084 100644 --- a/kipi-plugins/picasawebexport/picasawebtalker.h +++ b/kipi-plugins/picasawebexport/picasawebtalker.h @@ -34,7 +34,7 @@ // KDE includes. #include <kurl.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> namespace TDEIO { diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp index 81e4642..61cebb9 100644 --- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp +++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp @@ -33,7 +33,7 @@ extern "C" #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kapplication.h> #include <kstandarddirs.h> diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp index 94db6e6..e550a5c 100644 --- a/kipi-plugins/printwizard/frmprintwizard.cpp +++ b/kipi-plugins/printwizard/frmprintwizard.cpp @@ -49,7 +49,7 @@ extern "C" #include <kcombobox.h> #include <kprogress.h> #include <kurllabel.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpushbutton.h> #include <kapplication.h> #include <kaboutdata.h> diff --git a/kipi-plugins/printwizard/plugin_printwizard.cpp b/kipi-plugins/printwizard/plugin_printwizard.cpp index 55982b9..824ad5b 100644 --- a/kipi-plugins/printwizard/plugin_printwizard.cpp +++ b/kipi-plugins/printwizard/plugin_printwizard.cpp @@ -36,7 +36,7 @@ extern "C" #include <kapplication.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> #include <kstandarddirs.h> diff --git a/kipi-plugins/printwizard/utils.cpp b/kipi-plugins/printwizard/utils.cpp index c54b4e8..c2bd206 100644 --- a/kipi-plugins/printwizard/utils.cpp +++ b/kipi-plugins/printwizard/utils.cpp @@ -35,7 +35,7 @@ extern "C" #include <kurl.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> namespace KIPIPrintWizardPlugin { diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp index f1b818e..a5e4c68 100644 --- a/kipi-plugins/rawconverter/batchdialog.cpp +++ b/kipi-plugins/rawconverter/batchdialog.cpp @@ -56,9 +56,9 @@ extern "C" #include <kurl.h> #include <kiconloader.h> #include <kprogress.h> -#include <kio/renamedlg.h> +#include <tdeio/renamedlg.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <khelpmenu.h> #include <kpopupmenu.h> diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp index ee70d5d..ee25184 100644 --- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp +++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp @@ -47,7 +47,7 @@ extern "C" #include <kapplication.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp index 13f4c2d..d3f5e3a 100644 --- a/kipi-plugins/rawconverter/singledialog.cpp +++ b/kipi-plugins/rawconverter/singledialog.cpp @@ -51,8 +51,8 @@ extern "C" #include <kcursor.h> #include <klocale.h> #include <kmessagebox.h> -#include <kconfig.h> -#include <kio/renamedlg.h> +#include <tdeconfig.h> +#include <tdeio/renamedlg.h> #include <kapplication.h> #include <khelpmenu.h> #include <kiconloader.h> diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp index 1407887..51a47be 100644 --- a/kipi-plugins/sendimages/plugin_sendimages.cpp +++ b/kipi-plugins/sendimages/plugin_sendimages.cpp @@ -35,7 +35,7 @@ extern "C" #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kinstance.h> diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp index bd3896c..d6f4775 100644 --- a/kipi-plugins/sendimages/sendimages.cpp +++ b/kipi-plugins/sendimages/sendimages.cpp @@ -38,16 +38,16 @@ #include <klocale.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kimageeffect.h> #include <kprogress.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kio/job.h> -#include <kio/jobclasses.h> -#include <kio/netaccess.h> -#include <kio/global.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/netaccess.h> +#include <tdeio/global.h> #include <kprocess.h> #include <kimageio.h> #include <knuminput.h> diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp index 5e9ade4..9acf5ce 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.cpp +++ b/kipi-plugins/sendimages/sendimagesdialog.cpp @@ -48,11 +48,11 @@ #include <klocale.h> #include <klineedit.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <knuminput.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> #include <kbuttonbox.h> diff --git a/kipi-plugins/sendimages/sendimagesdialog.h b/kipi-plugins/sendimages/sendimagesdialog.h index 4817d4a..46cb12b 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.h +++ b/kipi-plugins/sendimages/sendimagesdialog.h @@ -32,7 +32,7 @@ #include <kdialogbase.h> #include <klistbox.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> #include <kurl.h> // LibKipi includes. diff --git a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp index ae3e88d..7fd1423 100644 --- a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp +++ b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp @@ -27,7 +27,7 @@ #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kapplication.h> diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp index 1d16148..38e0cdf 100644 --- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp +++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp @@ -35,10 +35,10 @@ #include <kdebug.h> #include <klocale.h> #include <kapplication.h> -#include <kio/netaccess.h> -#include <kfilemetainfo.h> +#include <tdeio/netaccess.h> +#include <tdefilemetainfo.h> #include <kstandarddirs.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kzip.h> #include <kmessagebox.h> #include <kaboutdata.h> diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp index 1bb0467..9d9c773 100644 --- a/kipi-plugins/simpleviewerexport/svedialog.cpp +++ b/kipi-plugins/simpleviewerexport/svedialog.cpp @@ -48,7 +48,7 @@ #include <kcolorbutton.h> #include <kurlrequester.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> // KIPI include files diff --git a/kipi-plugins/slideshow/plugin_slideshow.cpp b/kipi-plugins/slideshow/plugin_slideshow.cpp index b8ebf3b..a823380 100644 --- a/kipi-plugins/slideshow/plugin_slideshow.cpp +++ b/kipi-plugins/slideshow/plugin_slideshow.cpp @@ -46,7 +46,7 @@ extern "C" #include <kapplication.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kipi-plugins/slideshow/slideshow.h b/kipi-plugins/slideshow/slideshow.h index 6f01feb..7a31132 100644 --- a/kipi-plugins/slideshow/slideshow.h +++ b/kipi-plugins/slideshow/slideshow.h @@ -39,7 +39,7 @@ // KDE includes. -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> // Libkipi includes. diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp index ac01a78..526bfec 100644 --- a/kipi-plugins/slideshow/slideshowconfig.cpp +++ b/kipi-plugins/slideshow/slideshowconfig.cpp @@ -42,7 +42,7 @@ // Kde includes. #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kapplication.h> #include <kaboutdata.h> @@ -52,7 +52,7 @@ #include <kstandarddirs.h> #include <kfontdialog.h> #include <kcolorbutton.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> #include <kurl.h> // libkipi includes diff --git a/kipi-plugins/slideshow/slideshowconfig.h b/kipi-plugins/slideshow/slideshowconfig.h index a75e2cd..d817ee6 100644 --- a/kipi-plugins/slideshow/slideshowconfig.h +++ b/kipi-plugins/slideshow/slideshowconfig.h @@ -31,8 +31,8 @@ // KDE includes -#include <kconfig.h> -#include <kio/previewjob.h> +#include <tdeconfig.h> +#include <tdeio/previewjob.h> #include <kurl.h> // libkipi includes diff --git a/kipi-plugins/slideshow/slideshowconfigbase.ui b/kipi-plugins/slideshow/slideshowconfigbase.ui index b4bb68f..6543def 100644 --- a/kipi-plugins/slideshow/slideshowconfigbase.ui +++ b/kipi-plugins/slideshow/slideshowconfigbase.ui @@ -1481,12 +1481,12 @@ Ken Burns effect doesn't use this cache mechanism.</string> <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in declaration">libkipi/interface.h</include> <include location="global" impldecl="in declaration">kprocess.h</include> - <include location="global" impldecl="in declaration">kio/previewjob.h</include> + <include location="global" impldecl="in declaration">tdeio/previewjob.h</include> <include location="global" impldecl="in declaration">klistbox.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">libkipi/interface.h</include> <include location="global" impldecl="in implementation">kprocess.h</include> - <include location="global" impldecl="in implementation">kio/previewjob.h</include> + <include location="global" impldecl="in implementation">tdeio/previewjob.h</include> <include location="global" impldecl="in implementation">klistbox.h</include> </includes> <Q_SLOTS> diff --git a/kipi-plugins/slideshow/slideshowgl.cpp b/kipi-plugins/slideshow/slideshowgl.cpp index e5fc13a..9bae40e 100644 --- a/kipi-plugins/slideshow/slideshowgl.cpp +++ b/kipi-plugins/slideshow/slideshowgl.cpp @@ -20,7 +20,7 @@ * * ============================================================ */ -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/kipi-plugins/slideshow/slideshowgl.h b/kipi-plugins/slideshow/slideshowgl.h index 606ca76..a73b9a4 100644 --- a/kipi-plugins/slideshow/slideshowgl.h +++ b/kipi-plugins/slideshow/slideshowgl.h @@ -24,7 +24,7 @@ #define SLIDESHOWGL_H // KDE includes -#include <kconfig.h> +#include <tdeconfig.h> // QT includes #include <tqvaluelist.h> diff --git a/kipi-plugins/slideshow/slideshowkb.cpp b/kipi-plugins/slideshow/slideshowkb.cpp index 80c256b..2586fbf 100644 --- a/kipi-plugins/slideshow/slideshowkb.cpp +++ b/kipi-plugins/slideshow/slideshowkb.cpp @@ -41,7 +41,7 @@ // KDE includes. -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <tdeversion.h> diff --git a/kipi-plugins/slideshow/slideshowkb.h b/kipi-plugins/slideshow/slideshowkb.h index 2f24600..d053d60 100644 --- a/kipi-plugins/slideshow/slideshowkb.h +++ b/kipi-plugins/slideshow/slideshowkb.h @@ -44,7 +44,7 @@ // KDE includes. -#include <kconfig.h> +#include <tdeconfig.h> // Local includes. diff --git a/kipi-plugins/sync/galleryconfig.cpp b/kipi-plugins/sync/galleryconfig.cpp index f40db0c..32ffa87 100644 --- a/kipi-plugins/sync/galleryconfig.cpp +++ b/kipi-plugins/sync/galleryconfig.cpp @@ -40,7 +40,7 @@ #include <tdehtmlview.h> #include <krun.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> // KIPI include files diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp index aff311f..2ef56eb 100644 --- a/kipi-plugins/sync/gallerywindow.cpp +++ b/kipi-plugins/sync/gallerywindow.cpp @@ -44,7 +44,7 @@ #include <tdehtmlview.h> #include <krun.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> // KIPI include files diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp index dee5a5c..551a4b8 100644 --- a/kipi-plugins/sync/plugin_sync.cpp +++ b/kipi-plugins/sync/plugin_sync.cpp @@ -22,7 +22,7 @@ #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kapplication.h> #include <kmessagebox.h> diff --git a/kipi-plugins/sync/sink.h b/kipi-plugins/sync/sink.h index 39df189..910693c 100644 --- a/kipi-plugins/sync/sink.h +++ b/kipi-plugins/sync/sink.h @@ -22,7 +22,7 @@ #include <tqstring.h> #include "libkipi2/interface.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #if KDE_IS_VERSION(3,2,0) #include <tdewallet.h> diff --git a/kipi-plugins/sync/sinklist.cpp b/kipi-plugins/sync/sinklist.cpp index 77c12ff..0a99330 100644 --- a/kipi-plugins/sync/sinklist.cpp +++ b/kipi-plugins/sync/sinklist.cpp @@ -29,7 +29,7 @@ #include "sinks.h" #include "sinklist.h" -//#include "sinkconfig.h" +//#include "sintdeconfig.h" namespace KIPISyncPlugin { diff --git a/kipi-plugins/sync/sinks.cpp b/kipi-plugins/sync/sinks.cpp index 14fa279..bb5ea4c 100644 --- a/kipi-plugins/sync/sinks.cpp +++ b/kipi-plugins/sync/sinks.cpp @@ -21,7 +21,7 @@ #include <tqwidget.h> #include <kapplication.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tdeversion.h> #if KDE_IS_VERSION(3,2,0) diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp index ab26a2d..8ec8410 100644 --- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp +++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp @@ -25,7 +25,7 @@ #include <tqregexp.h> #include <klocale.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> #include <kmimetype.h> #include <kstandarddirs.h> diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.cpp b/kipi-plugins/timeadjust/plugin_timeadjust.cpp index 67e6c3a..e4c9009 100644 --- a/kipi-plugins/timeadjust/plugin_timeadjust.cpp +++ b/kipi-plugins/timeadjust/plugin_timeadjust.cpp @@ -28,7 +28,7 @@ #include <kapplication.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> // LibKIPI includes. diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp index 1755486..adf6a00 100644 --- a/kipi-plugins/timeadjust/timeadjustdialog.cpp +++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp @@ -59,7 +59,7 @@ extern "C" #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kdatetimewidget.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> // LibKipi includes. diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp index d1a0f25..64ab4d6 100644 --- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp +++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp @@ -29,7 +29,7 @@ #include <kaction.h> #include <kgenericfactory.h> #include <klibloader.h> - #include <kconfig.h> + #include <tdeconfig.h> #include <kdebug.h> #include <tdeversion.h> #include <krun.h> @@ -37,8 +37,8 @@ #include <kmessagebox.h> #include <ktextbrowser.h> #include <tdeversion.h> - #include <kfiledialog.h> - #include <kio/netaccess.h> + #include <tdefiledialog.h> + #include <tdeio/netaccess.h> // KIPI includes diff --git a/po/lt/kipiplugin_batchprocessimages.po b/po/lt/kipiplugin_batchprocessimages.po index 7bdf1df..ee41a73 100644 --- a/po/lt/kipiplugin_batchprocessimages.po +++ b/po/lt/kipiplugin_batchprocessimages.po @@ -120,7 +120,7 @@ msgid "&Add..." msgstr "" "#-#-#-#-# kcmbackground.po (kcmbackground) #-#-#-#-#\n" "&Įdėti...\n" -"#-#-#-#-# knetworkconf.po (knetworkconf) #-#-#-#-#\n" +"#-#-#-#-# knetwortdeconf.po (knetwortdeconf) #-#-#-#-#\n" "&Įdėti...\n" "#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n" "&Pridėti...\n" @@ -363,14 +363,14 @@ msgstr "" "#-#-#-#-# kspread.po (kspread) #-#-#-#-#\n" "#-#-#-#-# keduca.po (keduca) #-#-#-#-#\n" "Testas\n" -"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n" +"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n" "#-#-#-#-# kcalc.po (kcalc) #-#-#-#-#\n" "#-#-#-#-# keduca.po (keduca) #-#-#-#-#\n" "Testas\n" "#-#-#-#-# kcalc.po (kcalc) #-#-#-#-#\n" "#-#-#-#-# keduca.po (keduca) #-#-#-#-#\n" "Testas\n" -"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n" +"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n" "#-#-#-#-# kcalc.po (kcalc) #-#-#-#-#\n" #: batchprocessimageslist.cpp:58 @@ -781,7 +781,7 @@ msgstr "" "Nieko\n" "#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" "Nieko\n" -"#-#-#-#-# kfile_png.po (kfile_png) #-#-#-#-#\n" +"#-#-#-#-# tdefile_png.po (tdefile_png) #-#-#-#-#\n" "nieko\n" "#-#-#-#-# kolourpaint.po (kolourpaint) #-#-#-#-#\n" "Nieko\n" diff --git a/po/lt/kipiplugin_mpegencoder.po b/po/lt/kipiplugin_mpegencoder.po index bd9a2ec..1f31f4d 100644 --- a/po/lt/kipiplugin_mpegencoder.po +++ b/po/lt/kipiplugin_mpegencoder.po @@ -632,7 +632,7 @@ msgid "&Add..." msgstr "" "#-#-#-#-# kcmbackground.po (kcmbackground) #-#-#-#-#\n" "&Įdėti...\n" -"#-#-#-#-# knetworkconf.po (knetworkconf) #-#-#-#-#\n" +"#-#-#-#-# knetwortdeconf.po (knetwortdeconf) #-#-#-#-#\n" "&Įdėti...\n" "#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n" "&Pridėti...\n" diff --git a/po/lt/kipiplugin_slideshow.po b/po/lt/kipiplugin_slideshow.po index 9efd2a5..e0cd91f 100644 --- a/po/lt/kipiplugin_slideshow.po +++ b/po/lt/kipiplugin_slideshow.po @@ -169,7 +169,7 @@ msgstr "" "Nieko\n" "#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" "Nieko\n" -"#-#-#-#-# kfile_png.po (kfile_png) #-#-#-#-#\n" +"#-#-#-#-# tdefile_png.po (tdefile_png) #-#-#-#-#\n" "nieko\n" "#-#-#-#-# kolourpaint.po (kolourpaint) #-#-#-#-#\n" "Nieko\n" |