[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] /: polish
From:       Maik Qualmann <metzpinguin () gmail ! com>
Date:       2015-12-11 22:29:42
Message-ID: E1a7WC6-0002KY-Vt () scm ! kde ! org
[Download RAW message or body]

Git commit fde18dc6b6186c5496ce88f9747d8bb63cc85a2a by Maik Qualmann.
Committed on 11/12/2015 at 22:29.
Pushed by mqualmann into branch 'master'.

polish

M  +0    -1    libs/dimg/filters/lut3d/lut3dcontainer.cpp
M  +1    -2    libs/dimg/filters/lut3d/lut3dcontainer.h
M  +1    -1    libs/dimg/filters/lut3d/lut3dfilter.cpp
M  +2    -2    libs/dimg/filters/lut3d/lut3dfilter.h
M  +2    -5    libs/dimg/filters/lut3d/lut3dsettings.cpp
M  +1    -0    libs/dimg/filters/lut3d/lut3dsettings.h
M  +2    -2    utilities/queuemanager/basetools/color/lut3d.cpp

http://commits.kde.org/digikam/fde18dc6b6186c5496ce88f9747d8bb63cc85a2a

diff --git a/libs/dimg/filters/lut3d/lut3dcontainer.cpp \
b/libs/dimg/filters/lut3d/lut3dcontainer.cpp index 80cf0fc..18ca5fe 100644
--- a/libs/dimg/filters/lut3d/lut3dcontainer.cpp
+++ b/libs/dimg/filters/lut3d/lut3dcontainer.cpp
@@ -24,7 +24,6 @@
 // Local includes
 
 #include "lut3dcontainer.h"
-#include "imagecurves.h"
 #include "filteraction.h"
 
 namespace Digikam
diff --git a/libs/dimg/filters/lut3d/lut3dcontainer.h \
b/libs/dimg/filters/lut3d/lut3dcontainer.h index c3ff076..5691d07 100644
--- a/libs/dimg/filters/lut3d/lut3dcontainer.h
+++ b/libs/dimg/filters/lut3d/lut3dcontainer.h
@@ -42,7 +42,7 @@ class DIGIKAM_EXPORT Lut3DContainer
 
 public:
     Lut3DContainer();
-    Lut3DContainer(const QString &path, int intensity = 100);
+    Lut3DContainer(const QString& path, int intensity = 100);
 
     bool operator==(const Lut3DContainer& other) const;
 
@@ -55,7 +55,6 @@ public:
     int     intensity;
 };
 
-
 }  // namespace Digikam
 
 #endif /* LUT3DCONTAINER_H */
diff --git a/libs/dimg/filters/lut3d/lut3dfilter.cpp \
b/libs/dimg/filters/lut3d/lut3dfilter.cpp index 02ba1cd..daffa89 100644
--- a/libs/dimg/filters/lut3d/lut3dfilter.cpp
+++ b/libs/dimg/filters/lut3d/lut3dfilter.cpp
@@ -62,7 +62,7 @@ Lut3DFilter::~Lut3DFilter()
 {
     if (m_lutTable != NULL)
     {
-        delete []m_lutTable;
+        delete [] m_lutTable;
     }
 
     cancelFilter();
diff --git a/libs/dimg/filters/lut3d/lut3dfilter.h \
b/libs/dimg/filters/lut3d/lut3dfilter.h index ece7480..e38a30e 100644
--- a/libs/dimg/filters/lut3d/lut3dfilter.h
+++ b/libs/dimg/filters/lut3d/lut3dfilter.h
@@ -42,7 +42,7 @@ class DIGIKAM_EXPORT Lut3DFilter : public DImgThreadedFilter
 
 public:
     explicit Lut3DFilter(QObject* const parent = 0);
-    Lut3DFilter(DImg* const orgImage, const Lut3DContainer &par, QObject* const \
parent=0); +    Lut3DFilter(DImg* const orgImage, const Lut3DContainer& par, QObject* \
const parent=0);  virtual ~Lut3DFilter();
 
     static QString          FilterIdentifier()
@@ -82,7 +82,7 @@ private:
     void initToIdentity();
 
 private:
-    quint16 *m_lutTable; /* RGBA, A is unused */
+    quint16 *m_lutTable; // RGBA, A is unused
     int m_lutTableSize; // all axis are of this size
     int m_intensity;
 };
diff --git a/libs/dimg/filters/lut3d/lut3dsettings.cpp \
b/libs/dimg/filters/lut3d/lut3dsettings.cpp index 1b087c5..1cbb6ee 100644
--- a/libs/dimg/filters/lut3d/lut3dsettings.cpp
+++ b/libs/dimg/filters/lut3d/lut3dsettings.cpp
@@ -30,7 +30,6 @@
 #include <QDirIterator>
 #include <QGridLayout>
 #include <QStringList>
-#include <QString>
 #include <QLabel>
 #include <QIcon>
 
@@ -41,7 +40,6 @@
 // Local includes
 
 #include "digikam_debug.h"
-#include "dexpanderbox.h"
 #include "previewlist.h"
 #include "imageiface.h"
 #include "dnuminput.h"
@@ -76,7 +74,6 @@ Lut3DSettings::Lut3DSettings(QWidget* const parent, bool \
useGenericImg)  : QWidget(parent),
       d(new Private)
 {
-    int idx;
     DImg thumbImage;
 
     findLuts();
@@ -93,9 +90,9 @@ Lut3DSettings::Lut3DSettings(QWidget* const parent, bool \
useGenericImg)  
     d->correctionTools = new PreviewList(this);
 
-    for (idx = 0; idx < d->luts.count(); idx++)
+    for (int idx = 0; idx < d->luts.count(); idx++)
     {
-        const QString &path = d->luts[idx];
+        const QString& path = d->luts[idx];
         QFileInfo fi(path);
 
         d->correctionTools->addItem(new Lut3DFilter(&thumbImage, \
                Lut3DContainer(path)),
diff --git a/libs/dimg/filters/lut3d/lut3dsettings.h \
b/libs/dimg/filters/lut3d/lut3dsettings.h index d643fc8..3f63096 100644
--- a/libs/dimg/filters/lut3d/lut3dsettings.h
+++ b/libs/dimg/filters/lut3d/lut3dsettings.h
@@ -61,6 +61,7 @@ public:
     void findLuts();
 
     void startPreviewFilters();
+
 Q_SIGNALS:
 
     void signalSettingsChanged();
diff --git a/utilities/queuemanager/basetools/color/lut3d.cpp \
b/utilities/queuemanager/basetools/color/lut3d.cpp index 7c9a341..b0076f3 100644
--- a/utilities/queuemanager/basetools/color/lut3d.cpp
+++ b/utilities/queuemanager/basetools/color/lut3d.cpp
@@ -79,7 +79,7 @@ BatchToolSettings Lut3D::defaultSettings()
     Lut3DContainer defaultPrm = m_settingsView->defaultSettings();
 
     prm.insert(QLatin1String("path"),      defaultPrm.path);
-    prm.insert(QLatin1String("intensity"), defaultPrm.intensity);
+    prm.insert(QLatin1String("intensity"), (int)defaultPrm.intensity);
 
     return prm;
 }
@@ -100,7 +100,7 @@ void Lut3D::slotSettingsChanged()
     Lut3DContainer currentPrm = m_settingsView->settings();
 
     prm.insert(QLatin1String("path"),      currentPrm.path);
-    prm.insert(QLatin1String("intensity"), currentPrm.intensity);
+    prm.insert(QLatin1String("intensity"), (int)currentPrm.intensity);
 
     BatchTool::slotSettingsChanged(prm);
 }


[prev in list] [next in list] [prev in thread] [next in thread]