diff options
Diffstat (limited to 'examples/widgets/graphicsview/padnavigator')
7 files changed, 21 insertions, 20 deletions
diff --git a/examples/widgets/graphicsview/padnavigator/flippablepad.cpp b/examples/widgets/graphicsview/padnavigator/flippablepad.cpp index e5de331597..6a9097a736 100644 --- a/examples/widgets/graphicsview/padnavigator/flippablepad.cpp +++ b/examples/widgets/graphicsview/padnavigator/flippablepad.cpp @@ -75,8 +75,8 @@ FlippablePad::FlippablePad(const QSize &size, QGraphicsItem *parent) //! [2] //! [3] int numIcons = size.width() * size.height(); - QList<QPixmap> pixmaps; - QDirIterator it(":/images", QStringList() << "*.png"); + QVector<QPixmap> pixmaps; + QDirIterator it(":/images", {"*.png"}); while (it.hasNext() && pixmaps.size() < numIcons) pixmaps << it.next(); //! [3] diff --git a/examples/widgets/graphicsview/padnavigator/flippablepad.h b/examples/widgets/graphicsview/padnavigator/flippablepad.h index 323ace4372..ef757c47fb 100644 --- a/examples/widgets/graphicsview/padnavigator/flippablepad.h +++ b/examples/widgets/graphicsview/padnavigator/flippablepad.h @@ -53,15 +53,13 @@ #include "roundrectitem.h" -#include <QGraphicsObject> -#include <QLinearGradient> #include <QVector> //! [0] class FlippablePad : public RoundRectItem { public: - explicit FlippablePad(const QSize &size, QGraphicsItem *parent = 0); + explicit FlippablePad(const QSize &size, QGraphicsItem *parent = nullptr); RoundRectItem *iconAt(int column, int row) const; diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp index ef0b0b4510..b9ce2a47ca 100644 --- a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp +++ b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp @@ -52,10 +52,18 @@ #include "padnavigator.h" #include "splashitem.h" +#include <QEventTransition> +#include <QGraphicsProxyWidget> +#include <QGraphicsRotation> +#include <QHistoryState> +#include <QKeyEventTransition> +#include <QParallelAnimationGroup> +#include <QPropertyAnimation> +#include <QSequentialAnimationGroup> +#include <QStateMachine> + #ifndef QT_NO_OPENGL -#include <QtOpenGL> -#else -#include <QtWidgets> +#include <QOpenGLWidget> #endif //! [0] diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.h b/examples/widgets/graphicsview/padnavigator/padnavigator.h index 00cf2c0212..0fe9ad045d 100644 --- a/examples/widgets/graphicsview/padnavigator/padnavigator.h +++ b/examples/widgets/graphicsview/padnavigator/padnavigator.h @@ -54,17 +54,12 @@ #include <QGraphicsView> #include "ui_form.h" -QT_BEGIN_NAMESPACE -class QState; -class QStateMachine; -QT_END_NAMESPACE - //! [0] class PadNavigator : public QGraphicsView { Q_OBJECT public: - explicit PadNavigator(const QSize &size, QWidget *parent = 0); + explicit PadNavigator(const QSize &size, QWidget *parent = nullptr); protected: void resizeEvent(QResizeEvent *event) override; diff --git a/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp b/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp index 82205050ec..b4ea489069 100644 --- a/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp +++ b/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp @@ -50,7 +50,7 @@ #include "roundrectitem.h" -#include <QApplication> +#include <QGuiApplication> #include <QPainter> #include <QPalette> @@ -98,7 +98,7 @@ void RoundRectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opt //! [3] //! [4] if (fillRect) - painter->setBrush(QApplication::palette().brush(QPalette::Window)); + painter->setBrush(QGuiApplication::palette().brush(QPalette::Window)); else painter->setBrush(gradient); painter->setPen(QPen(Qt::black, 1)); diff --git a/examples/widgets/graphicsview/padnavigator/roundrectitem.h b/examples/widgets/graphicsview/padnavigator/roundrectitem.h index e76862c08c..91b3e6542e 100644 --- a/examples/widgets/graphicsview/padnavigator/roundrectitem.h +++ b/examples/widgets/graphicsview/padnavigator/roundrectitem.h @@ -61,13 +61,13 @@ class RoundRectItem : public QGraphicsObject Q_PROPERTY(bool fill READ fill WRITE setFill) public: RoundRectItem(const QRectF &bounds, const QColor &color, - QGraphicsItem *parent = 0); + QGraphicsItem *parent = nullptr); QPixmap pixmap() const; void setPixmap(const QPixmap &pixmap); QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool fill() const; void setFill(bool fill); diff --git a/examples/widgets/graphicsview/padnavigator/splashitem.h b/examples/widgets/graphicsview/padnavigator/splashitem.h index 2ad54f82a1..b8e723db81 100644 --- a/examples/widgets/graphicsview/padnavigator/splashitem.h +++ b/examples/widgets/graphicsview/padnavigator/splashitem.h @@ -58,10 +58,10 @@ class SplashItem : public QGraphicsObject { Q_OBJECT public: - explicit SplashItem(QGraphicsItem *parent = 0); + explicit SplashItem(QGraphicsItem *parent = nullptr); QRectF boundingRect() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; private: QString text; |