diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:25 -0600 |
| commit | fa6008238fe6befd362a23c8767775a744e22bc2 (patch) | |
| tree | e1cd2545f72128efed02d79e501397ced82e36bc | |
| parent | d21f600cd26a3c713e33fd7065b6e769825d86ed (diff) | |
| download | digikam-fa6008238fe6befd362a23c8767775a744e22bc2.tar.gz digikam-fa6008238fe6befd362a23c8767775a744e22bc2.zip | |
Rename additional header files to avoid conflicts with KDE4
271 files changed, 418 insertions, 418 deletions
diff --git a/digikam/digikam/album.cpp b/digikam/digikam/album.cpp index 73017857..a6e3a295 100644 --- a/digikam/digikam/album.cpp +++ b/digikam/digikam/album.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp index b4414dc0..ef46b5ae 100644 --- a/digikam/digikam/albumdb.cpp +++ b/digikam/digikam/albumdb.cpp @@ -47,7 +47,7 @@ extern "C" // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/digikam/albumfiletip.cpp b/digikam/digikam/albumfiletip.cpp index 683d767f..1950eab6 100644 --- a/digikam/digikam/albumfiletip.cpp +++ b/digikam/digikam/albumfiletip.cpp @@ -39,11 +39,11 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdefileitem.h> #include <kmimetype.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <tdeversion.h> // LibKDcraw includes. diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp index f485cc20..2155550b 100644 --- a/digikam/digikam/albumfolderview.cpp +++ b/digikam/digikam/albumfolderview.cpp @@ -36,12 +36,12 @@ // KDE includes. -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcalendarsystem.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaction.h> #include <tdefiledialog.h> diff --git a/digikam/digikam/albumicongroupitem.cpp b/digikam/digikam/albumicongroupitem.cpp index 9ed1a145..07562f8b 100644 --- a/digikam/digikam/albumicongroupitem.cpp +++ b/digikam/digikam/albumicongroupitem.cpp @@ -28,8 +28,8 @@ // KDE includes. -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcalendarsystem.h> // Local includes. diff --git a/digikam/digikam/albumiconitem.cpp b/digikam/digikam/albumiconitem.cpp index 5b9767e1..8c97f084 100644 --- a/digikam/digikam/albumiconitem.cpp +++ b/digikam/digikam/albumiconitem.cpp @@ -37,8 +37,8 @@ // KDE includes. #include <kurl.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeio/global.h> // Local includes. diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index 3277ff20..2ec28a80 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -68,9 +68,9 @@ extern "C" #include <tdeapplication.h> #include <kurl.h> #include <kurldrag.h> -#include <klocale.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kpropsdlg.h> #include <ktrader.h> diff --git a/digikam/digikam/albumiconviewfilter.cpp b/digikam/digikam/albumiconviewfilter.cpp index 7eaac19b..e45566be 100644 --- a/digikam/digikam/albumiconviewfilter.cpp +++ b/digikam/digikam/albumiconviewfilter.cpp @@ -28,7 +28,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> // Local includes. diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index 7255c68b..80b477e8 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -53,9 +53,9 @@ extern "C" // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> #include <tdeio/global.h> diff --git a/digikam/digikam/albumpropsedit.cpp b/digikam/digikam/albumpropsedit.cpp index 904c6970..7983f42f 100644 --- a/digikam/digikam/albumpropsedit.cpp +++ b/digikam/digikam/albumpropsedit.cpp @@ -46,9 +46,9 @@ #include <kdatepicker.h> #include <ktextedit.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcursor.h> #include <tdeversion.h> diff --git a/digikam/digikam/albumsettings.cpp b/digikam/digikam/albumsettings.cpp index b8a21e78..6b7d4315 100644 --- a/digikam/digikam/albumsettings.cpp +++ b/digikam/digikam/albumsettings.cpp @@ -30,7 +30,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp index b10d7503..bed6bcff 100644 --- a/digikam/digikam/cameralist.cpp +++ b/digikam/digikam/cameralist.cpp @@ -32,8 +32,8 @@ // KDE includes. -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/digikam/daboutdata.h b/digikam/digikam/daboutdata.h index 149d443b..5ff23f42 100644 --- a/digikam/digikam/daboutdata.h +++ b/digikam/digikam/daboutdata.h @@ -56,7 +56,7 @@ extern "C" // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> static const char digikam_version[] = "0.9.6"; diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp index 4ce5e445..8c4bedbf 100644 --- a/digikam/digikam/datefolderview.cpp +++ b/digikam/digikam/datefolderview.cpp @@ -34,8 +34,8 @@ // KDE includes. #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdeconfig.h> diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index a0b6e80f..463d7eb5 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -37,7 +37,7 @@ // KDE includes. #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kurl.h> #include <kstdaction.h> @@ -48,10 +48,10 @@ #include <ktip.h> #include <tdeversion.h> #include <tdeapplication.h> -#include <kmenubar.h> -#include <kglobalsettings.h> +#include <tdemenubar.h> +#include <tdeglobalsettings.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <twin.h> #include <kimageio.h> #include <dcopref.h> diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp index ec3c17a8..e7a95c01 100644 --- a/digikam/digikam/digikamfirstrun.cpp +++ b/digikam/digikam/digikamfirstrun.cpp @@ -49,7 +49,7 @@ extern "C" // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdefiledialog.h> #include <tdeapplication.h> @@ -57,7 +57,7 @@ extern "C" #include <kstandarddirs.h> #include <kurl.h> #include <kurlrequester.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp index 1637d961..33fd19fc 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -42,7 +42,7 @@ #include <kurl.h> #include <kpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialogbase.h> diff --git a/digikam/digikam/dio.cpp b/digikam/digikam/dio.cpp index 063df259..857dc037 100644 --- a/digikam/digikam/dio.cpp +++ b/digikam/digikam/dio.cpp @@ -43,10 +43,10 @@ extern "C" // KDE includes. #include <kprotocolinfo.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeio/renamedlg.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/digikam/firstrun.cpp b/digikam/digikam/firstrun.cpp index fb376b9b..43613034 100644 --- a/digikam/digikam/firstrun.cpp +++ b/digikam/digikam/firstrun.cpp @@ -34,7 +34,7 @@ // KDE includes. #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index e4a7c0df..ffa5f035 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -34,7 +34,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kcursor.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index 1ce216fd..e71e103f 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -41,7 +41,7 @@ // KDE includes. #include <kcursor.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index 189b11b5..44bf96f1 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -35,7 +35,7 @@ // KDE includes. #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> #include <krun.h> #include <ktrader.h> diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index cab88327..020f77dc 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -31,9 +31,9 @@ // KDE includes. #include <kcalendarsystem.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/digikam/kdatepickerpopup.cpp b/digikam/digikam/kdatepickerpopup.cpp index 34e26542..b4716426 100644 --- a/digikam/digikam/kdatepickerpopup.cpp +++ b/digikam/digikam/kdatepickerpopup.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp index 950b5e3e..b721a13d 100644 --- a/digikam/digikam/kipiinterface.cpp +++ b/digikam/digikam/kipiinterface.cpp @@ -45,7 +45,7 @@ extern "C" // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdefilemetainfo.h> #include <tdeio/netaccess.h> diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp index 71a9ea7b..77609197 100644 --- a/digikam/digikam/main.cpp +++ b/digikam/digikam/main.cpp @@ -38,12 +38,12 @@ #include <tdecmdlineargs.h> #include <tdeapplication.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <ktip.h> #include <tdeversion.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // KIPI includes. diff --git a/digikam/digikam/mediaplayerview.cpp b/digikam/digikam/mediaplayerview.cpp index 0bde3d46..23c313a2 100644 --- a/digikam/digikam/mediaplayerview.cpp +++ b/digikam/digikam/mediaplayerview.cpp @@ -34,7 +34,7 @@ #include <kmimetype.h> #include <kuserprofile.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/digikam/mimefilter.cpp b/digikam/digikam/mimefilter.cpp index 35696e45..80b3b501 100644 --- a/digikam/digikam/mimefilter.cpp +++ b/digikam/digikam/mimefilter.cpp @@ -28,8 +28,8 @@ // KDE includes. -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> // Local includes. diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index 6906629e..e6c255f9 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -32,8 +32,8 @@ // KDE includes. -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcalendarsystem.h> #include <tdeversion.h> diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp index c0d4c3ac..99006358 100644 --- a/digikam/digikam/ratingfilter.cpp +++ b/digikam/digikam/ratingfilter.cpp @@ -33,8 +33,8 @@ // KDE includes. #include <kiconloader.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <tdepopupmenu.h> diff --git a/digikam/digikam/ratingpopupmenu.cpp b/digikam/digikam/ratingpopupmenu.cpp index b419b65d..a1d17bab 100644 --- a/digikam/digikam/ratingpopupmenu.cpp +++ b/digikam/digikam/ratingpopupmenu.cpp @@ -30,8 +30,8 @@ // KDE includes. -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> // Local includes. diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp index 0cfc6052..f22ecb4d 100644 --- a/digikam/digikam/ratingwidget.cpp +++ b/digikam/digikam/ratingwidget.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> // Local includes. diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index e55cc62a..92bc3958 100644 --- a/digikam/digikam/scanlib.cpp +++ b/digikam/digikam/scanlib.cpp @@ -48,9 +48,9 @@ extern "C" // KDE includes. #include <kprogress.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp index 0a10e237..dff2b555 100644 --- a/digikam/digikam/searchadvanceddialog.cpp +++ b/digikam/digikam/searchadvanceddialog.cpp @@ -41,7 +41,7 @@ #include <kurl.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> // Local includes. diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp index 3dd46ae8..9591da72 100644 --- a/digikam/digikam/searchfolderview.cpp +++ b/digikam/digikam/searchfolderview.cpp @@ -33,11 +33,11 @@ // KDE includes. #include <tdepopupmenu.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdeversion.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #if KDE_IS_VERSION(3,2,0) #include <kinputdialog.h> diff --git a/digikam/digikam/searchquickdialog.cpp b/digikam/digikam/searchquickdialog.cpp index 094b65ef..67ca2a62 100644 --- a/digikam/digikam/searchquickdialog.cpp +++ b/digikam/digikam/searchquickdialog.cpp @@ -36,7 +36,7 @@ // KDE includes. #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> // Local includes. diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp index 402313d2..6089d549 100644 --- a/digikam/digikam/searchwidgets.cpp +++ b/digikam/digikam/searchwidgets.cpp @@ -40,7 +40,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kdialog.h> diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp index 55c9914c..44b6829a 100644 --- a/digikam/digikam/syncjob.cpp +++ b/digikam/digikam/syncjob.cpp @@ -36,7 +36,7 @@ #include <tdeio/job.h> #include <kprotocolinfo.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index 550b1ff2..956fd2e6 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -29,7 +29,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kicondialog.h> #include <tdeapplication.h> #include <tdeversion.h> diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index 48b20dfa..27ef49ca 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -33,15 +33,15 @@ // KDE includes. -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kcursor.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp index 118e480a..26f7bba5 100644 --- a/digikam/digikam/tagfolderview.cpp +++ b/digikam/digikam/tagfolderview.cpp @@ -32,11 +32,11 @@ // KDE includes. #include <tdepopupmenu.h> -#include <klocale.h> -#include <kabc/stdaddressbook.h> +#include <tdelocale.h> +#include <tdeabc/stdaddressbook.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index 344fdadc..bb0e0525 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/digikam/digikam/tagspopupmenu.cpp @@ -39,8 +39,8 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp index 8a083269..9fd19261 100644 --- a/digikam/digikam/timelinefolderview.cpp +++ b/digikam/digikam/timelinefolderview.cpp @@ -32,10 +32,10 @@ // KDE includes. #include <tdepopupmenu.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index 591f82bf..cc9ae2fd 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -37,7 +37,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdialog.h> #include <klineedit.h> @@ -46,7 +46,7 @@ #include <ksqueezedtextlabel.h> #include <kstandarddirs.h> #include <tdeversion.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #if KDE_IS_VERSION(3,2,0) #include <kinputdialog.h> diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index eecc0c92..46aff0ee 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -34,10 +34,10 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcalendarsystem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp index f0d9e1e0..eef7e740 100644 --- a/digikam/digikam/welcomepageview.cpp +++ b/digikam/digikam/welcomepageview.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> #include <tdehtml_part.h> #include <tdehtmlview.h> diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp index 6da1d1fe..28af6312 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp @@ -49,12 +49,12 @@ #include <tdeconfig.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeselect.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp index 498b97de..2c7862c9 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -49,12 +49,12 @@ #include <tdeconfig.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeselect.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp index 2be813dc..affae05f 100644 --- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index fdef3de9..930325b0 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -49,12 +49,12 @@ #include <tdeconfig.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeselect.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index b205537e..97a95431 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -51,11 +51,11 @@ #include <tdeconfig.h> #include <kcursor.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <tdeselect.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp index ff145b1d..242c95a3 100644 --- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/digikam/imageplugins/antivignetting/antivignettingtool.cpp index 6f1d1ecb..f1a163ad 100644 --- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp +++ b/digikam/imageplugins/antivignetting/antivignettingtool.cpp @@ -36,7 +36,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp index dc5484e8..441ee202 100644 --- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp @@ -36,7 +36,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp index 8ce215c4..9f02f883 100644 --- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/blurfx/blurfxtool.cpp b/digikam/imageplugins/blurfx/blurfxtool.cpp index 982e2829..01627a6f 100644 --- a/digikam/imageplugins/blurfx/blurfxtool.cpp +++ b/digikam/imageplugins/blurfx/blurfxtool.cpp @@ -36,7 +36,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp index 82e47f43..e604ae2b 100644 --- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp +++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp @@ -35,7 +35,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdeapplication.h> #include <knuminput.h> diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp index a98944d8..b4786ec7 100644 --- a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp +++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp index d40ec512..a125b523 100644 --- a/digikam/imageplugins/border/bordertool.cpp +++ b/digikam/imageplugins/border/bordertool.cpp @@ -37,7 +37,7 @@ #include <kcolorbutton.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp index f8f5f972..13f4e3f2 100644 --- a/digikam/imageplugins/border/imageeffect_border.cpp +++ b/digikam/imageplugins/border/imageeffect_border.cpp @@ -34,7 +34,7 @@ // KDE includes. #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/border/imageplugin_border.cpp b/digikam/imageplugins/border/imageplugin_border.cpp index 631f4a67..75d93709 100644 --- a/digikam/imageplugins/border/imageplugin_border.cpp +++ b/digikam/imageplugins/border/imageplugin_border.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp index 9304fff6..2d40d159 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/channelmixer.cpp @@ -58,12 +58,12 @@ #include <tdeconfig.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeselect.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp index 3487856b..473863f6 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.cpp +++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp @@ -57,11 +57,11 @@ #include <tdeapplication.h> #include <kcursor.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <tdeselect.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp index 9bd67bb9..2afbafdf 100644 --- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/charcoal/charcoaltool.cpp b/digikam/imageplugins/charcoal/charcoaltool.cpp index 0a282997..772cbe38 100644 --- a/digikam/imageplugins/charcoal/charcoaltool.cpp +++ b/digikam/imageplugins/charcoal/charcoaltool.cpp @@ -31,7 +31,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp index c64919b9..f57f1ecc 100644 --- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp +++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp @@ -31,7 +31,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp index fe5c8af6..c2aa2699 100644 --- a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp +++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp index 042ba015..ad9fd044 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.cpp +++ b/digikam/imageplugins/colorfx/colorfxtool.cpp @@ -45,7 +45,7 @@ #include <kcursor.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp index 9b86656f..8edb2a13 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -41,7 +41,7 @@ #include <tdeconfig.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> #include <tdeaboutdata.h> #include <khelpmenu.h> diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp index 207abaf3..21af85b7 100644 --- a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp @@ -25,7 +25,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp index baac89dc..8a661c0e 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp @@ -47,7 +47,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // Digikam includes. diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp index 13353483..1f7954da 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.cpp +++ b/digikam/imageplugins/coreplugin/bcgtool.cpp @@ -46,7 +46,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/coreplugin/blurtool.cpp b/digikam/imageplugins/coreplugin/blurtool.cpp index 3da8a557..85e1dc19 100644 --- a/digikam/imageplugins/coreplugin/blurtool.cpp +++ b/digikam/imageplugins/coreplugin/blurtool.cpp @@ -33,7 +33,7 @@ #include <kiconloader.h> #include <tdeconfig.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> // Digikam includes. diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index 3de92e7d..6fdca4e5 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -49,10 +49,10 @@ #include <tdeconfig.h> #include <kcursor.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <ktabwidget.h> diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp index 95b0e387..a5a40758 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp @@ -46,7 +46,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp index 3f10be22..3841ca38 100644 --- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp @@ -31,7 +31,7 @@ // KDE includes. #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kimageeffect.h> // Local includes. diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index 6e4a8496..367919a9 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -43,7 +43,7 @@ // KDE includes. #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kcursor.h> diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp index 28ea2e22..3ecc1a8c 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.cpp +++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp @@ -52,10 +52,10 @@ #include <kcursor.h> #include <tdefile.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksqueezedtextlabel.h> #include <kstandarddirs.h> #include <ktabwidget.h> diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp index 0e19b615..bd116d66 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -49,7 +49,7 @@ #include <kcursor.h> #include <kstandarddirs.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> // Digikam includes. diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp index f056863e..bafe063b 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -44,7 +44,7 @@ // KDE includes. #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kcursor.h> diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp index b307e186..bd23854b 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp @@ -33,7 +33,7 @@ #include <knuminput.h> #include <tdeconfig.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> // Digikam includes. diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index a05416ae..e7aebd88 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -47,10 +47,10 @@ // KDE includes. #include <tdefiledialog.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeapplication.h> #include <knuminput.h> diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp index b597b4bb..7a07eee2 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -49,7 +49,7 @@ // KDE includes. #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kcursor.h> #include <kstandarddirs.h> @@ -59,8 +59,8 @@ #include <kurllabel.h> #include <tdefiledialog.h> #include <tdefile.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> +#include <tdemessagebox.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <ksqueezedtextlabel.h> diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp index bb768e91..496de54f 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -43,7 +43,7 @@ #include <kcolordialog.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kcursor.h> diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp index f39aab12..0ee78bca 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -44,7 +44,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kcursor.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.cpp b/digikam/imageplugins/coreplugin/imageplugin_core.cpp index 4ee4b3f2..0bc4a18d 100644 --- a/digikam/imageplugins/coreplugin/imageplugin_core.cpp +++ b/digikam/imageplugins/coreplugin/imageplugin_core.cpp @@ -26,12 +26,12 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> #include <kcursor.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> // Local includes. diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index 5ef79e21..18882fc2 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -41,7 +41,7 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp index f4d5a11a..7baa2ee7 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp @@ -59,7 +59,7 @@ #include <kstandarddirs.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> // Local includes. diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index af411b2e..c223ed31 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -45,7 +45,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp index 5e5e2176..b1e55797 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.cpp +++ b/digikam/imageplugins/coreplugin/redeyetool.cpp @@ -47,7 +47,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // Digikam includes. diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp index 505517b9..c337d279 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.cpp +++ b/digikam/imageplugins/coreplugin/rgbtool.cpp @@ -45,7 +45,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp index 1e22e6d1..87926953 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp @@ -40,14 +40,14 @@ #include <tdeaboutdata.h> #include <knuminput.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kseparator.h> #include <tdeconfig.h> #include <kurl.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp index 468f88a1..b2a82398 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp @@ -38,15 +38,15 @@ #include <tdeaboutdata.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kseparator.h> #include <tdeconfig.h> #include <kurl.h> #include <kiconloader.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/digikam/imageplugins/distortionfx/distortionfxtool.cpp index 86d16ab7..3be193c3 100644 --- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp +++ b/digikam/imageplugins/distortionfx/distortionfxtool.cpp @@ -42,7 +42,7 @@ #include <kcursor.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp index aa0116f1..bf5fc9fc 100644 --- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp @@ -38,7 +38,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> #include <tdeaboutdata.h> #include <khelpmenu.h> diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp index a3e1a5df..c6e61082 100644 --- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp @@ -26,7 +26,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/emboss/embosstool.cpp b/digikam/imageplugins/emboss/embosstool.cpp index 0a40440c..be03d077 100644 --- a/digikam/imageplugins/emboss/embosstool.cpp +++ b/digikam/imageplugins/emboss/embosstool.cpp @@ -35,7 +35,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/digikam/imageplugins/emboss/imageeffect_emboss.cpp index 4a25e28d..9ec68b4c 100644 --- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp +++ b/digikam/imageplugins/emboss/imageeffect_emboss.cpp @@ -31,7 +31,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.cpp b/digikam/imageplugins/emboss/imageplugin_emboss.cpp index 33cd1504..95804805 100644 --- a/digikam/imageplugins/emboss/imageplugin_emboss.cpp +++ b/digikam/imageplugins/emboss/imageplugin_emboss.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/digikam/imageplugins/filmgrain/filmgraintool.cpp index 48aea525..7bb3aad3 100644 --- a/digikam/imageplugins/filmgrain/filmgraintool.cpp +++ b/digikam/imageplugins/filmgrain/filmgraintool.cpp @@ -34,7 +34,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp index 9f354da7..25bfc08f 100644 --- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp @@ -34,7 +34,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp index 112db9fe..2d4efe4e 100644 --- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/digikam/imageplugins/freerotation/freerotationtool.cpp index 0c16903d..70c053ce 100644 --- a/digikam/imageplugins/freerotation/freerotationtool.cpp +++ b/digikam/imageplugins/freerotation/freerotationtool.cpp @@ -37,7 +37,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp index e1141e88..9e546e04 100644 --- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp @@ -33,7 +33,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp index c08adb24..acf632b3 100644 --- a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/hotpixels/blackframelistview.h b/digikam/imageplugins/hotpixels/blackframelistview.h index 5e5cafa8..fe296d01 100644 --- a/digikam/imageplugins/hotpixels/blackframelistview.h +++ b/digikam/imageplugins/hotpixels/blackframelistview.h @@ -37,7 +37,7 @@ // KDE includes. #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp index 61afe385..4cabb689 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp @@ -34,7 +34,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kimageio.h> #include <tdeaboutdata.h> diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp index eb2cf57e..b8b9b86f 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp @@ -34,7 +34,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kimageio.h> #include <tdeaboutdata.h> diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp index de94e260..aaf26a39 100644 --- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp @@ -25,7 +25,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp index 90f43d39..06b6223f 100644 --- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp +++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp @@ -36,7 +36,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.cpp b/digikam/imageplugins/infrared/imageplugin_infrared.cpp index faf6b7a7..fcd991b4 100644 --- a/digikam/imageplugins/infrared/imageplugin_infrared.cpp +++ b/digikam/imageplugins/infrared/imageplugin_infrared.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/digikam/imageplugins/infrared/infraredtool.cpp index 34fa6f5c..6a482c5e 100644 --- a/digikam/imageplugins/infrared/infraredtool.cpp +++ b/digikam/imageplugins/infrared/infraredtool.cpp @@ -36,7 +36,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp index 82031418..f83ab76a 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -51,7 +51,7 @@ #include <kcursor.h> #include <kurllabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> @@ -60,9 +60,9 @@ #include <tdefiledialog.h> #include <kstandarddirs.h> #include <kprogress.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kpassivepopup.h> // Local includes. diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp index 921abef0..34073dc1 100644 --- a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp index 9c1e1aae..95190ab4 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.cpp +++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp @@ -53,11 +53,11 @@ #include <tdeapplication.h> #include <kcursor.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kprogress.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp index efa0043c..7b0dfca5 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp +++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp @@ -46,10 +46,10 @@ #include <kcharsets.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kstandarddirs.h> #include <tqlineedit.h> diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp index b05180fc..97f06372 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -43,7 +43,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> #include <tdeaboutdata.h> #include <khelpmenu.h> diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp index c06ef6c0..6ee59943 100644 --- a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp index 746db95e..80b32690 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.cpp +++ b/digikam/imageplugins/inserttext/inserttexttool.cpp @@ -49,7 +49,7 @@ #include <kcursor.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <ktextedit.h> diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp index 0595d23b..214a3cba 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.cpp +++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp @@ -37,7 +37,7 @@ #include <kstandarddirs.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> // Digikam includes. diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp index 6a8ff66b..5d9dbf15 100644 --- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp @@ -40,7 +40,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <kiconloader.h> diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp index 02cf17be..dd1d022d 100644 --- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp index 08e8cacc..dde7aab7 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp +++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp @@ -45,7 +45,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp index 50cc093b..9072855e 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -36,15 +36,15 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> #include <kstandarddirs.h> #include <knuminput.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> #include <tdeconfig.h> // Local includes. diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp index a787c531..01d05a5b 100644 --- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp index fd4651ac..d1e4908a 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp +++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp @@ -40,10 +40,10 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp index b194063f..ea20ab11 100644 --- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp @@ -32,7 +32,7 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp index c647b405..7d44dd46 100644 --- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/oilpaint/oilpainttool.cpp b/digikam/imageplugins/oilpaint/oilpainttool.cpp index f3eb418e..80a6cd62 100644 --- a/digikam/imageplugins/oilpaint/oilpainttool.cpp +++ b/digikam/imageplugins/oilpaint/oilpainttool.cpp @@ -36,7 +36,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp index 2b00d60c..cf03ebcb 100644 --- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp +++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp @@ -38,7 +38,7 @@ #include <kcolorbutton.h> #include <kcursor.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.cpp b/digikam/imageplugins/perspective/imageplugin_perspective.cpp index 75d1228a..f99fd370 100644 --- a/digikam/imageplugins/perspective/imageplugin_perspective.cpp +++ b/digikam/imageplugins/perspective/imageplugin_perspective.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp index 7205a45d..eadf9a7b 100644 --- a/digikam/imageplugins/perspective/perspectivetool.cpp +++ b/digikam/imageplugins/perspective/perspectivetool.cpp @@ -41,7 +41,7 @@ #include <kcursor.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kseparator.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp index 92b4837c..a43aacf5 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.cpp +++ b/digikam/imageplugins/perspective/perspectivewidget.cpp @@ -45,7 +45,7 @@ #include <kstandarddirs.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> // Local includes. diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp index 7b99f971..07101f59 100644 --- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp +++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp @@ -33,7 +33,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp index 9a069192..d309b851 100644 --- a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp +++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/raindrop/raindroptool.cpp b/digikam/imageplugins/raindrop/raindroptool.cpp index 14d13f62..3c153a45 100644 --- a/digikam/imageplugins/raindrop/raindroptool.cpp +++ b/digikam/imageplugins/raindrop/raindroptool.cpp @@ -36,7 +36,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp index 96b86b00..7edf075d 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp +++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp @@ -36,14 +36,14 @@ // KDE includes. #include <kurllabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.cpp b/digikam/imageplugins/restoration/imageplugin_restoration.cpp index 8975578d..4bcb9ad6 100644 --- a/digikam/imageplugins/restoration/imageplugin_restoration.cpp +++ b/digikam/imageplugins/restoration/imageplugin_restoration.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp index f4b97801..977633ed 100644 --- a/digikam/imageplugins/restoration/restorationtool.cpp +++ b/digikam/imageplugins/restoration/restorationtool.cpp @@ -36,14 +36,14 @@ // KDE includes. #include <kurllabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp index a927bc98..dba6d20e 100644 --- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp @@ -31,7 +31,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp index 68265afb..e0490a28 100644 --- a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/digikam/imageplugins/sheartool/sheartool.cpp index 4b6e9e78..4e2538a0 100644 --- a/digikam/imageplugins/sheartool/sheartool.cpp +++ b/digikam/imageplugins/sheartool/sheartool.cpp @@ -36,7 +36,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <kstandarddirs.h> diff --git a/digikam/imageplugins/superimpose/dirselectwidget.cpp b/digikam/imageplugins/superimpose/dirselectwidget.cpp index a4be4449..858bbd2d 100644 --- a/digikam/imageplugins/superimpose/dirselectwidget.cpp +++ b/digikam/imageplugins/superimpose/dirselectwidget.cpp @@ -32,7 +32,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp index f3c73ee7..bb674edf 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -41,7 +41,7 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> @@ -54,7 +54,7 @@ #include <tdefiledialog.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp index d690d27a..96724718 100644 --- a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp @@ -25,7 +25,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp index 681bf002..ccd3029b 100644 --- a/digikam/imageplugins/superimpose/superimposetool.cpp +++ b/digikam/imageplugins/superimpose/superimposetool.cpp @@ -41,7 +41,7 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> @@ -54,7 +54,7 @@ #include <tdefiledialog.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp index 7994db40..cc89e8aa 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.cpp +++ b/digikam/imageplugins/superimpose/superimposewidget.cpp @@ -35,7 +35,7 @@ #include <kstandarddirs.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> // Local includes. diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp index e235dab6..56f08d73 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.cpp +++ b/digikam/imageplugins/texture/imageeffect_texture.cpp @@ -33,7 +33,7 @@ // KDE includes. #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/imageplugins/texture/imageplugin_texture.cpp b/digikam/imageplugins/texture/imageplugin_texture.cpp index 04683bd9..7114fa6a 100644 --- a/digikam/imageplugins/texture/imageplugin_texture.cpp +++ b/digikam/imageplugins/texture/imageplugin_texture.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp index 74c68b8f..143cf146 100644 --- a/digikam/imageplugins/texture/texturetool.cpp +++ b/digikam/imageplugins/texture/texturetool.cpp @@ -35,7 +35,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> // LibKDcraw includes. diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index d740bbc0..2994084a 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -44,7 +44,7 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> @@ -52,9 +52,9 @@ #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kprogress.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdefiledialog.h> #include <kseparator.h> #include <tdeconfig.h> diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp index 41bd05d1..ada29aed 100644 --- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeaction.h> diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index c74a37f7..8e6da1eb 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -49,11 +49,11 @@ #include <tdeconfig.h> #include <kcursor.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kprogress.h> #include <kseparator.h> diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp index 47edc82b..a40dc681 100644 --- a/digikam/libs/dialogs/ctrlpaneldlg.cpp +++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp @@ -36,14 +36,14 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/libs/dialogs/deletedialog.cpp b/digikam/libs/dialogs/deletedialog.cpp index dde5e84b..bbe70411 100644 --- a/digikam/libs/dialogs/deletedialog.cpp +++ b/digikam/libs/dialogs/deletedialog.cpp @@ -39,10 +39,10 @@ #include <tdeconfig.h> #include <tdeversion.h> #include <kdialogbase.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> // Local includes. diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp index b9349a79..754047de 100644 --- a/digikam/libs/dialogs/dprogressdlg.cpp +++ b/digikam/libs/dialogs/dprogressdlg.cpp @@ -33,7 +33,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> #include <tdeapplication.h> #include <kdialogbase.h> diff --git a/digikam/libs/dialogs/iccprofileinfodlg.cpp b/digikam/libs/dialogs/iccprofileinfodlg.cpp index 1c174902..04f30c0c 100644 --- a/digikam/libs/dialogs/iccprofileinfodlg.cpp +++ b/digikam/libs/dialogs/iccprofileinfodlg.cpp @@ -23,7 +23,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index 4f8eb56f..ade4b983 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -31,7 +31,7 @@ // KDE includes. #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdefiledialog.h> #include <kimageio.h> diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp index 074cb3c5..fbc2b864 100644 --- a/digikam/libs/dialogs/imagedlgbase.cpp +++ b/digikam/libs/dialogs/imagedlgbase.cpp @@ -40,8 +40,8 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp index 94d22291..9c6c0867 100644 --- a/digikam/libs/dialogs/imageguidedlg.cpp +++ b/digikam/libs/dialogs/imageguidedlg.cpp @@ -39,14 +39,14 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <khelpmenu.h> #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kprogress.h> #include <kcolorbutton.h> #include <tdeconfig.h> diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp index 1e2b2a50..e67a565c 100644 --- a/digikam/libs/dialogs/rawcameradlg.cpp +++ b/digikam/libs/dialogs/rawcameradlg.cpp @@ -32,7 +32,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> #include <tdeaboutdata.h> diff --git a/digikam/libs/dimg/loaders/jp2ksettings.cpp b/digikam/libs/dimg/loaders/jp2ksettings.cpp index 32a2ca20..ca5c473a 100644 --- a/digikam/libs/dimg/loaders/jp2ksettings.cpp +++ b/digikam/libs/dimg/loaders/jp2ksettings.cpp @@ -31,7 +31,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <knuminput.h> diff --git a/digikam/libs/dimg/loaders/jpegsettings.cpp b/digikam/libs/dimg/loaders/jpegsettings.cpp index 3b15dfab..62bd6365 100644 --- a/digikam/libs/dimg/loaders/jpegsettings.cpp +++ b/digikam/libs/dimg/loaders/jpegsettings.cpp @@ -31,7 +31,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <knuminput.h> #include <kactivelabel.h> diff --git a/digikam/libs/dimg/loaders/pngsettings.cpp b/digikam/libs/dimg/loaders/pngsettings.cpp index e140d46b..ce39219b 100644 --- a/digikam/libs/dimg/loaders/pngsettings.cpp +++ b/digikam/libs/dimg/loaders/pngsettings.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <knuminput.h> diff --git a/digikam/libs/dimg/loaders/tiffsettings.cpp b/digikam/libs/dimg/loaders/tiffsettings.cpp index 96d6d6ad..3ea7e20c 100644 --- a/digikam/libs/dimg/loaders/tiffsettings.cpp +++ b/digikam/libs/dimg/loaders/tiffsettings.cpp @@ -31,7 +31,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> // Local includes. diff --git a/digikam/libs/greycstoration/greycstorationwidget.cpp b/digikam/libs/greycstoration/greycstorationwidget.cpp index 5a4bae78..147a92f7 100644 --- a/digikam/libs/greycstoration/greycstorationwidget.cpp +++ b/digikam/libs/greycstoration/greycstorationwidget.cpp @@ -34,7 +34,7 @@ // KDE includes. #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> // LibKDcraw includes. diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index 5d1d487c..0427840a 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -35,7 +35,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialogbase.h> diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index 7fe479cb..296ea35c 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -39,14 +39,14 @@ // KDE includes. -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kcursor.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ktextedit.h> #include <tdeconfig.h> #include <klineedit.h> diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index 53b758db..73884449 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -41,7 +41,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <ksqueezedtextlabel.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp index d28f8cba..5a48aaec 100644 --- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp +++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp @@ -32,7 +32,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialogbase.h> diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/digikam/libs/imageproperties/imagepropertiessidebar.cpp index 8e89d096..9f1dccc7 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebar.cpp @@ -29,11 +29,11 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp index 4c948b6a..6a13df1e 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp @@ -28,11 +28,11 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp index 7e3c92ad..e3606224 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp @@ -31,11 +31,11 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index b75ad4cc..952bb64a 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -35,7 +35,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <tdefileitem.h> #include <ksqueezedtextlabel.h> diff --git a/digikam/libs/imageproperties/navigatebarwidget.cpp b/digikam/libs/imageproperties/navigatebarwidget.cpp index ea01df03..ba923cfd 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.cpp +++ b/digikam/libs/imageproperties/navigatebarwidget.cpp @@ -29,7 +29,7 @@ #include <ksqueezedtextlabel.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index 72585635..4191962a 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -29,14 +29,14 @@ // KDE includes. #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kcursor.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdialogbase.h> // Local includes. diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp index 5833b89d..f788defa 100644 --- a/digikam/libs/themeengine/themeengine.cpp +++ b/digikam/libs/themeengine/themeengine.cpp @@ -35,12 +35,12 @@ // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kuser.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index 914f79f1..fecfbf11 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -52,10 +52,10 @@ extern "C" #include <tdefileitem.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <tdefileitem.h> -#include <kglobal.h> +#include <tdeglobal.h> // LibKDcraw includes. diff --git a/digikam/libs/thumbbar/thumbnailjob.cpp b/digikam/libs/thumbbar/thumbnailjob.cpp index 9ad8f144..1df75305 100644 --- a/digikam/libs/thumbbar/thumbnailjob.cpp +++ b/digikam/libs/thumbbar/thumbnailjob.cpp @@ -46,7 +46,7 @@ extern "C" // KDE includes. -#include <kglobal.h> +#include <tdeglobal.h> // Local includes. diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp index 7f168ea4..6409a0b0 100644 --- a/digikam/libs/widgets/common/curveswidget.cpp +++ b/digikam/libs/widgets/common/curveswidget.cpp @@ -44,7 +44,7 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> // Digikam includes. diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp index 91bc9a97..eea2bc40 100644 --- a/digikam/libs/widgets/common/dlogoaction.cpp +++ b/digikam/libs/widgets/common/dlogoaction.cpp @@ -33,7 +33,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/digikam/libs/widgets/common/filesaveoptionsbox.cpp index efbfac9f..26985fb5 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp +++ b/digikam/libs/widgets/common/filesaveoptionsbox.cpp @@ -34,7 +34,7 @@ // KDE includes. #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <knuminput.h> #include <tdeconfig.h> diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp index 56a7987c..44b52c70 100644 --- a/digikam/libs/widgets/common/histogramwidget.cpp +++ b/digikam/libs/widgets/common/histogramwidget.cpp @@ -45,7 +45,7 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp index a7a15f20..9e34d008 100644 --- a/digikam/libs/widgets/common/previewwidget.cpp +++ b/digikam/libs/widgets/common/previewwidget.cpp @@ -39,7 +39,7 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/common/searchtextbar.h b/digikam/libs/widgets/common/searchtextbar.h index 7a8081ad..9e599768 100644 --- a/digikam/libs/widgets/common/searchtextbar.h +++ b/digikam/libs/widgets/common/searchtextbar.h @@ -32,7 +32,7 @@ // KDE includes. #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp index 6ce56c7c..20abac78 100644 --- a/digikam/libs/widgets/common/splashscreen.cpp +++ b/digikam/libs/widgets/common/splashscreen.cpp @@ -31,9 +31,9 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/libs/widgets/common/statusled.cpp b/digikam/libs/widgets/common/statusled.cpp index 4e1e5f31..7d71c7f9 100644 --- a/digikam/libs/widgets/common/statusled.cpp +++ b/digikam/libs/widgets/common/statusled.cpp @@ -28,7 +28,7 @@ // KDE includes. -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> // Local includes. diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/digikam/libs/widgets/common/statusnavigatebar.cpp index dab8e0fa..c484483f 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.cpp +++ b/digikam/libs/widgets/common/statusnavigatebar.cpp @@ -31,7 +31,7 @@ // KDE includes. #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp index 31bcbd53..54c7f3bf 100644 --- a/digikam/libs/widgets/common/statusprogressbar.cpp +++ b/digikam/libs/widgets/common/statusprogressbar.cpp @@ -32,7 +32,7 @@ #include <ksqueezedtextlabel.h> #include <kprogress.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kcursor.h> diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp index 1672253c..10e70799 100644 --- a/digikam/libs/widgets/common/statuszoombar.cpp +++ b/digikam/libs/widgets/common/statuszoombar.cpp @@ -31,7 +31,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp index 5f9a85a6..cd2efd5f 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp @@ -39,7 +39,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp index 5d952b61..2e5152f7 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp @@ -39,7 +39,7 @@ // KDE includes. #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> // Lcms includes. diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp index eb94089d..c8d3045d 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp @@ -38,7 +38,7 @@ #include <kstandarddirs.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> // Local includes. diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index 4b69fd23..4b6ab95f 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -38,7 +38,7 @@ // KDE includes. #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index f3585c3c..27444a02 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -38,7 +38,7 @@ // KDE includes. #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> #include <kprogress.h> #include <tdeapplication.h> diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp index b1a60b3f..db80604b 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp @@ -42,7 +42,7 @@ #include <kstandarddirs.h> #include <kcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> // Local includes. diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index c74814a1..909dba9b 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -35,7 +35,7 @@ #include <ksqueezedtextlabel.h> #include <kdialog.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/digikam/libs/widgets/metadata/exifwidget.cpp b/digikam/libs/widgets/metadata/exifwidget.cpp index 286cf693..7761c250 100644 --- a/digikam/libs/widgets/metadata/exifwidget.cpp +++ b/digikam/libs/widgets/metadata/exifwidget.cpp @@ -28,7 +28,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp index 0bc5a7bc..fcb1646e 100644 --- a/digikam/libs/widgets/metadata/gpswidget.cpp +++ b/digikam/libs/widgets/metadata/gpswidget.cpp @@ -39,7 +39,7 @@ http://www.gpspassion.com/forumsen/topic.asp?TOPIC_ID=16593 // KDE includes. #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> // Local includes. diff --git a/digikam/libs/widgets/metadata/iptcwidget.cpp b/digikam/libs/widgets/metadata/iptcwidget.cpp index 24f782dd..b0bcb009 100644 --- a/digikam/libs/widgets/metadata/iptcwidget.cpp +++ b/digikam/libs/widgets/metadata/iptcwidget.cpp @@ -28,7 +28,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/metadata/makernotewidget.cpp b/digikam/libs/widgets/metadata/makernotewidget.cpp index d2904eda..ddd1fe3c 100644 --- a/digikam/libs/widgets/metadata/makernotewidget.cpp +++ b/digikam/libs/widgets/metadata/makernotewidget.cpp @@ -29,7 +29,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp b/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp index c45ea728..27963eaf 100644 --- a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp +++ b/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp index a9aff2ec..ed702b0b 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.cpp +++ b/digikam/libs/widgets/metadata/metadatalistview.cpp @@ -32,7 +32,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index fcc85647..dadec353 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -44,11 +44,11 @@ // KDE includes. #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kprinter.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp index cd59df39..17d07ccb 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.cpp +++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp @@ -32,7 +32,7 @@ #include <kstandarddirs.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> // Local includes. diff --git a/digikam/showfoto/main.cpp b/digikam/showfoto/main.cpp index 0918dd6b..0be2a542 100644 --- a/digikam/showfoto/main.cpp +++ b/digikam/showfoto/main.cpp @@ -32,9 +32,9 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kimageio.h> // Local includes. diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp index 0d53f179..6261ac5b 100644 --- a/digikam/showfoto/setup/setup.cpp +++ b/digikam/showfoto/setup/setup.cpp @@ -29,7 +29,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/digikam/showfoto/setup/setupeditor.cpp b/digikam/showfoto/setup/setupeditor.cpp index 72f58e38..dcb51e0f 100644 --- a/digikam/showfoto/setup/setupeditor.cpp +++ b/digikam/showfoto/setup/setupeditor.cpp @@ -35,7 +35,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kcolorbutton.h> #include <knuminput.h> diff --git a/digikam/showfoto/setup/setuptooltip.cpp b/digikam/showfoto/setup/setuptooltip.cpp index c53001e0..3fb1f3c6 100644 --- a/digikam/showfoto/setup/setuptooltip.cpp +++ b/digikam/showfoto/setup/setuptooltip.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp index 15ee6180..0b1b5f26 100644 --- a/digikam/showfoto/showfoto.cpp +++ b/digikam/showfoto/showfoto.cpp @@ -53,20 +53,20 @@ extern "C" #include <kstdaction.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kimageio.h> #include <tdeaccel.h> #include <tdeversion.h> -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <kprotocolinfo.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdetoolbar.h> #include <kstatusbar.h> #include <kprogress.h> diff --git a/digikam/tdeioslave/digikamalbums.cpp b/digikam/tdeioslave/digikamalbums.cpp index 17724eed..299df888 100644 --- a/digikam/tdeioslave/digikamalbums.cpp +++ b/digikam/tdeioslave/digikamalbums.cpp @@ -59,8 +59,8 @@ extern "C" // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdefilemetainfo.h> #include <kmimetype.h> diff --git a/digikam/tdeioslave/digikamdates.cpp b/digikam/tdeioslave/digikamdates.cpp index 6cd7b894..8b6f5c1e 100644 --- a/digikam/tdeioslave/digikamdates.cpp +++ b/digikam/tdeioslave/digikamdates.cpp @@ -49,8 +49,8 @@ extern "C" // KDE includes. #include <tdeio/global.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdefilemetainfo.h> #include <kdebug.h> diff --git a/digikam/tdeioslave/digikamsearch.cpp b/digikam/tdeioslave/digikamsearch.cpp index 462f5d11..3bc82ed9 100644 --- a/digikam/tdeioslave/digikamsearch.cpp +++ b/digikam/tdeioslave/digikamsearch.cpp @@ -52,8 +52,8 @@ extern "C" // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcalendarsystem.h> #include <kinstance.h> #include <tdefilemetainfo.h> diff --git a/digikam/tdeioslave/digikamtags.cpp b/digikam/tdeioslave/digikamtags.cpp index 4163dc6a..d03fda74 100644 --- a/digikam/tdeioslave/digikamtags.cpp +++ b/digikam/tdeioslave/digikamtags.cpp @@ -51,8 +51,8 @@ extern "C" #include <kinstance.h> #include <kdebug.h> #include <kurl.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <tdeio/global.h> #include <tdefilemetainfo.h> diff --git a/digikam/tdeioslave/digikamthumbnail.cpp b/digikam/tdeioslave/digikamthumbnail.cpp index 781fe0bf..60d4be48 100644 --- a/digikam/tdeioslave/digikamthumbnail.cpp +++ b/digikam/tdeioslave/digikamthumbnail.cpp @@ -53,11 +53,11 @@ #include <kurl.h> #include <kinstance.h> #include <kimageio.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kmdcodec.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktrader.h> #include <klibloader.h> #include <kmimetype.h> diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp index 0b66671b..27bc7459 100644 --- a/digikam/themedesigner/main.cpp +++ b/digikam/themedesigner/main.cpp @@ -31,8 +31,8 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp index e9c6ccb6..3b93fb2c 100644 --- a/digikam/themedesigner/mainwindow.cpp +++ b/digikam/themedesigner/mainwindow.cpp @@ -39,13 +39,13 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kcolordialog.h> #include <kcolorbutton.h> #include <tdeapplication.h> #include <kiconloader.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kuser.h> // Local includes. diff --git a/digikam/themedesigner/themedicongroupitem.cpp b/digikam/themedesigner/themedicongroupitem.cpp index 585bd525..1da37fd3 100644 --- a/digikam/themedesigner/themedicongroupitem.cpp +++ b/digikam/themedesigner/themedicongroupitem.cpp @@ -28,7 +28,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp index 939e12b9..2ed7df80 100644 --- a/digikam/themedesigner/themediconitem.cpp +++ b/digikam/themedesigner/themediconitem.cpp @@ -33,8 +33,8 @@ // KDE includes. -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp index a148b431..60fbae6a 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp +++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/digikam/utilities/batch/batchsyncmetadata.cpp b/digikam/utilities/batch/batchsyncmetadata.cpp index 91e36be0..831cdaf8 100644 --- a/digikam/utilities/batch/batchsyncmetadata.cpp +++ b/digikam/utilities/batch/batchsyncmetadata.cpp @@ -28,7 +28,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> // Local includes. diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp index 890a1e35..783226f8 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.cpp +++ b/digikam/utilities/batch/batchthumbsgenerator.cpp @@ -39,7 +39,7 @@ extern "C" // KDE includes. #include <kmdcodec.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> // Local includes. diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index 03931f83..ee3b5e88 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -35,12 +35,12 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> #include <tdeaction.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp index 8167a636..e288e608 100644 --- a/digikam/utilities/cameragui/cameracontroller.cpp +++ b/digikam/utilities/cameragui/cameracontroller.cpp @@ -49,9 +49,9 @@ extern "C" // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/renamedlg.h> #include <kstandarddirs.h> diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp index 84ebcaae..441492d2 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.cpp +++ b/digikam/utilities/cameragui/camerafolderdialog.cpp @@ -29,7 +29,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/digikam/utilities/cameragui/camerafolderview.cpp b/digikam/utilities/cameragui/camerafolderview.cpp index e04c4503..bfa95e8b 100644 --- a/digikam/utilities/cameragui/camerafolderview.cpp +++ b/digikam/utilities/cameragui/camerafolderview.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index be3ea365..be52eb88 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -39,7 +39,7 @@ #include <kurldrag.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeaction.h> #include <tdeapplication.h> diff --git a/digikam/utilities/cameragui/camerainfodialog.cpp b/digikam/utilities/cameragui/camerainfodialog.cpp index 2ad0ac10..f1012608 100644 --- a/digikam/utilities/cameragui/camerainfodialog.cpp +++ b/digikam/utilities/cameragui/camerainfodialog.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> // Local includes. diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index 27af679c..6e458fdf 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -54,10 +54,10 @@ #include <tdefiledialog.h> #include <kimageio.h> #include <tdeaboutdata.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprogress.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp index d096433d..4921c5a4 100644 --- a/digikam/utilities/cameragui/freespacewidget.cpp +++ b/digikam/utilities/cameragui/freespacewidget.cpp @@ -36,7 +36,7 @@ // KDE includes. #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdiskfreesp.h> #include <tdeio/global.h> #include <kiconloader.h> diff --git a/digikam/utilities/cameragui/gpcamera.cpp b/digikam/utilities/cameragui/gpcamera.cpp index 7139e985..e03d92d0 100644 --- a/digikam/utilities/cameragui/gpcamera.cpp +++ b/digikam/utilities/cameragui/gpcamera.cpp @@ -38,7 +38,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // C Ansi includes. extern "C" diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index 96690cab..265cfcd4 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -38,7 +38,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/digikam/utilities/cameragui/umscamera.cpp b/digikam/utilities/cameragui/umscamera.cpp index 84a9f2c4..537c29ba 100644 --- a/digikam/utilities/cameragui/umscamera.cpp +++ b/digikam/utilities/cameragui/umscamera.cpp @@ -43,7 +43,7 @@ extern "C" // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <tdefilemetainfo.h> // LibKDcraw includes. diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index edda7174..8154c097 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -52,10 +52,10 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdatetbl.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index 067c9a77..f81a70db 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -34,7 +34,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> #include <kseparator.h> diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp index dcc90407..4ad6929e 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp +++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp @@ -47,7 +47,7 @@ // KDE includes. #include <kcursor.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // Local includes. diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp index fc104b4e..43c8a16c 100644 --- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp +++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp @@ -27,7 +27,7 @@ #include <ktrader.h> #include <tdeparts/componentfactory.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kxmlguiclient.h> // Local includes. diff --git a/digikam/utilities/imageeditor/canvas/undoaction.h b/digikam/utilities/imageeditor/canvas/undoaction.h index 9a4c924e..5f29486e 100644 --- a/digikam/utilities/imageeditor/canvas/undoaction.h +++ b/digikam/utilities/imageeditor/canvas/undoaction.h @@ -27,7 +27,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/utilities/imageeditor/canvas/undocache.cpp b/digikam/utilities/imageeditor/canvas/undocache.cpp index e9776c76..5f36ae75 100644 --- a/digikam/utilities/imageeditor/canvas/undocache.cpp +++ b/digikam/utilities/imageeditor/canvas/undocache.cpp @@ -42,7 +42,7 @@ extern "C" #include <kstandarddirs.h> #include <tdeaboutdata.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> // Local includes. diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp index b4128396..a9296847 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp @@ -35,9 +35,9 @@ #include <tdeapplication.h> #include <kcolorbutton.h> #include <kdialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstandarddirs.h> #include <kstdguiitem.h> diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index 7e8ede3a..2a7a9495 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -60,19 +60,19 @@ extern "C" #include <kstdaction.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kimageio.h> #include <tdeaccel.h> -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <kprotocolinfo.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdetoolbar.h> #include <kstatusbar.h> #include <kprogress.h> diff --git a/digikam/utilities/imageeditor/editor/imageiface.h b/digikam/utilities/imageeditor/editor/imageiface.h index 70e1a3eb..272c62a5 100644 --- a/digikam/utilities/imageeditor/editor/imageiface.h +++ b/digikam/utilities/imageeditor/editor/imageiface.h @@ -32,7 +32,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> // Local includes. diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp index df797090..2a455664 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.cpp +++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp @@ -39,16 +39,16 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kimageio.h> #include <tdefiledialog.h> #include <tdeversion.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tdetoolbar.h> #include <tdeaccel.h> #include <tdeaction.h> diff --git a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h b/digikam/utilities/imageeditor/editor/savingcontextcontainer.h index b240a103..c747a357 100644 --- a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h +++ b/digikam/utilities/imageeditor/editor/savingcontextcontainer.h @@ -32,7 +32,7 @@ // KDE includes. #include <kurl.h> -#include <ktempfile.h> +#include <tdetempfile.h> // Local includes. diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.cpp b/digikam/utilities/imageeditor/rawimport/rawimport.cpp index 1120cb94..7bc1e7a5 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawimport.cpp @@ -30,7 +30,7 @@ // KDE includes. #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp index 7b70f7d0..d4b409e6 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp @@ -32,7 +32,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kcursor.h> #include <kdatetbl.h> #include <kiconloader.h> diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 58e5fd1c..3e231ec6 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -38,7 +38,7 @@ #include <tdeapplication.h> #include <ktabwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index ebd894cc..1803a4dd 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -55,17 +55,17 @@ // KDE includes. -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kimageio.h> #include <kcombobox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <knuminput.h> #include <kprinter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kpropertiesdialog.h> // Local includes. diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index 9161a0ae..a29efca7 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -49,15 +49,15 @@ #include <kseparator.h> #include <kcursor.h> #include <kurllabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> #include <tdefiledialog.h> #include <kstandarddirs.h> #include <kprogress.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // LibKDcraw includes. diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index 5111b914..68e5d4c3 100644 --- a/digikam/utilities/lighttable/lighttablebar.cpp +++ b/digikam/utilities/lighttable/lighttablebar.cpp @@ -30,9 +30,9 @@ // KDE includes. -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index dea0bb3c..2c1b5441 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -36,7 +36,7 @@ // KDE includes. #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> #include <krun.h> #include <ktrader.h> diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index bb811c86..5cac1dd9 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -30,13 +30,13 @@ #include <kkeydialog.h> #include <kedittoolbar.h> #include <tdeversion.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kstatusbar.h> -#include <kmenubar.h> +#include <tdemenubar.h> // LibKDcraw includes. diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index 9983e20b..2274d878 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -37,10 +37,10 @@ // KDE includes. #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kactivelabel.h> #include <kurlrequester.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kcursor.h> #include <tdeapplication.h> diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp index a453bd74..cc402678 100644 --- a/digikam/utilities/setup/setup.cpp +++ b/digikam/utilities/setup/setup.cpp @@ -30,9 +30,9 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index 92675a34..f3f275cf 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -34,11 +34,11 @@ // KDE includes. -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurllabel.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kcursor.h> #include <tdeapplication.h> diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp index 9ffd1480..d63db17d 100644 --- a/digikam/utilities/setup/setupcollections.cpp +++ b/digikam/utilities/setup/setupcollections.cpp @@ -39,11 +39,11 @@ // KDE includes. #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdefiledialog.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <tdeversion.h> diff --git a/digikam/utilities/setup/setupdcraw.cpp b/digikam/utilities/setup/setupdcraw.cpp index a401e630..929e1d4f 100644 --- a/digikam/utilities/setup/setupdcraw.cpp +++ b/digikam/utilities/setup/setupdcraw.cpp @@ -35,7 +35,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialog.h> #include <tdeconfig.h> diff --git a/digikam/utilities/setup/setupeditor.cpp b/digikam/utilities/setup/setupeditor.cpp index 73a1e585..56f72e17 100644 --- a/digikam/utilities/setup/setupeditor.cpp +++ b/digikam/utilities/setup/setupeditor.cpp @@ -33,7 +33,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kcolorbutton.h> #include <knuminput.h> diff --git a/digikam/utilities/setup/setupgeneral.cpp b/digikam/utilities/setup/setupgeneral.cpp index bfe3679f..b6fd47b5 100644 --- a/digikam/utilities/setup/setupgeneral.cpp +++ b/digikam/utilities/setup/setupgeneral.cpp @@ -41,11 +41,11 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <tdefiledialog.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurlrequester.h> // Local includes. diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index 3ce15ada..f76ec246 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -45,7 +45,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kdialogbase.h> #include <kurlrequester.h> @@ -53,10 +53,10 @@ #include <tdeconfig.h> #include <kcombobox.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurllabel.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> // lcms includes. diff --git a/digikam/utilities/setup/setupidentity.cpp b/digikam/utilities/setup/setupidentity.cpp index db24e800..a27c1161 100644 --- a/digikam/utilities/setup/setupidentity.cpp +++ b/digikam/utilities/setup/setupidentity.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/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp index 1fd93e52..c8b9891c 100644 --- a/digikam/utilities/setup/setupiofiles.cpp +++ b/digikam/utilities/setup/setupiofiles.cpp @@ -27,7 +27,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/digikam/utilities/setup/setuplighttable.cpp b/digikam/utilities/setup/setuplighttable.cpp index ffd17844..0ed01eab 100644 --- a/digikam/utilities/setup/setuplighttable.cpp +++ b/digikam/utilities/setup/setuplighttable.cpp @@ -33,7 +33,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp index 66f66a53..3357b1ca 100644 --- a/digikam/utilities/setup/setupmetadata.cpp +++ b/digikam/utilities/setup/setupmetadata.cpp @@ -37,12 +37,12 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kactivelabel.h> #include <kdialog.h> #include <kurllabel.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <tdeapplication.h> diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp index 8a112ebf..e1fc6809 100644 --- a/digikam/utilities/setup/setupmime.cpp +++ b/digikam/utilities/setup/setupmime.cpp @@ -35,7 +35,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <klineeditdlg.h> #include <kiconloader.h> diff --git a/digikam/utilities/setup/setupmisc.cpp b/digikam/utilities/setup/setupmisc.cpp index 21163c3b..8dc16e96 100644 --- a/digikam/utilities/setup/setupmisc.cpp +++ b/digikam/utilities/setup/setupmisc.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> // Local includes. diff --git a/digikam/utilities/setup/setupplugins.cpp b/digikam/utilities/setup/setupplugins.cpp index eb2f1f94..e0d9c494 100644 --- a/digikam/utilities/setup/setupplugins.cpp +++ b/digikam/utilities/setup/setupplugins.cpp @@ -35,7 +35,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> // libkipi includes. diff --git a/digikam/utilities/setup/setupslideshow.cpp b/digikam/utilities/setup/setupslideshow.cpp index 07fb48f5..970d9c67 100644 --- a/digikam/utilities/setup/setupslideshow.cpp +++ b/digikam/utilities/setup/setupslideshow.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <knuminput.h> #include <tdeconfig.h> diff --git a/digikam/utilities/setup/setuptooltip.cpp b/digikam/utilities/setup/setuptooltip.cpp index 83a43d9a..d4f00dda 100644 --- a/digikam/utilities/setup/setuptooltip.cpp +++ b/digikam/utilities/setup/setuptooltip.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> // Local includes. diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index fdcb1920..31c6cf28 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -37,9 +37,9 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Local includes. diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp index e49ed5e4..5239b148 100644 --- a/digikam/utilities/slideshow/toolbar.cpp +++ b/digikam/utilities/slideshow/toolbar.cpp @@ -32,7 +32,7 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> // Local includes. |