Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kipi-plugins

ChangeLog

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

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

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

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>

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

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>

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>

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 <tdeio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <kbuttonbox.h>
 #include <kdiroperator.h>
 #include <tdeversion.h>

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>

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>

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>

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>

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>

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>

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 <tdeio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kcursor.h>

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>

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>

kipi-plugins/batchprocessimages/renameimageswidget.cpp

@@ -54,9 +54,9 @@ extern "C"
 // KDE includes.
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 

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>

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>

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>
 

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>

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 <tdeio/global.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <klocale.h>
 #include <kprocess.h>
 #include <krun.h>

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>

kipi-plugins/cdarchiving/cdarchivingdialog.h

@@ -35,7 +35,7 @@
 // KDE includes
 
 #include <kdialogbase.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 // KIPI includes
 

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>

kipi-plugins/findimages/displaycompare.cpp

@@ -49,12 +49,12 @@
 #include <ksqueezedtextlabel.h>
 #include <kapplication.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kio/global.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>

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>

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 <tdeio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kimageio.h>
 
 // Local include files

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>

kipi-plugins/flickrexport/flickrtalker.h

@@ -34,7 +34,7 @@
 // KDE includes.
 
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TQProgressDialog;
 

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>

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.
 

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>

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)

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
 

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>

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
 

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>

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>

kipi-plugins/gpssync/gpssyncdialog.cpp

@@ -43,13 +43,13 @@
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
 #include <klistview.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
-#include <kconfig.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.
 

kipi-plugins/gpssync/kmlexport.cpp

@@ -33,8 +33,8 @@ extern "C"
 // KDE includes.
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>

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>

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>
 

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.

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

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
 

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>
 

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
 

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 {
 

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 {
 

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>

kipi-plugins/ipodexport/ipodexportdialog.cpp

@@ -32,11 +32,11 @@
 #include <tqwmatrix.h>
 
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
-#include <kfiledialog.h> // add images
+#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>

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>

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>

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 <tdefiledialog.h>
-#include <kfileitem.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>

kipi-plugins/kameraklient/cameraui.h

@@ -31,7 +31,7 @@
 
 // KDE includes.
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 // Local includes.
 

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>

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>

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>

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>

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.

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>

kipi-plugins/mpegencoder/kimg2mpg.cpp

@@ -67,8 +67,8 @@ extern "C"
 #include <kprogress.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kcolordialog.h>
 #include <klineedit.h>
 #include <kcolorbutton.h>

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
 

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>

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.
 

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>
 

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.

kipi-plugins/picasawebexport/picasawebtalker.h

@@ -34,7 +34,7 @@
 // KDE includes.
 
 #include <kurl.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 namespace TDEIO
 {

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>

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>

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>

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
 {

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>

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>
 

kipi-plugins/rawconverter/singledialog.cpp

@@ -51,8 +51,8 @@ extern "C"
 #include <kcursor.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>

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>

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 <tdeio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kprocess.h>
 #include <kimageio.h>
 #include <knuminput.h>

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>

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.

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>
 

kipi-plugins/simpleviewerexport/simpleviewerexport.cpp

@@ -35,10 +35,10 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kzip.h>
 #include <kmessagebox.h>
 #include <kaboutdata.h>

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

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>
 

kipi-plugins/slideshow/slideshow.h

@@ -39,7 +39,7 @@
 
 // KDE includes.
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 // Libkipi includes.

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

kipi-plugins/slideshow/slideshowconfig.h

@@ -31,8 +31,8 @@
 
 // KDE includes
 
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <kurl.h>
 
 // libkipi includes

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>

kipi-plugins/slideshow/slideshowgl.cpp

@@ -20,7 +20,7 @@
  *
  * ============================================================ */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>

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>

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>

kipi-plugins/slideshow/slideshowkb.h

@@ -44,7 +44,7 @@
 
 // KDE includes.
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // Local includes.
 

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
 

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
 

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>

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>

kipi-plugins/sync/sinklist.cpp

@@ -29,7 +29,7 @@
 
 #include "sinks.h"
 #include "sinklist.h"
-//#include "sinkconfig.h"
+//#include "sintdeconfig.h"
 
 namespace KIPISyncPlugin
 {

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)

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>

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.

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.

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 <tdefiledialog.h>
- #include <kio/netaccess.h>
+ #include <tdeio/netaccess.h>
 
 // KIPI includes
 

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"

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"

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"