Merge translation files from master branch.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

CMakeL10n.txt

@@ -0,0 +1,22 @@
+#################################################
+#
+#  (C) 2018 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

configure.in

@@ -628,7 +628,7 @@ else
     echo "-- using internal libsqlite3...... YES"
 fi
 
-if test -z "$GPHOTO_CONFIG" ; then
+if test "x$have_libgphoto2" != "xyes"; then
   echo "-- libgphoto2 library found....... NO"
   echo ""
   echo "digiKam needs libgphoto2 library development package."

digikam.lsm

@@ -1,24 +0,0 @@
-Begin4
-Title:          digiKam
-Version:        R14.0.0
-Entered-date:   2010-05-10
-Description:    Photo Management Program
-Keywords:       Digital Still Camera, TDE, Graphics, Image Viewer, Image Editor, Light Table, Time Line, Digital Camera
-                Interface, Gphoto, Digital Photo Management, Search, Rating, Tags, Comments, Exif, Iptc, Makenotes,
-                Geolocation, Batch process, Raw workflow
-Author:         Gilles Caulier <caulier dot gilles at gmail dot com>,
-                Marcel Wiesweg <marcel dot wiesweg at gmx dot de>,
-                Francisco J. Cruz <fj dot cruz at supercable dot es>,
-                Arnd Baecker <arnd dot baecker at web dot de>,
-                Andi Clemens <andi dot clemens at gmx dot net>,
-                Joern Ahrens <joern dot ahrens at kdemail dot net>,
-                Tom Albers <tomalbers at kde.nl>,
-                Renchi Raju <renchi at pooh.tam.uiuc.edu>,
-                Ralf Holzer <kde at ralfhoelzer.com>
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://www.digikam.org
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End

digikam/CMakeL10n.txt

@@ -0,0 +1,6 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "digikam"
+    SOURCES "." "tips"
+)

digikam/configure.in.bot

@@ -24,7 +24,7 @@ else
     echo "-- using internal libsqlite3...... YES"
 fi
 
-if test -z "$GPHOTO_CONFIG" ; then
+if test "x$have_libgphoto2" != "xyes"; then
   echo "-- libgphoto2 library found....... NO"
   echo ""
   echo "digiKam needs libgphoto2 library development package."

digikam/configure.in.in

@@ -124,18 +124,36 @@ AC_SUBST(LCMS_LIBS)
 #
 #------------------------------------------------------------------
 
-AC_PATH_PROG(GPHOTO_CONFIG,gphoto2-config)
-AC_PATH_PROG(GPHOTO_PORT_CONFIG,gphoto2-port-config)
-if test -n "${GPHOTO_CONFIG}"; then
-  GPHOTO_VERSION="`$GPHOTO_CONFIG --version`"
-  case "${GPHOTO_VERSION}" in "libgphoto2 2.5"*) CXXFLAGS="$CXXFLAGS -DHAVE_GPHOTO25";; esac
-  GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`"
+KDE_PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.5,
+         [have_libgphoto2=yes; have_gphoto25=yes], have_libgphoto2=no)
+if test "x$have_libgphoto2" = "xno"; then
+  KDE_PKG_CHECK_MODULES(GPHOTO2, libgphoto2,
+         have_libgphoto2=yes, have_libgphoto2=no)
+fi
+if test "x$have_libgphoto2" = "xno"; then
+  AC_PATH_PROG(GPHOTO_CONFIG,gphoto2-config)
+  AC_PATH_PROG(GPHOTO_PORT_CONFIG,gphoto2-port-config)
+  if test -n "${GPHOTO_CONFIG}"; then
+    GPHOTO_VERSION="`$GPHOTO_CONFIG --version`"
+    case "${GPHOTO_VERSION}" in "libgphoto2 2.5"*) CXXFLAGS="$CXXFLAGS -DHAVE_GPHOTO25";; esac
+    GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`"
+    AC_SUBST(GPHOTO_CFLAGS)
+    LIB_GPHOTO="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`"
+    AC_SUBST(LIB_GPHOTO)
+    have_libgphoto2=yes
+  else
+    AC_MSG_WARN([gPhoto2 not found.])
+    DO_NOT_COMPILE="digikam $DO_NOT_COMPILE"
+  fi
+else
+  if test "x$have_gphoto25" = "xyes"; then
+    GPHOTO_CFLAGS="$GPHOTO2_CFLAGS -DHAVE_GPHOTO25"
+  else
+    GPHOTO_CFLAGS="$GPHOTO2_CFLAGS"
+  fi
+  LIB_GPHOTO="$GPHOTO2_LIBS"
   AC_SUBST(GPHOTO_CFLAGS)
-  LIB_GPHOTO="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`"
   AC_SUBST(LIB_GPHOTO)
-else
-  AC_MSG_WARN([gPhoto2 not found.])
-  DO_NOT_COMPILE="digikam $DO_NOT_COMPILE"
 fi
 
 CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE"

digikam/data/about/digikam.css

@@ -20,6 +20,3 @@
   background-repeat: no-repeat;
   background-position: bottom right;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */
-

digikam/data/about/kde_infopage.css

@@ -324,5 +324,3 @@ body {margin: 0px; padding: 0px; background-color: #003070; background-image: ur
   height: 100px;
   z-index: -1;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */

digikam/data/about/kde_infopage_rtl.css

@@ -7,5 +7,3 @@ body {direction: rtl}
 #nextlink {
     text-align: left;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */

digikam/digikam/albumwidgetstack.h

@@ -35,7 +35,7 @@
 
 #include "digikam_export.h"
 
-class KURL::List;
+class KURL;
 
 namespace Digikam
 {

digikam/digikam/digikamview.cpp

@@ -33,6 +33,7 @@
 #include <tqlabel.h>
 #include <tqimage.h>
 #include <tqevent.h>
+#include <tqeventloop.h>
 #include <tqapplication.h>
 #include <tqsplitter.h>
 #include <tqtimer.h>
@@ -1542,7 +1543,7 @@ void DigikamView::slideShow(ImageInfoList &infoList)
         settings.pictInfoMap.insert(info->kurl(), pictInfo);
 
         emit signalProgressValue((int)((i++/cnt)*100.0));
-        kapp->processEvents();
+        kapp->eventLoop()->processEvents(TQEventLoop::AllEvents & ~TQEventLoop::WaitForMore);
     }
 
     emit signalProgressBarMode(StatusProgressBar::TextMode, TQString());   

digikam/imageplugins/charcoal/charcoal.cpp

@@ -68,7 +68,7 @@ void Charcoal::filterImage(void)
 
     // -- Applying Edge effect -----------------------------------------------
 
-    register long i=0;
+    long i=0;
     int kernelWidth = getOptimalKernelWidth(m_pencil, m_smooth);
     
     if((int)m_orgImage.width() < kernelWidth)
@@ -222,7 +222,7 @@ int Charcoal::getOptimalKernelWidth(double radius, double sigma)
 {
     double        normalize, value;
     long          kernelWidth;
-    register long u;
+    long u;
 
     if(radius > 0.0)
         return((int)(2.0*ceil(radius)+1.0));

digikam/imageplugins/coreplugin/iccprooftool.cpp

@@ -336,7 +336,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
     //---------- "Workspace" Page Setup ---------------------------------
 
     m_toolBoxWidgets->insertItem(WORKSPACEPAGE, spaceProfiles,
-                                 SmallIconSet("tablet"), i18n("Workspace Profile"));
+                                 SmallIconSet("input-tablet"), i18n("Workspace Profile"));
     TQWhatsThis::add(spaceProfiles, i18n("<p>Set here all parameters relevant to Color Workspace "
                     "Profiles.</p>"));
 
@@ -370,7 +370,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
     //---------- "Proofing" Page Setup ---------------------------------
 
     m_toolBoxWidgets->insertItem(PROOFINGPAGE, proofProfiles,
-                                 SmallIconSet("printer1"), i18n("Proofing Profile"));
+                                 SmallIconSet("printer"), i18n("Proofing Profile"));
     TQWhatsThis::add(proofProfiles, i18n("<p>Set here all parameters relevant to Proofing Color "
                     "Profiles.</p>"));
 

digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp

@@ -322,7 +322,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
     //---------- "Workspace" Page Setup ---------------------------------
 
     m_toolBoxWidgets->insertItem(WORKSPACEPAGE, spaceProfiles, 
-                                 SmallIconSet("tablet"), i18n("Workspace Profile"));
+                                 SmallIconSet("input-tablet"), i18n("Workspace Profile"));
     TQWhatsThis::add(spaceProfiles, i18n("<p>Set here all parameters relevant to Color Workspace "
                     "Profiles.</p>"));
 
@@ -356,7 +356,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
     //---------- "Proofing" Page Setup ---------------------------------
 
     m_toolBoxWidgets->insertItem(PROOFINGPAGE, proofProfiles, 
-                                 SmallIconSet("printer1"), i18n("Proofing Profile"));
+                                 SmallIconSet("printer"), i18n("Proofing Profile"));
     TQWhatsThis::add(proofProfiles, i18n("<p>Set here all parameters relevant to Proofing Color "
                     "Profiles.</p>"));
 

digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp

@@ -121,7 +121,7 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent)
     m_preciseCrop = new TQCheckBox(i18n("Exact"), cropSelection);
     TQWhatsThis::add( m_preciseCrop, i18n("<p>Enable this option to force exact aspect ratio crop."));
 
-    m_orientLabel = new TQLabel(i18n("Qt::Orientation:"), cropSelection);
+    m_orientLabel = new TQLabel(i18n("Orientation:"), cropSelection);
     m_orientCB    = new TQComboBox( false, cropSelection );
     m_orientCB->insertItem( i18n("Landscape") );
     m_orientCB->insertItem( i18n("Portrait") );
@@ -552,7 +552,7 @@ void ImageEffect_RatioCrop::slotSelectionOrientationChanged(int newOrientation)
 
     setRatioCBText(newOrientation);
 
-    // Change Qt::Orientation ComboBox
+    // Change Orientation ComboBox
 
     m_orientCB->setCurrentItem(newOrientation);
 

digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp

@@ -146,7 +146,7 @@ RatioCropTool::RatioCropTool(TQObject* parent)
     m_preciseCrop = new TQCheckBox(i18n("Exact"), cropSelection);
     TQWhatsThis::add( m_preciseCrop, i18n("<p>Enable this option to force exact aspect ratio crop."));
 
-    m_orientLabel = new TQLabel(i18n("Qt::Orientation:"), cropSelection);
+    m_orientLabel = new TQLabel(i18n("Orientation:"), cropSelection);
     m_orientCB    = new RComboBox(cropSelection);
     m_orientCB->insertItem( i18n("Landscape"));
     m_orientCB->insertItem( i18n("Portrait"));
@@ -592,7 +592,7 @@ void RatioCropTool::slotSelectionOrientationChanged(int newOrientation)
 
     setRatioCBText(newOrientation);
 
-    // Change Qt::Orientation ComboBox
+    // Change Orientation ComboBox
 
     m_orientCB->setCurrentItem(newOrientation);
 

digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c

@@ -38,9 +38,9 @@ integer f_end(alist *a)
 
  static int
 #ifdef KR_headers
-copy(from, len, to) FILE *from, *to; register long len;
+copy(from, len, to) FILE *from, *to; long len;
 #else
-copy(FILE *from, register long len, FILE *to)
+copy(FILE *from, long len, FILE *to)
 #endif
 {
 	int len1;

digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c

@@ -11,13 +11,13 @@
 
 #ifdef KR_headers
 char *f__icvt(value,ndigit,sign, base) longint value; int *ndigit,*sign;
- register int base;
+ int base;
 #else
 char *f__icvt(longint value, int *ndigit, int *sign, int base)
 #endif
 {
 	static char buf[MAXINTLENGTH+1];
-	register int i;
+	int i;
 	ulongint uvalue;
 
 	if(value > 0) {

digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c

@@ -8,7 +8,7 @@ integer s_cmp(a0, b0, la, lb) char *a0, *b0; ftnlen la, lb;
 integer s_cmp(char *a0, char *b0, ftnlen la, ftnlen lb)
 #endif
 {
-register unsigned char *a, *aend, *b, *bend;
+unsigned char *a, *aend, *b, *bend;
 a = (unsigned char *)a0;
 b = (unsigned char *)b0;
 aend = a + la;

digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c

@@ -9,12 +9,12 @@
 /* assign strings:  a = b */
 
 #ifdef KR_headers
-VOID s_copy(a, b, la, lb) register char *a, *b; ftnlen la, lb;
+VOID s_copy(a, b, la, lb) char *a, *b; ftnlen la, lb;
 #else
-void s_copy(register char *a, register char *b, ftnlen la, ftnlen lb)
+void s_copy(char *a, char *b, ftnlen la, ftnlen lb)
 #endif
 {
-	register char *aend, *bend;
+	char *aend, *bend;
 
 	aend = a + la;
 

digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c

@@ -8,7 +8,7 @@
 #endif
 
 #ifdef KR_headers
-void sig_die(s, kill) register char *s; int kill;
+void sig_die(s, kill) char *s; int kill;
 #else
 #include "stdlib.h"
 #ifdef __cplusplus
@@ -16,7 +16,7 @@ extern "C" {
 #endif
  extern void f_exit(void);
 
-void sig_die(register char *s, int kill)
+void sig_die(char *s, int kill)
 #endif
 {
 	/* print error message, then clear buffers */

digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c

@@ -71,8 +71,8 @@ wrt_Z(n,w,minlen,len) Uint *n; int w, minlen; ftnlen len;
 wrt_Z(Uint *n, int w, int minlen, ftnlen len)
 #endif
 {
-	register char *s, *se;
-	register int i, w1;
+	char *s, *se;
+	int i, w1;
 	static int one = 1;
 	static char hex[] = "0123456789ABCDEF";
 	s = (char *)n;
@@ -121,9 +121,9 @@ wrt_Z(Uint *n, int w, int minlen, ftnlen len)
 
  static int
 #ifdef KR_headers
-wrt_I(n,w,len, base) Uint *n; ftnlen len; register int base;
+wrt_I(n,w,len, base) Uint *n; ftnlen len; int base;
 #else
-wrt_I(Uint *n, int w, ftnlen len, register int base)
+wrt_I(Uint *n, int w, ftnlen len, int base)
 #endif
 {	int ndigit,sign,spare,i;
 	longint x;

digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp

@@ -30,16 +30,16 @@
 // Square 
 #define SQR(x) ((x) * (x))
 
+// C++ includes.
+
+#include <cmath>
+
 extern "C"
 {
 #include "f2c.h"
 #include "clapack.h"
 }
 
-// C++ includes.
-
-#include <cmath>
-
 // TQt includes.
 
 #include <tqglobal.h>
@@ -128,7 +128,7 @@ inline double RefocusMatrix::c_mat_elt (const CMat * const mat, const int col, c
 
 void RefocusMatrix::convolve_mat (CMat * result, const CMat * const mata, const CMat * const matb)
 {
-    register int xr, yr, xa, ya;
+    int xr, yr, xa, ya;
     
     for (yr = -result->radius; yr <= result->radius; yr++)
     {
@@ -138,7 +138,7 @@ void RefocusMatrix::convolve_mat (CMat * result, const CMat * const mata, const
             const int ya_high = TQMIN (mata->radius, yr + matb->radius);
             const int xa_low  = TQMAX (-mata->radius, xr - matb->radius);
             const int xa_high = TQMIN (mata->radius, xr + matb->radius);
-            register double val = 0.0;
+            double val = 0.0;
     
             for (ya = ya_low; ya <= ya_high; ya++)
             {
@@ -156,7 +156,7 @@ void RefocusMatrix::convolve_mat (CMat * result, const CMat * const mata, const
 
 void RefocusMatrix::convolve_star_mat (CMat * result, const CMat * const mata, const CMat * const matb)
 {
-    register int xr, yr, xa, ya;
+    int xr, yr, xa, ya;
     
     for (yr = -result->radius; yr <= result->radius; yr++)
     {
@@ -166,7 +166,7 @@ void RefocusMatrix::convolve_star_mat (CMat * result, const CMat * const mata, c
             const int ya_high = TQMIN (mata->radius, matb->radius - yr);
             const int xa_low = TQMAX (-mata->radius, -matb->radius - xr);
             const int xa_high = TQMIN (mata->radius, matb->radius - xr);
-            register double val = 0.0;
+            double val = 0.0;
     
             for (ya = ya_low; ya <= ya_high; ya++)
             {
@@ -184,13 +184,13 @@ void RefocusMatrix::convolve_star_mat (CMat * result, const CMat * const mata, c
 
 void RefocusMatrix::convolve_mat_fun (CMat * result, const CMat * const mata, double (f) (int, int))
 {
-    register int xr, yr, xa, ya;
+    int xr, yr, xa, ya;
     
     for (yr = -result->radius; yr <= result->radius; yr++)
     {
         for (xr = -result->radius; xr <= result->radius; xr++)
         {
-            register double val = 0.0;
+            double val = 0.0;
     
             for (ya = -mata->radius; ya <= mata->radius; ya++)
             {
@@ -219,7 +219,7 @@ int RefocusMatrix::as_cidx (const int k, const int l)
 
 void RefocusMatrix::print_c_mat (const CMat * const mat)
 {
-    register int x, y;
+    int x, y;
     
     for (y = -mat->radius; y <= mat->radius; y++)
     {
@@ -255,7 +255,7 @@ Mat *RefocusMatrix::make_s_matrix (CMat * mat, int m, double noise_factor)
 {
     const int mat_size = SQR (2 * m + 1);
     Mat *result = allocate_matrix (mat_size, mat_size);
-    register int yr, yc, xr, xc;
+    int yr, yc, xr, xc;
     
     for (yr = -m; yr <= m; yr++)
     {
@@ -285,7 +285,7 @@ Mat *RefocusMatrix::make_s_cmatrix (CMat * mat, int m, double noise_factor)
 {
     const int mat_size = as_cidx (m + 1, 0);
     Mat *result = allocate_matrix (mat_size, mat_size);
-    register int yr, yc, xr, xc;
+    int yr, yc, xr, xc;
     
     for (yr = 0; yr <= m; yr++)
     {
@@ -318,7 +318,7 @@ double RefocusMatrix::correlation (const int x, const int y, const double gamma,
 Mat *RefocusMatrix::copy_vec (const CMat * const mat, const int m)
 {
     Mat *result = allocate_matrix (SQR (2 * m + 1), 1);
-    register int x, y, index = 0;
+    int x, y, index = 0;
     
     for (y = -m; y <= m; y++)
     {
@@ -336,7 +336,7 @@ Mat *RefocusMatrix::copy_vec (const CMat * const mat, const int m)
 Mat *RefocusMatrix::copy_cvec (const CMat * const mat, const int m)
 {
     Mat *result = allocate_matrix (as_cidx (m + 1, 0), 1);
-    register int x, y, index = 0;
+    int x, y, index = 0;
     
     for (y = 0; y <= m; y++)
     {
@@ -354,7 +354,7 @@ Mat *RefocusMatrix::copy_cvec (const CMat * const mat, const int m)
 CMat *RefocusMatrix::copy_cvec2mat (const Mat * const cvec, const int m)
 {
     CMat *result = allocate_c_mat (m);
-    register int x, y;
+    int x, y;
     
     for (y = -m; y <= m; y++)
     {
@@ -370,7 +370,7 @@ CMat *RefocusMatrix::copy_cvec2mat (const Mat * const cvec, const int m)
 CMat *RefocusMatrix::copy_vec2mat (const Mat * const cvec, const int m)
 {
     CMat *result = allocate_c_mat (m);
-    register int x, y;
+    int x, y;
     
     for (y = -m; y <= m; y++)
     {
@@ -482,7 +482,7 @@ void RefocusMatrix::fill_matrix (CMat * matrix, const int m,
                                  double f (const int, const int, const double), 
                                  const double fun_arg)
 {
-    register int x, y;
+    int x, y;
     init_c_mat (matrix, m);
     
     for (y = -m; y <= m; y++)
@@ -498,7 +498,7 @@ void RefocusMatrix::fill_matrix2 (CMat * matrix, const int m,
                                   double f (const int, const int, const double, const double),
                                   const double fun_arg1, const double fun_arg2)
 {
-    register int x, y;
+    int x, y;
     init_c_mat (matrix, m);
     
     for (y = -m; y <= m; y++)
@@ -512,7 +512,7 @@ void RefocusMatrix::fill_matrix2 (CMat * matrix, const int m,
 
 void RefocusMatrix::make_gaussian_convolution (const double gradius, CMat * convolution, const int m)
 {
-    register int x, y;
+    int x, y;
     
 #ifdef RF_DEBUG
     DDebug() << "gauss: " << gradius << endl;
@@ -589,9 +589,9 @@ double RefocusMatrix::circle_intensity (const int x, const int y, const double r
     }
     else
     {
-        register double xlo = TQABS (x) - 0.5, xhi = TQABS (x) + 0.5,
+        double xlo = TQABS (x) - 0.5, xhi = TQABS (x) + 0.5,
             ylo = TQABS (y) - 0.5, yhi = TQABS (y) + 0.5;
-        register double symmetry_factor = 1, xc1, xc2;
+        double symmetry_factor = 1, xc1, xc2;
     
         if (xlo < 0)
         {

digikam/imageplugins/freerotation/freerotation.cpp

@@ -55,7 +55,7 @@ FreeRotation::FreeRotation(Digikam::DImg *orgImage, TQObject *parent, double ang
 void FreeRotation::filterImage(void)
 {
     int          progress;
-    register int w, h, nw, nh, j, i = 0;
+    int w, h, nw, nh, j, i = 0;
     int          nNewHeight, nNewWidth;
     int          nhdx, nhdy, nhsx, nhsy;
     double       lfSin, lfCos, lfx, lfy;

digikam/imageplugins/inserttext/fontchooserwidget.cpp

@@ -237,7 +237,7 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name,
         TQString sizeIsRelativeCBToolTipText =
         i18n("Font size<br><i>fixed</i> or <i>relative</i><br>to environment");
         TQString sizeIsRelativeCBWhatsThisText =
-        i18n("Here you can switch between fixed a font size and a font size "
+        i18n("Here you can switch between a fixed font size and a font size "
              "to be calculated dynamically and adjusted to any changing "
              "environment (e.g. widget dimensions, paper size)." );
         sizeIsRelativeCheckBox = new TQCheckBox( sizeIsRelativeCBText,

digikam/imageplugins/raindrop/raindrop.cpp

@@ -207,7 +207,7 @@ bool RainDrop::CreateRainDrop(uchar *pBits, int Width, int Height, bool sixteenB
                               uchar *pResBits, uchar* pStatusBits,
                               int X, int Y, int DropSize, double Coeff, bool bLimitRange)
 {
-    register int w, h, nw1, nh1, nw2, nh2;
+    int w, h, nw1, nh1, nw2, nh2;
     int          nHalfSize = DropSize / 2;
     int          nBright;
     double       lfRadius, lfOldRadius, lfAngle, lfDiv;
@@ -403,7 +403,7 @@ bool RainDrop::CreateRainDrop(uchar *pBits, int Width, int Height, bool sixteenB
 bool RainDrop::CanBeDropped(int Width, int Height, uchar *pStatusBits, int X, int Y, 
                             int DropSize, bool bLimitRange)
 {
-    register int w, h, i = 0;
+    int w, h, i = 0;
     int nHalfSize = DropSize / 2;
 
     if (pStatusBits == NULL)
@@ -433,7 +433,7 @@ bool RainDrop::CanBeDropped(int Width, int Height, uchar *pStatusBits, int X, in
 bool RainDrop::SetDropStatusBits (int Width, int Height, uchar *pStatusBits, 
                                   int X, int Y, int DropSize)
 {
-    register int w, h, i = 0;
+    int w, h, i = 0;
     int nHalfSize = DropSize / 2;
 
     if (pStatusBits == NULL)

digikam/imageplugins/sheartool/shear.cpp

@@ -58,7 +58,7 @@ Shear::Shear(Digikam::DImg *orgImage, TQObject *parent, float hAngle, float vAng
 void Shear::filterImage(void)
 {
     int          progress;
-    register int x, y, p = 0, pt;
+    int x, y, p = 0, pt;
     int          new_width, new_height;
     double       nx, ny, dx, dy;
     double       horz_factor, vert_factor;

digikam/libs/dialogs/deletedialogbase.ui

@@ -182,7 +182,7 @@
 	<connections>
 	</connections>
 	<layoutdefaults spacing="6" margin="11"/>
-	<includehints>
-		<includehint>tdelistbox.h</includehint>
-	</includehints>
+	<includes>
+		<include location="global" impldecl="in implementation">tdelistbox.h</include>
+	</includes>
 </UI>

digikam/libs/dimg/dimg.cpp

@@ -27,6 +27,9 @@
 
 extern "C"
 {
+#if !defined(__STDC_LIMIT_MACROS)
+#define __STDC_LIMIT_MACROS
+#endif
 #include <stdint.h>
 }
 

digikam/libs/dimg/filters/dimggaussianblur.cpp

@@ -84,7 +84,7 @@ void DImgGaussianBlur::gaussianBlurImage(uchar *data, int width, int height, boo
       
     int          nKSize, nCenter;
     double       x, sd, factor, lnsd, lnfactor;
-    register int i, j, n, h, w;
+    int i, j, n, h, w;
 
     nKSize      = 2 * radius + 1;
     nCenter     = nKSize / 2;

digikam/libs/dimg/filters/dimgimagefilters.cpp

@@ -68,7 +68,7 @@ void DImgImageFilters::equalizeImage(uchar *data, int w, int h, bool sixteenBit)
     struct double_packet  high, low, intensity;
     struct double_packet *map;
     struct int_packet    *equalize_map;
-    register long         i;               
+    long         i;               
     
     // Create an histogram of the current image.     
     ImageHistogram *histogram = new ImageHistogram(data, w, h, sixteenBit);
@@ -217,7 +217,7 @@ void DImgImageFilters::stretchContrastImage(uchar *data, int w, int h, bool sixt
     struct double_packet  high, low, intensity;
     struct int_packet    *normalize_map;
     long long             number_pixels;
-    register long         i;
+    long         i;
     unsigned long         threshold_intensity;
         
     // Create an histogram of the current image.     
@@ -717,7 +717,7 @@ void DImgImageFilters::channelMixerImage(uchar *data, int Width, int Height, boo
        return;
     }
         
-    register int i;
+    int i;
 
     double rnorm = CalculateNorm (rrGain, rgGain, rbGain, bPreserveLum);
     double gnorm = CalculateNorm (grGain, ggGain, gbGain, bPreserveLum);

digikam/libs/dimg/filters/dimgsharpen.cpp

@@ -89,7 +89,7 @@ void DImgSharpen::sharpenImage(double radius, double sigma)
     }
 
     double        alpha, normalize=0.0;
-    register long i=0, u, v;
+    long i=0, u, v;
 
     int kernelWidth = getOptimalKernelWidth(radius, sigma);
     
@@ -216,7 +216,7 @@ int DImgSharpen::getOptimalKernelWidth(double radius, double sigma)
 {
     double        normalize, value;
     long          kernelWidth;
-    register long u;
+    long u;
 
     if(radius > 0.0)
         return((int)(2.0*ceil(radius)+1.0));

digikam/libs/dimg/loaders/jp2kloader.cpp

@@ -36,6 +36,16 @@
 // files io. Uncomment this line only for debugging.
 //#define ENABLE_DEBUG_MESSAGES
 
+// C ANSI includes.
+
+extern "C"
+{
+#if !defined(__STDC_LIMIT_MACROS)
+#define __STDC_LIMIT_MACROS
+#endif
+#include <stdint.h>
+}
+
 // TQt includes.
 
 #include <tqfile.h>
@@ -90,7 +100,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
     // -------------------------------------------------------------------
     // Initialize JPEG 2000 API.
 
-    register long  i, x, y;
+    long  i, x, y;
     int            components[4];
     unsigned int   maximum_component_depth, scale[4], x_step[4], y_step[4];
     unsigned long  number_components;
@@ -458,7 +468,7 @@ bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
     // -------------------------------------------------------------------
     // Initialize JPEG 2000 API.
 
-    register long  i, x, y;
+    long  i, x, y;
     unsigned long  number_components;
 
     jas_image_t          *jp2_image   = 0;
@@ -650,7 +660,17 @@ bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
     DDebug() << "JPEG2000 quality: " << quality << endl;
     DDebug() << "JPEG2000 " << rate << endl;
 
+#   if defined(JAS_VERSION_MAJOR) && (JAS_VERSION_MAJOR >= 3)
+    const jas_image_fmtinfo_t *jp2_fmtinfo = jas_image_lookupfmtbyname("jp2");
+    int ret = -1;
+    if (jp2_fmtinfo)
+    {
+        ret = jas_image_encode(jp2_image, jp2_stream, jp2_fmtinfo->id, rate.utf8().data());
+    }
+#   else
     int ret = jp2_encode(jp2_image, jp2_stream, rate.utf8().data());
+#   endif
+
     if (ret != 0)
     {
         DDebug() << "Unable to encode JPEG2000 image" << endl;

digikam/libs/dimg/loaders/pngloader.cpp

@@ -830,7 +830,7 @@ void PNGLoader::writeRawProfile(png_struct *ping, png_info *ping_info, char *pro
 {
     png_textp      text;
 
-    register long  i;
+    long  i;
 
     uchar         *sp;
 
@@ -890,11 +890,11 @@ void PNGLoader::writeRawProfile(png_struct *ping, png_info *ping_info, char *pro
 
 size_t PNGLoader::concatenateString(char *destination, const char *source, const size_t length)
 {
-    register char       *q;
+    char       *q;
 
-    register const char *p;
+    const char *p;
 
-    register size_t      i;
+    size_t      i;
 
     size_t               count;
 
@@ -931,11 +931,11 @@ size_t PNGLoader::concatenateString(char *destination, const char *source, const
 
 size_t PNGLoader::copyString(char *destination, const char *source, const size_t length)
 {
-    register char       *q;
+    char       *q;
 
-    register const char *p;
+    const char *p;
 
-    register size_t      i;
+    size_t      i;
 
     if ( !destination || !source || length == 0 )
         return 0;

digikam/libs/greycstoration/CImg.h

@@ -36835,6 +36835,3 @@ namespace cimg {
 #endif
 
 #endif
-// Local Variables:
-// mode: c++
-// End:

digikam/libs/greycstoration/greycstoration.h

@@ -454,7 +454,7 @@ static void* greycstoration_thread(void *arg) {
       p.temporary = 0;
       p.counter = 0;
       p.tile = p.tile_border = p.thread = p.nb_threads = 0;
-      p.stop_request = false;
+      p.stop_request = 0;
       greycstoration_mutex_destroy(p);
     }
     p.is_running = false;

digikam/libs/greycstoration/greycstorationiface.cpp

@@ -172,7 +172,7 @@ void GreycstorationIface::stopComputation()
 
 void GreycstorationIface::filterImage()
 {
-    register int x, y;
+    int x, y;
 
     DDebug() << "GreycstorationIface::Initialization..." << endl;
 
@@ -330,7 +330,7 @@ void GreycstorationIface::inpainting()
     {
         // Copy the inpainting image data into a CImg type image with three channels and no alpha.
 
-        register int x, y;
+        int x, y;
 
         d->mask    = CImg<uchar>(d->inPaintingMask.width(), d->inPaintingMask.height(), 1, 3);
         uchar *ptr = d->inPaintingMask.bits();

digikam/libs/histogram/imagehistogram.cpp

@@ -167,7 +167,7 @@ void ImageHistogram::run()
 
 void ImageHistogram::calcHistogramValues()
 {
-    register uint  i;
+    uint  i;
     int            max;
 
     if (d->parent)

digikam/libs/jpegutils/jpegutils.cpp

@@ -411,7 +411,7 @@ bool exifRotate(const TQString& file, const TQString& documentName)
         // -- Metadata operations ------------------------------------------------------
 
         // Reset the Exif orientation tag of the temp image to normal
-        DDebug() << "ExifRotate: set Qt::Orientation tag to normal: " << file << endl;
+        DDebug() << "ExifRotate: set Orientation tag to normal: " << file << endl;
 
         metaData.load(temp);
         metaData.setImageOrientation(DMetadata::ORIENTATION_NORMAL);

digikam/libs/lprof/cmslnr.cpp

@@ -238,7 +238,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[])
 LPGAMMATABLE cmsxEstimateGamma(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints)
 {
 	double a[5];
-	LPSAMPLEDCURVE XNorm, YNorm;	
+	LPSAMPLEDCURVE XNorm, YNorm;
 	double e, Max;
 
 
@@ -246,14 +246,14 @@ LPGAMMATABLE cmsxEstimateGamma(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultin
 	    /* We have only a portion of curve. It is likely */
 	    /* maximum will not fall on exactly 100. */
 
-		if (!OneTry(X, Y, a)) 
-			return false;
+		if (!OneTry(X, Y, a))
+			return 0;
 
 		/* Got parameters. Compute maximum. */
 		e = a[1]* 255.0 + a[2];
-		if (e < 0) return false;
+		if (e < 0) return 0;
 		Max = pow(e, a[0]);
-		
+
 
 		/* Normalize values to maximum */
 		XNorm = NormalizeTo(X, 255.0, false);
@@ -261,8 +261,8 @@ LPGAMMATABLE cmsxEstimateGamma(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultin
 
 		/* Do the final fitting  */
 		if (!OneTry(XNorm, YNorm, a))
-				return false;
-				
+				return 0;
+
 		/* Type 3 = IEC 61966-2.1 (sRGB) */
         /* Y = (aX + b)^Gamma | X >= d */
         /* Y = cX             | X < d */

digikam/libs/lprof/cmsmntr.cpp

@@ -54,7 +54,7 @@ void ClampRGB(LPVEC3 RGB)
 
 
 static
-int RegressionSamplerA2B(register WORD In[], register WORD Out[], register LPVOID Cargo)
+int RegressionSamplerA2B(WORD In[], WORD Out[], LPVOID Cargo)
 {
     cmsCIEXYZ xyz;
     cmsCIELab Lab;   
@@ -95,7 +95,7 @@ int RegressionSamplerA2B(register WORD In[], register WORD Out[], register LPVOI
 
 
 static
-int RegressionSamplerB2A(register WORD In[], register WORD Out[], register LPVOID Cargo)
+int RegressionSamplerB2A(WORD In[], WORD Out[], LPVOID Cargo)
 {
     cmsCIELab Lab;
     cmsCIEXYZ xyz;

digikam/libs/lprof/cmsreg.cpp

@@ -147,7 +147,7 @@ BOOL MultipleLinearRegression(const LPMATN xi,                /* Dependent varia
 
     /* |bt| = |b| T */
     bt = MATNtranspose (b);
-    if (bt == false) return false;
+    if (bt == NULL) return false;
 
     /*  |yt| = |bt| * |xt| */
     yt = MATNmult (bt, xt);

digikam/libs/lprof/cmsscn.cpp

@@ -139,7 +139,7 @@ BOOL cmsxScannerProfilerInit(LPSCANNERPROFILERDATA sys)
 
 /* Auxiliar: take RGB and update gauge */
 static
-void GetRGB(LPPROFILERCOMMONDATA hdr, register WORD In[], double* r, double* g, double* b)
+void GetRGB(LPPROFILERCOMMONDATA hdr, WORD In[], double* r, double* g, double* b)
 {   
     static int Count = 0, n_old = 0;
     double R, G, B;
@@ -172,7 +172,7 @@ void GetRGB(LPPROFILERCOMMONDATA hdr, register WORD In[], double* r, double* g,
 
 /* The sampler for Lab */
 static
-int RegressionSamplerLab(register WORD In[], register WORD Out[], register LPVOID Cargo)
+int RegressionSamplerLab(WORD In[], WORD Out[], LPVOID Cargo)
 {
     cmsCIEXYZ xyz;  
     cmsCIELab Lab;
@@ -235,7 +235,7 @@ int RegressionSamplerLab(register WORD In[], register WORD Out[], register LPVOI
 
 /* The sampler for XYZ */
 static
-int RegressionSamplerXYZ(register WORD In[], register WORD Out[], register LPVOID Cargo)
+int RegressionSamplerXYZ(WORD In[], WORD Out[], LPVOID Cargo)
 {
     cmsCIEXYZ xyz;
     double r, g, b;

digikam/libs/lprof/cmssheet.cpp

@@ -470,8 +470,8 @@ void ReadReal(LPIT8 it8, int inum)
 static
 void InSymbol(LPIT8 it8)
 {
-        register char *idptr;
-        register int k;
+        char *idptr;
+        int k;
         SYMBOL key;
         int sng;
 

digikam/libs/sqlite2/printf.c

@@ -361,8 +361,8 @@ static int vxprintf(
         }
         bufpt = &buf[etBUFSIZE-1];
         {
-          register char *cset;      /* Use registers for speed */
-          register int base;
+          char *cset;      /* Use registers for speed */
+          int base;
           cset = infop->charset;
           base = infop->base;
           do{                                           /* Convert to ascii */
@@ -603,7 +603,7 @@ static int vxprintf(
     ** the output.
     */
     if( !flag_leftjustify ){
-      register int nspace;
+      int nspace;
       nspace = width-length;
       if( nspace>0 ){
         count += nspace;
@@ -619,7 +619,7 @@ static int vxprintf(
       count += length;
     }
     if( flag_leftjustify ){
-      register int nspace;
+      int nspace;
       nspace = width-length;
       if( nspace>0 ){
         count += nspace;

digikam/libs/sqlite2/util.c

@@ -499,14 +499,14 @@ int sqliteHashNoCase(const char *z, int n){
 ** there is no consistency, we will define our own.
 */
 int sqliteStrICmp(const char *zLeft, const char *zRight){
-  register unsigned char *a, *b;
+  unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
   return UpperToLower[*a] - UpperToLower[*b];
 }
 int sqliteStrNICmp(const char *zLeft, const char *zRight, int N){
-  register unsigned char *a, *b;
+  unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
@@ -940,7 +940,7 @@ static int sqlite_utf8_to_int(const unsigned char *z){
 */
 int 
 sqliteGlobCompare(const unsigned char *zPattern, const unsigned char *zString){
-  register int c;
+  int c;
   int invert;
   int seen;
   int c2;
@@ -1029,7 +1029,7 @@ sqliteGlobCompare(const unsigned char *zPattern, const unsigned char *zString){
 */
 int 
 sqliteLikeCompare(const unsigned char *zPattern, const unsigned char *zString){
-  register int c;
+  int c;
   int c2;
 
   while( (c = UpperToLower[*zPattern])!=0 ){

digikam/libs/sqlite3/sqlite3.c

@@ -14414,8 +14414,8 @@ static void vxprintf(
           bufpt -= 2;
         }
         {
-          register const char *cset;      /* Use registers for speed */
-          register int base;
+          const char *cset;      /* Use registers for speed */
+          int base;
           cset = &aDigits[infop->charset];
           base = infop->base;
           do{                                           /* Convert to ascii */
@@ -14684,7 +14684,7 @@ static void vxprintf(
     ** the output.
     */
     if( !flag_leftjustify ){
-      register int nspace;
+      int nspace;
       nspace = width-length;
       if( nspace>0 ){
         appendSpace(pAccum, nspace);
@@ -14694,7 +14694,7 @@ static void vxprintf(
       sqlite3StrAccumAppend(pAccum, bufpt, length);
     }
     if( flag_leftjustify ){
-      register int nspace;
+      int nspace;
       nspace = width-length;
       if( nspace>0 ){
         appendSpace(pAccum, nspace);
@@ -16201,14 +16201,14 @@ SQLITE_PRIVATE const unsigned char sqlite3UpperToLower[] = {
 ** there is no consistency, we will define our own.
 */
 SQLITE_PRIVATE int sqlite3StrICmp(const char *zLeft, const char *zRight){
-  register unsigned char *a, *b;
+  unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
   return UpperToLower[*a] - UpperToLower[*b];
 }
 SQLITE_PRIVATE int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N){
-  register unsigned char *a, *b;
+  unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
@@ -42104,7 +42104,7 @@ static void updateMaxBlobsize(Mem *p){
 #define Release(P) if((P)->flags&MEM_Dyn){ sqlite3VdbeMemRelease(P); }
 
 /*
-** Convert the given register into a string if it isn't one
+** Convert the given into a string if it isn't one
 ** already. Return non-zero if a malloc() fails.
 */
 #define Stringify(P, enc) \

digikam/libs/themeengine/texture.cpp

@@ -207,7 +207,7 @@ void Texture::doHgradient()
         xb = (float) d->color0.blue();
     unsigned char *pr = d->red, *pg = d->green, *pb = d->blue;
 
-    register int x, y;
+    int x, y;
 
     drx = (float) (d->color1.red()   - d->color0.red());
     dgx = (float) (d->color1.green() - d->color0.green());
@@ -252,7 +252,7 @@ void Texture::doVgradient()
     dby /= d->height;
 
     unsigned char *pr = d->red, *pg = d->green, *pb = d->blue;
-    register int y;
+    int y;
     
     for (y = 0; y < d->height; y++, pr += d->width, pg += d->width, pb += d->width) {
         memset(pr, (unsigned char) yr, d->width);
@@ -279,7 +279,7 @@ void Texture::doDgradient()
     unsigned int *xt = xtable; 
     unsigned int *yt = ytable; 
 
-    register int x, y;
+    int x, y;
 
     dry = drx = (float) (d->color1.red()   - d->color0.red());
     dgy = dgx = (float) (d->color1.green() - d->color0.green());
@@ -337,8 +337,8 @@ void Texture::doBevel()
 {
     unsigned char *pr = d->red, *pg = d->green, *pb = d->blue;
 
-    register unsigned char r, g, b, rr ,gg ,bb;
-    register unsigned int w = d->width, h = d->height - 1, wh = w * h;
+    unsigned char r, g, b, rr ,gg ,bb;
+    unsigned int w = d->width, h = d->height - 1, wh = w * h;
 
     while (--w)
     {
@@ -479,7 +479,7 @@ void Texture::buildImage()
 
     unsigned int* bits = (unsigned int*) image.bits();
     
-    register int p;
+    int p;
     for (p =0; p < d->width*d->height; p++)
     {
         *bits = 0xff << 24 | *pr << 16 | *pg << 8 | *pb;

digikam/libs/widgets/imageplugins/imageguidewidget.h

@@ -5,7 +5,7 @@
  *
  * Date        : 2004-08-20
  * Description : a widget to display an image with guides
- * 
+ *
  * Copyright (C) 2004-2008 Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
@@ -13,12 +13,12 @@
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * ============================================================ */
 
 #ifndef IMAGEGUIDEWIDGET_H
@@ -47,23 +47,23 @@ class ImageGuideWidgetPriv;
 class DIGIKAM_EXPORT ImageGuideWidget : public TQWidget
 {
 Q_OBJECT
-  
+
 
 public:
 
-    enum GuideToolMode 
+    enum GuideToolMode
     {
         HVGuideMode=0,
         PickColorMode
     };
 
-    enum RenderingPreviewMode 
+    enum RenderingPreviewMode
     {
         PreviewOriginalImage=0,     // Original image only.
-        PreviewBothImagesHorz,      //Qt::Horizontal with original and target duplicated.
-        PreviewBothImagesVert,      //Qt::Vertical with original and target duplicated.
-        PreviewBothImagesHorzCont,  //Qt::Horizontal with original and target in contiguous.
-        PreviewBothImagesVertCont,  //Qt::Vertical with original and target in contiguous.
+        PreviewBothImagesHorz,      // Horizontal with original and target duplicated.
+        PreviewBothImagesVert,      // Vertical with original and target duplicated.
+        PreviewBothImagesHorzCont,  // Horizontal with original and target in contiguous.
+        PreviewBothImagesVertCont,  // Vertical with original and target in contiguous.
         PreviewTargetImage,         // Target image only.
         PreviewToggleOnMouseOver,   // Original image if mouse is over image area, else target image.
         NoPreviewMode               // Target image only without information displayed.
@@ -78,14 +78,14 @@ public:
 
 public:
 
-    ImageGuideWidget(int w, int h, TQWidget *parent=0, 
+    ImageGuideWidget(int w, int h, TQWidget *parent=0,
                      bool spotVisible=true, int guideMode=HVGuideMode,
-                     const TQColor& guideColor=TQt::red, int guideSize=1, 
+                     const TQColor& guideColor=TQt::red, int guideSize=1,
                      bool blink=false, bool useImageSelection=false);
     ~ImageGuideWidget();
-        
+
     ImageIface* imageIface();
-    
+
     TQPoint getSpotPosition();
     DColor getSpotColor(int getColorFrom);
     void   setSpotVisible(bool spotVisible, bool blink=false);
@@ -94,13 +94,13 @@ public:
     void   updatePreview();
 
 public slots:
-        
+
     void slotChangeGuideColor(const TQColor &color);
-    void slotChangeGuideSize(int size);    
+    void slotChangeGuideSize(int size);
     void slotChangeRenderingPreviewMode(int mode);
-    void slotToggleUnderExposure(bool);    
-    void slotToggleOverExposure(bool);    
-    
+    void slotToggleUnderExposure(bool);
+    void slotToggleOverExposure(bool);
+
 signals:
 
     void spotPositionChangedFromOriginal(const Digikam::DColor &color, const TQPoint &position);
@@ -108,7 +108,7 @@ signals:
     void signalResized();
 
 protected:
-    
+
     void paintEvent(TQPaintEvent*);
     void resizeEvent(TQResizeEvent*);
     void timerEvent(TQTimerEvent*);
@@ -117,14 +117,14 @@ protected:
     void mouseMoveEvent(TQMouseEvent*);
     void enterEvent(TQEvent*);
     void leaveEvent(TQEvent*);
-    
+
 private:
 
     void updatePixmap();
 
 private:
 
-    ImageGuideWidgetPriv *d;    
+    ImageGuideWidgetPriv *d;
 };
 
 }  // NameSpace Digikam

digikam/libs/widgets/metadata/Makefile.am

@@ -13,5 +13,5 @@ INCLUDES = -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/themeengine \
 	       -I$(top_srcdir)/digikam/libs/widgets/common \
 	       -I$(top_srcdir)/digikam/digikam \
-	       $(LIBKEXIV2_CFLAGS) \
+	       $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes)

digikam/libs/widgets/metadata/metadatalistview.cpp

@@ -4,9 +4,9 @@
  * http://www.digikam.org
  *
  * Date        : 2006-02-21
- * Description : a generic list view widget to 
+ * Description : a generic list view widget to
  *               display metadata
- * 
+ *
  * Copyright (c) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
@@ -14,12 +14,12 @@
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * ============================================================ */
 
 // TQt includes.
@@ -53,7 +53,7 @@ MetadataListView::MetadataListView(TQWidget* parent)
     setItemMargin(0);
     setAllColumnsShowFocus(true);
     setResizeMode(TQListView::AllColumns);
-    //Qt::Vertical scroll bar is always disable to give more 
+    // Vertical scroll bar is always disable to give more
     // free space to metadata content
     setVScrollBarMode(TQScrollView::AlwaysOff);
 
@@ -203,9 +203,9 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
         subItems = 0;
         parentifDItem = new MdKeyListViewItem(this, *itKeysFilter);
 
-        DMetadata::MetaDataMap::const_iterator it = ifds.end(); 
+        DMetadata::MetaDataMap::const_iterator it = ifds.end();
 
-        while(1)   
+        while(1)
         {
             if ( *itKeysFilter == it.key().section('.', 1, 1) )
             {
@@ -259,7 +259,7 @@ void MetadataListView::slotSearchTextChanged(const TQString& filter)
     TQString search = filter.lower();
 
     TQListViewItemIterator it(this);
-    for ( ; it.current(); ++it ) 
+    for ( ; it.current(); ++it )
     {
         MetadataListViewItem *item = dynamic_cast<MetadataListViewItem*>(it.current());
         if (item)

digikam/project/NEWS.0.9.0

@@ -58,7 +58,7 @@ Showfoto      : Thumbbar moved to the left by default in vertical mode. Image pr
                 right to make a consistant GUI with digiKam main interface.
 Showfoto      : Thumbbar can be used to the bottom in horizontal mode.
 Showfoto      : New Exif Auto-rotate option like in digiKam ImageEditor.
-Showfoto      : New Set Qt::Orientation Exif flag to normal after Rotate/Flip like in digiKam ImageEditor.
+Showfoto      : New Set Orientation Exif flag to normal after Rotate/Flip like in digiKam ImageEditor.
 
 *** 0.9.0-beta2 *******************************************************
 
@@ -260,7 +260,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b
 122 ==> 131301 : Crash after add second image.
 123 ==> 109820 : Utility script to export tag information of images into the filesystem.
 124 ==> 117375 : Change file name without affecting extension.
-125 ==> 131603 : Qt::Orientation of RAW-images (especially Canons *.cr2).
+125 ==> 131603 : Orientation of RAW-images (especially Canons *.cr2).
 126 ==> 131532 : Minolta exception code can break EXIF rotation.
 127 ==> 131550 : digiKam/showfoto can't show jpeg image under PowerPC.
 128 ==> 131549 : Endianess problem under Linux-PowerPC (with png images at least).

digikam/project/NEWS.0.9.2

@@ -151,7 +151,7 @@ digiKam BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org):
 033 ==> 89365  : More standard menu structure.
 034 ==> 144214 : The plural form of "child" is "children", not "childs".
 035 ==> 124487 : No way to pause a slide show.
-036 ==> 128975 : "Correct Exif Qt::Orientation Tag" does not change the mtime 
+036 ==> 128975 : "Correct Exif Orientation Tag" does not change the mtime
                  of the image file.
 037 ==> 139814 : The window of digiKam exceed the screen if the resolution is 800x600.
 038 ==> 144481 :Qt::Vertical window size cannot be reduced to VGA resolution.

digikam/showfoto/showfoto.cpp

@@ -413,7 +413,7 @@ void ShowFoto::setupUserArea()
     TQWidget* widget = new TQWidget(this);
     TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
 
-    if(!config->readBoolEntry("HorizontalThumbbar", false)) //Qt::Vertical thumbbar layout
+    if(!config->readBoolEntry("HorizontalThumbbar", false)) // Vertical thumbbar layout
     {
         TQHBoxLayout *hlay = new TQHBoxLayout(widget);
         m_splitter        = new TQSplitter(widget);
@@ -428,7 +428,7 @@ void ShowFoto::setupUserArea()
         hlay->addWidget(m_splitter);
         hlay->addWidget(d->rightSidebar);
     }
-    else                                                     //Qt::Horizontal thumbbar layout
+    else                                                     // Horizontal thumbbar layout
     {
         m_splitter        = new TQSplitter(Qt::Horizontal, widget);
         TQWidget* widget2  = new TQWidget(m_splitter);

digikam/tdeioslave/digikamdates.cpp

@@ -199,7 +199,7 @@ void tdeio_digikamdates::special(const TQByteArray& data)
                          .arg(moEndStr, 2)
                          .arg(yrStart, 4)
                          .arg(moStartStr, 2),
-                         &values, false);
+                         &values, 0, false);
 
             TQ_LLONG     imageid;
             TQString     name;

digikam/tips

@@ -141,7 +141,7 @@
 <tr>
 <td><img src="hicolor/32x32/apps/digikam.png"></td>
 <td>
-... that you have direct access to the KDE Gamma Configuration using Tools -> Gamma Adjustment?
+... that you have direct access to the TDE Gamma Configuration using Tools -> Gamma Adjustment?
 </td>
 </tr>
 </table>

digikam/utilities/imageeditor/canvas/dimginterface.cpp

@@ -646,7 +646,7 @@ void DImgInterface::saveAs(const TQString& fileName, IOFileSettingsContainer *io
     // Update Exif Document Name tag with the original file name.
     meta.setExifTagString("Exif.Image.DocumentName", getImageFileName());
 
-    // Update Exif Qt::Orientation tag if necessary.
+    // Update Exif Orientation tag if necessary.
     if( setExifOrientationTag )
         meta.setImageOrientation(DMetadata::ORIENTATION_NORMAL);
 

digikam/utilities/imageeditor/canvas/undoaction.cpp

@@ -5,7 +5,7 @@
  *
  * Date        : 2005-02-06
  * Description : undo actions manager for image editor.
- * 
+ *
  * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
  * Copyright (C) 2005 by Joern Ahrens <joern.ahrens@kdemail.net>
  *
@@ -14,12 +14,12 @@
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * ============================================================ */
 
 // Local includes.
@@ -109,9 +109,9 @@ UndoActionFlip::UndoActionFlip(DImgInterface* iface,
               : UndoAction(iface), m_dir(dir)
 {
     if(m_dir ==Qt::Horizontal)
-        m_title = i18n("FlipQt::Horizontal");
+        m_title = i18n("Flip Horizontal");
     else if(m_dir ==Qt::Vertical)
-        m_title = i18n("FlipQt::Vertical");
+        m_title = i18n("Flip Vertical");
 }
 
 UndoActionFlip::~UndoActionFlip()
@@ -146,7 +146,7 @@ UndoActionBCG::UndoActionBCG(DImgInterface* iface,
                m_oldContrast(oldContrast), m_newGamma(newGamma), m_newBrightness(newBrightness),
                m_newContrast(newContrast)
 {
-    m_title = i18n("Brightness,Contrast,Gamma");    
+    m_title = i18n("Brightness,Contrast,Gamma");
 }
 
 UndoActionBCG::~UndoActionBCG()

digikam/utilities/imageeditor/editor/editorwindow.cpp

@@ -443,12 +443,12 @@ void EditorWindow::setupStandardActions()
 
     // -- Standard 'Flip' menu actions ---------------------------------------------
 
-    d->flipHorizAction = new TDEAction(i18n("FlipQt::Horizontally"), "mirror", CTRL+Key_Asterisk,
+    d->flipHorizAction = new TDEAction(i18n("Flip Horizontally"), "mirror", CTRL+Key_Asterisk,
                                    TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipHoriz()),
                                    actionCollection(), "editorwindow_flip_horiz");
     d->flipHorizAction->setEnabled(false);
 
-    d->flipVertAction = new TDEAction(i18n("FlipQt::Vertically"), "flip", CTRL+Key_Slash,
+    d->flipVertAction = new TDEAction(i18n("Flip Vertically"), "flip", CTRL+Key_Slash,
                                    TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipVert()),
                                    actionCollection(), "editorwindow_flip_vert");
     d->flipVertAction->setEnabled(false);

digikam/utilities/setup/setupicc.cpp

@@ -240,7 +240,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
     grid2->addMultiCellWidget(d->infoMonitorProfiles, 1, 1, 3, 3);
 
     TQLabel *workIcon     = new TQLabel(d->profilesGB);
-    workIcon->setPixmap(SmallIcon("tablet"));
+    workIcon->setPixmap(SmallIcon("input-tablet"));
     TQLabel *workProfiles = new TQLabel(i18n("Workspace:"), d->profilesGB);
     d->workProfilesKC    = new SqueezedComboBox(d->profilesGB);
     workProfiles->setBuddy(d->workProfilesKC);
@@ -273,7 +273,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
     grid2->addMultiCellWidget(d->infoInProfiles, 3, 3, 3, 3);
 
     TQLabel *proofIcon     = new TQLabel(d->profilesGB);
-    proofIcon->setPixmap(SmallIcon("printer1"));
+    proofIcon->setPixmap(SmallIcon("printer"));
     TQLabel *proofProfiles = new TQLabel(i18n("Soft proof:"), d->profilesGB);
     d->proofProfilesKC    = new SqueezedComboBox(d->profilesGB);
     proofProfiles->setBuddy(d->proofProfilesKC);

doc/da_digikam/index.docbook

@@ -3546,12 +3546,3 @@ fi                 </screen></blockquote>
 
 &documentation.index;
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->

doc/da_showfoto/index.docbook

@@ -1797,12 +1797,3 @@
 
 &documentation.index;
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->

doc/de_digikam/credits-annex.docbook

@@ -147,12 +147,3 @@ Since &digikam; uses autoconf and automake you should not have trouble compiling
 </appendix>
 
 &documentation.index;
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->

doc/de_digikam/editor-color.docbook

@@ -768,12 +768,3 @@
 
 </sect3>
 </sect2>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-

doc/de_digikam/editor-decorate.docbook

@@ -236,10 +236,3 @@
 </sect3>
 
 </sect2>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->

doc/de_digikam/editor-enhance.docbook

@@ -1,10 +1,4 @@
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
---><sect2 id="editor-correct-tools">
+<sect2 id="editor-correct-tools">
   <title>Bild verbessern</title>
   <sect3 id="sharpening">
     <sect3info>

doc/de_digikam/editor-filters.docbook

@@ -636,11 +636,3 @@
 </sect3>
 
 </sect2>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->

doc/de_digikam/editor-transform.docbook

@@ -498,11 +498,3 @@
 </sect3>
 
 </sect2>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->

doc/de_showfoto/index.docbook

@@ -196,12 +196,3 @@ Mehrfaches Klicken auf denn gleichen Reiter lässt die Seitenleiste erscheinen b
 &doc-credits-annexes;
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->