From ca974a522c029a32b1f01571806e93edb56883e1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:12:11 -0600
Subject: Rename common header files for consistency with class renaming

---
 kipi-plugins/acquireimages/acquireimagedialog.cpp             | 4 ++--
 kipi-plugins/acquireimages/plugin_acquireimages.cpp           | 2 +-
 kipi-plugins/acquireimages/screenshotdialog.cpp               | 4 ++--
 kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp  | 2 +-
 kipi-plugins/batchprocessimages/borderimagesdialog.cpp        | 2 +-
 kipi-plugins/batchprocessimages/colorimagesdialog.cpp         | 2 +-
 kipi-plugins/batchprocessimages/convertimagesdialog.cpp       | 2 +-
 kipi-plugins/batchprocessimages/effectimagesdialog.cpp        | 2 +-
 kipi-plugins/batchprocessimages/filterimagesdialog.cpp        | 2 +-
 kipi-plugins/batchprocessimages/imagepreview.cpp              | 2 +-
 kipi-plugins/batchprocessimages/outputdialog.cpp              | 2 +-
 kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp | 2 +-
 kipi-plugins/batchprocessimages/recompressimagesdialog.cpp    | 2 +-
 kipi-plugins/batchprocessimages/renameimagesdialog.cpp        | 2 +-
 kipi-plugins/batchprocessimages/resizeimagesdialog.cpp        | 2 +-
 kipi-plugins/calendar/calwizard.cpp                           | 2 +-
 kipi-plugins/calendar/monthwidget.cpp                         | 2 +-
 kipi-plugins/calendar/plugin_calendar.cpp                     | 2 +-
 kipi-plugins/cdarchiving/cdarchiving.cpp                      | 4 ++--
 kipi-plugins/cdarchiving/cdarchivingdialog.cpp                | 4 ++--
 kipi-plugins/cdarchiving/plugin_cdarchiving.cpp               | 2 +-
 kipi-plugins/common/include/kpaboutdata.h                     | 2 +-
 kipi-plugins/findimages/displaycompare.cpp                    | 2 +-
 kipi-plugins/findimages/finddupplicatedialog.cpp              | 2 +-
 kipi-plugins/findimages/finddupplicateimages.cpp              | 2 +-
 kipi-plugins/findimages/plugin_findimages.cpp                 | 2 +-
 kipi-plugins/flickrexport/flickrwidget.cpp                    | 2 +-
 kipi-plugins/flickrexport/flickrwindow.cpp                    | 2 +-
 kipi-plugins/flickrexport/mpform.cpp                          | 2 +-
 kipi-plugins/flickrexport/plugin_flickrexport.cpp             | 2 +-
 kipi-plugins/galleryexport/galleries.cpp                      | 2 +-
 kipi-plugins/galleryexport/galleryconfig.cpp                  | 2 +-
 kipi-plugins/galleryexport/gallerylist.cpp                    | 2 +-
 kipi-plugins/galleryexport/gallerympform.cpp                  | 2 +-
 kipi-plugins/galleryexport/gallerywindow.cpp                  | 4 ++--
 kipi-plugins/galleryexport/plugin_galleryexport.cpp           | 2 +-
 kipi-plugins/gpssync/gpsbabelbinary.cpp                       | 2 +-
 kipi-plugins/gpssync/gpseditdialog.cpp                        | 2 +-
 kipi-plugins/gpssync/gpssyncdialog.cpp                        | 2 +-
 kipi-plugins/gpssync/kmlexport.cpp                            | 2 +-
 kipi-plugins/gpssync/kmlexportconfig.cpp                      | 2 +-
 kipi-plugins/gpssync/plugin_gpssync.cpp                       | 2 +-
 kipi-plugins/htmlexport/generator.cpp                         | 4 ++--
 kipi-plugins/htmlexport/plugin.cpp                            | 2 +-
 kipi-plugins/htmlexport/wizard.cpp                            | 2 +-
 kipi-plugins/ipodexport/plugin_ipodexport.cpp                 | 2 +-
 kipi-plugins/jpeglossless/plugin_jpeglossless.cpp             | 2 +-
 kipi-plugins/kameraklient/cameraselection.cpp                 | 2 +-
 kipi-plugins/kameraklient/cameraui.cpp                        | 2 +-
 kipi-plugins/kameraklient/dmessagebox.cpp                     | 2 +-
 kipi-plugins/kameraklient/kameraklient.cpp                    | 2 +-
 kipi-plugins/kameraklient/setupcamera.cpp                     | 2 +-
 kipi-plugins/metadataedit/commenteditdialog.cpp               | 2 +-
 kipi-plugins/metadataedit/commentremovedialog.cpp             | 2 +-
 kipi-plugins/metadataedit/exifcaption.cpp                     | 4 ++--
 kipi-plugins/metadataedit/exifdatetime.cpp                    | 4 ++--
 kipi-plugins/metadataedit/exifeditdialog.cpp                  | 2 +-
 kipi-plugins/metadataedit/iptccaption.cpp                     | 4 ++--
 kipi-plugins/metadataedit/iptcdatetime.cpp                    | 4 ++--
 kipi-plugins/metadataedit/iptceditdialog.cpp                  | 2 +-
 kipi-plugins/metadataedit/iptcstatus.cpp                      | 4 ++--
 kipi-plugins/metadataedit/plugin_metadataedit.cpp             | 2 +-
 kipi-plugins/mpegencoder/checkbinprog.cpp                     | 2 +-
 kipi-plugins/mpegencoder/kimg2mpg.cpp                         | 2 +-
 kipi-plugins/mpegencoder/plugin_mpegencoder.cpp               | 2 +-
 kipi-plugins/picasawebexport/mpform.cpp                       | 2 +-
 kipi-plugins/picasawebexport/picasawebtalker.cpp              | 2 +-
 kipi-plugins/picasawebexport/picasawebwindow.cpp              | 2 +-
 kipi-plugins/picasawebexport/plugin_picasawebexport.cpp       | 2 +-
 kipi-plugins/printwizard/frmprintwizard.cpp                   | 4 ++--
 kipi-plugins/printwizard/plugin_printwizard.cpp               | 2 +-
 kipi-plugins/rawconverter/batchdialog.cpp                     | 2 +-
 kipi-plugins/rawconverter/plugin_rawconverter.cpp             | 2 +-
 kipi-plugins/rawconverter/singledialog.cpp                    | 2 +-
 kipi-plugins/sendimages/plugin_sendimages.cpp                 | 2 +-
 kipi-plugins/sendimages/sendimages.cpp                        | 2 +-
 kipi-plugins/sendimages/sendimagesdialog.cpp                  | 2 +-
 kipi-plugins/simpleviewerexport/firstrundlg.cpp               | 4 ++--
 kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp       | 2 +-
 kipi-plugins/simpleviewerexport/simpleviewerexport.cpp        | 4 ++--
 kipi-plugins/simpleviewerexport/svedialog.cpp                 | 2 +-
 kipi-plugins/slideshow/plugin_slideshow.cpp                   | 2 +-
 kipi-plugins/slideshow/slideshowconfig.cpp                    | 4 ++--
 kipi-plugins/slideshow/toolbar.cpp                            | 2 +-
 kipi-plugins/sync/galleryconfig.cpp                           | 2 +-
 kipi-plugins/sync/gallerywindow.cpp                           | 4 ++--
 kipi-plugins/sync/plugin_sync.cpp                             | 2 +-
 kipi-plugins/sync/sinks.cpp                                   | 2 +-
 kipi-plugins/sync/sinks/gallery/galleryform.cpp               | 2 +-
 kipi-plugins/sync/sintdelist.cpp                              | 2 +-
 kipi-plugins/timeadjust/plugin_timeadjust.cpp                 | 2 +-
 kipi-plugins/timeadjust/timeadjustdialog.cpp                  | 4 ++--
 kipi-plugins/wallpaper/plugin_wallpaper.cpp                   | 2 +-
 93 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index 3a21ed9..d008895 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.cpp
+++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp
@@ -73,8 +73,8 @@ extern "C"
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <tdefiletreeview.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.cpp b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
index ada1dd8..b5254e2 100644
--- a/kipi-plugins/acquireimages/plugin_acquireimages.cpp
+++ b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
@@ -38,7 +38,7 @@
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <kscan.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes
 
diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp
index 004165b..7903420 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.cpp
+++ b/kipi-plugins/acquireimages/screenshotdialog.cpp
@@ -50,8 +50,8 @@ extern "C"
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
index 64f6cc2..ee9163c 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
@@ -63,7 +63,7 @@ extern "C"
 #include <knuminput.h>
 #include <kinstance.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
index 4a1a343..df705a1 100644
--- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
@@ -37,7 +37,7 @@
 #include <knuminput.h>
 #include <kprocess.h>
 #include <kcolorbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
index ff57cdf..50b3128 100644
--- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
index 2c8c6ce..fd065fd 100644
--- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
index a6d1c12..8bef844 100644
--- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
index be9dc6d..6f1e098 100644
--- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index f5c7502..01b5cc6 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -59,7 +59,7 @@ extern "C"
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp
index 02d6df1..b3b6311 100644
--- a/kipi-plugins/batchprocessimages/outputdialog.cpp
+++ b/kipi-plugins/batchprocessimages/outputdialog.cpp
@@ -31,7 +31,7 @@
 // KDElib includes
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
index 0e963f7..083e581 100644
--- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
+++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
@@ -34,7 +34,7 @@ extern "C"
 // KDE includes
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tdeaction.h>
 #include <kgenericfactory.h>
diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
index fd0ece7..6abcb19 100644
--- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
index 6228a11..8313973 100644
--- a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
index 9bae472..7fa466f 100644
--- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
@@ -38,7 +38,7 @@
 #include <knuminput.h>
 #include <kprocess.h>
 #include <kcolorbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp
index e62c1d7..d8fc6b2 100644
--- a/kipi-plugins/calendar/calwizard.cpp
+++ b/kipi-plugins/calendar/calwizard.cpp
@@ -40,7 +40,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kprinter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp
index 3cd11ab..cfdeb78 100644
--- a/kipi-plugins/calendar/monthwidget.cpp
+++ b/kipi-plugins/calendar/monthwidget.cpp
@@ -40,7 +40,7 @@
 #include <kimageio.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdeio/previewjob.h>
diff --git a/kipi-plugins/calendar/plugin_calendar.cpp b/kipi-plugins/calendar/plugin_calendar.cpp
index d5f01d5..ad34bc2 100644
--- a/kipi-plugins/calendar/plugin_calendar.cpp
+++ b/kipi-plugins/calendar/plugin_calendar.cpp
@@ -33,7 +33,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp
index a07c2d8..2c2c2b4 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/cdarchiving.cpp
@@ -42,8 +42,8 @@ extern "C"
 
 // Include files for KDE
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index e898154..40fafd8 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -44,8 +44,8 @@
 
 // KDE includes
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
index b459814..897ed97 100644
--- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
@@ -23,7 +23,7 @@
 // KDE includes
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
diff --git a/kipi-plugins/common/include/kpaboutdata.h b/kipi-plugins/common/include/kpaboutdata.h
index a390115..97ea75c 100644
--- a/kipi-plugins/common/include/kpaboutdata.h
+++ b/kipi-plugins/common/include/kpaboutdata.h
@@ -23,7 +23,7 @@
 #ifndef __KIPI_ABOUT_DATA__
 #define __KIPI_ABOUT_DATA__
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <libkipi/libkipi_export.h>
 
diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp
index d92ade8..92d85b1 100644
--- a/kipi-plugins/findimages/displaycompare.cpp
+++ b/kipi-plugins/findimages/displaycompare.cpp
@@ -47,7 +47,7 @@
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <ksqueezedtextlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp
index 466edba..575aafb 100644
--- a/kipi-plugins/findimages/finddupplicatedialog.cpp
+++ b/kipi-plugins/findimages/finddupplicatedialog.cpp
@@ -51,7 +51,7 @@
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
 #include <kbuttonbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksqueezedtextlabel.h>
 #include <tdeio/global.h>
 #include <tdelistview.h>
diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp
index 9a614bf..4a9aa50 100644
--- a/kipi-plugins/findimages/finddupplicateimages.cpp
+++ b/kipi-plugins/findimages/finddupplicateimages.cpp
@@ -44,7 +44,7 @@ extern "C"
 #include <klocale.h>
 #include <kinstance.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <kdebug.h>
 #include <kprogress.h>
diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp
index d6aaf1e..c608f20 100644
--- a/kipi-plugins/findimages/plugin_findimages.cpp
+++ b/kipi-plugins/findimages/plugin_findimages.cpp
@@ -34,7 +34,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 
 // Lib KIPI includes.
diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp
index 1fb6d8c..4920ccf 100644
--- a/kipi-plugins/flickrexport/flickrwidget.cpp
+++ b/kipi-plugins/flickrexport/flickrwidget.cpp
@@ -47,7 +47,7 @@
 #include <tdehtmlview.h>
 #include <kseparator.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Libkipi includes.
 
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index b13877d..7e598b9 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -40,7 +40,7 @@
 #include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
diff --git a/kipi-plugins/flickrexport/mpform.cpp b/kipi-plugins/flickrexport/mpform.cpp
index ab33c30..61d0d47 100644
--- a/kipi-plugins/flickrexport/mpform.cpp
+++ b/kipi-plugins/flickrexport/mpform.cpp
@@ -34,7 +34,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kurl.h>
diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.cpp b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
index 0464a73..2ee6a20 100644
--- a/kipi-plugins/flickrexport/plugin_flickrexport.cpp
+++ b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
@@ -35,7 +35,7 @@ extern "C"
 #include <klibloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 // libkipi includes.
diff --git a/kipi-plugins/galleryexport/galleries.cpp b/kipi-plugins/galleryexport/galleries.cpp
index 8d2f11c..0e54f19 100644
--- a/kipi-plugins/galleryexport/galleries.cpp
+++ b/kipi-plugins/galleryexport/galleries.cpp
@@ -19,7 +19,7 @@
 #include <tqstring.h>
 
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/kipi-plugins/galleryexport/galleryconfig.cpp b/kipi-plugins/galleryexport/galleryconfig.cpp
index 32ffa87..2fdd9d5 100644
--- a/kipi-plugins/galleryexport/galleryconfig.cpp
+++ b/kipi-plugins/galleryexport/galleryconfig.cpp
@@ -34,7 +34,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
diff --git a/kipi-plugins/galleryexport/gallerylist.cpp b/kipi-plugins/galleryexport/gallerylist.cpp
index 740139f..fc17286 100644
--- a/kipi-plugins/galleryexport/gallerylist.cpp
+++ b/kipi-plugins/galleryexport/gallerylist.cpp
@@ -34,7 +34,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 // Local includes.
diff --git a/kipi-plugins/galleryexport/gallerympform.cpp b/kipi-plugins/galleryexport/gallerympform.cpp
index a2cd525..e279680 100644
--- a/kipi-plugins/galleryexport/gallerympform.cpp
+++ b/kipi-plugins/galleryexport/gallerympform.cpp
@@ -19,7 +19,7 @@
  *
  * ============================================================ */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kurl.h>
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index c41f201..a080154 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -33,12 +33,12 @@
 
 // Include files for KDE
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
index 955c2f9..e6087ce 100644
--- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp
+++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
@@ -28,7 +28,7 @@
 #include <klibloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 
diff --git a/kipi-plugins/gpssync/gpsbabelbinary.cpp b/kipi-plugins/gpssync/gpsbabelbinary.cpp
index f7d01a5..568e4fa 100644
--- a/kipi-plugins/gpssync/gpsbabelbinary.cpp
+++ b/kipi-plugins/gpssync/gpsbabelbinary.cpp
@@ -22,7 +22,7 @@
 
 // KDE includes
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp
index 4b00658..0176167 100644
--- a/kipi-plugins/gpssync/gpseditdialog.cpp
+++ b/kipi-plugins/gpssync/gpseditdialog.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
 #include <tdehtmlview.h>
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index 88152fa..c898b71 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -36,7 +36,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <ksqueezedtextlabel.h>
 #include <kiconloader.h>
diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp
index bcac620..ec5d322 100644
--- a/kipi-plugins/gpssync/kmlexport.cpp
+++ b/kipi-plugins/gpssync/kmlexport.cpp
@@ -32,7 +32,7 @@ extern "C"
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
 #include <klocale.h>
diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp
index 1282365..d9baeca 100644
--- a/kipi-plugins/gpssync/kmlexportconfig.cpp
+++ b/kipi-plugins/gpssync/kmlexportconfig.cpp
@@ -36,7 +36,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <kdialog.h>
diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp
index 5c57dce..4839099 100644
--- a/kipi-plugins/gpssync/plugin_gpssync.cpp
+++ b/kipi-plugins/gpssync/plugin_gpssync.cpp
@@ -30,7 +30,7 @@
 
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/htmlexport/generator.cpp b/kipi-plugins/htmlexport/generator.cpp
index 5db5ffc..dc33d1f 100644
--- a/kipi-plugins/htmlexport/generator.cpp
+++ b/kipi-plugins/htmlexport/generator.cpp
@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqregexp.h>
 
 // KDE
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeio/netaccess.h>
diff --git a/kipi-plugins/htmlexport/plugin.cpp b/kipi-plugins/htmlexport/plugin.cpp
index 314e715..98b1860 100644
--- a/kipi-plugins/htmlexport/plugin.cpp
+++ b/kipi-plugins/htmlexport/plugin.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // KDE
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <klocale.h>
diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp
index a0d46fb..563c3b5 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <ktextbrowser.h>
 #include <kurlrequester.h>
 #include <kwizard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
 
diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.cpp b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
index 4aa04f8..7a79b62 100644
--- a/kipi-plugins/ipodexport/plugin_ipodexport.cpp
+++ b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
@@ -22,7 +22,7 @@ extern "C" {
 
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
index a1d7743..97a14cf 100644
--- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
+++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // LibKipi includes.
 
diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp
index 0a6c52e..978c347 100644
--- a/kipi-plugins/kameraklient/cameraselection.cpp
+++ b/kipi-plugins/kameraklient/cameraselection.cpp
@@ -31,7 +31,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index a6893a7..35cf3ad 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -69,7 +69,7 @@
 #include <kstatusbar.h>
 #include <tdestdaccel.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kipi-plugins/kameraklient/dmessagebox.cpp b/kipi-plugins/kameraklient/dmessagebox.cpp
index fb4afff..f1a1262 100644
--- a/kipi-plugins/kameraklient/dmessagebox.cpp
+++ b/kipi-plugins/kameraklient/dmessagebox.cpp
@@ -33,7 +33,7 @@
 #include <tqtextedit.h>
 // KDE
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 // Local
 #include "dmessagebox.h"
diff --git a/kipi-plugins/kameraklient/kameraklient.cpp b/kipi-plugins/kameraklient/kameraklient.cpp
index 99de5cd..789f555 100644
--- a/kipi-plugins/kameraklient/kameraklient.cpp
+++ b/kipi-plugins/kameraklient/kameraklient.cpp
@@ -23,7 +23,7 @@
 #include <tqiconset.h>
 #include <tqwidget.h>
 // KDE
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp
index 65c2f1d..9d32f8b 100644
--- a/kipi-plugins/kameraklient/setupcamera.cpp
+++ b/kipi-plugins/kameraklient/setupcamera.cpp
@@ -33,7 +33,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp
index 0a32b52..cf41a1f 100644
--- a/kipi-plugins/metadataedit/commenteditdialog.cpp
+++ b/kipi-plugins/metadataedit/commenteditdialog.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <ktextedit.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
 
diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp
index 19acd29..039f4c9 100644
--- a/kipi-plugins/metadataedit/commentremovedialog.cpp
+++ b/kipi-plugins/metadataedit/commentremovedialog.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
 
diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp
index 712576e..e6e20ff 100644
--- a/kipi-plugins/metadataedit/exifcaption.cpp
+++ b/kipi-plugins/metadataedit/exifcaption.cpp
@@ -36,8 +36,8 @@
 #include <kdialog.h>
 #include <klineedit.h>
 #include <ktextedit.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kactivelabel.h>
 
 // LibKExiv2 includes. 
diff --git a/kipi-plugins/metadataedit/exifdatetime.cpp b/kipi-plugins/metadataedit/exifdatetime.cpp
index e25b558..54985a5 100644
--- a/kipi-plugins/metadataedit/exifdatetime.cpp
+++ b/kipi-plugins/metadataedit/exifdatetime.cpp
@@ -34,8 +34,8 @@
 #include <kdialog.h>
 #include <kdatetimewidget.h>
 #include <knuminput.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kseparator.h>
 
 // LibKExiv2 includes. 
diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp
index e4d9628..d166a05 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -33,7 +33,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp
index 2f691ce..b0e8a60 100644
--- a/kipi-plugins/metadataedit/iptccaption.cpp
+++ b/kipi-plugins/metadataedit/iptccaption.cpp
@@ -36,8 +36,8 @@
 #include <kdialog.h>
 #include <klineedit.h>
 #include <ktextedit.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kseparator.h>
 #include <kactivelabel.h>
 
diff --git a/kipi-plugins/metadataedit/iptcdatetime.cpp b/kipi-plugins/metadataedit/iptcdatetime.cpp
index b4f296f..edbe598 100644
--- a/kipi-plugins/metadataedit/iptcdatetime.cpp
+++ b/kipi-plugins/metadataedit/iptcdatetime.cpp
@@ -35,8 +35,8 @@
 #include <kdialog.h>
 #include <kdatewidget.h>
 #include <ktimewidget.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kseparator.h>
 
 // LibKExiv2 includes. 
diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp
index 335e72a..c389b9f 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -33,7 +33,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp
index 172f25e..f4a7e0e 100644
--- a/kipi-plugins/metadataedit/iptcstatus.cpp
+++ b/kipi-plugins/metadataedit/iptcstatus.cpp
@@ -33,8 +33,8 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kactivelabel.h>
 
 // LibKExiv2 includes. 
diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
index 38f50af..beb6731 100644
--- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp
+++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/mpegencoder/checkbinprog.cpp b/kipi-plugins/mpegencoder/checkbinprog.cpp
index 9f620cf..5c5cff0 100644
--- a/kipi-plugins/mpegencoder/checkbinprog.cpp
+++ b/kipi-plugins/mpegencoder/checkbinprog.cpp
@@ -33,7 +33,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index 8f736e5..84c532c 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -80,7 +80,7 @@ extern "C"
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
index f2305bd..0aba7d4 100644
--- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
+++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
@@ -30,7 +30,7 @@
 
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/picasawebexport/mpform.cpp b/kipi-plugins/picasawebexport/mpform.cpp
index cc391e1..cc71928 100644
--- a/kipi-plugins/picasawebexport/mpform.cpp
+++ b/kipi-plugins/picasawebexport/mpform.cpp
@@ -34,7 +34,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kurl.h>
diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp
index 5ea3db8..c38af3d 100644
--- a/kipi-plugins/picasawebexport/picasawebtalker.cpp
+++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp
@@ -49,7 +49,7 @@
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdeio/jobclasses.h>
 #include <kurl.h>
diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp
index b52bf83..4024bda 100644
--- a/kipi-plugins/picasawebexport/picasawebwindow.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp
@@ -45,7 +45,7 @@
 #include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
index a816d7a..209a31a 100644
--- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
+++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
@@ -35,7 +35,7 @@ extern "C"
 #include <klibloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 // libkipi includes.
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index 51de9b7..e4b96b0 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -51,8 +51,8 @@ extern "C"
 #include <kurllabel.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/printwizard/plugin_printwizard.cpp b/kipi-plugins/printwizard/plugin_printwizard.cpp
index 908e2c1..5e9c206 100644
--- a/kipi-plugins/printwizard/plugin_printwizard.cpp
+++ b/kipi-plugins/printwizard/plugin_printwizard.cpp
@@ -33,7 +33,7 @@ extern "C"
 
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index f7a40bd..1a8dfa3 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -59,7 +59,7 @@ extern "C"
 #include <tdeio/renamedlg.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
index 86bc405..2dd955c 100644
--- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp
+++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
@@ -44,7 +44,7 @@ extern "C"
 
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index e5fcd11..32aaa19 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -53,7 +53,7 @@ extern "C"
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <tdeio/renamedlg.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp
index 6ec2026..08c3834 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.cpp
+++ b/kipi-plugins/sendimages/plugin_sendimages.cpp
@@ -30,7 +30,7 @@ extern "C"
 // Include files for KDE
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tdeaction.h>
 #include <kgenericfactory.h>
diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp
index d6f4775..5519378 100644
--- a/kipi-plugins/sendimages/sendimages.cpp
+++ b/kipi-plugins/sendimages/sendimages.cpp
@@ -39,7 +39,7 @@
 #include <klocale.h>
 #include <kinstance.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <kprogress.h>
 #include <kmessagebox.h>
diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp
index d79fb9c..cc630cd 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.cpp
+++ b/kipi-plugins/sendimages/sendimagesdialog.cpp
@@ -57,7 +57,7 @@
 #include <kdialogbase.h>
 #include <kbuttonbox.h>
 #include <ksqueezedtextlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
 #include <kurlrequester.h>
diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.cpp b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
index 26bc257..ae9a015 100644
--- a/kipi-plugins/simpleviewerexport/firstrundlg.cpp
+++ b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
@@ -32,12 +32,12 @@
 // KDE include files
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurllabel.h>
 #include <kurlrequester.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // KIPI include files
 
diff --git a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
index 52cf607..f8631f2 100644
--- a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
+++ b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
@@ -29,7 +29,7 @@
 #include <klibloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // LibKIPI includes.
 
diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
index 38e0cdf..7e8ceb4 100644
--- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
+++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
@@ -34,14 +34,14 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/netaccess.h>
 #include <tdefilemetainfo.h>
 #include <kstandarddirs.h>
 #include <tdeio/job.h>
 #include <kzip.h>
 #include <kmessagebox.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <ktempdir.h>
 
 // KIPI includes
diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp
index a001e56..c7fd72b 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.cpp
+++ b/kipi-plugins/simpleviewerexport/svedialog.cpp
@@ -49,7 +49,7 @@
 #include <kurlrequester.h>
 #include <kglobalsettings.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // KIPI include files
 
diff --git a/kipi-plugins/slideshow/plugin_slideshow.cpp b/kipi-plugins/slideshow/plugin_slideshow.cpp
index 955a3ee..79c98a7 100644
--- a/kipi-plugins/slideshow/plugin_slideshow.cpp
+++ b/kipi-plugins/slideshow/plugin_slideshow.cpp
@@ -43,7 +43,7 @@ extern "C"
  
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp
index d5e38e7..7225bf4 100644
--- a/kipi-plugins/slideshow/slideshowconfig.cpp
+++ b/kipi-plugins/slideshow/slideshowconfig.cpp
@@ -44,8 +44,8 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/slideshow/toolbar.cpp b/kipi-plugins/slideshow/toolbar.cpp
index 8a70951..a6ab08d 100644
--- a/kipi-plugins/slideshow/toolbar.cpp
+++ b/kipi-plugins/slideshow/toolbar.cpp
@@ -29,7 +29,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
diff --git a/kipi-plugins/sync/galleryconfig.cpp b/kipi-plugins/sync/galleryconfig.cpp
index 32ffa87..2fdd9d5 100644
--- a/kipi-plugins/sync/galleryconfig.cpp
+++ b/kipi-plugins/sync/galleryconfig.cpp
@@ -34,7 +34,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index 84ca881..0643e9b 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/gallerywindow.cpp
@@ -33,12 +33,12 @@
 
 // Include files for KDE
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp
index cd227c7..406d848 100644
--- a/kipi-plugins/sync/plugin_sync.cpp
+++ b/kipi-plugins/sync/plugin_sync.cpp
@@ -24,7 +24,7 @@
 #include <klibloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 
diff --git a/kipi-plugins/sync/sinks.cpp b/kipi-plugins/sync/sinks.cpp
index bb5ea4c..fc98893 100644
--- a/kipi-plugins/sync/sinks.cpp
+++ b/kipi-plugins/sync/sinks.cpp
@@ -19,7 +19,7 @@
 #include <tqstring.h>
 
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/kipi-plugins/sync/sinks/gallery/galleryform.cpp b/kipi-plugins/sync/sinks/gallery/galleryform.cpp
index e726a3b..469676d 100644
--- a/kipi-plugins/sync/sinks/gallery/galleryform.cpp
+++ b/kipi-plugins/sync/sinks/gallery/galleryform.cpp
@@ -18,7 +18,7 @@
  *
  * ============================================================ */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kurl.h>
diff --git a/kipi-plugins/sync/sintdelist.cpp b/kipi-plugins/sync/sintdelist.cpp
index c54febd..80b4e9a 100644
--- a/kipi-plugins/sync/sintdelist.cpp
+++ b/kipi-plugins/sync/sintdelist.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpushbutton.h>
 
 
diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.cpp b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
index d6c4ef0..0c88d6a 100644
--- a/kipi-plugins/timeadjust/plugin_timeadjust.cpp
+++ b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
@@ -25,7 +25,7 @@
 
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp
index 775d017..d4c534f 100644
--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
+++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
@@ -52,8 +52,8 @@ extern "C"
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
index 589bfce..fc544c7 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
@@ -33,7 +33,7 @@
  #include <kdebug.h>
  #include <tdeversion.h>
  #include <krun.h>
- #include <kapplication.h>
+ #include <tdeapplication.h>
  #include <kmessagebox.h>
  #include <ktextbrowser.h>
  #include <tdeversion.h>
-- 
cgit v1.2.1