[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam] core: krazy++
From: Gilles Caulier <null () kde ! org>
Date: 2018-03-31 20:47:09
Message-ID: E1f2NP3-0007DR-W8 () code ! kde ! org
[Download RAW message or body]
Git commit b54d2d0e3f383d7e50578fd411d2f0383c5bb888 by Gilles Caulier.
Committed on 31/03/2018 at 20:47.
Pushed by cgilles into branch 'master'.
krazy++
M +5 -5 core/libs/dimg/filters/dimgthreadedanalyser.h
M +3 -3 core/libs/dimg/filters/film/filmfilter.h
M +4 -4 core/libs/dimg/filters/film/filmfilter_p.h
M +4 -5 core/libs/dimg/filters/icc/iccprofile.h
M +1 -1 core/libs/progressmanager/dprogresswdg.h
M +1 -1 core/libs/widgets/combo/dcombobox.h
M +6 -6 core/libs/widgets/common/dexpanderbox.h
M +4 -4 core/libs/widgets/common/modelcompleter.h
M +1 -1 core/libs/widgets/files/filesaveconflictbox.h
M +4 -4 core/libs/widgets/graphicsview/paniconwidget.h
M +1 -1 core/libs/widgets/itemview/dcategorizedsortfilterproxymodel.h
M +1 -1 core/libs/widgets/itemview/dcategorydrawer.h
M +4 -4 core/libs/widgets/metadata/altlangstredit.h
M +1 -1 core/libs/widgets/metadata/countryselector.h
M +4 -4 core/libs/widgets/metadata/subjectwidget.h
M +2 -2 core/libs/widgets/range/dnuminput.h
M +2 -2 core/libs/widgets/range/dsliderspinbox.h
M +4 -4 core/utilities/assistants/calendar/print/calpainter.h
M +1 -1 core/utilities/assistants/common/dpreviewimage.h
M +1 -1 core/utilities/assistants/common/dpreviewmanager.h
M +4 -4 core/utilities/assistants/expoblending/blendingdlg/enfusesettings.h
M +4 -4 core/utilities/assistants/expoblending/blendingdlg/enfusestack.h
M +1 -1 core/utilities/assistants/webservices/vkontakte/vknewalbumdlg.h
M +1 -1 core/utilities/assistants/webservices/yandexfotki/yfrsa.h
M +4 -4 core/utilities/geolocation/editor/dialog/gpsundocommand.h
M +4 -4 core/utilities/geolocation/editor/items/gpsimageitem.h
M +4 -4 core/utilities/geolocation/editor/items/gpsimagemodel.h
M +4 -4 core/utilities/geolocation/editor/reversegeocoding/simpletreemodel.h
M +2 -2 core/utilities/imageeditor/widgets/rubberitem.h
M +4 -4 core/utilities/kdesupport/kfilemetadata/baloowrap.h
M +5 -5 core/utilities/kdesupport/ksane/saveimgthread.h
M +21 -6 core/utilities/maintenance/duplicatesfinder.h
M +3 -3 core/utilities/presentation/opengl/presentationgl.h
M +1 -1 core/utilities/presentation/opengl/presentationkb.h
M +3 -3 core/utilities/presentation/presentationmngr.h
M +3 -3 core/utilities/presentation/widgets/presentationwidget.h
M +1 -1 core/utilities/queuemanager/tools/metadata/clockphotodialog.cpp
M +1 -1 core/utilities/queuemanager/tools/metadata/clockphotodialog.h
M +5 -0 core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.cpp
M +6 -1 core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.h
M +1 -1 core/utilities/queuemanager/views/assignedlist.h
M +5 -5 core/utilities/queuemanager/views/queuepool.h
https://commits.kde.org/digikam/b54d2d0e3f383d7e50578fd411d2f0383c5bb888
diff --git a/core/libs/dimg/filters/dimgthreadedanalyser.h \
b/core/libs/dimg/filters/dimgthreadedanalyser.h index 7eb6c4284c..1ac1608467 100644
--- a/core/libs/dimg/filters/dimgthreadedanalyser.h
+++ b/core/libs/dimg/filters/dimgthreadedanalyser.h
@@ -23,8 +23,8 @@
*
* ============================================================ */
-#ifndef DIMGTHREADEDANALYSER_H
-#define DIMGTHREADEDANALYSER_H
+#ifndef DIMG_THREADED_ANALYSER_H
+#define DIMG_THREADED_ANALYSER_H
// Local includes
@@ -51,7 +51,7 @@ public:
* You need to call startFilter() to start the threaded computation.
* To run analyser without to use multithreading, call startFilterDirectly().
*/
- DImgThreadedAnalyser(DImg* const orgImage, QObject* const parent=0,
+ explicit DImgThreadedAnalyser(DImg* const orgImage, QObject* const parent=0,
const QString& name = QString());
~DImgThreadedAnalyser();
@@ -100,6 +100,6 @@ protected:
virtual void startAnalyse() = 0;
};
-} // namespace Digikam
+} // namespace Digikam
-#endif /* DIMGTHREADEDANALYSER_H */
+#endif // DIMG_THREADED_ANALYSER_H
diff --git a/core/libs/dimg/filters/film/filmfilter.h \
b/core/libs/dimg/filters/film/filmfilter.h index 39300a375c..2522d847d8 100644
--- a/core/libs/dimg/filters/film/filmfilter.h
+++ b/core/libs/dimg/filters/film/filmfilter.h
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef FILMFILTER_H_
-#define FILMFILTER_H_
+#ifndef FILM_FILTER_H
+#define FILM_FILTER_H
// Qt includes
@@ -178,4 +178,4 @@ private:
} // namespace Digikam
-#endif /* FILMFILTER_H_ */
+#endif // FILM_FILTER_H
diff --git a/core/libs/dimg/filters/film/filmfilter_p.h \
b/core/libs/dimg/filters/film/filmfilter_p.h index e8a8a9317a..3063dfaa8a 100644
--- a/core/libs/dimg/filters/film/filmfilter_p.h
+++ b/core/libs/dimg/filters/film/filmfilter_p.h
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef FILMFILTER_P_H
-#define FILMFILTER_P_H
+#ifndef FILM_FILTER_P_H
+#define FILM_FILTER_P_H
#include "filmfilter.h"
@@ -35,7 +35,7 @@ class FilmProfile
{
public:
- FilmProfile(double rdm=0.0, double gdm=0.0, double bdm=0.0)
+ explicit FilmProfile(double rdm=0.0, double gdm=0.0, double bdm=0.0)
: redDmax(rdm),
greenDmax(gdm),
blueDmax(bdm),
@@ -161,4 +161,4 @@ public:
} // namespace Digikam
-#endif // FILMFILTER_P_H
+#endif // FILM_FILTER_P_H
diff --git a/core/libs/dimg/filters/icc/iccprofile.h \
b/core/libs/dimg/filters/icc/iccprofile.h index 39d9a9c5d2..ec2dbe7cbf 100644
--- a/core/libs/dimg/filters/icc/iccprofile.h
+++ b/core/libs/dimg/filters/icc/iccprofile.h
@@ -23,8 +23,8 @@
*
* ============================================================ */
-#ifndef ICCPROFILE_H
-#define ICCPROFILE_H
+#ifndef ICC_PROFILE_H
+#define ICC_PROFILE_H
// Qt includes
@@ -39,7 +39,6 @@
namespace Digikam
{
-
class DIGIKAM_EXPORT IccProfile
{
public:
@@ -196,8 +195,8 @@ public:
~LcmsLock();
};
-} // namespace Digikam
+} // namespace Digikam
Q_DECLARE_METATYPE(Digikam::IccProfile)
-#endif // ICCPROFILE_H
+#endif // ICC_PROFILE_H
diff --git a/core/libs/progressmanager/dprogresswdg.h \
b/core/libs/progressmanager/dprogresswdg.h index fe54c8f331..09e2d4ce86 100644
--- a/core/libs/progressmanager/dprogresswdg.h
+++ b/core/libs/progressmanager/dprogresswdg.h
@@ -41,7 +41,7 @@ class DIGIKAM_EXPORT DProgressWdg : public QProgressBar
public:
- DProgressWdg(QWidget* const parent);
+ explicit DProgressWdg(QWidget* const parent);
~DProgressWdg();
/** Call this method to start a new instance of progress notification into \
progress manager
diff --git a/core/libs/widgets/combo/dcombobox.h \
b/core/libs/widgets/combo/dcombobox.h index f51066b11c..efd4d088b6 100644
--- a/core/libs/widgets/combo/dcombobox.h
+++ b/core/libs/widgets/combo/dcombobox.h
@@ -44,7 +44,7 @@ class DIGIKAM_EXPORT DComboBox : public QWidget
public:
- DComboBox(QWidget* const parent=0);
+ explicit DComboBox(QWidget* const parent=0);
~DComboBox();
void setCurrentIndex(int d);
diff --git a/core/libs/widgets/common/dexpanderbox.h \
b/core/libs/widgets/common/dexpanderbox.h index 33e34de3fa..d91505e765 100644
--- a/core/libs/widgets/common/dexpanderbox.h
+++ b/core/libs/widgets/common/dexpanderbox.h
@@ -106,7 +106,7 @@ class DIGIKAM_EXPORT DClickLabel : public QLabel
public:
- DClickLabel(QWidget* const parent = 0);
+ explicit DClickLabel(QWidget* const parent = 0);
explicit DClickLabel(const QString& text, QWidget* const parent = 0);
~DClickLabel();
@@ -132,7 +132,7 @@ class DIGIKAM_EXPORT DSqueezedClickLabel : public \
DAdjustableLabel
public:
- DSqueezedClickLabel(QWidget* const parent = 0);
+ explicit DSqueezedClickLabel(QWidget* const parent = 0);
explicit DSqueezedClickLabel(const QString& text, QWidget* const parent = 0);
~DSqueezedClickLabel();
@@ -156,7 +156,7 @@ class DIGIKAM_EXPORT DArrowClickLabel : public QWidget
public:
- DArrowClickLabel(QWidget* const parent = 0);
+ explicit DArrowClickLabel(QWidget* const parent = 0);
~DArrowClickLabel();
void setArrowType(Qt::ArrowType arrowType);
@@ -189,7 +189,7 @@ class DIGIKAM_EXPORT DLabelExpander : public QWidget
public:
- DLabelExpander(QWidget* const parent = 0);
+ explicit DLabelExpander(QWidget* const parent = 0);
~DLabelExpander();
void setCheckBoxVisible(bool b);
@@ -243,7 +243,7 @@ class DIGIKAM_EXPORT DExpanderBox : public QScrollArea
public:
- DExpanderBox(QWidget* const parent = 0);
+ explicit DExpanderBox(QWidget* const parent = 0);
~DExpanderBox();
/** Add DLabelExpander item at end of box layout with these settings :
@@ -328,7 +328,7 @@ class DIGIKAM_EXPORT DExpanderBoxExclusive : public DExpanderBox
public:
- DExpanderBoxExclusive(QWidget* const parent = 0);
+ explicit DExpanderBoxExclusive(QWidget* const parent = 0);
~DExpanderBoxExclusive();
/** Show one expander open at most */
diff --git a/core/libs/widgets/common/modelcompleter.h \
b/core/libs/widgets/common/modelcompleter.h index cb8f7e14fb..9fd6510c1a 100644
--- a/core/libs/widgets/common/modelcompleter.h
+++ b/core/libs/widgets/common/modelcompleter.h
@@ -23,8 +23,8 @@
*
* ============================================================ */
-#ifndef MODELCOMPLETER_H
-#define MODELCOMPLETER_H
+#ifndef MODEL_COMPLETER_H
+#define MODEL_COMPLETER_H
// QT includes
@@ -45,7 +45,7 @@ class DIGIKAM_EXPORT ModelCompleter : public QCompleter
public:
- ModelCompleter(QObject* parent = 0);
+ explicit ModelCompleter(QObject* parent = 0);
~ModelCompleter();
/**
@@ -83,4 +83,4 @@ private:
} // namespace Digikam
-#endif // MODELCOMPLETER_H
+#endif // MODEL_COMPLETER_H
diff --git a/core/libs/widgets/files/filesaveconflictbox.h \
b/core/libs/widgets/files/filesaveconflictbox.h index 9a702338d0..1ae9808f86 100644
--- a/core/libs/widgets/files/filesaveconflictbox.h
+++ b/core/libs/widgets/files/filesaveconflictbox.h
@@ -52,7 +52,7 @@ public:
public:
- FileSaveConflictBox(QWidget* const parent);
+ explicit FileSaveConflictBox(QWidget* const parent);
~FileSaveConflictBox();
ConflictRule conflictRule() const;
diff --git a/core/libs/widgets/graphicsview/paniconwidget.h \
b/core/libs/widgets/graphicsview/paniconwidget.h index 506b4d2056..47ce966772 100644
--- a/core/libs/widgets/graphicsview/paniconwidget.h
+++ b/core/libs/widgets/graphicsview/paniconwidget.h
@@ -25,8 +25,8 @@
*
* ============================================================ */
-#ifndef PANICONWIDGET_H
-#define PANICONWIDGET_H
+#ifndef PAN_ICON_WIDGET_H
+#define PAN_ICON_WIDGET_H
// Qt includes
@@ -59,7 +59,7 @@ class DIGIKAM_EXPORT PanIconFrame : public QFrame
public:
- PanIconFrame(QWidget* const parent=0);
+ explicit PanIconFrame(QWidget* const parent=0);
~PanIconFrame();
/**
@@ -185,4 +185,4 @@ private:
} // namespace Digikam
-#endif // PANICONWIDGET_H
+#endif // PAN_ICON_WIDGET_H
diff --git a/core/libs/widgets/itemview/dcategorizedsortfilterproxymodel.h \
b/core/libs/widgets/itemview/dcategorizedsortfilterproxymodel.h index \
37b6fceec5..734c03992f 100644
--- a/core/libs/widgets/itemview/dcategorizedsortfilterproxymodel.h
+++ b/core/libs/widgets/itemview/dcategorizedsortfilterproxymodel.h
@@ -68,7 +68,7 @@ public:
///< CategoryDisplayRole.
};
- DCategorizedSortFilterProxyModel(QObject* const parent = 0);
+ explicit DCategorizedSortFilterProxyModel(QObject* const parent = 0);
virtual ~DCategorizedSortFilterProxyModel();
/**
diff --git a/core/libs/widgets/itemview/dcategorydrawer.h \
b/core/libs/widgets/itemview/dcategorydrawer.h index 94c2c3096e..b4806ba1db 100644
--- a/core/libs/widgets/itemview/dcategorydrawer.h
+++ b/core/libs/widgets/itemview/dcategorydrawer.h
@@ -61,7 +61,7 @@ public:
*
* @since 5.0
*/
- DCategoryDrawer(DCategorizedView* const view);
+ explicit DCategoryDrawer(DCategorizedView* const view);
virtual ~DCategoryDrawer();
/**
diff --git a/core/libs/widgets/metadata/altlangstredit.h \
b/core/libs/widgets/metadata/altlangstredit.h index 7b45def092..242976f231 100644
--- a/core/libs/widgets/metadata/altlangstredit.h
+++ b/core/libs/widgets/metadata/altlangstredit.h
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef ALTLANGSTREDIT_H
-#define ALTLANGSTREDIT_H
+#ifndef ALT_LANG_STR_EDIT_H
+#define ALT_LANG_STR_EDIT_H
// Qt includes
@@ -44,7 +44,7 @@ class DIGIKAM_EXPORT AltLangStrEdit : public QWidget
public:
- AltLangStrEdit(QWidget* const parent);
+ explicit AltLangStrEdit(QWidget* const parent);
~AltLangStrEdit();
void setTitle(const QString& title);
@@ -117,4 +117,4 @@ private:
} // namespace Digikam
-#endif // ALTLANGSTREDIT_H
+#endif // ALT_LANG_STR_EDIT_H
diff --git a/core/libs/widgets/metadata/countryselector.h \
b/core/libs/widgets/metadata/countryselector.h index a71fcc4063..37eb71b5d7 100644
--- a/core/libs/widgets/metadata/countryselector.h
+++ b/core/libs/widgets/metadata/countryselector.h
@@ -42,7 +42,7 @@ class DIGIKAM_EXPORT CountrySelector : public QComboBox
public:
- CountrySelector(QWidget* const parent);
+ explicit CountrySelector(QWidget* const parent);
~CountrySelector();
void setCountry(const QString& countryCode);
diff --git a/core/libs/widgets/metadata/subjectwidget.h \
b/core/libs/widgets/metadata/subjectwidget.h index a30f5fe8e4..2e2fcd5d71 100644
--- a/core/libs/widgets/metadata/subjectwidget.h
+++ b/core/libs/widgets/metadata/subjectwidget.h
@@ -22,8 +22,8 @@
*
* ============================================================ */
-#ifndef SUBJECTWIDGET_H
-#define SUBJECTWIDGET_H
+#ifndef SUBJECT_WIDGET_H
+#define SUBJECT_WIDGET_H
// Qt includes
@@ -67,7 +67,7 @@ class DIGIKAM_EXPORT SubjectWidget : public QWidget
public:
- SubjectWidget(QWidget* const parent);
+ explicit SubjectWidget(QWidget* const parent);
~SubjectWidget();
void setSubjectsList(const QStringList& list);
@@ -112,4 +112,4 @@ private:
} // namespace Digikam
-#endif // SUBJECTWIDGET_H
+#endif // SUBJECT_WIDGET_H
diff --git a/core/libs/widgets/range/dnuminput.h \
b/core/libs/widgets/range/dnuminput.h index 2838101f88..bb7058c79d 100644
--- a/core/libs/widgets/range/dnuminput.h
+++ b/core/libs/widgets/range/dnuminput.h
@@ -43,7 +43,7 @@ class DIGIKAM_EXPORT DIntNumInput : public QWidget
public:
- DIntNumInput(QWidget* const parent=0);
+ explicit DIntNumInput(QWidget* const parent=0);
~DIntNumInput();
void setRange(int min, int max, int step);
@@ -82,7 +82,7 @@ class DIGIKAM_EXPORT DDoubleNumInput : public QWidget
public:
- DDoubleNumInput(QWidget* const parent=0);
+ explicit DDoubleNumInput(QWidget* const parent=0);
~DDoubleNumInput();
void setDecimals(int p);
diff --git a/core/libs/widgets/range/dsliderspinbox.h \
b/core/libs/widgets/range/dsliderspinbox.h index ebc58141fb..84e5a486bd 100644
--- a/core/libs/widgets/range/dsliderspinbox.h
+++ b/core/libs/widgets/range/dsliderspinbox.h
@@ -134,7 +134,7 @@ class DSliderSpinBox : public DAbstractSliderSpinBox
public:
- DSliderSpinBox(QWidget* parent = 0);
+ explicit DSliderSpinBox(QWidget* parent = 0);
~DSliderSpinBox();
void setRange(int minimum, int maximum);
@@ -176,7 +176,7 @@ class DDoubleSliderSpinBox : public DAbstractSliderSpinBox
public:
- DDoubleSliderSpinBox(QWidget* parent = 0);
+ explicit DDoubleSliderSpinBox(QWidget* parent = 0);
~DDoubleSliderSpinBox();
void setRange(double minimum, double maximum, int decimals = 0);
diff --git a/core/utilities/assistants/calendar/print/calpainter.h \
b/core/utilities/assistants/calendar/print/calpainter.h index 01792212a3..38540caddb \
100644
--- a/core/utilities/assistants/calendar/print/calpainter.h
+++ b/core/utilities/assistants/calendar/print/calpainter.h
@@ -23,8 +23,8 @@
*
* ============================================================ */
-#ifndef CALPAINTER_H
-#define CALPAINTER_H
+#ifndef CAL_PAINTER_H
+#define CAL_PAINTER_H
// Qt includes
@@ -42,7 +42,7 @@ class CalPainter : public QObject, public QPainter
public:
- CalPainter(QPaintDevice* const pd);
+ explicit CalPainter(QPaintDevice* const pd);
~CalPainter();
void setImage(const QUrl& imagePath);
@@ -66,4 +66,4 @@ private:
} // Namespace Digikam
-#endif // CALPAINTER_H
+#endif // CAL_PAINTER_H
diff --git a/core/utilities/assistants/common/dpreviewimage.h \
b/core/utilities/assistants/common/dpreviewimage.h index 27657ca5a5..372e5a627a \
100644
--- a/core/utilities/assistants/common/dpreviewimage.h
+++ b/core/utilities/assistants/common/dpreviewimage.h
@@ -101,7 +101,7 @@ class DPreviewImage : public QGraphicsView
public:
- DPreviewImage(QWidget* const parent);
+ explicit DPreviewImage(QWidget* const parent);
~DPreviewImage();
public:
diff --git a/core/utilities/assistants/common/dpreviewmanager.h \
b/core/utilities/assistants/common/dpreviewmanager.h index f88dd3aea4..ab8eed9ebc \
100644
--- a/core/utilities/assistants/common/dpreviewmanager.h
+++ b/core/utilities/assistants/common/dpreviewmanager.h
@@ -50,7 +50,7 @@ public:
public:
- DPreviewManager(QWidget* const parent);
+ explicit DPreviewManager(QWidget* const parent);
~DPreviewManager();
bool load(const QUrl& file, bool fit = true);
diff --git a/core/utilities/assistants/expoblending/blendingdlg/enfusesettings.h \
b/core/utilities/assistants/expoblending/blendingdlg/enfusesettings.h index \
ab3f8f2395..76d4e284b9 100644
--- a/core/utilities/assistants/expoblending/blendingdlg/enfusesettings.h
+++ b/core/utilities/assistants/expoblending/blendingdlg/enfusesettings.h
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef ENFUSESETTINGS_H
-#define ENFUSESETTINGS_H
+#ifndef ENFUSE_SETTINGS_H
+#define ENFUSE_SETTINGS_H
// Qt includes
@@ -91,7 +91,7 @@ class EnfuseSettingsWidget : public QWidget
public:
- EnfuseSettingsWidget(QWidget* const parent);
+ explicit EnfuseSettingsWidget(QWidget* const parent);
~EnfuseSettingsWidget();
void setSettings(const EnfuseSettings& settings);
@@ -110,4 +110,4 @@ private:
} // namespace Digikam
-#endif // ENFUSESETTINGS_H
+#endif // ENFUSE_SETTINGS_H
diff --git a/core/utilities/assistants/expoblending/blendingdlg/enfusestack.h \
b/core/utilities/assistants/expoblending/blendingdlg/enfusestack.h index \
43855e32e9..8eabc23277 100644
--- a/core/utilities/assistants/expoblending/blendingdlg/enfusestack.h
+++ b/core/utilities/assistants/expoblending/blendingdlg/enfusestack.h
@@ -22,8 +22,8 @@
*
* ============================================================ */
-#ifndef ENFUSESTACK_H
-#define ENFUSESTACK_H
+#ifndef ENFUSE_STACK_H
+#define ENFUSE_STACK_H
// Qt includes
@@ -77,7 +77,7 @@ class EnfuseStackList : public QTreeWidget
public:
- EnfuseStackList(QWidget* const parent);
+ explicit EnfuseStackList(QWidget* const parent);
virtual ~EnfuseStackList();
void setTemplateFileName(DSaveSettingsWidget::OutputFormat, const QString&);
@@ -115,4 +115,4 @@ private:
} // namespace Digikam
-#endif /* ENFUSESTACK_H */
+#endif // ENFUSE_STACK_H
diff --git a/core/utilities/assistants/webservices/vkontakte/vknewalbumdlg.h \
b/core/utilities/assistants/webservices/vkontakte/vknewalbumdlg.h index \
d370b7438e..0082ba8116 100644
--- a/core/utilities/assistants/webservices/vkontakte/vknewalbumdlg.h
+++ b/core/utilities/assistants/webservices/vkontakte/vknewalbumdlg.h
@@ -55,7 +55,7 @@ public:
*
* @param parent Parent widget
*/
- VKNewAlbumDlg(QWidget* const parent);
+ explicit VKNewAlbumDlg(QWidget* const parent);
/**
* @brief Album editing dialog
diff --git a/core/utilities/assistants/webservices/yandexfotki/yfrsa.h \
b/core/utilities/assistants/webservices/yandexfotki/yfrsa.h index \
fa7ae4a807..73ea223214 100644
--- a/core/utilities/assistants/webservices/yandexfotki/yfrsa.h
+++ b/core/utilities/assistants/webservices/yandexfotki/yfrsa.h
@@ -81,7 +81,7 @@ public:
}
// Construction and conversion operations
- vlong ( unsigned x=0 );
+ vlong ( unsigned x = 0 );
vlong ( const vlong& x ); // copy constructor
~vlong();
diff --git a/core/utilities/geolocation/editor/dialog/gpsundocommand.h \
b/core/utilities/geolocation/editor/dialog/gpsundocommand.h index \
5a6aa1f0f3..b1f3e3f68f 100644
--- a/core/utilities/geolocation/editor/dialog/gpsundocommand.h
+++ b/core/utilities/geolocation/editor/dialog/gpsundocommand.h
@@ -23,8 +23,8 @@
* ============================================================ */
-#ifndef GPSUNDOCOMMAND_H
-#define GPSUNDOCOMMAND_H
+#ifndef GPS_UNDO_COMMAND_H
+#define GPS_UNDO_COMMAND_H
// Qt includes
@@ -45,7 +45,7 @@ public:
{
public:
- UndoInfo(QPersistentModelIndex pModelIndex)
+ explicit UndoInfo(QPersistentModelIndex pModelIndex)
: modelIndex(pModelIndex)
{
}
@@ -83,4 +83,4 @@ private:
} // namespace Digikam
-#endif // GPSUNDOCOMMAND_H
+#endif // GPS_UNDO_COMMAND_H
diff --git a/core/utilities/geolocation/editor/items/gpsimageitem.h \
b/core/utilities/geolocation/editor/items/gpsimageitem.h index 010ad65b3a..cd8d4daa37 \
100644
--- a/core/utilities/geolocation/editor/items/gpsimageitem.h
+++ b/core/utilities/geolocation/editor/items/gpsimageitem.h
@@ -22,8 +22,8 @@
*
* ============================================================ */
-#ifndef GPSIMAGEITEM_H
-#define GPSIMAGEITEM_H
+#ifndef GPS_IMAGE_ITEM_H
+#define GPS_IMAGE_ITEM_H
// Qt includes
@@ -110,7 +110,7 @@ public:
public:
- GPSImageItem(const QUrl& url);
+ explicit GPSImageItem(const QUrl& url);
virtual ~GPSImageItem();
/// @name Loading and saving
@@ -197,4 +197,4 @@ protected:
} // namespace Digikam
-#endif // GPSIMAGEITEM_H
+#endif // GPS_IMAGE_ITEM_H
diff --git a/core/utilities/geolocation/editor/items/gpsimagemodel.h \
b/core/utilities/geolocation/editor/items/gpsimagemodel.h index \
98d5339307..ceaf987b6a 100644
--- a/core/utilities/geolocation/editor/items/gpsimagemodel.h
+++ b/core/utilities/geolocation/editor/items/gpsimagemodel.h
@@ -22,8 +22,8 @@
*
* ============================================================ */
-#ifndef GPSIMAGEMODEL_H
-#define GPSIMAGEMODEL_H
+#ifndef GPS_IMAGE_MODEL_H
+#define GPS_IMAGE_MODEL_H
// Qt includes
@@ -44,7 +44,7 @@ class GPSImageModel : public QAbstractItemModel
public:
- GPSImageModel(QObject* const parent = 0);
+ explicit GPSImageModel(QObject* const parent = 0);
~GPSImageModel();
// own functions:
@@ -90,4 +90,4 @@ private:
} // namespace Digikam
-#endif // GPSIMAGEMODEL_H
+#endif // GPS_IMAGE_MODEL_H
diff --git a/core/utilities/geolocation/editor/reversegeocoding/simpletreemodel.h \
b/core/utilities/geolocation/editor/reversegeocoding/simpletreemodel.h index \
75af96e130..a0a55729aa 100644
--- a/core/utilities/geolocation/editor/reversegeocoding/simpletreemodel.h
+++ b/core/utilities/geolocation/editor/reversegeocoding/simpletreemodel.h
@@ -22,8 +22,8 @@
*
* ============================================================ */
-#ifndef SIMPLETREEMODEL_H
-#define SIMPLETREEMODEL_H
+#ifndef SIMPLE_TREE_MODEL_H
+#define SIMPLE_TREE_MODEL_H
// Qt includes
@@ -69,7 +69,7 @@ public:
friend class SimpleTreeModel;
};
- SimpleTreeModel(const int columnCount, QObject* const parent = 0);
+ explicit SimpleTreeModel(const int columnCount, QObject* const parent = 0);
~SimpleTreeModel();
// QAbstractItemModel:
@@ -96,4 +96,4 @@ private:
} // namespace Digikam
-#endif // SIMPLETREEMODEL_H
+#endif // SIMPLE_TREE_MODEL_H
diff --git a/core/utilities/imageeditor/widgets/rubberitem.h \
b/core/utilities/imageeditor/widgets/rubberitem.h index d87af0af10..b400af16d6 100644
--- a/core/utilities/imageeditor/widgets/rubberitem.h
+++ b/core/utilities/imageeditor/widgets/rubberitem.h
@@ -46,7 +46,7 @@ class DIGIKAM_EXPORT RubberItem : public RegionFrameItem
public:
- RubberItem(ImagePreviewItem* const item);
+ explicit RubberItem(ImagePreviewItem* const item);
virtual ~RubberItem();
void setCanvas(Canvas* const canvas);
@@ -64,4 +64,4 @@ private:
} // namespace Digikam
-#endif /* RUBBER_ITEM_H */
+#endif // RUBBER_ITEM_H
diff --git a/core/utilities/kdesupport/kfilemetadata/baloowrap.h \
b/core/utilities/kdesupport/kfilemetadata/baloowrap.h index 295ef6504b..b2d54ee0bf \
100644
--- a/core/utilities/kdesupport/kfilemetadata/baloowrap.h
+++ b/core/utilities/kdesupport/kfilemetadata/baloowrap.h
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef BALOOWRAP_H
-#define BALOOWRAP_H
+#ifndef BALOO_WRAP_H
+#define BALOO_WRAP_H
// Qt includes
@@ -71,7 +71,7 @@ class DIGIKAM_DATABASE_EXPORT BalooWrap : public QObject
public:
- BalooWrap(QObject* const parent = 0);
+ explicit BalooWrap(QObject* const parent = 0);
~BalooWrap();
/**
@@ -120,4 +120,4 @@ private:
} // namespace Digikam
-#endif /* BALOOWRAP_H */
+#endif // BALOO_WRAP_H
diff --git a/core/utilities/kdesupport/ksane/saveimgthread.h \
b/core/utilities/kdesupport/ksane/saveimgthread.h index 51fddc12de..f3bcdf48f8 100644
--- a/core/utilities/kdesupport/ksane/saveimgthread.h
+++ b/core/utilities/kdesupport/ksane/saveimgthread.h
@@ -20,8 +20,8 @@
*
* ============================================================ */
-#ifndef SAVEIMGTHREAD_H
-#define SAVEIMGTHREAD_H
+#ifndef SAVE_IMG_THREAD_H
+#define SAVE_IMG_THREAD_H
// Qt includes
@@ -40,7 +40,7 @@ class SaveImgThread : public QThread
public:
- SaveImgThread(QObject* const parent);
+ explicit SaveImgThread(QObject* const parent);
~SaveImgThread();
void setTargetFile(const QUrl& url, const QString& format);
@@ -63,6 +63,6 @@ private:
Private* const d;
};
-} // namespace Digikam
+} // namespace Digikam
-#endif // SAVEIMGTHREAD_H
+#endif // SAVE_IMG_THREAD_H
diff --git a/core/utilities/maintenance/duplicatesfinder.h \
b/core/utilities/maintenance/duplicatesfinder.h index 6ae21faf43..2dd7f9e041 100644
--- a/core/utilities/maintenance/duplicatesfinder.h
+++ b/core/utilities/maintenance/duplicatesfinder.h
@@ -22,8 +22,8 @@
*
* ============================================================ */
-#ifndef DUPLICATESFINDER_H
-#define DUPLICATESFINDER_H
+#ifndef DUPLICATES_FINDER_H
+#define DUPLICATES_FINDER_H
// Qt includes
@@ -46,13 +46,28 @@ public:
/** Version to find all duplicates in the set of images
*/
- DuplicatesFinder(const QList<qlonglong>& imageIds, int minSimilarity = 90, int \
maxSimilarity = 100, int searchResultRestriction = 0, ProgressItem* const parent = \
0); + explicit DuplicatesFinder(const QList<qlonglong>& imageIds,
+ int minSimilarity = 90,
+ int maxSimilarity = 100,
+ int searchResultRestriction = 0,
+ ProgressItem* const parent = 0);
+
/** Version to find all duplicates over a specific list to PAlbums and TAlbums
*/
- DuplicatesFinder(const AlbumList& albums, const AlbumList& tags, int \
albumTagRelation = 0, int minSimilarity = 90, int maxSimilarity = 100, int \
searchResultRestriction = 0, ProgressItem* const parent = 0); + \
DuplicatesFinder(const AlbumList& albums, + const AlbumList& \
tags, + int albumTagRelation = 0,
+ int minSimilarity = 90,
+ int maxSimilarity = 100,
+ int searchResultRestriction = 0,
+ ProgressItem* const parent = 0);
+
/** Version to find all duplicates over whole collections
*/
- explicit DuplicatesFinder(const int minSimilarity = 90, int maxSimilarity = 100, \
int searchResultRestriction = 0, ProgressItem* const parent = 0); + explicit \
DuplicatesFinder(const int minSimilarity = 90, + int \
maxSimilarity = 100, + int searchResultRestriction = 0,
+ ProgressItem* const parent = 0);
~DuplicatesFinder();
private Q_SLOTS:
@@ -71,4 +86,4 @@ private:
} // namespace Digikam
-#endif /* DUPLICATESFINDER_H */
+#endif // DUPLICATES_FINDER_H
diff --git a/core/utilities/presentation/opengl/presentationgl.h \
b/core/utilities/presentation/opengl/presentationgl.h index a5c0997364..920f110941 \
100644
--- a/core/utilities/presentation/opengl/presentationgl.h
+++ b/core/utilities/presentation/opengl/presentationgl.h
@@ -53,7 +53,7 @@ class PresentationGL : public QGLWidget
public:
- PresentationGL(PresentationContainer* const sharedData);
+ explicit PresentationGL(PresentationContainer* const sharedData);
~PresentationGL();
void registerEffects();
@@ -120,6 +120,6 @@ private:
Private* const d;
};
-} // namespace Digikam
+} // namespace Digikam
-#endif /* PRESENTATION_GL_H */
+#endif // PRESENTATION_GL_H
diff --git a/core/utilities/presentation/opengl/presentationkb.h \
b/core/utilities/presentation/opengl/presentationkb.h index 96bb67fa22..7339498003 \
100644
--- a/core/utilities/presentation/opengl/presentationkb.h
+++ b/core/utilities/presentation/opengl/presentationkb.h
@@ -114,7 +114,7 @@ class PresentationKB : public QGLWidget
public:
- PresentationKB(PresentationContainer* const sharedData);
+ explicit PresentationKB(PresentationContainer* const sharedData);
~PresentationKB();
diff --git a/core/utilities/presentation/presentationmngr.h \
b/core/utilities/presentation/presentationmngr.h index eccb8c6649..08eb2ffa40 100644
--- a/core/utilities/presentation/presentationmngr.h
+++ b/core/utilities/presentation/presentationmngr.h
@@ -47,7 +47,7 @@ class DIGIKAM_EXPORT PresentationMngr : public QObject
public:
- PresentationMngr(QObject* const parent);
+ explicit PresentationMngr(QObject* const parent);
~PresentationMngr();
void addFile(const QUrl& url, const QString& comment);
@@ -62,6 +62,6 @@ private:
PresentationContainer* m_sharedData;
};
-} // namespace Digikam
+} // namespace Digikam
-#endif // PRESENTATION_MNGR_H
+#endif // PRESENTATION_MNGR_H
diff --git a/core/utilities/presentation/widgets/presentationwidget.h \
b/core/utilities/presentation/widgets/presentationwidget.h index \
32025755bd..7f7161de5e 100644
--- a/core/utilities/presentation/widgets/presentationwidget.h
+++ b/core/utilities/presentation/widgets/presentationwidget.h
@@ -57,7 +57,7 @@ public:
public:
- PresentationWidget(PresentationContainer* const sharedData);
+ explicit PresentationWidget(PresentationContainer* const sharedData);
~PresentationWidget();
void registerEffects();
@@ -133,6 +133,6 @@ private:
Private* const d;
};
-} // namespace Digikam
+} // namespace Digikam
-#endif /* PRESENTATION_WIDGET_H */
+#endif // PRESENTATION_WIDGET_H
diff --git a/core/utilities/queuemanager/tools/metadata/clockphotodialog.cpp \
b/core/utilities/queuemanager/tools/metadata/clockphotodialog.cpp index \
5149e61002..133cc008ed 100644
--- a/core/utilities/queuemanager/tools/metadata/clockphotodialog.cpp
+++ b/core/utilities/queuemanager/tools/metadata/clockphotodialog.cpp
@@ -298,4 +298,4 @@ void ClockPhotoDialog::slotCancel()
reject();
}
-} // namespace Digikam
+} // namespace Digikam
diff --git a/core/utilities/queuemanager/tools/metadata/clockphotodialog.h \
b/core/utilities/queuemanager/tools/metadata/clockphotodialog.h index \
010b6007fa..8a98c6f10e 100644
--- a/core/utilities/queuemanager/tools/metadata/clockphotodialog.h
+++ b/core/utilities/queuemanager/tools/metadata/clockphotodialog.h
@@ -68,6 +68,6 @@ private:
Private* const d;
};
-} // namespace Digikam
+} // namespace Digikam
#endif // CLOCK_PHOTO_DIALOG_H
diff --git a/core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.cpp \
b/core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.cpp index \
4f7795acc8..30a236d6ad 100644
--- a/core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.cpp
+++ b/core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.cpp
@@ -30,6 +30,9 @@
#include "detbyclockphotobutton.h"
#include "digikam_debug.h"
+namespace Digikam
+{
+
void DetByClockPhotoButton::dragEnterEvent(QDragEnterEvent* event)
{
event->acceptProposedAction();
@@ -47,3 +50,5 @@ void DetByClockPhotoButton::dropEvent(QDropEvent* event)
emit signalClockPhotoDropped(url);
}
}
+
+} // namespace Digikam
diff --git a/core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.h \
b/core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.h index \
2aaaba87d1..0c7d12e6d2 100644
--- a/core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.h
+++ b/core/utilities/queuemanager/tools/metadata/detbyclockphotobutton.h
@@ -29,13 +29,16 @@
#include <QDragEnterEvent>
#include <QPushButton>
+namespace Digikam
+{
+
class DetByClockPhotoButton : public QPushButton
{
Q_OBJECT
public:
- DetByClockPhotoButton(const QString& text)
+ explicit DetByClockPhotoButton(const QString& text)
: QPushButton(text)
{
setAcceptDrops(true);
@@ -49,4 +52,6 @@ Q_SIGNALS:
void signalClockPhotoDropped(const QUrl&);
};
+} // namespace Digikam
+
#endif // DET_BY_CLOCK_PHOTO_BUTTON_H
diff --git a/core/utilities/queuemanager/views/assignedlist.h \
b/core/utilities/queuemanager/views/assignedlist.h index 5c44fa6508..063f586821 \
100644
--- a/core/utilities/queuemanager/views/assignedlist.h
+++ b/core/utilities/queuemanager/views/assignedlist.h
@@ -45,7 +45,7 @@ class AssignedListViewItem : public QTreeWidgetItem
public:
- AssignedListViewItem(QTreeWidget* const parent);
+ explicit AssignedListViewItem(QTreeWidget* const parent);
AssignedListViewItem(QTreeWidget* const parent, QTreeWidgetItem* const \
preceding); virtual ~AssignedListViewItem();
diff --git a/core/utilities/queuemanager/views/queuepool.h \
b/core/utilities/queuemanager/views/queuepool.h index 732d3b4265..e9675ef301 100644
--- a/core/utilities/queuemanager/views/queuepool.h
+++ b/core/utilities/queuemanager/views/queuepool.h
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef QUEUEPOOL_H
-#define QUEUEPOOL_H
+#ifndef QUEUE_POOL_H
+#define QUEUE_POOL_H
// Qt includes
@@ -52,7 +52,7 @@ class QueuePoolBar : public QTabBar
public:
- QueuePoolBar(QWidget* const parent);
+ explicit QueuePoolBar(QWidget* const parent);
~QueuePoolBar();
Q_SIGNALS:
@@ -132,6 +132,6 @@ private Q_SLOTS:
void slotTestCanDecode(const QDragMoveEvent*, bool&);
};
-} // namespace Digikam
+} // namespace Digikam
-#endif // QUEUEPOOL_H
+#endif // QUEUE_POOL_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic