diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-30 22:22:22 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-06-28 16:15:09 +0000 |
| commit | 5ede5706a8b8052280981aa1d9c42999a24b74b5 (patch) | |
| tree | 93240295ca4f9e21f3ce6c74748f04697c060c67 /examples | |
| parent | fdbf400b27ff25f98a64879adeeb342931a84d9a (diff) | |
Convert features.wheelevent to QT_CONFIG
Change-Id: I46083a9115c199d1ebe024ed5f64b160a27462f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'examples')
10 files changed, 10 insertions, 10 deletions
diff --git a/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp b/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp index 8b11c20972..fd0060d8a9 100644 --- a/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp +++ b/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp @@ -171,7 +171,7 @@ void MandelbrotWidget::keyPressEvent(QKeyEvent *event) } //! [11] -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) //! [12] void MandelbrotWidget::wheelEvent(QWheelEvent *event) { diff --git a/examples/corelib/threads/mandelbrot/mandelbrotwidget.h b/examples/corelib/threads/mandelbrot/mandelbrotwidget.h index cbacc2cdd0..a04bfa6e81 100644 --- a/examples/corelib/threads/mandelbrot/mandelbrotwidget.h +++ b/examples/corelib/threads/mandelbrot/mandelbrotwidget.h @@ -68,7 +68,7 @@ protected: void paintEvent(QPaintEvent *event) override; void resizeEvent(QResizeEvent *event) override; void keyPressEvent(QKeyEvent *event) override; -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; #endif void mousePressEvent(QMouseEvent *event) override; diff --git a/examples/widgets/graphicsview/chip/view.cpp b/examples/widgets/graphicsview/chip/view.cpp index 79b173bec7..491f1a54cf 100644 --- a/examples/widgets/graphicsview/chip/view.cpp +++ b/examples/widgets/graphicsview/chip/view.cpp @@ -64,7 +64,7 @@ #endif #include <qmath.h> -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void GraphicsView::wheelEvent(QWheelEvent *e) { if (e->modifiers() & Qt::ControlModifier) { diff --git a/examples/widgets/graphicsview/chip/view.h b/examples/widgets/graphicsview/chip/view.h index 2d174250c2..89b2e813f1 100644 --- a/examples/widgets/graphicsview/chip/view.h +++ b/examples/widgets/graphicsview/chip/view.h @@ -69,7 +69,7 @@ public: GraphicsView(View *v) : QGraphicsView(), view(v) { } protected: -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *) override; #endif diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp index 8b2f0a0629..844c8f8aac 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp @@ -184,7 +184,7 @@ void GraphWidget::timerEvent(QTimerEvent *event) } //! [4] -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) //! [5] void GraphWidget::wheelEvent(QWheelEvent *event) { diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.h b/examples/widgets/graphicsview/elasticnodes/graphwidget.h index 79acb89985..5ed6aed452 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.h +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.h @@ -73,7 +73,7 @@ public slots: protected: void keyPressEvent(QKeyEvent *event) override; void timerEvent(QTimerEvent *event) override; -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; #endif void drawBackground(QPainter *painter, const QRectF &rect) override; diff --git a/examples/widgets/painting/affine/xform.cpp b/examples/widgets/painting/affine/xform.cpp index e48c101262..e47bc9d251 100644 --- a/examples/widgets/painting/affine/xform.cpp +++ b/examples/widgets/painting/affine/xform.cpp @@ -260,7 +260,7 @@ void XFormView::timerEvent(QTimerEvent *e) } } -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void XFormView::wheelEvent(QWheelEvent *e) { m_scale += e->delta() / qreal(600); diff --git a/examples/widgets/painting/affine/xform.h b/examples/widgets/painting/affine/xform.h index f2eed99b4f..1dce3b26da 100644 --- a/examples/widgets/painting/affine/xform.h +++ b/examples/widgets/painting/affine/xform.h @@ -125,7 +125,7 @@ signals: protected: void timerEvent(QTimerEvent *e) override; -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *) override; #endif diff --git a/examples/widgets/widgets/mousebuttons/buttontester.cpp b/examples/widgets/widgets/mousebuttons/buttontester.cpp index 3faf6e3553..6653221698 100644 --- a/examples/widgets/widgets/mousebuttons/buttontester.cpp +++ b/examples/widgets/widgets/mousebuttons/buttontester.cpp @@ -89,7 +89,7 @@ void ButtonTester::mouseDoubleClickEvent(QMouseEvent *e) this->setText(result); } -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void ButtonTester::wheelEvent (QWheelEvent *e) { QString result; diff --git a/examples/widgets/widgets/mousebuttons/buttontester.h b/examples/widgets/widgets/mousebuttons/buttontester.h index cd05171d86..d99dcceb18 100644 --- a/examples/widgets/widgets/mousebuttons/buttontester.h +++ b/examples/widgets/widgets/mousebuttons/buttontester.h @@ -64,7 +64,7 @@ protected: void mousePressEvent(QMouseEvent *event) override; void mouseReleaseEvent(QMouseEvent *event) override; void mouseDoubleClickEvent(QMouseEvent *event) override; -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent * event) override; #endif int buttonByNumber(const Qt::MouseButton button); |