diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-13 01:00:43 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-13 01:00:43 +0200 |
commit | 8d8140dffa9aa680a519b501fc5bdf08c91dd735 (patch) | |
tree | 346d255ca98fd79aaef9db84eac724a49285da1c /examples/widgets/gestures/imagegestures/imagewidget.h | |
parent | e55a79b022e542a482177c2f34140c23b100b708 (diff) | |
parent | a90899df4330afccd8299fa81754f369e6d12344 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9953c1ca16862184c2373027e946c482ce8e6f0e
Diffstat (limited to 'examples/widgets/gestures/imagegestures/imagewidget.h')
-rw-r--r-- | examples/widgets/gestures/imagegestures/imagewidget.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/widgets/gestures/imagegestures/imagewidget.h b/examples/widgets/gestures/imagegestures/imagewidget.h index 5e92541067..ae5eb7bc2b 100644 --- a/examples/widgets/gestures/imagegestures/imagewidget.h +++ b/examples/widgets/gestures/imagegestures/imagewidget.h @@ -51,9 +51,9 @@ #ifndef IMAGEWIDGET_H #define IMAGEWIDGET_H -#include <QWidget> #include <QImage> -#include <QtWidgets> +#include <QLoggingCategory> +#include <QWidget> QT_BEGIN_NAMESPACE class QGestureEvent; @@ -70,9 +70,9 @@ class ImageWidget : public QWidget Q_OBJECT public: - ImageWidget(QWidget *parent = 0); + ImageWidget(QWidget *parent = nullptr); void openDirectory(const QString &path); - void grabGestures(const QList<Qt::GestureType> &gestures); + void grabGestures(const QVector<Qt::GestureType> &gestures); protected: bool event(QEvent *event) override; @@ -87,7 +87,7 @@ private: void swipeTriggered(QSwipeGesture*); //! [class definition begin] - QImage loadImage(const QString &fileName); + QImage loadImage(const QString &fileName) const; void loadImage(); void goNextImage(); void goPrevImage(); |