diff options
Diffstat (limited to 'examples/widgets/graphicsview/chip')
-rw-r--r-- | examples/widgets/graphicsview/chip/chip.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/graphicsview/chip/mainwindow.cpp | 8 | ||||
-rw-r--r-- | examples/widgets/graphicsview/chip/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/widgets/graphicsview/chip/view.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/graphicsview/chip/view.h | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/examples/widgets/graphicsview/chip/chip.cpp b/examples/widgets/graphicsview/chip/chip.cpp index 3d2bbdfcef..25f4ccc2e9 100644 --- a/examples/widgets/graphicsview/chip/chip.cpp +++ b/examples/widgets/graphicsview/chip/chip.cpp @@ -50,7 +50,9 @@ #include "chip.h" -#include <QtWidgets> +#include <QGraphicsSceneMouseEvent> +#include <QPainter> +#include <QStyleOptionGraphicsItem> Chip::Chip(const QColor &color, int x, int y) { diff --git a/examples/widgets/graphicsview/chip/mainwindow.cpp b/examples/widgets/graphicsview/chip/mainwindow.cpp index b6e1313eb2..f2f89c8722 100644 --- a/examples/widgets/graphicsview/chip/mainwindow.cpp +++ b/examples/widgets/graphicsview/chip/mainwindow.cpp @@ -56,13 +56,11 @@ #include <QSplitter> MainWindow::MainWindow(QWidget *parent) - : QWidget(parent) + : QWidget(parent), scene(new QGraphicsScene(this)) + , h1Splitter(new QSplitter(this)), h2Splitter(new QSplitter(this)) { populateScene(); - h1Splitter = new QSplitter; - h2Splitter = new QSplitter; - QSplitter *vSplitter = new QSplitter; vSplitter->setOrientation(Qt::Vertical); vSplitter->addWidget(h1Splitter); @@ -93,8 +91,6 @@ MainWindow::MainWindow(QWidget *parent) void MainWindow::populateScene() { - scene = new QGraphicsScene(this); - QImage image(":/qt4logo.png"); // Populate scene diff --git a/examples/widgets/graphicsview/chip/mainwindow.h b/examples/widgets/graphicsview/chip/mainwindow.h index 9417d12d7a..3f91b2efb4 100644 --- a/examples/widgets/graphicsview/chip/mainwindow.h +++ b/examples/widgets/graphicsview/chip/mainwindow.h @@ -62,7 +62,7 @@ class MainWindow : public QWidget { Q_OBJECT public: - MainWindow(QWidget *parent = 0); + MainWindow(QWidget *parent = nullptr); private: void setupMatrix(); diff --git a/examples/widgets/graphicsview/chip/view.cpp b/examples/widgets/graphicsview/chip/view.cpp index 7d5fd699a4..21998dc2df 100644 --- a/examples/widgets/graphicsview/chip/view.cpp +++ b/examples/widgets/graphicsview/chip/view.cpp @@ -62,7 +62,7 @@ #else #include <QtWidgets> #endif -#include <qmath.h> +#include <QtMath> #if QT_CONFIG(wheelevent) void GraphicsView::wheelEvent(QWheelEvent *e) diff --git a/examples/widgets/graphicsview/chip/view.h b/examples/widgets/graphicsview/chip/view.h index 89b2e813f1..ea7bd414f5 100644 --- a/examples/widgets/graphicsview/chip/view.h +++ b/examples/widgets/graphicsview/chip/view.h @@ -81,7 +81,7 @@ class View : public QFrame { Q_OBJECT public: - explicit View(const QString &name, QWidget *parent = 0); + explicit View(const QString &name, QWidget *parent = nullptr); QGraphicsView *view() const; |