summaryrefslogtreecommitdiffstats
path: root/pictureviewer2.h
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2018-11-23 16:23:22 +0100
committerArno <arno@disconnect.de>2018-11-23 16:25:36 +0100
commit665b60be68ed714d7a6eda8f846175d5e5f4f292 (patch)
tree8832e1b8181555013e8392af644fc575078a0b77 /pictureviewer2.h
parentfcf85127c27290fdb3d321c79ecdaf8d22f10c0f (diff)
downloadSheMov-665b60be68ed714d7a6eda8f846175d5e5f4f292.tar.gz
SheMov-665b60be68ed714d7a6eda8f846175d5e5f4f292.tar.bz2
SheMov-665b60be68ed714d7a6eda8f846175d5e5f4f292.zip
Fix clang warnings in pictureviewer2
Get the QGraphicsItems right (I hope), and use auto where applicable. Let the compiler do the hard work. Also use type-safe connect syntax, fix nullptr warnings and weed out foreach.
Diffstat (limited to 'pictureviewer2.h')
-rw-r--r--pictureviewer2.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/pictureviewer2.h b/pictureviewer2.h
index 270fd99..2525133 100644
--- a/pictureviewer2.h
+++ b/pictureviewer2.h
@@ -47,7 +47,7 @@ class PictureViewer2 : public QGraphicsView {
Q_OBJECT
public:
enum AssocActions { HideAction, MarkAction, DeleteAction, SlideAction };
- explicit PictureViewer2(QWidget *parent = 0);
+ explicit PictureViewer2(QWidget *parent = nullptr);
void addFiles(const PicDataList &files, bool clear = true);
void addFiles(const QString &dir, bool clear = true);
void addFiles(const QStringList &files, bool clear = true);
@@ -134,7 +134,7 @@ class PictureViewerSlideDlg : public QDialog {
Q_OBJECT
public:
enum SlideResult { SlideAll, SlideRecent, SlideSelection, NoSlide };
- explicit PictureViewerSlideDlg(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ explicit PictureViewerSlideDlg(QWidget *parent = nullptr, Qt::WindowFlags = Qt::Widget);
int result() const { return mSlideResult; }
void setResult(int result);
int days() const { return mRecentDays->value(); }
@@ -165,8 +165,8 @@ class PictureViewerSlideDlg : public QDialog {
class PictureViewer2Item : public QGraphicsItem {
public:
- explicit PictureViewer2Item(const PicData &data, const int numSelected, int cur, const QSize &picSize = QSize(), QGraphicsItem *parent = 0);
- explicit PictureViewer2Item(QTextDocument *doc, QGraphicsItem *parent = 0);
+ explicit PictureViewer2Item(const PicData &data, const int numSelected, int cur, const QSize &picSize = QSize(), QGraphicsItem *parent = nullptr);
+ explicit PictureViewer2Item(QTextDocument *doc, QGraphicsItem *parent = nullptr);
~PictureViewer2Item();
QRectF boundingRect() const;
void appendText(const QString &text);
@@ -180,7 +180,7 @@ class PictureViewer2Item : public QGraphicsItem {
class PictureViewerGraphicsScene : public QGraphicsScene {
Q_OBJECT
public:
- explicit PictureViewerGraphicsScene(QObject *parent = 0) : QGraphicsScene(parent) {}
+ explicit PictureViewerGraphicsScene(QObject *parent = nullptr) : QGraphicsScene(parent) {}
void setCursorOffset(int offset) { mCursorOffset = offset; }
signals: