From kde-commits  Mon Apr 30 23:05:44 2018
From: Human Dynamo <null () kde ! org>
Date: Mon, 30 Apr 2018 23:05:44 +0000
To: kde-commits
Subject: [digikam] core/libs/dimg/filters: krazy++
Message-Id: <E1fDHrc-0003II-Du () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=152512955901749

Git commit 58fb9304bfca3fe4537db3dd5237a1a3d466f505 by Human Dynamo.
Committed on 30/04/2018 at 23:02.
Pushed by cgilles into branch 'master'.

krazy++

M  +5    -5    core/libs/dimg/filters/decorate/borderfilter.h
M  +22   -21   core/libs/dimg/filters/decorate/bordersettings.cpp
M  +4    -5    core/libs/dimg/filters/decorate/bordersettings.h
M  +3    -3    core/libs/dimg/filters/decorate/texturefilter.h
M  +3    -3    core/libs/dimg/filters/film/filmfilter.cpp
M  +1    -1    core/libs/dimg/filters/film/filmfilter.h
M  +7    -5    core/libs/dimg/filters/hsl/hslfilter.h
M  +3    -3    core/libs/dimg/filters/hsl/hslsettings.h
M  +3    -3    core/libs/dimg/filters/hsl/hspreviewwidget.h
M  +4    -4    core/libs/dimg/filters/lc/localcontrastcontainer.h
M  +3    -3    core/libs/dimg/filters/lc/localcontrastfilter.h
M  +3    -3    core/libs/dimg/filters/lc/localcontrastsettings.h

https://commits.kde.org/digikam/58fb9304bfca3fe4537db3dd5237a1a3d466f505

diff --git a/core/libs/dimg/filters/decorate/borderfilter.h b/core/libs/dim=
g/filters/decorate/borderfilter.h
index b7c5007ecd..859a63e292 100644
--- a/core/libs/dimg/filters/decorate/borderfilter.h
+++ b/core/libs/dimg/filters/decorate/borderfilter.h
@@ -9,7 +9,7 @@
  * Copyright 2005-2018 by Gilles Caulier <caulier dot gilles at gmail dot =
com>
  * Copyright 2006-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  * Copyright 2009-2010 by Andi Clemens <andi dot clemens at gmail dot com>
- * Copyright 2010 by Martin Klapetek <martin dot klapetek at gmail dot com>
+ * Copyright 2010      by Martin Klapetek <martin dot klapetek at gmail do=
t com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -24,8 +24,8 @@
  *
  * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 =

-#ifndef BORDERFILTER_H
-#define BORDERFILTER_H
+#ifndef DIGIKAM_BORDER_FILTER_H
+#define DIGIKAM_BORDER_FILTER_H
 =

 // Qt includes
 =

@@ -72,7 +72,7 @@ public:
 =

 public:
 =

-    BorderContainer()
+    explicit BorderContainer()
     {
         preserveAspectRatio   =3D true;
         orgWidth              =3D 0;
@@ -186,4 +186,4 @@ private:
 =

 } // namespace Digikam
 =

-#endif /* BORDERFILTER_H */
+#endif // DIGIKAM_BORDER_FILTER_H
diff --git a/core/libs/dimg/filters/decorate/bordersettings.cpp b/core/libs=
/dimg/filters/decorate/bordersettings.cpp
index 430d33f3bd..7758cdc275 100644
--- a/core/libs/dimg/filters/decorate/bordersettings.cpp
+++ b/core/libs/dimg/filters/decorate/bordersettings.cpp
@@ -52,12 +52,12 @@
 namespace Digikam
 {
 =

-class Private
+class BorderSettings::Private
 {
 public:
 =

-    explicit Private() :
-        preserveAspectRatio(0),
+    explicit Private()
+      : preserveAspectRatio(0),
         labelBackground(0),
         labelBorderPercent(0),
         labelBorderWidth(0),
@@ -67,7 +67,8 @@ public:
         borderType(0),
         borderPercent(0),
         borderWidth(0)
-    {}
+    {
+    }
 =

     static const QString configBorderTypeEntry;
     static const QString configBorderPercentEntry;
@@ -104,17 +105,17 @@ public:
     DIntNumInput*        borderWidth;
 };
 =

-const QString Private::configBorderTypeEntry(QLatin1String("Border Type"));
-const QString Private::configBorderPercentEntry(QLatin1String("Border Perc=
ent"));
-const QString Private::configBorderWidthEntry(QLatin1String("Border Width"=
));
-const QString Private::configPreserveAspectRatioEntry(QLatin1String("Prese=
rve Aspect Ratio"));
-const QString Private::configSolidColorEntry(QLatin1String("Solid Color"));
-const QString Private::configNiepceBorderColorEntry(QLatin1String("Niepce =
Border Color"));
-const QString Private::configNiepceLineColorEntry(QLatin1String("Niepce Li=
ne Color"));
-const QString Private::configBevelUpperLeftColorEntry(QLatin1String("Bevel=
 Upper Left Color"));
-const QString Private::configBevelLowerRightColorEntry(QLatin1String("Beve=
l Lower Right Color"));
-const QString Private::configDecorativeFirstColorEntry(QLatin1String("Deco=
rative First Color"));
-const QString Private::configDecorativeSecondColorEntry(QLatin1String("Dec=
orative Second Color"));
+const QString BorderSettings::Private::configBorderTypeEntry(QLatin1String=
("Border Type"));
+const QString BorderSettings::Private::configBorderPercentEntry(QLatin1Str=
ing("Border Percent"));
+const QString BorderSettings::Private::configBorderWidthEntry(QLatin1Strin=
g("Border Width"));
+const QString BorderSettings::Private::configPreserveAspectRatioEntry(QLat=
in1String("Preserve Aspect Ratio"));
+const QString BorderSettings::Private::configSolidColorEntry(QLatin1String=
("Solid Color"));
+const QString BorderSettings::Private::configNiepceBorderColorEntry(QLatin=
1String("Niepce Border Color"));
+const QString BorderSettings::Private::configNiepceLineColorEntry(QLatin1S=
tring("Niepce Line Color"));
+const QString BorderSettings::Private::configBevelUpperLeftColorEntry(QLat=
in1String("Bevel Upper Left Color"));
+const QString BorderSettings::Private::configBevelLowerRightColorEntry(QLa=
tin1String("Bevel Lower Right Color"));
+const QString BorderSettings::Private::configDecorativeFirstColorEntry(QLa=
tin1String("Decorative First Color"));
+const QString BorderSettings::Private::configDecorativeSecondColorEntry(QL=
atin1String("Decorative Second Color"));
 =

 // --------------------------------------------------------
 =

@@ -122,12 +123,12 @@ BorderSettings::BorderSettings(QWidget* parent)
     : QWidget(parent),
       d(new Private)
 {
-    const int spacing =3D QApplication::style()->pixelMetric(QStyle::PM_De=
faultLayoutSpacing);
+    const int spacing       =3D QApplication::style()->pixelMetric(QStyle:=
:PM_DefaultLayoutSpacing);
 =

-    QGridLayout* grid =3D new QGridLayout(parent);
+    QGridLayout* const grid =3D new QGridLayout(parent);
 =

-    QLabel* label1 =3D new QLabel(i18n("Type:"));
-    d->borderType  =3D new DComboBox();
+    QLabel* const label1    =3D new QLabel(i18n("Type:"));
+    d->borderType           =3D new DComboBox();
     d->borderType->addItem(i18nc("solid border type", "Solid"));
     // NOTE: Niepce is a real name. This is the first guy in the world to =
have built a camera.
     d->borderType->addItem(QLatin1String("Niepce"));
@@ -151,7 +152,7 @@ BorderSettings::BorderSettings(QWidget* parent)
     d->borderType->setDefaultIndex(BorderContainer::SolidBorder);
     d->borderType->setWhatsThis(i18n("Select the border type to add around=
 the image here."));
 =

-    DLineWidget* line1 =3D new DLineWidget(Qt::Horizontal);
+    DLineWidget* const line1 =3D new DLineWidget(Qt::Horizontal);
 =

     // -------------------------------------------------------------------
 =

@@ -174,7 +175,7 @@ BorderSettings::BorderSettings(QWidget* parent)
     d->borderWidth->setDefaultValue(100);
     d->borderWidth->setWhatsThis(i18n("Set here the border width in pixels=
 to add around the image."));
 =

-    DLineWidget* line2 =3D new DLineWidget(Qt::Horizontal);
+    DLineWidget* const line2 =3D new DLineWidget(Qt::Horizontal);
 =

     // -------------------------------------------------------------------
 =

diff --git a/core/libs/dimg/filters/decorate/bordersettings.h b/core/libs/d=
img/filters/decorate/bordersettings.h
index 36100f05b5..79d4ee9d7b 100644
--- a/core/libs/dimg/filters/decorate/bordersettings.h
+++ b/core/libs/dimg/filters/decorate/bordersettings.h
@@ -21,8 +21,8 @@
  *
  * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 =

-#ifndef BORDERSETTINGS_H
-#define BORDERSETTINGS_H
+#ifndef DIGIKAM_BORDER_SETTINGS_H
+#define DIGIKAM_BORDER_SETTINGS_H
 =

 // Local includes
 =

@@ -41,8 +41,6 @@
 namespace Digikam
 {
 =

-class Private;
-
 class DIGIKAM_EXPORT BorderSettings : public QWidget
 {
     Q_OBJECT
@@ -80,9 +78,10 @@ private:
 =

 private:
 =

+    class Private;
     Private* const d;
 };
 =

 } // namespace Digikam
 =

-#endif /* BORDERSETTINGS_H */
+#endif // DIGIKAM_BORDER_SETTINGS_H
diff --git a/core/libs/dimg/filters/decorate/texturefilter.h b/core/libs/di=
mg/filters/decorate/texturefilter.h
index 87581abb76..ed26949e3b 100644
--- a/core/libs/dimg/filters/decorate/texturefilter.h
+++ b/core/libs/dimg/filters/decorate/texturefilter.h
@@ -23,8 +23,8 @@
  *
  * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 =

-#ifndef TEXTUREFILTER_H
-#define TEXTUREFILTER_H
+#ifndef DIGIKAM_TEXTURE_FILTER_H
+#define DIGIKAM_TEXTURE_FILTER_H
 =

 // Qt includes
 =

@@ -90,4 +90,4 @@ private:
 =

 } // namespace Digikam
 =

-#endif /* TEXTUREFILTER_H */
+#endif // DIGIKAM_TEXTURE_FILTER_H
diff --git a/core/libs/dimg/filters/film/filmfilter.cpp b/core/libs/dimg/fi=
lters/film/filmfilter.cpp
index ea4eba5847..0809eb8c2f 100644
--- a/core/libs/dimg/filters/film/filmfilter.cpp
+++ b/core/libs/dimg/filters/film/filmfilter.cpp
@@ -38,8 +38,8 @@
 namespace Digikam
 {
 =

-FilmContainer::FilmContainer() :
-    d(QSharedPointer<Private>(new Private))
+FilmContainer::FilmContainer()
+    : d(QSharedPointer<Private>(new Private))
 {
 }
 =

@@ -250,7 +250,7 @@ LevelsContainer FilmContainer::toLevels() const
     LevelsContainer l;
     int max =3D d->sixteenBit ? 65535 : 255;
 =

-    for (int i =3D LuminosityChannel; i <=3D AlphaChannel; i++)
+    for (int i =3D LuminosityChannel ; i <=3D AlphaChannel ; i++)
     {
         l.lInput[i]  =3D blackPointForChannel(i) * max * d->exposure;
         l.hInput[i]  =3D whitePointForChannel(i) * d->profile.wp(i);
diff --git a/core/libs/dimg/filters/film/filmfilter.h b/core/libs/dimg/filt=
ers/film/filmfilter.h
index 01bb68a8f3..f6ec1ca9f0 100644
--- a/core/libs/dimg/filters/film/filmfilter.h
+++ b/core/libs/dimg/filters/film/filmfilter.h
@@ -83,7 +83,7 @@ public:
     {
     public:
 =

-        ListItem(const QString& text, QListWidget* const parent, CNFilmPro=
file type)
+        explicit ListItem(const QString& text, QListWidget* const parent, =
CNFilmProfile type)
             : QListWidgetItem(text, parent, type + QListWidgetItem::UserTy=
pe)
         {
         }
diff --git a/core/libs/dimg/filters/hsl/hslfilter.h b/core/libs/dimg/filter=
s/hsl/hslfilter.h
index b306c60a59..baa9a002b7 100644
--- a/core/libs/dimg/filters/hsl/hslfilter.h
+++ b/core/libs/dimg/filters/hsl/hslfilter.h
@@ -21,8 +21,8 @@
  * GNU General Public License for more details.
  * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 =

-#ifndef HSLFILTER_H
-#define HSLFILTER_H
+#ifndef DIGIKAM_HSL_FILTER_H
+#define DIGIKAM_HSL_FILTER_H
 =

 // Local includes
 =

@@ -40,7 +40,7 @@ class DIGIKAM_EXPORT HSLContainer
 =

 public:
 =

-    HSLContainer()
+    explicit HSLContainer()
     {
         hue        =3D 0.0;
         saturation =3D 0.0;
@@ -48,7 +48,9 @@ public:
         lightness  =3D 0.0;
     };
 =

-    ~HSLContainer() {};
+    ~HSLContainer()
+    {
+    };
 =

 public:
 =

@@ -117,4 +119,4 @@ private:
 =

 } // namespace Digikam
 =

-#endif // HSLFILTER_H
+#endif // DIGIKAM_HSL_FILTER_H
diff --git a/core/libs/dimg/filters/hsl/hslsettings.h b/core/libs/dimg/filt=
ers/hsl/hslsettings.h
index 386dfc9f79..539c9c9170 100644
--- a/core/libs/dimg/filters/hsl/hslsettings.h
+++ b/core/libs/dimg/filters/hsl/hslsettings.h
@@ -21,8 +21,8 @@
  *
  * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 =

-#ifndef HSLSETTINGS_H
-#define HSLSETTINGS_H
+#ifndef DIGIKAM_HSL_SETTINGS_H
+#define DIGIKAM_HSL_SETTINGS_H
 =

 // Local includes
 =

@@ -76,4 +76,4 @@ private:
 =

 } // namespace Digikam
 =

-#endif /* HSLSETTINGS_H */
+#endif // DIGIKAM_HSL_SETTINGS_H
diff --git a/core/libs/dimg/filters/hsl/hspreviewwidget.h b/core/libs/dimg/=
filters/hsl/hspreviewwidget.h
index 7116d77e2c..a0c5d42584 100644
--- a/core/libs/dimg/filters/hsl/hspreviewwidget.h
+++ b/core/libs/dimg/filters/hsl/hspreviewwidget.h
@@ -21,8 +21,8 @@
  *
  * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 =

-#ifndef HSPREVIEWWIDGET_H
-#define HSPREVIEWWIDGET_H
+#ifndef DIGIKAM_HS_PREVIEW_WIDGET_H
+#define DIGIKAM_HS_PREVIEW_WIDGET_H
 =

 // Qt includes
 =

@@ -65,4 +65,4 @@ private:
 =

 } // namespace Digikam
 =

-#endif /* HSPREVIEWWIDGET_H */
+#endif // DIGIKAM_HS_PREVIEW_WIDGET_H
diff --git a/core/libs/dimg/filters/lc/localcontrastcontainer.h b/core/libs=
/dimg/filters/lc/localcontrastcontainer.h
index 1a8653ad39..8e1707c090 100644
--- a/core/libs/dimg/filters/lc/localcontrastcontainer.h
+++ b/core/libs/dimg/filters/lc/localcontrastcontainer.h
@@ -23,8 +23,8 @@
  *
  * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 =

-#ifndef LOCALCONTRASTCONTAINER_H
-#define LOCALCONTRASTCONTAINER_H
+#ifndef DIGIKAM_LOCAL_CONTRAST_CONTAINER_H
+#define DIGIKAM_LOCAL_CONTRAST_CONTAINER_H
 =

 #define TONEMAPPING_MAX_STAGES 4
 =

@@ -40,7 +40,7 @@ class DIGIKAM_EXPORT LocalContrastContainer
 =

 public:
 =

-    LocalContrastContainer();
+    explicit LocalContrastContainer();
     ~LocalContrastContainer();
 =

     double getPower(int nstage)  const;
@@ -65,4 +65,4 @@ public:
 =

 } // namespace Digikam
 =

-#endif // LOCALCONTRASTCONTAINER_H
+#endif // DIGIKAM_LOCAL_CONTRAST_CONTAINER_H
diff --git a/core/libs/dimg/filters/lc/localcontrastfilter.h b/core/libs/di=
mg/filters/lc/localcontrastfilter.h
index 64b4a2a35a..3138a32278 100644
--- a/core/libs/dimg/filters/lc/localcontrastfilter.h
+++ b/core/libs/dimg/filters/lc/localcontrastfilter.h
@@ -24,8 +24,8 @@
  *
  * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 =

-#ifndef LOCALCONTRASTFILTER_H
-#define LOCALCONTRASTFILTER_H
+#ifndef DIGIKAM_LOCAL_CONTRAST_FILTER_H
+#define DIGIKAM_LOCAL_CONTRAST_FILTER_H
 =

 // Qt includes
 =

@@ -123,4 +123,4 @@ private:
 =

 } // namespace Digikam
 =

-#endif // LOCALCONTRASTFILTER_H
+#endif // DIGIKAM_LOCAL_CONTRAST_FILTER_H
diff --git a/core/libs/dimg/filters/lc/localcontrastsettings.h b/core/libs/=
dimg/filters/lc/localcontrastsettings.h
index bf390e708c..ee9b35604a 100644
--- a/core/libs/dimg/filters/lc/localcontrastsettings.h
+++ b/core/libs/dimg/filters/lc/localcontrastsettings.h
@@ -22,8 +22,8 @@
  *
  * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 =

-#ifndef LOCALCONTRASTSETTINGS_H
-#define LOCALCONTRASTSETTINGS_H
+#ifndef DIGIKAM_LOCAL_CONTRAST_SETTINGS_H
+#define DIGIKAM_LOCAL_CONTRAST_SETTINGS_H
 =

 // Local includes
 =

@@ -78,4 +78,4 @@ private:
 =

 } // namespace Digikam
 =

-#endif /* LOCALCONTRASTSETTINGS_H */
+#endif // DIGIKAM_LOCAL_CONTRAST_SETTINGS_H