diff options
Diffstat (limited to 'examples/widgets/animation')
16 files changed, 37 insertions, 31 deletions
diff --git a/examples/widgets/animation/animatedtiles/main.cpp b/examples/widgets/animation/animatedtiles/main.cpp index 8edd64e482..553b620e41 100644 --- a/examples/widgets/animation/animatedtiles/main.cpp +++ b/examples/widgets/animation/animatedtiles/main.cpp @@ -69,7 +69,7 @@ class Button : public QGraphicsWidget { Q_OBJECT public: - Button(const QPixmap &pixmap, QGraphicsItem *parent = 0) + Button(const QPixmap &pixmap, QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent), _pix(pixmap) { setAcceptHoverEvents(true); diff --git a/examples/widgets/animation/easing/window.h b/examples/widgets/animation/easing/window.h index 2b7b2a5bf3..541377a981 100644 --- a/examples/widgets/animation/easing/window.h +++ b/examples/widgets/animation/easing/window.h @@ -66,7 +66,7 @@ public: class Window : public QWidget { Q_OBJECT public: - Window(QWidget *parent = 0); + Window(QWidget *parent = nullptr); private slots: void curveChanged(int row); void pathChanged(int index); diff --git a/examples/widgets/animation/moveblocks/main.cpp b/examples/widgets/animation/moveblocks/main.cpp index e59b17cbf9..d03b57cd5e 100644 --- a/examples/widgets/animation/moveblocks/main.cpp +++ b/examples/widgets/animation/moveblocks/main.cpp @@ -169,7 +169,8 @@ class GraphicsView : public QGraphicsView { Q_OBJECT public: - GraphicsView(QGraphicsScene *scene, QWidget *parent = NULL) : QGraphicsView(scene, parent) + GraphicsView(QGraphicsScene *scene, QWidget *parent = nullptr) + : QGraphicsView(scene, parent) { } diff --git a/examples/widgets/animation/stickman/graphicsview.cpp b/examples/widgets/animation/stickman/graphicsview.cpp index 9cb57fcd9e..7058e15345 100644 --- a/examples/widgets/animation/stickman/graphicsview.cpp +++ b/examples/widgets/animation/stickman/graphicsview.cpp @@ -55,7 +55,9 @@ #include <QtWidgets/QGraphicsScene> #include <QtWidgets/QGraphicsView> -GraphicsView::GraphicsView(QWidget *parent) : QGraphicsView(parent), m_editor(0) {} +GraphicsView::GraphicsView(QWidget *parent) + : QGraphicsView(parent), m_editor(nullptr) +{} void GraphicsView::keyPressEvent(QKeyEvent *e) { diff --git a/examples/widgets/animation/stickman/graphicsview.h b/examples/widgets/animation/stickman/graphicsview.h index 56396bb780..361fee219d 100644 --- a/examples/widgets/animation/stickman/graphicsview.h +++ b/examples/widgets/animation/stickman/graphicsview.h @@ -58,7 +58,7 @@ class GraphicsView: public QGraphicsView { Q_OBJECT public: - GraphicsView(QWidget *parent = 0); + GraphicsView(QWidget *parent = nullptr); protected: void resizeEvent(QResizeEvent *event) override; diff --git a/examples/widgets/animation/stickman/lifecycle.cpp b/examples/widgets/animation/stickman/lifecycle.cpp index 5d4c406b2e..046e3f4cd1 100644 --- a/examples/widgets/animation/stickman/lifecycle.cpp +++ b/examples/widgets/animation/stickman/lifecycle.cpp @@ -175,9 +175,8 @@ void LifeCycle::addActivity(const QString &fileName, Qt::Key key, QObject *sende QState *state = makeState(m_alive, fileName); m_alive->addTransition(new KeyPressTransition(m_keyReceiver, key, state)); - if((sender != NULL) || (signal != NULL)) { + if (sender || signal) m_alive->addTransition(sender, signal, state); - } } QState *LifeCycle::makeState(QState *parentState, const QString &animationFileName) @@ -192,7 +191,7 @@ QState *LifeCycle::makeState(QState *parentState, const QString &animationFileNa } const int frameCount = animation.totalFrames(); - QState *previousState = 0; + QState *previousState = nullptr; for (int i=0; i<frameCount; ++i) { animation.setCurrentFrame(i); @@ -204,7 +203,7 @@ QState *LifeCycle::makeState(QState *parentState, const QString &animationFileNa //! [1] frameState->setObjectName(QString::fromLatin1("frame %0").arg(i)); - if (previousState == 0) + if (previousState == nullptr) topLevel->setInitialState(frameState); else //! [2] diff --git a/examples/widgets/animation/stickman/stickman.cpp b/examples/widgets/animation/stickman/stickman.cpp index 8b183d87d5..5725f64eec 100644 --- a/examples/widgets/animation/stickman/stickman.cpp +++ b/examples/widgets/animation/stickman/stickman.cpp @@ -176,8 +176,7 @@ Node *StickMan::node(int idx) const { if (idx >= 0 && idx < NodeCount) return m_nodes[idx]; - else - return 0; + return nullptr; } void StickMan::timerEvent(QTimerEvent *) diff --git a/examples/widgets/animation/sub-attaq/animationmanager.cpp b/examples/widgets/animation/sub-attaq/animationmanager.cpp index 62dac7852a..e3dc27f37f 100644 --- a/examples/widgets/animation/sub-attaq/animationmanager.cpp +++ b/examples/widgets/animation/sub-attaq/animationmanager.cpp @@ -56,7 +56,7 @@ #include <QtCore/QDebug> // the universe's only animation manager -AnimationManager *AnimationManager::instance = 0; +AnimationManager *AnimationManager::instance = nullptr; AnimationManager::AnimationManager() { diff --git a/examples/widgets/animation/sub-attaq/boat.cpp b/examples/widgets/animation/sub-attaq/boat.cpp index 9f4feba2ec..9037d54878 100644 --- a/examples/widgets/animation/sub-attaq/boat.cpp +++ b/examples/widgets/animation/sub-attaq/boat.cpp @@ -92,8 +92,9 @@ static QAbstractAnimation *setupDestroyAnimation(Boat *boat) -Boat::Boat() : PixmapItem(QString("boat"), GraphicsScene::Big), - speed(0), bombsAlreadyLaunched(0), direction(Boat::None), movementAnimation(0) +Boat::Boat() + : PixmapItem(QString("boat"), GraphicsScene::Big), + speed(0), bombsAlreadyLaunched(0), direction(Boat::None) { setZValue(4); setFlags(QGraphicsItem::ItemIsFocusable); diff --git a/examples/widgets/animation/sub-attaq/boat_p.h b/examples/widgets/animation/sub-attaq/boat_p.h index de11ff9555..8ebfeb27f5 100644 --- a/examples/widgets/animation/sub-attaq/boat_p.h +++ b/examples/widgets/animation/sub-attaq/boat_p.h @@ -146,7 +146,8 @@ private: class MoveStateRight : public QState { public: - explicit MoveStateRight(Boat *boat,QState *parent = 0) : QState(parent), boat(boat) + explicit MoveStateRight(Boat *boat, QState *parent = nullptr) + : QState(parent), boat(boat) { } protected: @@ -163,7 +164,8 @@ private: class MoveStateLeft : public QState { public: - explicit MoveStateLeft(Boat *boat,QState *parent = 0) : QState(parent), boat(boat) + explicit MoveStateLeft(Boat *boat, QState *parent = nullptr) + : QState(parent), boat(boat) { } protected: @@ -180,7 +182,8 @@ private: class StopState : public QState { public: - explicit StopState(Boat *boat,QState *parent = 0) : QState(parent), boat(boat) + explicit StopState(Boat *boat, QState *parent = nullptr) + : QState(parent), boat(boat) { } protected: @@ -198,13 +201,14 @@ private: class LaunchStateRight : public QState { public: - explicit LaunchStateRight(Boat *boat,QState *parent = 0) : QState(parent), boat(boat) + explicit LaunchStateRight(Boat *boat, QState *parent = nullptr) + : QState(parent), boat(boat) { } protected: void onEntry(QEvent *) override { - Bomb *b = new Bomb(); + Bomb *b = new Bomb; b->setPos(boat->x()+boat->size().width(),boat->y()); GraphicsScene *scene = static_cast<GraphicsScene *>(boat->scene()); scene->addItem(b); @@ -219,13 +223,14 @@ private: class LaunchStateLeft : public QState { public: - explicit LaunchStateLeft(Boat *boat,QState *parent = 0) : QState(parent), boat(boat) + explicit LaunchStateLeft(Boat *boat, QState *parent = nullptr) + : QState(parent), boat(boat) { } protected: void onEntry(QEvent *) override { - Bomb *b = new Bomb(); + Bomb *b = new Bomb; b->setPos(boat->x() - b->size().width(), boat->y()); GraphicsScene *scene = static_cast<GraphicsScene *>(boat->scene()); scene->addItem(b); diff --git a/examples/widgets/animation/sub-attaq/mainwindow.cpp b/examples/widgets/animation/sub-attaq/mainwindow.cpp index b08a7d9f98..a4bb15b383 100644 --- a/examples/widgets/animation/sub-attaq/mainwindow.cpp +++ b/examples/widgets/animation/sub-attaq/mainwindow.cpp @@ -63,7 +63,8 @@ # include <QtOpenGL/QtOpenGL> #endif -MainWindow::MainWindow() : QMainWindow(0) +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) { QMenu *file = menuBar()->addMenu(tr("&File")); diff --git a/examples/widgets/animation/sub-attaq/mainwindow.h b/examples/widgets/animation/sub-attaq/mainwindow.h index 8d3cc85cd1..c4fb9d324d 100644 --- a/examples/widgets/animation/sub-attaq/mainwindow.h +++ b/examples/widgets/animation/sub-attaq/mainwindow.h @@ -62,7 +62,7 @@ class MainWindow : public QMainWindow { Q_OBJECT public: - MainWindow(); + MainWindow(QWidget *parent = nullptr); private: GraphicsScene *scene; diff --git a/examples/widgets/animation/sub-attaq/pixmapitem.cpp b/examples/widgets/animation/sub-attaq/pixmapitem.cpp index 0723cdfb5d..9475d5c3f8 100644 --- a/examples/widgets/animation/sub-attaq/pixmapitem.cpp +++ b/examples/widgets/animation/sub-attaq/pixmapitem.cpp @@ -54,7 +54,8 @@ //Qt #include <QPainter> -PixmapItem::PixmapItem(const QString &fileName,GraphicsScene::Mode mode, QGraphicsItem * parent) : QGraphicsObject(parent) +PixmapItem::PixmapItem(const QString &fileName,GraphicsScene::Mode mode, QGraphicsItem * parent) + : QGraphicsObject(parent) { if (mode == GraphicsScene::Big) pix = QPixmap(QStringLiteral(":/big/") + fileName); diff --git a/examples/widgets/animation/sub-attaq/pixmapitem.h b/examples/widgets/animation/sub-attaq/pixmapitem.h index de8ed67a38..ec5c01857f 100644 --- a/examples/widgets/animation/sub-attaq/pixmapitem.h +++ b/examples/widgets/animation/sub-attaq/pixmapitem.h @@ -60,7 +60,7 @@ class PixmapItem : public QGraphicsObject { public: - PixmapItem(const QString &fileName, GraphicsScene::Mode mode, QGraphicsItem * parent = 0); + PixmapItem(const QString &fileName, GraphicsScene::Mode mode, QGraphicsItem *parent = nullptr); PixmapItem(const QString &fileName, QGraphicsScene *scene); QSizeF size() const; QRectF boundingRect() const override; diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.cpp b/examples/widgets/animation/sub-attaq/qanimationstate.cpp index fc0da7cea2..ef88df8abe 100644 --- a/examples/widgets/animation/sub-attaq/qanimationstate.cpp +++ b/examples/widgets/animation/sub-attaq/qanimationstate.cpp @@ -84,7 +84,7 @@ machine.start(); Constructs a new state with the given \a parent state. */ QAnimationState::QAnimationState(QState *parent) - : QState(parent), m_animation(0) + : QState(parent), m_animation(nullptr) { } diff --git a/examples/widgets/animation/sub-attaq/states.cpp b/examples/widgets/animation/sub-attaq/states.cpp index 8a3a97a20f..cda10ccdaf 100644 --- a/examples/widgets/animation/sub-attaq/states.cpp +++ b/examples/widgets/animation/sub-attaq/states.cpp @@ -67,11 +67,8 @@ #include <QtCore/QRandomGenerator> PlayState::PlayState(GraphicsScene *scene, QState *parent) - : QState(parent), - scene(scene), - machine(0), - currentLevel(0), - score(0) + : QState(parent), scene(scene), machine(nullptr), + currentLevel(0), score(0) { } |