summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:01 -0600
commit7f7536ce977e7a4a00727244246fc71062a76721 (patch)
tree7deaba7d507a5bb63df96afb8d82ac336db80221
parentca974a522c029a32b1f01571806e93edb56883e1 (diff)
downloadkipi-plugins-7f7536ce977e7a4a00727244246fc71062a76721.tar.gz
kipi-plugins-7f7536ce977e7a4a00727244246fc71062a76721.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--kipi-plugins/acquireimages/acquireimagedialog.cpp6
-rw-r--r--kipi-plugins/acquireimages/plugin_acquireimages.cpp6
-rw-r--r--kipi-plugins/acquireimages/screenshotdialog.cpp4
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp6
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimageslist.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/borderimagesdialog.cpp4
-rw-r--r--kipi-plugins/batchprocessimages/borderoptionsdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/colorimagesdialog.cpp4
-rw-r--r--kipi-plugins/batchprocessimages/coloroptionsdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/convertimagesdialog.cpp4
-rw-r--r--kipi-plugins/batchprocessimages/convertoptionsdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/effectimagesdialog.cpp4
-rw-r--r--kipi-plugins/batchprocessimages/effectoptionsdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/filterimagesdialog.cpp4
-rw-r--r--kipi-plugins/batchprocessimages/filteroptionsdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/imagepreview.cpp4
-rw-r--r--kipi-plugins/batchprocessimages/outputdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp8
-rw-r--r--kipi-plugins/batchprocessimages/recompressimagesdialog.cpp4
-rw-r--r--kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/renameimageswidget.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/resizeimagesdialog.cpp4
-rw-r--r--kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp4
-rw-r--r--kipi-plugins/calendar/calevents.cpp2
-rw-r--r--kipi-plugins/calendar/calformatter.cpp4
-rw-r--r--kipi-plugins/calendar/calpainter.cpp4
-rw-r--r--kipi-plugins/calendar/calselect.cpp4
-rw-r--r--kipi-plugins/calendar/calsettings.cpp4
-rw-r--r--kipi-plugins/calendar/caltemplate.cpp2
-rw-r--r--kipi-plugins/calendar/calwidget.cpp4
-rw-r--r--kipi-plugins/calendar/calwizard.cpp4
-rw-r--r--kipi-plugins/calendar/monthwidget.cpp4
-rw-r--r--kipi-plugins/calendar/plugin_calendar.cpp2
-rw-r--r--kipi-plugins/cdarchiving/cdarchiving.cpp4
-rw-r--r--kipi-plugins/cdarchiving/cdarchivingdialog.cpp6
-rw-r--r--kipi-plugins/cdarchiving/plugin_cdarchiving.cpp2
-rw-r--r--kipi-plugins/common/libkipiplugins/kpaboutdata.cpp4
-rw-r--r--kipi-plugins/findimages/displaycompare.cpp4
-rw-r--r--kipi-plugins/findimages/finddupplicatedialog.cpp6
-rw-r--r--kipi-plugins/findimages/finddupplicateimages.cpp4
-rw-r--r--kipi-plugins/findimages/plugin_findimages.cpp4
-rw-r--r--kipi-plugins/flickrexport/flickrtalker.cpp4
-rw-r--r--kipi-plugins/flickrexport/flickrwidget.cpp2
-rw-r--r--kipi-plugins/flickrexport/flickrwindow.cpp4
-rw-r--r--kipi-plugins/flickrexport/imageslist.cpp2
-rw-r--r--kipi-plugins/flickrexport/login.cpp2
-rw-r--r--kipi-plugins/flickrexport/plugin_flickrexport.cpp2
-rw-r--r--kipi-plugins/galleryexport/galleries.cpp2
-rw-r--r--kipi-plugins/galleryexport/galleryconfig.cpp4
-rw-r--r--kipi-plugins/galleryexport/gallerylist.cpp4
-rw-r--r--kipi-plugins/galleryexport/gallerytalker.cpp2
-rw-r--r--kipi-plugins/galleryexport/gallerywidget.cpp2
-rw-r--r--kipi-plugins/galleryexport/gallerywindow.cpp4
-rw-r--r--kipi-plugins/galleryexport/plugin_galleryexport.cpp4
-rw-r--r--kipi-plugins/gpssync/gpsbabelbinary.cpp6
-rw-r--r--kipi-plugins/gpssync/gpseditdialog.cpp4
-rw-r--r--kipi-plugins/gpssync/gpslistviewitem.cpp2
-rw-r--r--kipi-plugins/gpssync/gpssyncdialog.cpp6
-rw-r--r--kipi-plugins/gpssync/kmlexport.cpp4
-rw-r--r--kipi-plugins/gpssync/kmlexportconfig.cpp2
-rw-r--r--kipi-plugins/gpssync/kmlgpsdataparser.cpp2
-rw-r--r--kipi-plugins/gpssync/plugin_gpssync.cpp4
-rw-r--r--kipi-plugins/helloworld/plugin_helloworld.cpp2
-rw-r--r--kipi-plugins/htmlexport/generator.cpp2
-rw-r--r--kipi-plugins/htmlexport/plugin.cpp2
-rw-r--r--kipi-plugins/htmlexport/wizard.cpp2
-rw-r--r--kipi-plugins/imageviewer/plugin_viewer.cpp2
-rw-r--r--kipi-plugins/imageviewer/viewerwidget.cpp4
-rw-r--r--kipi-plugins/ipodexport/imagelist.cpp2
-rw-r--r--kipi-plugins/ipodexport/imagelistitem.h2
-rw-r--r--kipi-plugins/ipodexport/ipodexportdialog.cpp4
-rw-r--r--kipi-plugins/ipodexport/ipodheader.cpp2
-rw-r--r--kipi-plugins/ipodexport/ipodlistitem.cpp2
-rw-r--r--kipi-plugins/ipodexport/plugin_ipodexport.cpp2
-rw-r--r--kipi-plugins/jpeglossless/convert2grayscale.cpp4
-rw-r--r--kipi-plugins/jpeglossless/imageflip.cpp4
-rw-r--r--kipi-plugins/jpeglossless/imagerotate.cpp4
-rw-r--r--kipi-plugins/jpeglossless/jpegtransform.cpp4
-rw-r--r--kipi-plugins/jpeglossless/plugin_jpeglossless.cpp4
-rw-r--r--kipi-plugins/jpeglossless/utils.cpp4
-rw-r--r--kipi-plugins/kameraklient/camerafolderview.cpp2
-rw-r--r--kipi-plugins/kameraklient/cameraiconview.cpp2
-rw-r--r--kipi-plugins/kameraklient/cameraselection.cpp2
-rw-r--r--kipi-plugins/kameraklient/cameraui.cpp4
-rw-r--r--kipi-plugins/kameraklient/dmessagebox.cpp2
-rw-r--r--kipi-plugins/kameraklient/gpcontroller.cpp2
-rw-r--r--kipi-plugins/kameraklient/gpfileiteminfodlg.cpp2
-rw-r--r--kipi-plugins/kameraklient/kameraklient.cpp4
-rw-r--r--kipi-plugins/kameraklient/savefiledialog.cpp2
-rw-r--r--kipi-plugins/kameraklient/setupcamera.cpp4
-rw-r--r--kipi-plugins/metadataedit/commenteditdialog.cpp2
-rw-r--r--kipi-plugins/metadataedit/commentremovedialog.cpp2
-rw-r--r--kipi-plugins/metadataedit/exifadjust.cpp2
-rw-r--r--kipi-plugins/metadataedit/exifcaption.cpp2
-rw-r--r--kipi-plugins/metadataedit/exifdatetime.cpp2
-rw-r--r--kipi-plugins/metadataedit/exifdevice.cpp2
-rw-r--r--kipi-plugins/metadataedit/exifeditdialog.cpp4
-rw-r--r--kipi-plugins/metadataedit/exiflens.cpp2
-rw-r--r--kipi-plugins/metadataedit/exiflight.cpp2
-rw-r--r--kipi-plugins/metadataedit/iptccaption.cpp2
-rw-r--r--kipi-plugins/metadataedit/iptccategories.cpp2
-rw-r--r--kipi-plugins/metadataedit/iptccredits.cpp2
-rw-r--r--kipi-plugins/metadataedit/iptcdatetime.cpp2
-rw-r--r--kipi-plugins/metadataedit/iptceditdialog.cpp4
-rw-r--r--kipi-plugins/metadataedit/iptckeywords.cpp2
-rw-r--r--kipi-plugins/metadataedit/iptcorigin.cpp2
-rw-r--r--kipi-plugins/metadataedit/iptcstatus.cpp2
-rw-r--r--kipi-plugins/metadataedit/iptcsubjects.cpp2
-rw-r--r--kipi-plugins/metadataedit/plugin_metadataedit.cpp6
-rw-r--r--kipi-plugins/mpegencoder/checkbinprog.cpp4
-rw-r--r--kipi-plugins/mpegencoder/kimg2mpg.cpp6
-rw-r--r--kipi-plugins/mpegencoder/kshowdebuggingoutput.h2
-rw-r--r--kipi-plugins/mpegencoder/optionsdialog.cpp2
-rw-r--r--kipi-plugins/mpegencoder/plugin_mpegencoder.cpp4
-rw-r--r--kipi-plugins/picasawebexport/picasaweblogin.cpp2
-rw-r--r--kipi-plugins/picasawebexport/picasawebtalker.cpp4
-rw-r--r--kipi-plugins/picasawebexport/picasawebwidget.cpp2
-rw-r--r--kipi-plugins/picasawebexport/picasawebwindow.cpp4
-rw-r--r--kipi-plugins/picasawebexport/plugin_picasawebexport.cpp2
-rw-r--r--kipi-plugins/printwizard/frmprintwizard.cpp4
-rw-r--r--kipi-plugins/printwizard/plugin_printwizard.cpp4
-rw-r--r--kipi-plugins/printwizard/tphoto.cpp4
-rw-r--r--kipi-plugins/printwizard/utils.cpp4
-rw-r--r--kipi-plugins/rawconverter/actionthread.cpp2
-rw-r--r--kipi-plugins/rawconverter/batchdialog.cpp4
-rw-r--r--kipi-plugins/rawconverter/plugin_rawconverter.cpp4
-rw-r--r--kipi-plugins/rawconverter/previewwidget.cpp2
-rw-r--r--kipi-plugins/rawconverter/savesettingswidget.cpp2
-rw-r--r--kipi-plugins/rawconverter/singledialog.cpp4
-rw-r--r--kipi-plugins/sendimages/listimageserrordialog.cpp2
-rw-r--r--kipi-plugins/sendimages/plugin_sendimages.cpp8
-rw-r--r--kipi-plugins/sendimages/sendimages.cpp4
-rw-r--r--kipi-plugins/sendimages/sendimagesdialog.cpp4
-rw-r--r--kipi-plugins/simpleviewerexport/firstrundlg.cpp2
-rw-r--r--kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp2
-rw-r--r--kipi-plugins/simpleviewerexport/simpleviewerexport.cpp4
-rw-r--r--kipi-plugins/simpleviewerexport/svedialog.cpp6
-rw-r--r--kipi-plugins/slideshow/imageloadthread.cpp2
-rw-r--r--kipi-plugins/slideshow/plugin_slideshow.cpp4
-rw-r--r--kipi-plugins/slideshow/slideshow.cpp4
-rw-r--r--kipi-plugins/slideshow/slideshowconfig.cpp4
-rw-r--r--kipi-plugins/slideshow/slideshowgl.cpp4
-rw-r--r--kipi-plugins/slideshow/slideshowkb.cpp6
-rw-r--r--kipi-plugins/slideshow/toolbar.cpp2
-rw-r--r--kipi-plugins/sync/galleryconfig.cpp4
-rw-r--r--kipi-plugins/sync/gallerywidget.cpp2
-rw-r--r--kipi-plugins/sync/gallerywindow.cpp4
-rw-r--r--kipi-plugins/sync/plugin_sync.cpp4
-rw-r--r--kipi-plugins/sync/sinks.cpp2
-rw-r--r--kipi-plugins/sync/sinks/gallery/gallerysink.cpp2
-rw-r--r--kipi-plugins/sync/sintdelist.cpp4
-rw-r--r--kipi-plugins/timeadjust/plugin_timeadjust.cpp2
-rw-r--r--kipi-plugins/timeadjust/timeadjustdialog.cpp4
-rw-r--r--kipi-plugins/wallpaper/plugin_wallpaper.cpp4
155 files changed, 251 insertions, 251 deletions
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index d008895..a780827 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.cpp
+++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp
@@ -57,10 +57,10 @@ extern "C"
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kinstance.h>
#include <tdeconfig.h>
@@ -69,7 +69,7 @@ extern "C"
#include <ksqueezedtextlabel.h>
#include <tdeio/netaccess.h>
#include <kimageio.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeversion.h>
#include <kdebug.h>
#include <tdefiletreeview.h>
diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.cpp b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
index b5254e2..50da6d4 100644
--- a/kipi-plugins/acquireimages/plugin_acquireimages.cpp
+++ b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
@@ -26,7 +26,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -34,9 +34,9 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kscan.h>
#include <tdeapplication.h>
diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp
index 7903420..e2b65ee 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.cpp
+++ b/kipi-plugins/acquireimages/screenshotdialog.cpp
@@ -44,11 +44,11 @@ extern "C"
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
index ee9163c..209d1fa 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
@@ -55,11 +55,11 @@ extern "C"
#include <kstandarddirs.h>
#include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprogress.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kinstance.h>
#include <tdeconfig.h>
@@ -75,7 +75,7 @@ extern "C"
#include <tdeio/global.h>
#include <tdeio/previewjob.h>
#include <kbuttonbox.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
#include <tdeversion.h>
#include <kurlrequester.h>
#include <klineedit.h>
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp
index f61868a..dc53320 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp
@@ -27,7 +27,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes
diff --git a/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp b/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp
index 2984c77..3b9b488 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp
@@ -31,7 +31,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
// Local include files
diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
index df705a1..03db3c9 100644
--- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
@@ -31,9 +31,9 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kprocess.h>
#include <kcolorbutton.h>
diff --git a/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp b/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp
index f9d4f19..870e56a 100644
--- a/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp
@@ -35,7 +35,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
index 50b3128..ea8663c 100644
--- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
@@ -31,9 +31,9 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kprocess.h>
#include <tdeapplication.h>
diff --git a/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp b/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp
index 832b1b8..b255c14 100644
--- a/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp
@@ -35,7 +35,7 @@
// Include files for KDE
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
index fd065fd..47e7b4a 100644
--- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
@@ -33,9 +33,9 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kprocess.h>
#include <tdeapplication.h>
diff --git a/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp b/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp
index 395bba2..325b5f9 100644
--- a/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp
@@ -34,7 +34,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
// Local includes
diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
index 8bef844..79e5cd3 100644
--- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
@@ -31,9 +31,9 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kprocess.h>
#include <tdeapplication.h>
diff --git a/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp b/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp
index e15202b..49884c6 100644
--- a/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp
@@ -34,7 +34,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
index 6f1e098..f16081d 100644
--- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
@@ -31,9 +31,9 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kprocess.h>
#include <tdeapplication.h>
diff --git a/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp b/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp
index d22c43a..1925ffe 100644
--- a/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp
@@ -34,7 +34,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index 01b5cc6..5bedd14 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -49,13 +49,13 @@ extern "C"
// KDE includes
#include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <tdeio/netaccess.h>
#include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kcursor.h>
#include <kdebug.h>
diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp
index b3b6311..d0228ec 100644
--- a/kipi-plugins/batchprocessimages/outputdialog.cpp
+++ b/kipi-plugins/batchprocessimages/outputdialog.cpp
@@ -30,7 +30,7 @@
// KDElib includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <khelpmenu.h>
#include <kiconloader.h>
diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
index 083e581..3d777b2 100644
--- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
+++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
@@ -33,9 +33,9 @@ extern "C"
// KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -43,9 +43,9 @@ extern "C"
#include <kdebug.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
// KIPI includes
diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
index 6abcb19..4578c91 100644
--- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
@@ -31,9 +31,9 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kprocess.h>
#include <tdeapplication.h>
diff --git a/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp b/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp
index 21975da..e3e4de4 100644
--- a/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp
@@ -34,7 +34,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
// Local includes
diff --git a/kipi-plugins/batchprocessimages/renameimageswidget.cpp b/kipi-plugins/batchprocessimages/renameimageswidget.cpp
index 8884507..d2a3f99 100644
--- a/kipi-plugins/batchprocessimages/renameimageswidget.cpp
+++ b/kipi-plugins/batchprocessimages/renameimageswidget.cpp
@@ -53,7 +53,7 @@ extern "C"
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeio/previewjob.h>
#include <tdeio/renamedlg.h>
diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
index 7fa466f..5e63fbd 100644
--- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
@@ -32,9 +32,9 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kprocess.h>
#include <kcolorbutton.h>
diff --git a/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp b/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp
index bc063dc..c11b739 100644
--- a/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp
@@ -35,10 +35,10 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// Local includes
diff --git a/kipi-plugins/calendar/calevents.cpp b/kipi-plugins/calendar/calevents.cpp
index 4c493e5..ccdd39a 100644
--- a/kipi-plugins/calendar/calevents.cpp
+++ b/kipi-plugins/calendar/calevents.cpp
@@ -25,7 +25,7 @@
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "calevents.h"
diff --git a/kipi-plugins/calendar/calformatter.cpp b/kipi-plugins/calendar/calformatter.cpp
index 8acc8d8..62e8c7e 100644
--- a/kipi-plugins/calendar/calformatter.cpp
+++ b/kipi-plugins/calendar/calformatter.cpp
@@ -26,8 +26,8 @@
#include <tqmap.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
#include <libkcal/calendarlocal.h>
diff --git a/kipi-plugins/calendar/calpainter.cpp b/kipi-plugins/calendar/calpainter.cpp
index 7e791a8..5db3307 100644
--- a/kipi-plugins/calendar/calpainter.cpp
+++ b/kipi-plugins/calendar/calpainter.cpp
@@ -33,8 +33,8 @@
// KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeversion.h>
#include <kcalendarsystem.h>
#include <kdebug.h>
diff --git a/kipi-plugins/calendar/calselect.cpp b/kipi-plugins/calendar/calselect.cpp
index 2277853..fbe2fd0 100644
--- a/kipi-plugins/calendar/calselect.cpp
+++ b/kipi-plugins/calendar/calselect.cpp
@@ -31,8 +31,8 @@
// KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
#include <kstandarddirs.h>
diff --git a/kipi-plugins/calendar/calsettings.cpp b/kipi-plugins/calendar/calsettings.cpp
index ce9c657..c25191f 100644
--- a/kipi-plugins/calendar/calsettings.cpp
+++ b/kipi-plugins/calendar/calsettings.cpp
@@ -21,8 +21,8 @@
// KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
// Local includes.
diff --git a/kipi-plugins/calendar/caltemplate.cpp b/kipi-plugins/calendar/caltemplate.cpp
index b6b2c90..6894ec5 100644
--- a/kipi-plugins/calendar/caltemplate.cpp
+++ b/kipi-plugins/calendar/caltemplate.cpp
@@ -41,7 +41,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
// Local includes.
diff --git a/kipi-plugins/calendar/calwidget.cpp b/kipi-plugins/calendar/calwidget.cpp
index f32e8e7..b5efe78 100644
--- a/kipi-plugins/calendar/calwidget.cpp
+++ b/kipi-plugins/calendar/calwidget.cpp
@@ -32,8 +32,8 @@
// KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
// Local includes.
diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp
index d8fc6b2..c125180 100644
--- a/kipi-plugins/calendar/calwizard.cpp
+++ b/kipi-plugins/calendar/calwizard.cpp
@@ -37,8 +37,8 @@
// KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <tdeapplication.h>
#include <khelpmenu.h>
diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp
index cfdeb78..31929bb 100644
--- a/kipi-plugins/calendar/monthwidget.cpp
+++ b/kipi-plugins/calendar/monthwidget.cpp
@@ -38,8 +38,8 @@
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <kimageio.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kipi-plugins/calendar/plugin_calendar.cpp b/kipi-plugins/calendar/plugin_calendar.cpp
index ad34bc2..35f320b 100644
--- a/kipi-plugins/calendar/plugin_calendar.cpp
+++ b/kipi-plugins/calendar/plugin_calendar.cpp
@@ -26,7 +26,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp
index 2c2c2b4..1d3460a 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/cdarchiving.cpp
@@ -48,13 +48,13 @@ extern "C"
#include <tdeconfig.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kimageio.h>
#include <kinstance.h>
#include <tdeio/global.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <krun.h>
#include <kstandarddirs.h>
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index 40fafd8..9936854 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -52,13 +52,13 @@
#include <kdebug.h>
#include <kdirsize.h>
#include <tdefontdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <khelpmenu.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <tdepopupmenu.h>
#include <ksqueezedtextlabel.h>
diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
index 897ed97..8bd97ce 100644
--- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
@@ -30,7 +30,7 @@
#include <kgenericfactory.h>
#include <kinstance.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
// LibKipi includes
diff --git a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp
index f2a4176..dfbbaa2 100644
--- a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp
+++ b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp
@@ -21,9 +21,9 @@
//////////////////////////////////////////////////////////////////////////////
#include <tqglobal.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeversion.h>
#include "kpaboutdata.h"
diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp
index 92d85b1..a2e8a73 100644
--- a/kipi-plugins/findimages/displaycompare.cpp
+++ b/kipi-plugins/findimages/displaycompare.cpp
@@ -42,8 +42,8 @@
// Include files for KDE
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <tdelistview.h>
#include <ksqueezedtextlabel.h>
diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp
index 575aafb..f297e66 100644
--- a/kipi-plugins/findimages/finddupplicatedialog.cpp
+++ b/kipi-plugins/findimages/finddupplicatedialog.cpp
@@ -38,7 +38,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefontdialog.h>
#include <kiconloader.h>
#include <kdebug.h>
@@ -48,8 +48,8 @@
#include <klineedit.h>
#include <knuminput.h>
#include <kcolorbutton.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
#include <kbuttonbox.h>
#include <tdeapplication.h>
#include <ksqueezedtextlabel.h>
diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp
index 4a9aa50..8aebf92 100644
--- a/kipi-plugins/findimages/finddupplicateimages.cpp
+++ b/kipi-plugins/findimages/finddupplicateimages.cpp
@@ -41,14 +41,14 @@ extern "C"
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <kimageeffect.h>
#include <kdebug.h>
#include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kurl.h>
#include <tdeio/job.h>
diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp
index c608f20..acc32b1 100644
--- a/kipi-plugins/findimages/plugin_findimages.cpp
+++ b/kipi-plugins/findimages/plugin_findimages.cpp
@@ -27,13 +27,13 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <tdeversion.h>
diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp
index f05b65f..8a61b40 100644
--- a/kipi-plugins/flickrexport/flickrtalker.cpp
+++ b/kipi-plugins/flickrexport/flickrtalker.cpp
@@ -44,13 +44,13 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kmimetype.h>
#include <kstandarddirs.h>
#include <kmdcodec.h>
#include <kapp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// LibKExiv2 includes.
diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp
index 4920ccf..68655d5 100644
--- a/kipi-plugins/flickrexport/flickrwidget.cpp
+++ b/kipi-plugins/flickrexport/flickrwidget.cpp
@@ -42,7 +42,7 @@
#include <klineedit.h>
#include <kdialog.h>
#include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kseparator.h>
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index 7e598b9..c306d9e 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -38,8 +38,8 @@
#include <klineedit.h>
#include <khelpmenu.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdehtml_part.h>
diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp
index 639523a..7072d38 100644
--- a/kipi-plugins/flickrexport/imageslist.cpp
+++ b/kipi-plugins/flickrexport/imageslist.cpp
@@ -34,7 +34,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <knuminput.h>
#include <kiconloader.h>
diff --git a/kipi-plugins/flickrexport/login.cpp b/kipi-plugins/flickrexport/login.cpp
index 9a3fb1c..bcdec07 100644
--- a/kipi-plugins/flickrexport/login.cpp
+++ b/kipi-plugins/flickrexport/login.cpp
@@ -30,7 +30,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes.
diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.cpp b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
index 2ee6a20..fe78220 100644
--- a/kipi-plugins/flickrexport/plugin_flickrexport.cpp
+++ b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
@@ -29,7 +29,7 @@ extern "C"
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
diff --git a/kipi-plugins/galleryexport/galleries.cpp b/kipi-plugins/galleryexport/galleries.cpp
index 0e54f19..fd21da2 100644
--- a/kipi-plugins/galleryexport/galleries.cpp
+++ b/kipi-plugins/galleryexport/galleries.cpp
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,2,0)
#include <tdewallet.h>
diff --git a/kipi-plugins/galleryexport/galleryconfig.cpp b/kipi-plugins/galleryexport/galleryconfig.cpp
index 2fdd9d5..9fd31ca 100644
--- a/kipi-plugins/galleryexport/galleryconfig.cpp
+++ b/kipi-plugins/galleryexport/galleryconfig.cpp
@@ -32,8 +32,8 @@
// Include files for KDE
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdehtml_part.h>
diff --git a/kipi-plugins/galleryexport/gallerylist.cpp b/kipi-plugins/galleryexport/gallerylist.cpp
index fc17286..2d0ef10 100644
--- a/kipi-plugins/galleryexport/gallerylist.cpp
+++ b/kipi-plugins/galleryexport/gallerylist.cpp
@@ -32,8 +32,8 @@
// Include files for KDE
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kiconloader.h>
diff --git a/kipi-plugins/galleryexport/gallerytalker.cpp b/kipi-plugins/galleryexport/gallerytalker.cpp
index c019939..86dc209 100644
--- a/kipi-plugins/galleryexport/gallerytalker.cpp
+++ b/kipi-plugins/galleryexport/gallerytalker.cpp
@@ -25,7 +25,7 @@
#include <tqimage.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include <kdebug.h>
#include <kmimetype.h>
diff --git a/kipi-plugins/galleryexport/gallerywidget.cpp b/kipi-plugins/galleryexport/gallerywidget.cpp
index 836f93a..7cd47e5 100644
--- a/kipi-plugins/galleryexport/gallerywidget.cpp
+++ b/kipi-plugins/galleryexport/gallerywidget.cpp
@@ -19,7 +19,7 @@
*
* ============================================================ */
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index a080154..cdc813d 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -36,8 +36,8 @@
#include <tdeaboutdata.h>
#include <khelpmenu.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdehtml_part.h>
diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
index e6087ce..3963286 100644
--- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp
+++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
@@ -22,14 +22,14 @@
* ============================================================ */
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
// libkipi includes.
diff --git a/kipi-plugins/gpssync/gpsbabelbinary.cpp b/kipi-plugins/gpssync/gpsbabelbinary.cpp
index 568e4fa..26a4635 100644
--- a/kipi-plugins/gpssync/gpsbabelbinary.cpp
+++ b/kipi-plugins/gpssync/gpsbabelbinary.cpp
@@ -24,9 +24,9 @@
#include <tdeapplication.h>
#include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
// Local includes
diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp
index 0176167..7310396 100644
--- a/kipi-plugins/gpssync/gpseditdialog.cpp
+++ b/kipi-plugins/gpssync/gpseditdialog.cpp
@@ -30,14 +30,14 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <khelpmenu.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <tdeapplication.h>
#include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdehtmlview.h>
#include <tdepopupmenu.h>
diff --git a/kipi-plugins/gpssync/gpslistviewitem.cpp b/kipi-plugins/gpssync/gpslistviewitem.cpp
index cba1afd..5e0a8e2 100644
--- a/kipi-plugins/gpssync/gpslistviewitem.cpp
+++ b/kipi-plugins/gpssync/gpslistviewitem.cpp
@@ -27,7 +27,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
// LibKExiv2 includes.
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index c898b71..210ebdb 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -35,7 +35,7 @@
// KDE includes.
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <khelpmenu.h>
#include <ksqueezedtextlabel.h>
@@ -45,8 +45,8 @@
#include <tdelistview.h>
#include <tdefiledialog.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
#include <knuminput.h>
#include <kseparator.h>
#include <tdeio/previewjob.h>
diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp
index ec5d322..ff06255 100644
--- a/kipi-plugins/gpssync/kmlexport.cpp
+++ b/kipi-plugins/gpssync/kmlexport.cpp
@@ -35,8 +35,8 @@ extern "C"
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
// Libkexiv2 includes.
diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp
index d9baeca..59b2bac 100644
--- a/kipi-plugins/gpssync/kmlexportconfig.cpp
+++ b/kipi-plugins/gpssync/kmlexportconfig.cpp
@@ -41,7 +41,7 @@
#include <kcolorbutton.h>
#include <kdialog.h>
#include <khelpmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <knuminput.h>
#include "kpaboutdata.h"
diff --git a/kipi-plugins/gpssync/kmlgpsdataparser.cpp b/kipi-plugins/gpssync/kmlgpsdataparser.cpp
index 522da15..6b45600 100644
--- a/kipi-plugins/gpssync/kmlgpsdataparser.cpp
+++ b/kipi-plugins/gpssync/kmlgpsdataparser.cpp
@@ -27,7 +27,7 @@
// KDE includes.
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace KIPIGPSSyncPlugin
{
diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp
index 4839099..dbd7c80 100644
--- a/kipi-plugins/gpssync/plugin_gpssync.cpp
+++ b/kipi-plugins/gpssync/plugin_gpssync.cpp
@@ -28,14 +28,14 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// LibKIPI includes.
diff --git a/kipi-plugins/helloworld/plugin_helloworld.cpp b/kipi-plugins/helloworld/plugin_helloworld.cpp
index c47959c..7678560 100644
--- a/kipi-plugins/helloworld/plugin_helloworld.cpp
+++ b/kipi-plugins/helloworld/plugin_helloworld.cpp
@@ -20,7 +20,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
diff --git a/kipi-plugins/htmlexport/generator.cpp b/kipi-plugins/htmlexport/generator.cpp
index dc33d1f..e9cdd0e 100644
--- a/kipi-plugins/htmlexport/generator.cpp
+++ b/kipi-plugins/htmlexport/generator.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/netaccess.h>
#include <kstandarddirs.h>
#include <kurl.h>
diff --git a/kipi-plugins/htmlexport/plugin.cpp b/kipi-plugins/htmlexport/plugin.cpp
index 98b1860..110443e 100644
--- a/kipi-plugins/htmlexport/plugin.cpp
+++ b/kipi-plugins/htmlexport/plugin.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
#include <tdeapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <krun.h>
// KIPI
diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp
index 563c3b5..a004e35 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
#include <kdebug.h>
#include <kdialog.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ktextbrowser.h>
#include <kurlrequester.h>
#include <kwizard.h>
diff --git a/kipi-plugins/imageviewer/plugin_viewer.cpp b/kipi-plugins/imageviewer/plugin_viewer.cpp
index 75378a0..4cf2891 100644
--- a/kipi-plugins/imageviewer/plugin_viewer.cpp
+++ b/kipi-plugins/imageviewer/plugin_viewer.cpp
@@ -20,7 +20,7 @@
// KDE includes
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
// QT includes
diff --git a/kipi-plugins/imageviewer/viewerwidget.cpp b/kipi-plugins/imageviewer/viewerwidget.cpp
index dd8ef65..0f15882 100644
--- a/kipi-plugins/imageviewer/viewerwidget.cpp
+++ b/kipi-plugins/imageviewer/viewerwidget.cpp
@@ -24,13 +24,13 @@
#include <tqgl.h>
#include <iostream>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdragobject.h>
#include <tqbitmap.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// local includes.
#include "viewerwidget.h"
diff --git a/kipi-plugins/ipodexport/imagelist.cpp b/kipi-plugins/ipodexport/imagelist.cpp
index 33b0125..57724a4 100644
--- a/kipi-plugins/ipodexport/imagelist.cpp
+++ b/kipi-plugins/ipodexport/imagelist.cpp
@@ -19,7 +19,7 @@
#include <tqpainter.h>
#include <tqsimplerichtext.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "imagelist.h"
diff --git a/kipi-plugins/ipodexport/imagelistitem.h b/kipi-plugins/ipodexport/imagelistitem.h
index dfa2325..e0e771d 100644
--- a/kipi-plugins/ipodexport/imagelistitem.h
+++ b/kipi-plugins/ipodexport/imagelistitem.h
@@ -20,7 +20,7 @@ extern "C" {
#include <tqstring.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace IpodExport
{
diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp
index 18421f2..c3d5ddd 100644
--- a/kipi-plugins/ipodexport/ipodexportdialog.cpp
+++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp
@@ -37,8 +37,8 @@
#include <kiconloader.h>
#include <kinputdialog.h> //new album
#include <tdeio/previewjob.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmountpoint.h>
#include <kstandarddirs.h>
#include <kurl.h>
diff --git a/kipi-plugins/ipodexport/ipodheader.cpp b/kipi-plugins/ipodexport/ipodheader.cpp
index 61c56b1..d5885e8 100644
--- a/kipi-plugins/ipodexport/ipodheader.cpp
+++ b/kipi-plugins/ipodexport/ipodheader.cpp
@@ -14,7 +14,7 @@
#include "ipodheader.h"
#include "ipodexportdialog.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "kpushbutton.h"
#include "tqlabel.h"
diff --git a/kipi-plugins/ipodexport/ipodlistitem.cpp b/kipi-plugins/ipodexport/ipodlistitem.cpp
index 6f7c062..8f9ebe9 100644
--- a/kipi-plugins/ipodexport/ipodlistitem.cpp
+++ b/kipi-plugins/ipodexport/ipodlistitem.cpp
@@ -14,7 +14,7 @@
#include "ipodlistitem.h"
-#include <klocale.h>
+#include <tdelocale.h>
using namespace IpodExport;
diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.cpp b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
index 7a79b62..ff66c1e 100644
--- a/kipi-plugins/ipodexport/plugin_ipodexport.cpp
+++ b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
@@ -27,7 +27,7 @@ extern "C" {
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#define debug() kdDebug( 51000 )
diff --git a/kipi-plugins/jpeglossless/convert2grayscale.cpp b/kipi-plugins/jpeglossless/convert2grayscale.cpp
index adac001..b410c9f 100644
--- a/kipi-plugins/jpeglossless/convert2grayscale.cpp
+++ b/kipi-plugins/jpeglossless/convert2grayscale.cpp
@@ -51,9 +51,9 @@ extern "C"
// KDE includes.
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
// Local includes.
diff --git a/kipi-plugins/jpeglossless/imageflip.cpp b/kipi-plugins/jpeglossless/imageflip.cpp
index d9975c6..53d9935 100644
--- a/kipi-plugins/jpeglossless/imageflip.cpp
+++ b/kipi-plugins/jpeglossless/imageflip.cpp
@@ -50,9 +50,9 @@ extern "C"
// KDE includes.
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
// Local includes
diff --git a/kipi-plugins/jpeglossless/imagerotate.cpp b/kipi-plugins/jpeglossless/imagerotate.cpp
index b5f821f..8a35988 100644
--- a/kipi-plugins/jpeglossless/imagerotate.cpp
+++ b/kipi-plugins/jpeglossless/imagerotate.cpp
@@ -51,9 +51,9 @@ extern "C"
// KDE includes.
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
// Local includes.
diff --git a/kipi-plugins/jpeglossless/jpegtransform.cpp b/kipi-plugins/jpeglossless/jpegtransform.cpp
index 427240e..a0fc0fb 100644
--- a/kipi-plugins/jpeglossless/jpegtransform.cpp
+++ b/kipi-plugins/jpeglossless/jpegtransform.cpp
@@ -49,8 +49,8 @@ extern "C"
// KDE includes.
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
// Local includes.
diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
index 97a14cf..e69358e 100644
--- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
+++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
@@ -32,14 +32,14 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
// LibKipi includes.
diff --git a/kipi-plugins/jpeglossless/utils.cpp b/kipi-plugins/jpeglossless/utils.cpp
index 180f9da..c2ac773 100644
--- a/kipi-plugins/jpeglossless/utils.cpp
+++ b/kipi-plugins/jpeglossless/utils.cpp
@@ -46,9 +46,9 @@ extern "C"
// KDE includes.
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
// LibKExiv2 includes.
diff --git a/kipi-plugins/kameraklient/camerafolderview.cpp b/kipi-plugins/kameraklient/camerafolderview.cpp
index 88d4ae2..1e51545 100644
--- a/kipi-plugins/kameraklient/camerafolderview.cpp
+++ b/kipi-plugins/kameraklient/camerafolderview.cpp
@@ -20,7 +20,7 @@
* ============================================================ */
// KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
// Local
#include "camerafolderitem.h"
diff --git a/kipi-plugins/kameraklient/cameraiconview.cpp b/kipi-plugins/kameraklient/cameraiconview.cpp
index 123b82e..795a029 100644
--- a/kipi-plugins/kameraklient/cameraiconview.cpp
+++ b/kipi-plugins/kameraklient/cameraiconview.cpp
@@ -29,7 +29,7 @@
#include <tqpopupmenu.h>
#include <tqvaluevector.h>
// KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <ktrader.h>
diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp
index 978c347..dbc78e4 100644
--- a/kipi-plugins/kameraklient/cameraselection.cpp
+++ b/kipi-plugins/kameraklient/cameraselection.cpp
@@ -30,7 +30,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <khelpmenu.h>
#include <kiconloader.h>
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index 35cf3ad..47b515c 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -55,12 +55,12 @@
#include <kdirlister.h>
#include <tdefiledialog.h>
#include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kedittoolbar.h>
#include <tdeio/job.h>
#include <kkeydialog.h>
#include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprogress.h>
#include <krun.h>
diff --git a/kipi-plugins/kameraklient/dmessagebox.cpp b/kipi-plugins/kameraklient/dmessagebox.cpp
index f1a1262..28f710d 100644
--- a/kipi-plugins/kameraklient/dmessagebox.cpp
+++ b/kipi-plugins/kameraklient/dmessagebox.cpp
@@ -32,7 +32,7 @@
#include <tqpushbutton.h>
#include <tqtextedit.h>
// KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kiconloader.h>
// Local
diff --git a/kipi-plugins/kameraklient/gpcontroller.cpp b/kipi-plugins/kameraklient/gpcontroller.cpp
index e1a4c38..24e0385 100644
--- a/kipi-plugins/kameraklient/gpcontroller.cpp
+++ b/kipi-plugins/kameraklient/gpcontroller.cpp
@@ -31,7 +31,7 @@
#include <tqcolor.h>
// KDE
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// Local
#include "gpfileiteminfo.h"
#include "mtlist.h"
diff --git a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp
index 98ba033..f0fc7ed 100644
--- a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp
+++ b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp
@@ -28,7 +28,7 @@
#include <tqlabel.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kseparator.h>
#include "gpfileiteminfo.h"
diff --git a/kipi-plugins/kameraklient/kameraklient.cpp b/kipi-plugins/kameraklient/kameraklient.cpp
index 789f555..92e4d3c 100644
--- a/kipi-plugins/kameraklient/kameraklient.cpp
+++ b/kipi-plugins/kameraklient/kameraklient.cpp
@@ -28,8 +28,8 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kinstance.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeshortcut.h>
#include <kstandarddirs.h>
// Local
diff --git a/kipi-plugins/kameraklient/savefiledialog.cpp b/kipi-plugins/kameraklient/savefiledialog.cpp
index 7b41afa..5a82369 100644
--- a/kipi-plugins/kameraklient/savefiledialog.cpp
+++ b/kipi-plugins/kameraklient/savefiledialog.cpp
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
// KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <kbuttonbox.h>
#include <kiconloader.h>
// Local
diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp
index 9d32f8b..b390464 100644
--- a/kipi-plugins/kameraklient/setupcamera.cpp
+++ b/kipi-plugins/kameraklient/setupcamera.cpp
@@ -31,8 +31,8 @@
// KDE includes.
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <khelpmenu.h>
#include <kiconloader.h>
diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp
index cf41a1f..8a4449d 100644
--- a/kipi-plugins/metadataedit/commenteditdialog.cpp
+++ b/kipi-plugins/metadataedit/commenteditdialog.cpp
@@ -31,7 +31,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <ktextedit.h>
diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp
index 039f4c9..00942b9 100644
--- a/kipi-plugins/metadataedit/commentremovedialog.cpp
+++ b/kipi-plugins/metadataedit/commentremovedialog.cpp
@@ -31,7 +31,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/kipi-plugins/metadataedit/exifadjust.cpp b/kipi-plugins/metadataedit/exifadjust.cpp
index 553b630..3d40296 100644
--- a/kipi-plugins/metadataedit/exifadjust.cpp
+++ b/kipi-plugins/metadataedit/exifadjust.cpp
@@ -33,7 +33,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <knuminput.h>
diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp
index e6e20ff..2227873 100644
--- a/kipi-plugins/metadataedit/exifcaption.cpp
+++ b/kipi-plugins/metadataedit/exifcaption.cpp
@@ -32,7 +32,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <klineedit.h>
#include <ktextedit.h>
diff --git a/kipi-plugins/metadataedit/exifdatetime.cpp b/kipi-plugins/metadataedit/exifdatetime.cpp
index 54985a5..fc98ee5 100644
--- a/kipi-plugins/metadataedit/exifdatetime.cpp
+++ b/kipi-plugins/metadataedit/exifdatetime.cpp
@@ -30,7 +30,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <kdatetimewidget.h>
#include <knuminput.h>
diff --git a/kipi-plugins/metadataedit/exifdevice.cpp b/kipi-plugins/metadataedit/exifdevice.cpp
index b63d045..587a9d4 100644
--- a/kipi-plugins/metadataedit/exifdevice.cpp
+++ b/kipi-plugins/metadataedit/exifdevice.cpp
@@ -34,7 +34,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <knuminput.h>
#include <klineedit.h>
diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp
index d166a05..00cf4e4 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -29,12 +29,12 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <khelpmenu.h>
#include <tdepopupmenu.h>
diff --git a/kipi-plugins/metadataedit/exiflens.cpp b/kipi-plugins/metadataedit/exiflens.cpp
index a672b87..a3ad737 100644
--- a/kipi-plugins/metadataedit/exiflens.cpp
+++ b/kipi-plugins/metadataedit/exiflens.cpp
@@ -33,7 +33,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <knuminput.h>
diff --git a/kipi-plugins/metadataedit/exiflight.cpp b/kipi-plugins/metadataedit/exiflight.cpp
index 703ad9d..bbe0b97 100644
--- a/kipi-plugins/metadataedit/exiflight.cpp
+++ b/kipi-plugins/metadataedit/exiflight.cpp
@@ -34,7 +34,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <knuminput.h>
diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp
index b0e8a60..a310f2c 100644
--- a/kipi-plugins/metadataedit/iptccaption.cpp
+++ b/kipi-plugins/metadataedit/iptccaption.cpp
@@ -32,7 +32,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <klineedit.h>
#include <ktextedit.h>
diff --git a/kipi-plugins/metadataedit/iptccategories.cpp b/kipi-plugins/metadataedit/iptccategories.cpp
index 8bab7e6..a52fc10 100644
--- a/kipi-plugins/metadataedit/iptccategories.cpp
+++ b/kipi-plugins/metadataedit/iptccategories.cpp
@@ -31,7 +31,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tdelistbox.h>
#include <kiconloader.h>
diff --git a/kipi-plugins/metadataedit/iptccredits.cpp b/kipi-plugins/metadataedit/iptccredits.cpp
index 3c88916..6680993 100644
--- a/kipi-plugins/metadataedit/iptccredits.cpp
+++ b/kipi-plugins/metadataedit/iptccredits.cpp
@@ -32,7 +32,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <klineedit.h>
#include <kactivelabel.h>
diff --git a/kipi-plugins/metadataedit/iptcdatetime.cpp b/kipi-plugins/metadataedit/iptcdatetime.cpp
index edbe598..6339729 100644
--- a/kipi-plugins/metadataedit/iptcdatetime.cpp
+++ b/kipi-plugins/metadataedit/iptcdatetime.cpp
@@ -31,7 +31,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <kdatewidget.h>
#include <ktimewidget.h>
diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp
index c389b9f..7b4490b 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -29,12 +29,12 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <khelpmenu.h>
#include <tdepopupmenu.h>
diff --git a/kipi-plugins/metadataedit/iptckeywords.cpp b/kipi-plugins/metadataedit/iptckeywords.cpp
index aff162d..bf8cfdf 100644
--- a/kipi-plugins/metadataedit/iptckeywords.cpp
+++ b/kipi-plugins/metadataedit/iptckeywords.cpp
@@ -31,7 +31,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tdelistbox.h>
#include <klineedit.h>
diff --git a/kipi-plugins/metadataedit/iptcorigin.cpp b/kipi-plugins/metadataedit/iptcorigin.cpp
index 222e331..0e0e642 100644
--- a/kipi-plugins/metadataedit/iptcorigin.cpp
+++ b/kipi-plugins/metadataedit/iptcorigin.cpp
@@ -32,7 +32,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <klineedit.h>
#include <kactivelabel.h>
diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp
index f4a7e0e..05113b4 100644
--- a/kipi-plugins/metadataedit/iptcstatus.cpp
+++ b/kipi-plugins/metadataedit/iptcstatus.cpp
@@ -30,7 +30,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <klineedit.h>
#include <tdeapplication.h>
diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp
index 573c6b1..f92b0c9 100644
--- a/kipi-plugins/metadataedit/iptcsubjects.cpp
+++ b/kipi-plugins/metadataedit/iptcsubjects.cpp
@@ -31,7 +31,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tdelistbox.h>
#include <klineedit.h>
diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
index beb6731..8e3c6e8 100644
--- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp
+++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
@@ -22,7 +22,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kgenericfactory.h>
@@ -30,9 +30,9 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
// LibKIPI includes.
diff --git a/kipi-plugins/mpegencoder/checkbinprog.cpp b/kipi-plugins/mpegencoder/checkbinprog.cpp
index 5c5cff0..7aeb416 100644
--- a/kipi-plugins/mpegencoder/checkbinprog.cpp
+++ b/kipi-plugins/mpegencoder/checkbinprog.cpp
@@ -31,11 +31,11 @@
// KDElib includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
namespace KIPIMPEGEncoderPlugin
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index 84c532c..312114c 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -66,7 +66,7 @@ extern "C"
#include <kprogress.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdefiledialog.h>
#include <kcolordialog.h>
@@ -76,9 +76,9 @@ extern "C"
#include <kbuttonbox.h>
#include <kurl.h>
#include <kimageio.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <khelpmenu.h>
diff --git a/kipi-plugins/mpegencoder/kshowdebuggingoutput.h b/kipi-plugins/mpegencoder/kshowdebuggingoutput.h
index bd18482..d8c21fd 100644
--- a/kipi-plugins/mpegencoder/kshowdebuggingoutput.h
+++ b/kipi-plugins/mpegencoder/kshowdebuggingoutput.h
@@ -33,7 +33,7 @@
// KDElib includes
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace KIPIMPEGEncoderPlugin
{
diff --git a/kipi-plugins/mpegencoder/optionsdialog.cpp b/kipi-plugins/mpegencoder/optionsdialog.cpp
index 83f29eb..fe3dfb0 100644
--- a/kipi-plugins/mpegencoder/optionsdialog.cpp
+++ b/kipi-plugins/mpegencoder/optionsdialog.cpp
@@ -32,7 +32,7 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
index 0aba7d4..e4ec880 100644
--- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
+++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
@@ -28,14 +28,14 @@
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// Local includes
diff --git a/kipi-plugins/picasawebexport/picasaweblogin.cpp b/kipi-plugins/picasawebexport/picasaweblogin.cpp
index 9fcad57..d319dc4 100644
--- a/kipi-plugins/picasawebexport/picasaweblogin.cpp
+++ b/kipi-plugins/picasawebexport/picasaweblogin.cpp
@@ -31,7 +31,7 @@
// KDE includes.
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes.
diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp
index c38af3d..c48a80a 100644
--- a/kipi-plugins/picasawebexport/picasawebtalker.cpp
+++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp
@@ -43,14 +43,14 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include <kdebug.h>
#include <kmimetype.h>
#include <kstandarddirs.h>
#include <kmdcodec.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/jobclasses.h>
#include <kurl.h>
diff --git a/kipi-plugins/picasawebexport/picasawebwidget.cpp b/kipi-plugins/picasawebexport/picasawebwidget.cpp
index 08c6ab5..dbb4dc7 100644
--- a/kipi-plugins/picasawebexport/picasawebwidget.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwidget.cpp
@@ -40,7 +40,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp
index 4024bda..76fb780 100644
--- a/kipi-plugins/picasawebexport/picasawebwindow.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp
@@ -43,8 +43,8 @@
#include <khelpmenu.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdehtml_part.h>
diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
index 209a31a..7e8583e 100644
--- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
+++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
@@ -29,7 +29,7 @@ extern "C"
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index e4b96b0..9448232 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -42,10 +42,10 @@ extern "C"
#include <ksimpleconfig.h>
#include <tdelistbox.h>
#include <kprinter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcombobox.h>
#include <kprogress.h>
#include <kurllabel.h>
diff --git a/kipi-plugins/printwizard/plugin_printwizard.cpp b/kipi-plugins/printwizard/plugin_printwizard.cpp
index 5e9c206..0098a41 100644
--- a/kipi-plugins/printwizard/plugin_printwizard.cpp
+++ b/kipi-plugins/printwizard/plugin_printwizard.cpp
@@ -31,14 +31,14 @@ extern "C"
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kurl.h>
diff --git a/kipi-plugins/printwizard/tphoto.cpp b/kipi-plugins/printwizard/tphoto.cpp
index cdae0d1..451e124 100644
--- a/kipi-plugins/printwizard/tphoto.cpp
+++ b/kipi-plugins/printwizard/tphoto.cpp
@@ -29,8 +29,8 @@
// KDE includes.
#include <kprinter.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
// Local includes.
diff --git a/kipi-plugins/printwizard/utils.cpp b/kipi-plugins/printwizard/utils.cpp
index c2bd206..a769c03 100644
--- a/kipi-plugins/printwizard/utils.cpp
+++ b/kipi-plugins/printwizard/utils.cpp
@@ -33,8 +33,8 @@ extern "C"
// Include files for KDE
#include <kurl.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
namespace KIPIPrintWizardPlugin
diff --git a/kipi-plugins/rawconverter/actionthread.cpp b/kipi-plugins/rawconverter/actionthread.cpp
index f1fd62d..6cc0dc5 100644
--- a/kipi-plugins/rawconverter/actionthread.cpp
+++ b/kipi-plugins/rawconverter/actionthread.cpp
@@ -40,7 +40,7 @@ extern "C"
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
// LibKDcraw includes.
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index 1a8dfa3..e6d7079 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -52,12 +52,12 @@ extern "C"
#include <kcursor.h>
#include <kdebug.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <kiconloader.h>
#include <kprogress.h>
#include <tdeio/renamedlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <khelpmenu.h>
diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
index 2dd955c..04539c1 100644
--- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp
+++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
@@ -42,14 +42,14 @@ extern "C"
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// LibKDcraw includes.
diff --git a/kipi-plugins/rawconverter/previewwidget.cpp b/kipi-plugins/rawconverter/previewwidget.cpp
index 1906fdb..e14dc3b 100644
--- a/kipi-plugins/rawconverter/previewwidget.cpp
+++ b/kipi-plugins/rawconverter/previewwidget.cpp
@@ -32,7 +32,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes.
diff --git a/kipi-plugins/rawconverter/savesettingswidget.cpp b/kipi-plugins/rawconverter/savesettingswidget.cpp
index f511b5a..1f115c1 100644
--- a/kipi-plugins/rawconverter/savesettingswidget.cpp
+++ b/kipi-plugins/rawconverter/savesettingswidget.cpp
@@ -33,7 +33,7 @@
// KDE includes.
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes.
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index 32aaa19..9869537 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -49,8 +49,8 @@ extern "C"
// KDE includes.
#include <kcursor.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdeio/renamedlg.h>
#include <tdeapplication.h>
diff --git a/kipi-plugins/sendimages/listimageserrordialog.cpp b/kipi-plugins/sendimages/listimageserrordialog.cpp
index 5e2622e..cf560f9 100644
--- a/kipi-plugins/sendimages/listimageserrordialog.cpp
+++ b/kipi-plugins/sendimages/listimageserrordialog.cpp
@@ -32,7 +32,7 @@
// KDElib includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kurl.h>
#include <kstandarddirs.h>
diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp
index 08c3834..11f886a 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.cpp
+++ b/kipi-plugins/sendimages/plugin_sendimages.cpp
@@ -29,9 +29,9 @@ extern "C"
// Include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -39,9 +39,9 @@ extern "C"
#include <kdebug.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kimageio.h>
#include <tdeversion.h>
diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp
index 5519378..5cd9f47 100644
--- a/kipi-plugins/sendimages/sendimages.cpp
+++ b/kipi-plugins/sendimages/sendimages.cpp
@@ -36,13 +36,13 @@
// KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <kimageeffect.h>
#include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp
index cc630cd..f4c6242 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.cpp
+++ b/kipi-plugins/sendimages/sendimagesdialog.cpp
@@ -45,11 +45,11 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kinstance.h>
#include <tdeconfig.h>
diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.cpp b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
index ae9a015..4548f74 100644
--- a/kipi-plugins/simpleviewerexport/firstrundlg.cpp
+++ b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
@@ -31,7 +31,7 @@
// KDE include files
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kurllabel.h>
#include <kurlrequester.h>
diff --git a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
index f8631f2..e5c6c0e 100644
--- a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
+++ b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
@@ -23,7 +23,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
index 7e8ceb4..d9f95ba 100644
--- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
+++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
@@ -33,14 +33,14 @@
// KDE includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.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 <tdemessagebox.h>
#include <tdeaboutdata.h>
#include <ktempdir.h>
diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp
index c7fd72b..8e3f8dd 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.cpp
+++ b/kipi-plugins/simpleviewerexport/svedialog.cpp
@@ -39,15 +39,15 @@
// KDE include files
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <khelpmenu.h>
#include <tdepopupmenu.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kcolorbutton.h>
#include <kurlrequester.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
diff --git a/kipi-plugins/slideshow/imageloadthread.cpp b/kipi-plugins/slideshow/imageloadthread.cpp
index e833132..f5df7a5 100644
--- a/kipi-plugins/slideshow/imageloadthread.cpp
+++ b/kipi-plugins/slideshow/imageloadthread.cpp
@@ -33,7 +33,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes.
diff --git a/kipi-plugins/slideshow/plugin_slideshow.cpp b/kipi-plugins/slideshow/plugin_slideshow.cpp
index 79c98a7..b8cb754 100644
--- a/kipi-plugins/slideshow/plugin_slideshow.cpp
+++ b/kipi-plugins/slideshow/plugin_slideshow.cpp
@@ -41,14 +41,14 @@ extern "C"
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// Lib KIPI includes.
diff --git a/kipi-plugins/slideshow/slideshow.cpp b/kipi-plugins/slideshow/slideshow.cpp
index 335d250..5f4e040 100644
--- a/kipi-plugins/slideshow/slideshow.cpp
+++ b/kipi-plugins/slideshow/slideshow.cpp
@@ -44,9 +44,9 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeversion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <kurl.h>
diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp
index 7225bf4..58fc07c 100644
--- a/kipi-plugins/slideshow/slideshowconfig.cpp
+++ b/kipi-plugins/slideshow/slideshowconfig.cpp
@@ -41,9 +41,9 @@
// Kde includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <khelpmenu.h>
diff --git a/kipi-plugins/slideshow/slideshowgl.cpp b/kipi-plugins/slideshow/slideshowgl.cpp
index 9bae40e..8239181 100644
--- a/kipi-plugins/slideshow/slideshowgl.cpp
+++ b/kipi-plugins/slideshow/slideshowgl.cpp
@@ -21,10 +21,10 @@
* ============================================================ */
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeversion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kimageeffect.h>
#include <tqtimer.h>
diff --git a/kipi-plugins/slideshow/slideshowkb.cpp b/kipi-plugins/slideshow/slideshowkb.cpp
index 2586fbf..4931ebb 100644
--- a/kipi-plugins/slideshow/slideshowkb.cpp
+++ b/kipi-plugins/slideshow/slideshowkb.cpp
@@ -42,10 +42,10 @@
// KDE includes.
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeversion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
// Local includes.
diff --git a/kipi-plugins/slideshow/toolbar.cpp b/kipi-plugins/slideshow/toolbar.cpp
index a6ab08d..df84523 100644
--- a/kipi-plugins/slideshow/toolbar.cpp
+++ b/kipi-plugins/slideshow/toolbar.cpp
@@ -31,7 +31,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes.
diff --git a/kipi-plugins/sync/galleryconfig.cpp b/kipi-plugins/sync/galleryconfig.cpp
index 2fdd9d5..9fd31ca 100644
--- a/kipi-plugins/sync/galleryconfig.cpp
+++ b/kipi-plugins/sync/galleryconfig.cpp
@@ -32,8 +32,8 @@
// Include files for KDE
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdehtml_part.h>
diff --git a/kipi-plugins/sync/gallerywidget.cpp b/kipi-plugins/sync/gallerywidget.cpp
index 6b6d0b7..320f7b3 100644
--- a/kipi-plugins/sync/gallerywidget.cpp
+++ b/kipi-plugins/sync/gallerywidget.cpp
@@ -19,7 +19,7 @@
*
* ============================================================ */
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index 0643e9b..99574f9 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/gallerywindow.cpp
@@ -36,8 +36,8 @@
#include <tdeaboutdata.h>
#include <khelpmenu.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdehtml_part.h>
diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp
index 406d848..a9ef1a3 100644
--- a/kipi-plugins/sync/plugin_sync.cpp
+++ b/kipi-plugins/sync/plugin_sync.cpp
@@ -18,14 +18,14 @@
* ============================================================ */
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
// libkipi includes.
diff --git a/kipi-plugins/sync/sinks.cpp b/kipi-plugins/sync/sinks.cpp
index fc98893..436c826 100644
--- a/kipi-plugins/sync/sinks.cpp
+++ b/kipi-plugins/sync/sinks.cpp
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,2,0)
#include <tdewallet.h>
diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
index 8ec8410..4802374 100644
--- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
+++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
@@ -24,7 +24,7 @@
#include <tqimage.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include <kdebug.h>
#include <kmimetype.h>
diff --git a/kipi-plugins/sync/sintdelist.cpp b/kipi-plugins/sync/sintdelist.cpp
index 80b4e9a..72e9789 100644
--- a/kipi-plugins/sync/sintdelist.cpp
+++ b/kipi-plugins/sync/sintdelist.cpp
@@ -19,8 +19,8 @@
// Include files for KDE
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kpushbutton.h>
diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.cpp b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
index 0c88d6a..6afcde2 100644
--- a/kipi-plugins/timeadjust/plugin_timeadjust.cpp
+++ b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
@@ -23,7 +23,7 @@
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kgenericfactory.h>
diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp
index d4c534f..433a3bf 100644
--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
+++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
@@ -51,7 +51,7 @@ extern "C"
#include <kiconloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <khelpmenu.h>
@@ -60,7 +60,7 @@ extern "C"
#include <kstandarddirs.h>
#include <kdatetimewidget.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// LibKipi includes.
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
index fc544c7..559ea4d 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
@@ -25,7 +25,7 @@
// Include files for KDE
- #include <klocale.h>
+ #include <tdelocale.h>
#include <tdeaction.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -34,7 +34,7 @@
#include <tdeversion.h>
#include <krun.h>
#include <tdeapplication.h>
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
#include <ktextbrowser.h>
#include <tdeversion.h>
#include <tdefiledialog.h>