diff --git a/core/app/items/digikamimageview_p.h b/core/app/items/digikamimageview_p.h index db11fc7bef..9cd53b5429 100644 --- a/core/app/items/digikamimageview_p.h +++ b/core/app/items/digikamimageview_p.h @@ -54,7 +54,7 @@ class DigikamImageView::Private : public QObject public: explicit Private(DigikamImageView* const qq); - virtual ~Private(); + ~Private(); void updateOverlays(); void triggerRotateAction(const char* actionName); @@ -80,6 +80,10 @@ class DigikamImageView::Private : public QObject private: DigikamImageView* q_ptr; + +private: + + Private() {}; // disable default constuctor. }; } // namespace Digikam diff --git a/core/app/items/overlays/assignnameoverlay.cpp b/core/app/items/overlays/assignnameoverlay.cpp index 5fad057575..983bee5f0a 100644 --- a/core/app/items/overlays/assignnameoverlay.cpp +++ b/core/app/items/overlays/assignnameoverlay.cpp @@ -94,21 +94,9 @@ class AssignNameOverlay::Private QPersistentModelIndex index; }; -AssignNameOverlay::AssignNameOverlay() - : PersistentWidgetDelegateOverlay(0), - d(new Private) -{ - setup(); -} - AssignNameOverlay::AssignNameOverlay(QObject* const parent) : PersistentWidgetDelegateOverlay(parent), d(new Private) -{ - setup(); -} - -void AssignNameOverlay::setup() { d->filteredModel.setSourceAlbumModel(&d->tagModel); d->filterModel.setSourceFilterModel(&d->filteredModel); diff --git a/core/app/items/overlays/assignnameoverlay.h b/core/app/items/overlays/assignnameoverlay.h index a4d5296861..4a151e6cb7 100644 --- a/core/app/items/overlays/assignnameoverlay.h +++ b/core/app/items/overlays/assignnameoverlay.h @@ -50,7 +50,6 @@ class AssignNameOverlay : public PersistentWidgetDelegateOverlay public: - AssignNameOverlay(); explicit AssignNameOverlay(QObject* const parent); ~AssignNameOverlay(); @@ -85,7 +84,7 @@ protected Q_SLOTS: private: - void setup(); + AssignNameOverlay() {}; // Disable default constructor. private: diff --git a/core/libs/album/albumtreeview.h b/core/libs/album/albumtreeview.h index 87d54c44b8..e9db90c826 100644 --- a/core/libs/album/albumtreeview.h +++ b/core/libs/album/albumtreeview.h @@ -89,7 +89,7 @@ class AbstractAlbumTreeView : public QTreeView, public StateSavingObject * If you give 0 for model, call setAlbumModel afterwards. * If you supply 0 for filterModel, call setAlbumFilterModel afterwards. */ - explicit AbstractAlbumTreeView(QWidget* const parent, Flags flags); + AbstractAlbumTreeView(QWidget* const parent, Flags flags); ~AbstractAlbumTreeView(); AbstractSpecificAlbumModel* albumModel() const; diff --git a/core/libs/imageproperties/versionsdelegate.h b/core/libs/imageproperties/versionsdelegate.h index 4410acd913..68986e0fc4 100644 --- a/core/libs/imageproperties/versionsdelegate.h +++ b/core/libs/imageproperties/versionsdelegate.h @@ -43,7 +43,7 @@ class VersionsDelegate : public QStyledItemDelegate, public ImageDelegateOverlay public: - explicit VersionsDelegate(QObject* const parent = 0); + VersionsDelegate(QObject* const parent = 0); ~VersionsDelegate(); QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const; diff --git a/project/reports/cppcheck.sh b/project/reports/cppcheck.sh index cad2d27662..9abdb7b527 100755 --- a/project/reports/cppcheck.sh +++ b/project/reports/cppcheck.sh @@ -58,7 +58,7 @@ cppcheck-htmlreport --file=report.cppcheck.xml \ --report-dir=$REPORT_DIR \ --source-dir=. \ --title=$TITLE - +exit # update www.digikam.org report section. updateReportToWebsite "cppcheck" $REPORT_DIR $TITLE $(parseGitBranch)