diff options
122 files changed, 249 insertions, 202 deletions
diff --git a/src/digikam/albumiconview.cpp b/src/digikam/albumiconview.cpp index d80fcba4..e68d003f 100644 --- a/src/digikam/albumiconview.cpp +++ b/src/digikam/albumiconview.cpp @@ -77,7 +77,7 @@ extern "C" #include <kservice.h> #include <krun.h> #include <tdeaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconeffect.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/src/digikam/albummanager.cpp b/src/digikam/albummanager.cpp index 847ce99e..551f9415 100644 --- a/src/digikam/albummanager.cpp +++ b/src/digikam/albummanager.cpp @@ -56,7 +56,7 @@ extern "C" #include <tdelocale.h> #include <tdeversion.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/netaccess.h> #include <tdeio/global.h> #include <tdeio/job.h> diff --git a/src/digikam/digikamapp.cpp b/src/digikam/digikamapp.cpp index d6e2551a..a723ccd4 100644 --- a/src/digikam/digikamapp.cpp +++ b/src/digikam/digikamapp.cpp @@ -38,7 +38,7 @@ #include <tdeaboutdata.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kstdaction.h> #include <tdestdaccel.h> diff --git a/src/digikam/digikamfirstrun.cpp b/src/digikam/digikamfirstrun.cpp index 0810e334..06a1b892 100644 --- a/src/digikam/digikamfirstrun.cpp +++ b/src/digikam/digikamfirstrun.cpp @@ -54,7 +54,7 @@ extern "C" #include <tdefiledialog.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kurlrequester.h> #include <tdemessagebox.h> diff --git a/src/digikam/digikamview.cpp b/src/digikam/digikamview.cpp index 1fb00828..be3b5b82 100644 --- a/src/digikam/digikamview.cpp +++ b/src/digikam/digikamview.cpp @@ -49,7 +49,7 @@ #include <kdialogbase.h> #include <krun.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/digikam/ratingfilter.cpp b/src/digikam/ratingfilter.cpp index 1cfa0bbf..4c74e7b9 100644 --- a/src/digikam/ratingfilter.cpp +++ b/src/digikam/ratingfilter.cpp @@ -35,7 +35,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdepopupmenu.h> // Local includes. diff --git a/src/digikam/ratingpopupmenu.cpp b/src/digikam/ratingpopupmenu.cpp index a1d17bab..c0ac87a1 100644 --- a/src/digikam/ratingpopupmenu.cpp +++ b/src/digikam/ratingpopupmenu.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/digikam/ratingwidget.cpp b/src/digikam/ratingwidget.cpp index 3371a2c6..94606e09 100644 --- a/src/digikam/ratingwidget.cpp +++ b/src/digikam/ratingwidget.cpp @@ -31,7 +31,7 @@ // KDE includes. #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/digikam/timelineview.cpp b/src/digikam/timelineview.cpp index 7794c898..a287f817 100644 --- a/src/digikam/timelineview.cpp +++ b/src/digikam/timelineview.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <ksqueezedtextlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeversion.h> #include <tdemessagebox.h> diff --git a/src/digikam/upgradedb_sqlite2tosqlite3.cpp b/src/digikam/upgradedb_sqlite2tosqlite3.cpp index b9156349..ca4db889 100644 --- a/src/digikam/upgradedb_sqlite2tosqlite3.cpp +++ b/src/digikam/upgradedb_sqlite2tosqlite3.cpp @@ -31,7 +31,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/global.h> #include <iostream> diff --git a/src/digikam/welcomepageview.cpp b/src/digikam/welcomepageview.cpp index c7c5cf8c..81c35c0c 100644 --- a/src/digikam/welcomepageview.cpp +++ b/src/digikam/welcomepageview.cpp @@ -36,7 +36,7 @@ #include <tdehtmlview.h> #include <tdeapplication.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/imageplugins/adjustcurves/adjustcurves.cpp b/src/imageplugins/adjustcurves/adjustcurves.cpp index dcda4da6..570e9e1e 100644 --- a/src/imageplugins/adjustcurves/adjustcurves.cpp +++ b/src/imageplugins/adjustcurves/adjustcurves.cpp @@ -60,7 +60,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/imageplugins/adjustcurves/adjustcurvestool.cpp b/src/imageplugins/adjustcurves/adjustcurvestool.cpp index dbf2a08d..df171be0 100644 --- a/src/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/src/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -60,7 +60,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kpushbutton.h> // Local includes. diff --git a/src/imageplugins/adjustlevels/adjustlevels.cpp b/src/imageplugins/adjustlevels/adjustlevels.cpp index 4a65b275..2e5dee8e 100644 --- a/src/imageplugins/adjustlevels/adjustlevels.cpp +++ b/src/imageplugins/adjustlevels/adjustlevels.cpp @@ -60,7 +60,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/imageplugins/adjustlevels/adjustlevelstool.cpp b/src/imageplugins/adjustlevels/adjustlevelstool.cpp index c8697226..d6af2405 100644 --- a/src/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/src/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -58,7 +58,7 @@ #include <tdemessagebox.h> #include <tdepopupmenu.h> #include <tdeselect.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/antivignetting/antivignettingtool.cpp b/src/imageplugins/antivignetting/antivignettingtool.cpp index 6f468794..c16578a2 100644 --- a/src/imageplugins/antivignetting/antivignettingtool.cpp +++ b/src/imageplugins/antivignetting/antivignettingtool.cpp @@ -40,7 +40,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kseparator.h> // LibKDcraw includes. diff --git a/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp index 494fe430..722fd2b4 100644 --- a/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp +++ b/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp @@ -40,7 +40,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> #include <kseparator.h> diff --git a/src/imageplugins/border/bordertool.cpp b/src/imageplugins/border/bordertool.cpp index 0ae2ab30..8d4c4a1d 100644 --- a/src/imageplugins/border/bordertool.cpp +++ b/src/imageplugins/border/bordertool.cpp @@ -39,7 +39,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/border/imageeffect_border.cpp b/src/imageplugins/border/imageeffect_border.cpp index 61318b3b..87371cdb 100644 --- a/src/imageplugins/border/imageeffect_border.cpp +++ b/src/imageplugins/border/imageeffect_border.cpp @@ -38,7 +38,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <knuminput.h> #include <kcolorbutton.h> diff --git a/src/imageplugins/channelmixer/channelmixer.cpp b/src/imageplugins/channelmixer/channelmixer.cpp index f7aee9de..5dffe931 100644 --- a/src/imageplugins/channelmixer/channelmixer.cpp +++ b/src/imageplugins/channelmixer/channelmixer.cpp @@ -69,7 +69,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/imageplugins/channelmixer/channelmixertool.cpp b/src/imageplugins/channelmixer/channelmixertool.cpp index ac27be5c..ad4213dc 100644 --- a/src/imageplugins/channelmixer/channelmixertool.cpp +++ b/src/imageplugins/channelmixer/channelmixertool.cpp @@ -64,7 +64,7 @@ #include <tdemessagebox.h> #include <tdepopupmenu.h> #include <tdeselect.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/charcoal/charcoaltool.cpp b/src/imageplugins/charcoal/charcoaltool.cpp index 75984cca..0d646658 100644 --- a/src/imageplugins/charcoal/charcoaltool.cpp +++ b/src/imageplugins/charcoal/charcoaltool.cpp @@ -35,7 +35,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/charcoal/imageeffect_charcoal.cpp b/src/imageplugins/charcoal/imageeffect_charcoal.cpp index 9a83f470..0af6c745 100644 --- a/src/imageplugins/charcoal/imageeffect_charcoal.cpp +++ b/src/imageplugins/charcoal/imageeffect_charcoal.cpp @@ -36,7 +36,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/imageplugins/colorfx/colorfxtool.cpp b/src/imageplugins/colorfx/colorfxtool.cpp index 864e5da1..25cf1bc8 100644 --- a/src/imageplugins/colorfx/colorfxtool.cpp +++ b/src/imageplugins/colorfx/colorfxtool.cpp @@ -47,7 +47,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/colorfx/imageeffect_colorfx.cpp b/src/imageplugins/colorfx/imageeffect_colorfx.cpp index abf96f77..8434ce0b 100644 --- a/src/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/src/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -48,7 +48,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/imageplugins/coreplugin/autocorrectiontool.cpp b/src/imageplugins/coreplugin/autocorrectiontool.cpp index f9e35986..6b4792b0 100644 --- a/src/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/src/imageplugins/coreplugin/autocorrectiontool.cpp @@ -48,7 +48,7 @@ #include <kcursor.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Digikam includes. diff --git a/src/imageplugins/coreplugin/bcgtool.cpp b/src/imageplugins/coreplugin/bcgtool.cpp index b33b16df..3c7d5a14 100644 --- a/src/imageplugins/coreplugin/bcgtool.cpp +++ b/src/imageplugins/coreplugin/bcgtool.cpp @@ -47,7 +47,7 @@ #include <kcursor.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/coreplugin/bwsepiatool.cpp b/src/imageplugins/coreplugin/bwsepiatool.cpp index 54a53e80..baf2ebb5 100644 --- a/src/imageplugins/coreplugin/bwsepiatool.cpp +++ b/src/imageplugins/coreplugin/bwsepiatool.cpp @@ -53,7 +53,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktabwidget.h> // LibKDcraw includes. diff --git a/src/imageplugins/coreplugin/hsl/hsltool.cpp b/src/imageplugins/coreplugin/hsl/hsltool.cpp index ff681c16..2f4826e5 100644 --- a/src/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/src/imageplugins/coreplugin/hsl/hsltool.cpp @@ -47,7 +47,7 @@ #include <kcursor.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index c2f1a752..311e9111 100644 --- a/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -47,7 +47,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kcursor.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcolordialog.h> // Digikam includes. diff --git a/src/imageplugins/coreplugin/iccprooftool.cpp b/src/imageplugins/coreplugin/iccprooftool.cpp index d7026949..072a69c8 100644 --- a/src/imageplugins/coreplugin/iccprooftool.cpp +++ b/src/imageplugins/coreplugin/iccprooftool.cpp @@ -57,7 +57,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <ksqueezedtextlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktabwidget.h> #include <kurllabel.h> #include <kurlrequester.h> diff --git a/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp index c76c20a9..3c2b950d 100644 --- a/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -47,7 +47,7 @@ // KDE includes. #include <kcursor.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> #include <tdeapplication.h> diff --git a/src/imageplugins/coreplugin/imageeffect_bcg.cpp b/src/imageplugins/coreplugin/imageeffect_bcg.cpp index 5d6d3a90..475cb735 100644 --- a/src/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/src/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -48,7 +48,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kcursor.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Digikam includes. diff --git a/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp index e2195a63..1bc1f60e 100644 --- a/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -51,7 +51,7 @@ #include <tdemessagebox.h> #include <kcursor.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <knuminput.h> #include <ktabwidget.h> diff --git a/src/imageplugins/coreplugin/imageeffect_iccproof.cpp b/src/imageplugins/coreplugin/imageeffect_iccproof.cpp index bee8560c..c6e5e918 100644 --- a/src/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/src/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -52,7 +52,7 @@ #include <tdelocale.h> #include <tdeapplication.h> #include <kcursor.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktabwidget.h> #include <tdeconfig.h> #include <kurlrequester.h> diff --git a/src/imageplugins/coreplugin/imageeffect_redeye.cpp b/src/imageplugins/coreplugin/imageeffect_redeye.cpp index 817a1893..accb9d78 100644 --- a/src/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/src/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -47,7 +47,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kcursor.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcolordialog.h> // Digikam includes. diff --git a/src/imageplugins/coreplugin/imageeffect_rgb.cpp b/src/imageplugins/coreplugin/imageeffect_rgb.cpp index 135ef8b6..5b1cf93c 100644 --- a/src/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/src/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -47,7 +47,7 @@ #include <tdelocale.h> #include <tdeapplication.h> #include <kcursor.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Digikam includes. diff --git a/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index 92afaf1c..6ed0a9c7 100644 --- a/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -45,7 +45,7 @@ #include <knuminput.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcolorbutton.h> // Digikam includes. diff --git a/src/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/src/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp index 17eaf415..e920da6e 100644 --- a/src/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp +++ b/src/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp @@ -57,7 +57,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdeglobal.h> diff --git a/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index f48050ff..41df2b47 100644 --- a/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -47,7 +47,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/coreplugin/redeyetool.cpp b/src/imageplugins/coreplugin/redeyetool.cpp index 72d9bca3..f86ace25 100644 --- a/src/imageplugins/coreplugin/redeyetool.cpp +++ b/src/imageplugins/coreplugin/redeyetool.cpp @@ -48,7 +48,7 @@ #include <kcursor.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Digikam includes. diff --git a/src/imageplugins/coreplugin/rgbtool.cpp b/src/imageplugins/coreplugin/rgbtool.cpp index d4f7dfe4..b375af1b 100644 --- a/src/imageplugins/coreplugin/rgbtool.cpp +++ b/src/imageplugins/coreplugin/rgbtool.cpp @@ -46,7 +46,7 @@ #include <kcursor.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/distortionfx/distortionfxtool.cpp b/src/imageplugins/distortionfx/distortionfxtool.cpp index 22b3980a..09873166 100644 --- a/src/imageplugins/distortionfx/distortionfxtool.cpp +++ b/src/imageplugins/distortionfx/distortionfxtool.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp index 03f3ccf4..fb8e987e 100644 --- a/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp +++ b/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp @@ -44,7 +44,7 @@ #include <khelpmenu.h> #include <tdeapplication.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> // Local includes. diff --git a/src/imageplugins/emboss/embosstool.cpp b/src/imageplugins/emboss/embosstool.cpp index 03a22f96..ba33b031 100644 --- a/src/imageplugins/emboss/embosstool.cpp +++ b/src/imageplugins/emboss/embosstool.cpp @@ -36,7 +36,7 @@ #include <tdeconfig.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/emboss/imageeffect_emboss.cpp b/src/imageplugins/emboss/imageeffect_emboss.cpp index fe4b1eed..f1807d16 100644 --- a/src/imageplugins/emboss/imageeffect_emboss.cpp +++ b/src/imageplugins/emboss/imageeffect_emboss.cpp @@ -35,7 +35,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> #include <tdeconfig.h> diff --git a/src/imageplugins/filmgrain/filmgraintool.cpp b/src/imageplugins/filmgrain/filmgraintool.cpp index 8fe07a24..04b5389b 100644 --- a/src/imageplugins/filmgrain/filmgraintool.cpp +++ b/src/imageplugins/filmgrain/filmgraintool.cpp @@ -38,7 +38,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> // Local includes. diff --git a/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp index 90f32959..f69b8e90 100644 --- a/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp +++ b/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp @@ -38,7 +38,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> // Local includes. diff --git a/src/imageplugins/freerotation/freerotationtool.cpp b/src/imageplugins/freerotation/freerotationtool.cpp index 37bc168b..12c8ec23 100644 --- a/src/imageplugins/freerotation/freerotationtool.cpp +++ b/src/imageplugins/freerotation/freerotationtool.cpp @@ -39,7 +39,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/freerotation/imageeffect_freerotation.cpp b/src/imageplugins/freerotation/imageeffect_freerotation.cpp index e5f76cfa..27a4c81f 100644 --- a/src/imageplugins/freerotation/imageeffect_freerotation.cpp +++ b/src/imageplugins/freerotation/imageeffect_freerotation.cpp @@ -37,7 +37,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> #include <kcursor.h> #include <kseparator.h> diff --git a/src/imageplugins/hotpixels/hotpixelstool.cpp b/src/imageplugins/hotpixels/hotpixelstool.cpp index dd4dd8b9..f79284f6 100644 --- a/src/imageplugins/hotpixels/hotpixelstool.cpp +++ b/src/imageplugins/hotpixels/hotpixelstool.cpp @@ -39,7 +39,7 @@ #include <kimageio.h> #include <tdeaboutdata.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <kprogress.h> #include <kiconloader.h> diff --git a/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp index 4e73d981..8354770b 100644 --- a/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp +++ b/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp @@ -39,7 +39,7 @@ #include <kimageio.h> #include <tdeaboutdata.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <kprogress.h> diff --git a/src/imageplugins/infrared/imageeffect_infrared.cpp b/src/imageplugins/infrared/imageeffect_infrared.cpp index ae0adc9f..f331f123 100644 --- a/src/imageplugins/infrared/imageeffect_infrared.cpp +++ b/src/imageplugins/infrared/imageeffect_infrared.cpp @@ -40,7 +40,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> // Local includes. diff --git a/src/imageplugins/infrared/infraredtool.cpp b/src/imageplugins/infrared/infraredtool.cpp index 83e35d3b..7de7d664 100644 --- a/src/imageplugins/infrared/infraredtool.cpp +++ b/src/imageplugins/infrared/infraredtool.cpp @@ -40,7 +40,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> // Local includes. diff --git a/src/imageplugins/inpainting/imageeffect_inpainting.cpp b/src/imageplugins/inpainting/imageeffect_inpainting.cpp index 1ef057b1..a804a9dd 100644 --- a/src/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/src/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -58,7 +58,7 @@ #include <tdeapplication.h> #include <tdepopupmenu.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> #include <tdemessagebox.h> #include <knuminput.h> diff --git a/src/imageplugins/inpainting/inpaintingtool.cpp b/src/imageplugins/inpainting/inpaintingtool.cpp index 906c1f65..5b82ad1e 100644 --- a/src/imageplugins/inpainting/inpaintingtool.cpp +++ b/src/imageplugins/inpainting/inpaintingtool.cpp @@ -60,7 +60,7 @@ #include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> // Local includes. diff --git a/src/imageplugins/inserttext/fontchooserwidget.cpp b/src/imageplugins/inserttext/fontchooserwidget.cpp index aa76ea8e..9fe26b4d 100644 --- a/src/imageplugins/inserttext/fontchooserwidget.cpp +++ b/src/imageplugins/inserttext/fontchooserwidget.cpp @@ -51,7 +51,7 @@ #include <tdelistbox.h> #include <tdelocale.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqlineedit.h> // Local includes. diff --git a/src/imageplugins/inserttext/imageeffect_inserttext.cpp b/src/imageplugins/inserttext/imageeffect_inserttext.cpp index 6e353e68..fecd08e8 100644 --- a/src/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/src/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -50,7 +50,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kcolorbutton.h> #include <ktextedit.h> diff --git a/src/imageplugins/inserttext/inserttexttool.cpp b/src/imageplugins/inserttext/inserttexttool.cpp index 231697d1..ae9f4048 100644 --- a/src/imageplugins/inserttext/inserttexttool.cpp +++ b/src/imageplugins/inserttext/inserttexttool.cpp @@ -51,7 +51,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktextedit.h> // Local includes. diff --git a/src/imageplugins/inserttext/inserttextwidget.cpp b/src/imageplugins/inserttext/inserttextwidget.cpp index dc5b65f4..a88844c7 100644 --- a/src/imageplugins/inserttext/inserttextwidget.cpp +++ b/src/imageplugins/inserttext/inserttextwidget.cpp @@ -35,7 +35,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdeglobal.h> diff --git a/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp index 15d4ca64..984067f3 100644 --- a/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp +++ b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp @@ -45,7 +45,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> // Local includes. diff --git a/src/imageplugins/lensdistortion/lensdistortiontool.cpp b/src/imageplugins/lensdistortion/lensdistortiontool.cpp index 9561ae61..f5a776bb 100644 --- a/src/imageplugins/lensdistortion/lensdistortiontool.cpp +++ b/src/imageplugins/lensdistortion/lensdistortiontool.cpp @@ -46,7 +46,7 @@ #include <tdeconfig.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp index 128c6679..49d70161 100644 --- a/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -40,7 +40,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> #include <tdefiledialog.h> #include <tdeglobalsettings.h> diff --git a/src/imageplugins/noisereduction/noisereductiontool.cpp b/src/imageplugins/noisereduction/noisereductiontool.cpp index b990e515..7d878df5 100644 --- a/src/imageplugins/noisereduction/noisereductiontool.cpp +++ b/src/imageplugins/noisereduction/noisereductiontool.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp index 46d3bf0c..96a90ae0 100644 --- a/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp +++ b/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp @@ -36,7 +36,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> #include <tdeconfig.h> diff --git a/src/imageplugins/oilpaint/oilpainttool.cpp b/src/imageplugins/oilpaint/oilpainttool.cpp index c1e73698..fd897540 100644 --- a/src/imageplugins/oilpaint/oilpainttool.cpp +++ b/src/imageplugins/oilpaint/oilpainttool.cpp @@ -37,7 +37,7 @@ #include <kcursor.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/perspective/imageeffect_perspective.cpp b/src/imageplugins/perspective/imageeffect_perspective.cpp index ac20bfa1..9a8412df 100644 --- a/src/imageplugins/perspective/imageeffect_perspective.cpp +++ b/src/imageplugins/perspective/imageeffect_perspective.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kseparator.h> // Local includes. diff --git a/src/imageplugins/perspective/perspectivetool.cpp b/src/imageplugins/perspective/perspectivetool.cpp index 96209942..6afb7142 100644 --- a/src/imageplugins/perspective/perspectivetool.cpp +++ b/src/imageplugins/perspective/perspectivetool.cpp @@ -44,7 +44,7 @@ #include <tdelocale.h> #include <tdepopupmenu.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/perspective/perspectivewidget.cpp b/src/imageplugins/perspective/perspectivewidget.cpp index ae2c5c03..821442aa 100644 --- a/src/imageplugins/perspective/perspectivewidget.cpp +++ b/src/imageplugins/perspective/perspectivewidget.cpp @@ -43,7 +43,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdeglobal.h> #include <tdeapplication.h> diff --git a/src/imageplugins/raindrop/imageeffect_raindrop.cpp b/src/imageplugins/raindrop/imageeffect_raindrop.cpp index a95b49dc..67a6d5ba 100644 --- a/src/imageplugins/raindrop/imageeffect_raindrop.cpp +++ b/src/imageplugins/raindrop/imageeffect_raindrop.cpp @@ -37,7 +37,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> // Local includes. diff --git a/src/imageplugins/raindrop/raindroptool.cpp b/src/imageplugins/raindrop/raindroptool.cpp index 35f55cb7..f00a18bc 100644 --- a/src/imageplugins/raindrop/raindroptool.cpp +++ b/src/imageplugins/raindrop/raindroptool.cpp @@ -37,7 +37,7 @@ #include <tdeconfig.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/restoration/imageeffect_restoration.cpp b/src/imageplugins/restoration/imageeffect_restoration.cpp index 8173155d..bf91d86e 100644 --- a/src/imageplugins/restoration/imageeffect_restoration.cpp +++ b/src/imageplugins/restoration/imageeffect_restoration.cpp @@ -42,7 +42,7 @@ #include <tdeapplication.h> #include <tdefiledialog.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> // Local includes. diff --git a/src/imageplugins/restoration/restorationtool.cpp b/src/imageplugins/restoration/restorationtool.cpp index 9a0111b0..4cc03058 100644 --- a/src/imageplugins/restoration/restorationtool.cpp +++ b/src/imageplugins/restoration/restorationtool.cpp @@ -42,7 +42,7 @@ #include <tdeapplication.h> #include <tdefiledialog.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> // Local includes. diff --git a/src/imageplugins/sheartool/imageeffect_sheartool.cpp b/src/imageplugins/sheartool/imageeffect_sheartool.cpp index 1d59d9f7..2a1e7ae2 100644 --- a/src/imageplugins/sheartool/imageeffect_sheartool.cpp +++ b/src/imageplugins/sheartool/imageeffect_sheartool.cpp @@ -35,7 +35,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> #include <kseparator.h> #include <kcursor.h> diff --git a/src/imageplugins/sheartool/sheartool.cpp b/src/imageplugins/sheartool/sheartool.cpp index 01d72a88..fa1e4c6a 100644 --- a/src/imageplugins/sheartool/sheartool.cpp +++ b/src/imageplugins/sheartool/sheartool.cpp @@ -38,7 +38,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/superimpose/imageeffect_superimpose.cpp b/src/imageplugins/superimpose/imageeffect_superimpose.cpp index e2dce011..fd1a170e 100644 --- a/src/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/src/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -47,7 +47,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> #include <knuminput.h> #include <kiconloader.h> diff --git a/src/imageplugins/superimpose/superimposetool.cpp b/src/imageplugins/superimpose/superimposetool.cpp index 934bf065..209cce8d 100644 --- a/src/imageplugins/superimpose/superimposetool.cpp +++ b/src/imageplugins/superimpose/superimposetool.cpp @@ -47,7 +47,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> #include <knuminput.h> #include <kiconloader.h> diff --git a/src/imageplugins/superimpose/superimposewidget.cpp b/src/imageplugins/superimpose/superimposewidget.cpp index edae15aa..e90f00a1 100644 --- a/src/imageplugins/superimpose/superimposewidget.cpp +++ b/src/imageplugins/superimpose/superimposewidget.cpp @@ -33,7 +33,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdeglobal.h> diff --git a/src/imageplugins/texture/imageeffect_texture.cpp b/src/imageplugins/texture/imageeffect_texture.cpp index a045f68d..0ad8c7b6 100644 --- a/src/imageplugins/texture/imageeffect_texture.cpp +++ b/src/imageplugins/texture/imageeffect_texture.cpp @@ -37,7 +37,7 @@ #include <tdeaboutdata.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> // Local includes. diff --git a/src/imageplugins/texture/texturetool.cpp b/src/imageplugins/texture/texturetool.cpp index d2050930..0b63e50a 100644 --- a/src/imageplugins/texture/texturetool.cpp +++ b/src/imageplugins/texture/texturetool.cpp @@ -36,7 +36,7 @@ #include <tdeconfig.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp index 7c065db3..7dc7d6bd 100644 --- a/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -50,7 +50,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> #include <tdemessagebox.h> #include <knuminput.h> diff --git a/src/imageplugins/whitebalance/whitebalancetool.cpp b/src/imageplugins/whitebalance/whitebalancetool.cpp index 5f432721..ec433ad2 100644 --- a/src/imageplugins/whitebalance/whitebalancetool.cpp +++ b/src/imageplugins/whitebalance/whitebalancetool.cpp @@ -57,7 +57,7 @@ #include <tdepopupmenu.h> #include <kprogress.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // LibKDcraw includes. diff --git a/src/libs/dialogs/ctrlpaneldlg.cpp b/src/libs/dialogs/ctrlpaneldlg.cpp index 9d218a99..8e33e177 100644 --- a/src/libs/dialogs/ctrlpaneldlg.cpp +++ b/src/libs/dialogs/ctrlpaneldlg.cpp @@ -42,7 +42,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> // Local includes. diff --git a/src/libs/dialogs/dprogressdlg.cpp b/src/libs/dialogs/dprogressdlg.cpp index 935b9f65..d1d3f77d 100644 --- a/src/libs/dialogs/dprogressdlg.cpp +++ b/src/libs/dialogs/dprogressdlg.cpp @@ -38,7 +38,7 @@ #include <tdeapplication.h> #include <kdialogbase.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/libs/dialogs/imagedialog.cpp b/src/libs/dialogs/imagedialog.cpp index f56a6d91..cee90d60 100644 --- a/src/libs/dialogs/imagedialog.cpp +++ b/src/libs/dialogs/imagedialog.cpp @@ -32,7 +32,7 @@ #include <tdeapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <kimageio.h> #include <kiconloader.h> diff --git a/src/libs/dialogs/imagedlgbase.cpp b/src/libs/dialogs/imagedlgbase.cpp index 3bdb8725..f9601b53 100644 --- a/src/libs/dialogs/imagedlgbase.cpp +++ b/src/libs/dialogs/imagedlgbase.cpp @@ -47,7 +47,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> // Local includes. diff --git a/src/libs/dialogs/imageguidedlg.cpp b/src/libs/dialogs/imageguidedlg.cpp index 01937d8f..070cae9f 100644 --- a/src/libs/dialogs/imageguidedlg.cpp +++ b/src/libs/dialogs/imageguidedlg.cpp @@ -45,7 +45,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #include <kprogress.h> #include <kcolorbutton.h> diff --git a/src/libs/dimg/loaders/dimgloader.cpp b/src/libs/dimg/loaders/dimgloader.cpp index 615b11e1..22541766 100644 --- a/src/libs/dimg/loaders/dimgloader.cpp +++ b/src/libs/dimg/loaders/dimgloader.cpp @@ -24,7 +24,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/libs/dimg/loaders/jp2kloader.cpp b/src/libs/dimg/loaders/jp2kloader.cpp index 66351c25..016a7196 100644 --- a/src/libs/dimg/loaders/jp2kloader.cpp +++ b/src/libs/dimg/loaders/jp2kloader.cpp @@ -58,6 +58,16 @@ extern "C" #include "dimgloaderobserver.h" #include "jp2kloader.h" +static void cleanup_jasper() +{ +#if defined(JAS_VERSION_MAJOR) && (JAS_VERSION_MAJOR >= 3) + jas_cleanup_thread(); + jas_cleanup_library(); +#else + jas_cleanup(); +#endif +} + namespace Digikam { @@ -69,7 +79,7 @@ JP2KLoader::JP2KLoader(DImg* image) } bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) -{ +{ readMetadata(filePath, DImg::JPEG); FILE *file = fopen(TQFile::encodeName(filePath), "rb"); @@ -109,17 +119,45 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) jas_stream_t *jp2_stream = 0; jas_matrix_t *pixels[4]; - int init = jas_init(); - if (init != 0) + +#if defined(JAS_VERSION_MAJOR) && (JAS_VERSION_MAJOR >= 3) + jas_conf_clear(); + + // Limit JasPer memory usage to 512 MB + size_t memoryLimit = (512 * 1024) * 1024; + size_t jasperTotalMemSize = jas_get_total_mem_size(); + if (!jasperTotalMemSize) + { + jasperTotalMemSize = JAS_DEFAULT_MAX_MEM_USAGE; + } + memoryLimit = (memoryLimit < jasperTotalMemSize) ? memoryLimit : jasperTotalMemSize; + jas_conf_set_max_mem_usage(memoryLimit); + + if (jas_init_library()) + { + DDebug() << "Unable to init JPEG2000 decoder" << endl; + return false; + } + + if (jas_init_thread()) + { + DDebug() << "Unable to init JPEG2000 decoder" << endl; + jas_cleanup_library(); + return false; + } +#else + if (jas_init()) { DDebug() << "Unable to init JPEG2000 decoder" << endl; return false; } +#endif jp2_stream = jas_stream_fopen(TQFile::encodeName(filePath), "rb"); if (jp2_stream == 0) { DDebug() << "Unable to open JPEG2000 stream" << endl; + cleanup_jasper(); return false; } @@ -127,6 +165,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) if (jp2_image == 0) { jas_stream_close(jp2_stream); + cleanup_jasper(); DDebug() << "Unable to decode JPEG2000 image" << endl; return false; } @@ -150,6 +189,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) if ((components[0] < 0) || (components[1] < 0) || (components[2] < 0)) { jas_image_destroy(jp2_image); + cleanup_jasper(); DDebug() << "Error parsing JPEG2000 image : Missing Image Channel" << endl; return false; } @@ -169,6 +209,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) if (components[0] < 0) { jas_image_destroy(jp2_image); + cleanup_jasper(); DDebug() << "Error parsing JP2000 image : Missing Image Channel" << endl; return false; } @@ -183,6 +224,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) if ((components[0] < 0) || (components[1] < 0) || (components[2] < 0)) { jas_image_destroy(jp2_image); + cleanup_jasper(); DDebug() << "Error parsing JP2000 image : Missing Image Channel" << endl; return false; } @@ -199,6 +241,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) default: { jas_image_destroy(jp2_image); + cleanup_jasper(); DDebug() << "Error parsing JP2000 image : Colorspace Model Is Not Supported" << endl; return false; } @@ -221,6 +264,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) (jas_image_cmptsgnd(jp2_image, components[i]) != false)) { jas_image_destroy(jp2_image); + cleanup_jasper(); DDebug() << "Error parsing JPEG2000 image : Irregular Channel Geometry Not Supported" << endl; return false; } @@ -242,6 +286,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) if (!pixels[i]) { jas_image_destroy(jp2_image); + cleanup_jasper(); DDebug() << "Error decoding JPEG2000 image data : Memory Allocation Failed" << endl; return false; } @@ -271,7 +316,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) for (i = 0 ; i < (long)number_components ; i++) jas_matrix_destroy(pixels[i]); - jas_cleanup(); + cleanup_jasper(); return false; } @@ -295,7 +340,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) for (i = 0 ; i < (long)number_components ; i++) jas_matrix_destroy(pixels[i]); - jas_cleanup(); + cleanup_jasper(); return false; } } @@ -402,7 +447,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) for (i = 0 ; i < (long)number_components ; i++) jas_matrix_destroy(pixels[i]); - jas_cleanup(); + cleanup_jasper(); return false; } @@ -452,7 +497,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) for (i = 0 ; i < (long)number_components ; i++) jas_matrix_destroy(pixels[i]); - jas_cleanup(); + cleanup_jasper(); return true; } @@ -476,20 +521,48 @@ bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer) jas_matrix_t *pixels[4]; jas_image_cmptparm_t component_info[4]; - int init = jas_init(); - if (init != 0) + +#if defined(JAS_VERSION_MAJOR) && (JAS_VERSION_MAJOR >= 3) + jas_conf_clear(); + + // Limit JasPer memory usage to 512 MB + size_t memoryLimit = (512 * 1024) * 1024; + size_t jasperTotalMemSize = jas_get_total_mem_size(); + if (!jasperTotalMemSize) + { + jasperTotalMemSize = JAS_DEFAULT_MAX_MEM_USAGE; + } + memoryLimit = (memoryLimit < jasperTotalMemSize) ? memoryLimit : jasperTotalMemSize; + jas_conf_set_max_mem_usage(memoryLimit); + + if (jas_init_library()) + { + DDebug() << "Unable to init JPEG2000 decoder" << endl; + return false; + } + + if (jas_init_thread()) + { + DDebug() << "Unable to init JPEG2000 decoder" << endl; + jas_cleanup_library(); + return false; + } +#else + if (jas_init()) { DDebug() << "Unable to init JPEG2000 decoder" << endl; return false; } +#endif jp2_stream = jas_stream_fopen(TQFile::encodeName(filePath), "wb"); if (jp2_stream == 0) { DDebug() << "Unable to open JPEG2000 stream" << endl; + cleanup_jasper(); return false; } - + number_components = imageHasAlpha() ? 4 : 3; for (i = 0 ; i < (long)number_components ; i++) @@ -508,6 +581,7 @@ bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer) if (jp2_image == 0) { jas_stream_close(jp2_stream); + cleanup_jasper(); DDebug() << "Unable to create JPEG2000 image" << endl; return false; } @@ -562,6 +636,7 @@ bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer) jas_matrix_destroy(pixels[x]); jas_image_destroy(jp2_image); + cleanup_jasper(); DDebug() << "Error encoding JPEG2000 image data : Memory Allocation Failed" << endl; return false; } @@ -583,7 +658,7 @@ bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer) for (i = 0 ; i < (long)number_components ; i++) jas_matrix_destroy(pixels[i]); - jas_cleanup(); + cleanup_jasper(); return false; } @@ -633,7 +708,7 @@ bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer) for (i = 0 ; i < (long)number_components ; i++) jas_matrix_destroy(pixels[i]); - jas_cleanup(); + cleanup_jasper(); return false; } } @@ -680,7 +755,7 @@ bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer) for (i = 0 ; i < (long)number_components ; i++) jas_matrix_destroy(pixels[i]); - jas_cleanup(); + cleanup_jasper(); return false; } @@ -697,7 +772,7 @@ bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer) for (i = 0 ; i < (long)number_components ; i++) jas_matrix_destroy(pixels[i]); - jas_cleanup(); + cleanup_jasper(); return true; } diff --git a/src/libs/dimg/loaders/rawloader.cpp b/src/libs/dimg/loaders/rawloader.cpp index 8ecaa1f3..783ffa6b 100644 --- a/src/libs/dimg/loaders/rawloader.cpp +++ b/src/libs/dimg/loaders/rawloader.cpp @@ -33,7 +33,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/libs/imageproperties/imagepropertiescolorstab.cpp b/src/libs/imageproperties/imagepropertiescolorstab.cpp index 01fd06d2..792a0cef 100644 --- a/src/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/src/libs/imageproperties/imagepropertiescolorstab.cpp @@ -46,7 +46,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialogbase.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktabwidget.h> // Local includes. diff --git a/src/libs/themeengine/themeengine.cpp b/src/libs/themeengine/themeengine.cpp index 7445cec1..3f5ff65c 100644 --- a/src/libs/themeengine/themeengine.cpp +++ b/src/libs/themeengine/themeengine.cpp @@ -37,7 +37,7 @@ #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kuser.h> #include <tdeapplication.h> #include <tdeglobalsettings.h> diff --git a/src/libs/widgets/common/dlogoaction.cpp b/src/libs/widgets/common/dlogoaction.cpp index 47ef084f..148b15d8 100644 --- a/src/libs/widgets/common/dlogoaction.cpp +++ b/src/libs/widgets/common/dlogoaction.cpp @@ -32,7 +32,7 @@ #include <tdetoolbar.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> // Local includes. diff --git a/src/libs/widgets/common/dpopupmenu.cpp b/src/libs/widgets/common/dpopupmenu.cpp index befee139..bf83945a 100644 --- a/src/libs/widgets/common/dpopupmenu.cpp +++ b/src/libs/widgets/common/dpopupmenu.cpp @@ -35,7 +35,7 @@ #include <tdeapplication.h> #include <kiconeffect.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> // Local includes. diff --git a/src/libs/widgets/common/splashscreen.cpp b/src/libs/widgets/common/splashscreen.cpp index 7a8cbba1..28e9fe6b 100644 --- a/src/libs/widgets/common/splashscreen.cpp +++ b/src/libs/widgets/common/splashscreen.cpp @@ -32,7 +32,7 @@ // KDE includes. #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> // Local includes. diff --git a/src/libs/widgets/common/statusled.cpp b/src/libs/widgets/common/statusled.cpp index e0475057..00bb42d9 100644 --- a/src/libs/widgets/common/statusled.cpp +++ b/src/libs/widgets/common/statusled.cpp @@ -29,7 +29,7 @@ // KDE includes. #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/libs/widgets/imageplugins/imageguidewidget.cpp b/src/libs/widgets/imageplugins/imageguidewidget.cpp index 4ed7f254..9e47f4d6 100644 --- a/src/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/src/libs/widgets/imageplugins/imageguidewidget.cpp @@ -36,7 +36,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdeglobal.h> diff --git a/src/libs/widgets/imageplugins/imagepanelwidget.cpp b/src/libs/widgets/imageplugins/imagepanelwidget.cpp index 6e62dae1..d02c9a73 100644 --- a/src/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/src/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -43,7 +43,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/libs/widgets/imageplugins/imagepannelwidget.cpp b/src/libs/widgets/imageplugins/imagepannelwidget.cpp index 336d59ef..e7add5e5 100644 --- a/src/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/src/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -44,7 +44,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kseparator.h> // Local includes. diff --git a/src/libs/widgets/imageplugins/imageregionwidget.cpp b/src/libs/widgets/imageplugins/imageregionwidget.cpp index c1392cc2..34550624 100644 --- a/src/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/src/libs/widgets/imageplugins/imageregionwidget.cpp @@ -40,7 +40,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdeglobal.h> #include <tdeapplication.h> diff --git a/src/libs/widgets/imageplugins/imagewidget.cpp b/src/libs/widgets/imageplugins/imagewidget.cpp index 949b19aa..c29abed5 100644 --- a/src/libs/widgets/imageplugins/imagewidget.cpp +++ b/src/libs/widgets/imageplugins/imagewidget.cpp @@ -38,7 +38,7 @@ #include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/libs/widgets/metadata/worldmapwidget.cpp b/src/libs/widgets/metadata/worldmapwidget.cpp index 811e9148..9d77aaa4 100644 --- a/src/libs/widgets/metadata/worldmapwidget.cpp +++ b/src/libs/widgets/metadata/worldmapwidget.cpp @@ -30,7 +30,7 @@ // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdelocale.h> #include <kstaticdeleter.h> diff --git a/src/showfoto/showfoto.cpp b/src/showfoto/showfoto.cpp index 605524a6..b7b09cd3 100644 --- a/src/showfoto/showfoto.cpp +++ b/src/showfoto/showfoto.cpp @@ -61,7 +61,7 @@ extern "C" #include <tdeversion.h> #include <tdemessagebox.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> diff --git a/src/tdeioslave/digikamtags.cpp b/src/tdeioslave/digikamtags.cpp index 3fd14987..167914f1 100644 --- a/src/tdeioslave/digikamtags.cpp +++ b/src/tdeioslave/digikamtags.cpp @@ -53,7 +53,7 @@ extern "C" #include <kurl.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/global.h> #include <tdefilemetainfo.h> diff --git a/src/tdeioslave/digikamthumbnail.cpp b/src/tdeioslave/digikamthumbnail.cpp index 8b3eda0a..29e011d2 100644 --- a/src/tdeioslave/digikamthumbnail.cpp +++ b/src/tdeioslave/digikamthumbnail.cpp @@ -55,7 +55,7 @@ #include <kimageio.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmdcodec.h> #include <tdetempfile.h> #include <ktrader.h> diff --git a/src/utilities/cameragui/cameracontroller.cpp b/src/utilities/cameragui/cameracontroller.cpp index 34afa8ab..76aada89 100644 --- a/src/utilities/cameragui/cameracontroller.cpp +++ b/src/utilities/cameragui/cameracontroller.cpp @@ -53,7 +53,7 @@ extern "C" #include <kurl.h> #include <tdemessagebox.h> #include <tdeio/renamedlg.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/utilities/cameragui/cameraui.cpp b/src/utilities/cameragui/cameraui.cpp index 157dbaea..cc995dca 100644 --- a/src/utilities/cameragui/cameraui.cpp +++ b/src/utilities/cameragui/cameraui.cpp @@ -62,7 +62,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <khelpmenu.h> #include <kcalendarsystem.h> #include <kurllabel.h> diff --git a/src/utilities/imageeditor/canvas/undocache.cpp b/src/utilities/imageeditor/canvas/undocache.cpp index 5f36ae75..6da80763 100644 --- a/src/utilities/imageeditor/canvas/undocache.cpp +++ b/src/utilities/imageeditor/canvas/undocache.cpp @@ -39,7 +39,7 @@ extern "C" // KDE includes. -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> #include <kinstance.h> #include <tdeglobal.h> diff --git a/src/utilities/imageeditor/editor/editortoolsettings.cpp b/src/utilities/imageeditor/editor/editortoolsettings.cpp index 3ac45ccf..c4caf363 100644 --- a/src/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/src/utilities/imageeditor/editor/editortoolsettings.cpp @@ -39,7 +39,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> // LibKDcraw includes. diff --git a/src/utilities/imageeditor/editor/editorwindow.cpp b/src/utilities/imageeditor/editor/editorwindow.cpp index 657a0eae..819627e1 100644 --- a/src/utilities/imageeditor/editor/editorwindow.cpp +++ b/src/utilities/imageeditor/editor/editorwindow.cpp @@ -67,7 +67,7 @@ extern "C" #include <tdeaccel.h> #include <tdemessagebox.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> diff --git a/src/utilities/imageeditor/editor/imagewindow.cpp b/src/utilities/imageeditor/editor/imagewindow.cpp index 94dc584b..4bc91212 100644 --- a/src/utilities/imageeditor/editor/imagewindow.cpp +++ b/src/utilities/imageeditor/editor/imagewindow.cpp @@ -41,7 +41,7 @@ #include <kcursor.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> #include <tdetempfile.h> diff --git a/src/utilities/imageeditor/rawimport/rawimport.cpp b/src/utilities/imageeditor/rawimport/rawimport.cpp index a9254ce8..54453107 100644 --- a/src/utilities/imageeditor/rawimport/rawimport.cpp +++ b/src/utilities/imageeditor/rawimport/rawimport.cpp @@ -34,7 +34,7 @@ #include <tdeconfig.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp index ac7ca43e..5c491a10 100644 --- a/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -41,7 +41,7 @@ #include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> // LibKDcraw includes. diff --git a/src/utilities/imageeditor/tools/imageprint.cpp b/src/utilities/imageeditor/tools/imageprint.cpp index f1ffef05..7c0265f1 100644 --- a/src/utilities/imageeditor/tools/imageprint.cpp +++ b/src/utilities/imageeditor/tools/imageprint.cpp @@ -57,7 +57,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kimageio.h> diff --git a/src/utilities/imageeditor/tools/imageresize.cpp b/src/utilities/imageeditor/tools/imageresize.cpp index a681d187..77e0e34c 100644 --- a/src/utilities/imageeditor/tools/imageresize.cpp +++ b/src/utilities/imageeditor/tools/imageresize.cpp @@ -53,7 +53,7 @@ #include <kiconloader.h> #include <tdeapplication.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> #include <tdemessagebox.h> #include <knuminput.h> diff --git a/src/utilities/lighttable/lighttablebar.cpp b/src/utilities/lighttable/lighttablebar.cpp index cfb935ab..ed6005aa 100644 --- a/src/utilities/lighttable/lighttablebar.cpp +++ b/src/utilities/lighttable/lighttablebar.cpp @@ -34,7 +34,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // Local includes. diff --git a/src/utilities/setup/setupcamera.cpp b/src/utilities/setup/setupcamera.cpp index 6dc4edff..c2e401a7 100644 --- a/src/utilities/setup/setupcamera.cpp +++ b/src/utilities/setup/setupcamera.cpp @@ -39,7 +39,7 @@ #include <kurllabel.h> #include <kiconloader.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcursor.h> #include <tdeapplication.h> diff --git a/src/utilities/setup/setupicc.cpp b/src/utilities/setup/setupicc.cpp index 3ff258ab..d0403011 100644 --- a/src/utilities/setup/setupicc.cpp +++ b/src/utilities/setup/setupicc.cpp @@ -57,7 +57,7 @@ #include <kurllabel.h> #include <kiconloader.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // lcms includes. diff --git a/src/utilities/setup/setupmetadata.cpp b/src/utilities/setup/setupmetadata.cpp index 185dfafe..6c9b3f32 100644 --- a/src/utilities/setup/setupmetadata.cpp +++ b/src/utilities/setup/setupmetadata.cpp @@ -43,7 +43,7 @@ #include <kurllabel.h> #include <kiconloader.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> // Local includes. diff --git a/translations/messages/es.po b/translations/messages/es.po index 3cc239aa..79f4e050 100644 --- a/translations/messages/es.po +++ b/translations/messages/es.po @@ -9,13 +9,14 @@ # Alberto Garcia <[email protected]>, 2007. # Pablo Pita Leira <[email protected]>, 2007, 2008. # Eduardo Herrera <[email protected]>, 2023. +# Matias Fonzo <[email protected]>, 2025. msgid "" msgstr "" "Project-Id-Version: digikam\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-12-26 18:13+0000\n" -"PO-Revision-Date: 2023-03-22 00:18+0000\n" -"Last-Translator: Eduardo Herrera <[email protected]>\n" +"PO-Revision-Date: 2025-02-13 21:12+0000\n" +"Last-Translator: Matias Fonzo <[email protected]>\n" "Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" "projects/applications/digikam/es/>\n" "Language: es\n" @@ -23,7 +24,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.16.1\n" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -496,9 +497,8 @@ msgid "<br><nobr><i>Mime Type</i></nobr>" msgstr "<br><nobr><i>Tipo Mime </i></nobr>" #: digikam/albumiconviewfilter.cpp:163 -#, fuzzy msgid "<br/><nobr><i>Rating</i></nobr>" -msgstr "<br><nobr><i>Valoración</i></nobr>" +msgstr "<br/><nobr><i>Valoración</i></nobr>" #: digikam/albumiconviewfilter.cpp:166 msgid "<br><nobr><i>Tags</i></nobr>" @@ -795,9 +795,8 @@ msgid "A Color Theme Designer for digiKam" msgstr "Diseñador de temas de color para digiKam" #: digikam/daboutdata.h:120 -#, fuzzy msgid "(c) 2002-2009, digiKam developers team" -msgstr "(c) 2002-2008, el equipo de desarrollo de digiKam" +msgstr "(c) 2002-2009, el equipo de desarrollo de digiKam" #: digikam/daboutdata.h:131 msgid "Main developer and coordinator" diff --git a/translations/messages/ka.po b/translations/messages/ka.po index 4c339fb9..231c3a9b 100644 --- a/translations/messages/ka.po +++ b/translations/messages/ka.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: digikam\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2024-12-26 18:13+0000\n" -"PO-Revision-Date: 2025-01-23 05:12+0000\n" +"PO-Revision-Date: 2025-03-05 04:44+0000\n" "Last-Translator: Temuri Doghonadze <[email protected]>\n" "Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" "projects/applications/digikam/ka/>\n" @@ -590,7 +590,7 @@ msgstr "შეუძებელია ფუძე ალბომის სა #: digikam/albummanager.cpp:1021 msgid "Album name cannot contain '/'" -msgstr "ალბომის სახელი, არ შეიძლება, შეიცავდეს '/'-ს." +msgstr "ალბომის სახელი, არ შეიძლება, შეიცავდეს '/'-ს" #: digikam/albummanager.cpp:1031 #, fuzzy @@ -907,7 +907,7 @@ msgstr "პოლონური თარგმანი" #: digikam/daboutdata.h:256 msgid "Beta tester" -msgstr "Beta tester" +msgstr "ბეტატესტერი" #: digikam/daboutdata.h:261 #, fuzzy @@ -1146,9 +1146,8 @@ msgid "Open in File Manager" msgstr "ფაილთა მმართველში გახსნა" #: digikam/digikamapp.cpp:662 -#, fuzzy msgid "New &Tag..." -msgstr "ახალი &ჭდე" +msgstr "ახალი &ჭდე..." #: digikam/digikamapp.cpp:666 digikam/tagfilterview.cpp:886 #: digikam/tagfolderview.cpp:548 libs/imageproperties/imagedescedittab.cpp:832 @@ -3512,9 +3511,8 @@ msgid "Blurring algorithms" msgstr "" #: imageplugins/blurfx/imageplugin_blurfx.cpp:48 -#, fuzzy msgid "Blur Effects..." -msgstr "დაბინდვა" +msgstr "დაბინდვის ეფექტები..." #: imageplugins/border/bordertool.cpp:70 imageplugins/border/bordertool.cpp:570 #: imageplugins/border/imageeffect_border.cpp:70 @@ -3585,7 +3583,7 @@ msgstr "დეკორატიული მშრალი" #: imageplugins/border/bordertool.cpp:102 #: imageplugins/border/imageeffect_border.cpp:109 msgid "Decorative Pink" -msgstr "ვარდისფერი ვარდისფერი" +msgstr "დეკორატიული ვარდისფერი" #: imageplugins/border/bordertool.cpp:103 #: imageplugins/border/imageeffect_border.cpp:110 @@ -4066,9 +4064,8 @@ msgid "<p>This is the color effect preview" msgstr "<p>ეს არის გამოსახულების ფილტრის ეფექტის ესკიზი." #: imageplugins/colorfx/imageplugin_colorfx.cpp:50 -#, fuzzy msgid "Color Effects..." -msgstr "ფერის მართვა///" +msgstr "ფერის ეფექტები..." #: imageplugins/coreplugin/autocorrectiontool.cpp:79 msgid "Auto-Correction" @@ -4598,7 +4595,7 @@ msgstr "ლენტა" #: imageplugins/coreplugin/bwsepiatool.cpp:486 #: imageplugins/coreplugin/imageeffect_bwsepia.cpp:485 msgid "Lens Filters" -msgstr "ლინზის ფილტრები" +msgstr "ლინზის ფილტრები" #: imageplugins/coreplugin/bwsepiatool.cpp:487 #: imageplugins/coreplugin/imageeffect_bwsepia.cpp:486 @@ -5299,9 +5296,8 @@ msgstr "" #: imageplugins/coreplugin/imageeffect_redeye.cpp:170 #: imageplugins/coreplugin/redeyetool.cpp:185 -#, fuzzy msgid "Tint Level:" -msgstr "ავტოგასწორება" +msgstr "შეფერვის დონე:" #: imageplugins/coreplugin/imageeffect_redeye.cpp:174 #: imageplugins/coreplugin/redeyetool.cpp:189 @@ -5419,9 +5415,8 @@ msgid "16 bits" msgstr "16 ბიტიანი" #: imageplugins/coreplugin/imageplugin_core.cpp:114 -#, fuzzy msgid "Color Management..." -msgstr "ფერის მართვა///" +msgstr "ფერის მართვა..." #: imageplugins/coreplugin/imageplugin_core.cpp:120 msgid "Black && White..." @@ -5894,9 +5889,8 @@ msgstr "" #: imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp:165 #: imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp:197 -#, fuzzy msgid "Noise filter:" -msgstr "მწვანე ფილტრი" +msgstr "ხმაურის ფილტრი:" #: imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp:169 #: imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp:202 @@ -5910,9 +5904,8 @@ msgstr "" #: imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp:175 #: imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp:208 -#, fuzzy msgid "Gaussian sharpness:" -msgstr "გაზისევრი დაბინდვა" +msgstr "გაუსის სიმკვეთრე:" #: imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp:179 #: imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp:213 @@ -5926,9 +5919,8 @@ msgstr "" #: imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp:184 #: imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp:218 -#, fuzzy msgid "Matrix size:" -msgstr "ფაილის &ზომის ჩვენება" +msgstr "მატრიცის ზომა:" #: imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp:187 #: imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp:222 @@ -6218,9 +6210,8 @@ msgstr "კამერის დამატება..." #: imageplugins/freerotation/imageeffect_freerotation.cpp:61 #: imageplugins/freerotation/imageeffect_freerotation.cpp:70 #: imageplugins/freerotation/imageeffect_freerotation.cpp:293 -#, fuzzy msgid "Free Rotation" -msgstr "ორიენტაცია:" +msgstr "თავისუფალი ბრუნვა" #: imageplugins/freerotation/freerotationtool.cpp:75 #, fuzzy @@ -6368,9 +6359,8 @@ msgstr "" "პოზიციის ფიქსაცია." #: imageplugins/freerotation/imageplugin_freerotation.cpp:48 -#, fuzzy msgid "Free Rotation..." -msgstr "წითელი თვალის შესწორება" +msgstr "თავისუფალი ბრუნვა..." #: imageplugins/hotpixels/blackframelistview.cpp:43 msgid "Preview" @@ -7254,9 +7244,8 @@ msgid "Perspective Adjustment..." msgstr "გამა მომართვა..." #: imageplugins/perspective/perspectivewidget.cpp:205 -#, fuzzy msgid "Perspective Adjustment" -msgstr "გამა მომართვა..." +msgstr "პერსპექტივის გასწორება" #: imageplugins/raindrop/imageeffect_raindrop.cpp:57 #, fuzzy @@ -7287,9 +7276,8 @@ msgstr "" #: imageplugins/raindrop/imageeffect_raindrop.cpp:94 #: imageplugins/raindrop/raindroptool.cpp:87 -#, fuzzy msgid "Drop size:" -msgstr "ფაილის &ზომის ჩვენება" +msgstr "წვეთის ზომა:" #: imageplugins/raindrop/imageeffect_raindrop.cpp:99 #: imageplugins/raindrop/raindroptool.cpp:92 @@ -8346,9 +8334,8 @@ msgid "" msgstr "" #: libs/greycstoration/greycstorationwidget.cpp:211 -#, fuzzy msgid "Integral step:" -msgstr "კონტრასტი" +msgstr "ინტეგრალის ნაბიჯი:" #: libs/greycstoration/greycstorationwidget.cpp:215 #, fuzzy @@ -8895,7 +8882,6 @@ msgid "JPEG quality %1" msgstr "JPEG ხარისხი %1" #: libs/imageproperties/imagepropertiestab.cpp:504 -#, fuzzy msgid "%1 bpp" msgstr "%1 bpp" @@ -9066,9 +9052,8 @@ msgid "The ICC profile device class" msgstr "" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:149 -#, fuzzy msgid "Rendering Intent" -msgstr "ტონირების დაფარვა:" +msgstr "რენდერის დანიშნულება" #: libs/widgets/iccprofiles/iccprofilewidget.cpp:150 #, fuzzy @@ -9654,9 +9639,8 @@ msgid "Exposure Indicators" msgstr "გადამეტებული ექსპოზიციის ინდიკატორი" #: showfoto/setup/setupeditor.cpp:137 utilities/setup/setupeditor.cpp:112 -#, fuzzy msgid "&Under-exposure color:" -msgstr "გადამეტებული ექსპოზიციის ინდიკატორი" +msgstr "არასაკმარისი ექსპოზიციის &ფერი:" #: showfoto/setup/setupeditor.cpp:140 #, fuzzy @@ -9665,9 +9649,8 @@ msgid "" msgstr "<p>აქ შეარჩიეთ ფონის ფერი გამოსახულების რედაქტორთან გამოსაყენებლად." #: showfoto/setup/setupeditor.cpp:144 utilities/setup/setupeditor.cpp:119 -#, fuzzy msgid "&Over-exposure color:" -msgstr "გადამეტებული ექსპოზიციის ინდიკატორი" +msgstr "&გადამეტებული ექსპოზიციის ინდიკატორი:" #: showfoto/setup/setupeditor.cpp:147 #, fuzzy @@ -10035,9 +10018,8 @@ msgid "July 2007 - 10 Items" msgstr "" #: themedesigner/themediconitem.cpp:153 -#, fuzzy msgid "Photo caption" -msgstr "კომენტარები:" +msgstr "სურათის წარწერა" #: themedesigner/themediconitem.cpp:170 msgid "Events, Places, Vacation" @@ -10166,9 +10148,8 @@ msgid "Listing files in %1 is complete" msgstr "%1-ში ფაილების აღნუსხვა..." #: utilities/cameragui/cameracontroller.cpp:304 -#, fuzzy msgid "Getting thumbnails..." -msgstr "ესკიზების მიღება %1/%2-თვის..." +msgstr "მინიატურების მიღება..." #: utilities/cameragui/cameracontroller.cpp:327 #, fuzzy @@ -10271,9 +10252,8 @@ msgid "" msgstr "<p>აქ მომართეთ გამოსახულების ტონი." #: utilities/cameragui/camerafolderview.cpp:62 -#, fuzzy msgid "Camera Folders" -msgstr "შევქმნა საქაღალდე?" +msgstr "კამერის საქაღალდეები" #: utilities/cameragui/cameraiconview.cpp:588 msgid "Download" @@ -10285,9 +10265,8 @@ msgid "Download && Delete" msgstr "მონიშნულის ჩამოტვირთვა" #: utilities/cameragui/cameraiconview.cpp:590 -#, fuzzy msgid "Toggle lock" -msgstr " %1 ფაილის ჩამოტვირთვა" +msgstr "დაბლოკვის გადართვა" #: utilities/cameragui/cameraiconview.cpp:755 #, fuzzy @@ -10675,7 +10654,7 @@ msgstr "" #: utilities/cameragui/gpcamera.cpp:980 utilities/cameragui/gpcamera.cpp:981 #: utilities/cameragui/gpcamera.cpp:982 msgid "yes" -msgstr "yes" +msgstr "დიახ" #: utilities/cameragui/gpcamera.cpp:978 utilities/cameragui/gpcamera.cpp:979 #: utilities/cameragui/gpcamera.cpp:980 utilities/cameragui/gpcamera.cpp:981 @@ -10883,14 +10862,12 @@ msgid "" msgstr "ნაგულისხმევი სამუშაო გარემოს პროფილის გამოყენება" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:75 -#, fuzzy msgid "Original Image:" -msgstr "ორიგინალური" +msgstr "ორიგინალი გამოსახულება:" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:77 -#, fuzzy msgid "Corrected Image:" -msgstr "&გამოსახულებების დახარისხება" +msgstr "გასწორებული გამოსახულება:" #: utilities/imageeditor/canvas/colorcorrectiondlg.cpp:81 #, fuzzy @@ -11430,9 +11407,8 @@ msgid "Image Settings" msgstr "გამოსახულების პარამეტრები" #: utilities/imageeditor/tools/imageprint.cpp:382 -#, fuzzy msgid "Image position:" -msgstr "გამოსახულების სათაური" +msgstr "გამოსახულების მდებარეობა:" #: utilities/imageeditor/tools/imageprint.cpp:386 #: utilities/imageeditor/tools/imageprint.cpp:576 @@ -11924,9 +11900,8 @@ msgid "Image Editor Color Management Settings" msgstr "ნახატის რედაქტორის ფერთა პროფილების მართვა" #: utilities/setup/setup.cpp:186 -#, fuzzy msgid "Kipi Plugins" -msgstr "Kipi მოდულები" +msgstr "Kipi-ის დამატებები" #: utilities/setup/setup.cpp:186 #, fuzzy @@ -12481,9 +12456,8 @@ msgid "<p>The following profile is invalid:</p><p><b>" msgstr "" #: utilities/setup/setupicc.cpp:555 -#, fuzzy msgid "Invalid Profile" -msgstr "ICC პროფილები" +msgstr "არასწორი პროფილი" #: utilities/setup/setupicc.cpp:559 #, fuzzy @@ -12981,9 +12955,8 @@ msgid "" msgstr " შეუძლებელია %1-თვის ესკიზის შექმნა" #: utilities/slideshow/slideshow.cpp:451 -#, fuzzy msgid "SlideShow Completed." -msgstr "სლაიდების ჩვენების პარამეტრები" +msgstr "სლაიდშოუ დასრულდა." #: utilities/slideshow/slideshow.cpp:452 #, fuzzy diff --git a/translations/messages/nl.po b/translations/messages/nl.po index 22183dec..98b3fc53 100644 --- a/translations/messages/nl.po +++ b/translations/messages/nl.po @@ -47,8 +47,8 @@ msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "" -",[email protected],[email protected],f.de.kruijf@hetnet." -"nl,[email protected]" #: digikam/album.cpp:327 digikam/albumfolderview.cpp:268 #: digikam/albumfolderview.cpp:588 digikam/albumfolderview.cpp:1063 @@ -322,7 +322,7 @@ msgid "" "_n: %1 %2 - 1 Item\n" "%1 %2 - %n Items" msgstr "" -"_n: %1 %2 - 1 item\n" +"%1 %2 - 1 item\n" "%1 %2 - %n items" #: digikam/albumiconitem.cpp:299 @@ -382,7 +382,7 @@ msgid "" "_n: Move to Trash\n" "Move %n Files to Trash" msgstr "" -"_n: Verplaatsen naar prullenbak\n" +"Verplaatsen naar prullenbak\n" "%n bestanden verplaatsen naar prullenbak" #: digikam/albumiconview.cpp:715 digikam/imagepreviewview.cpp:425 |