diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-22 22:28:32 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-22 22:28:33 +0200 |
commit | c0f7cc3a3cc3f06b09591f25277f8083b3a55581 (patch) | |
tree | ecf3d3f49d6dc85b55fbdbe999e386ceda31ef39 /examples/widgets/widgets/tetrix/tetrixboard.cpp | |
parent | 139240ac671953f0763308f235d8b868c1efe1b1 (diff) | |
parent | aa6d7dd7ee306c0adbcd42b013d1e749072205bb (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic274a375d6fc1312ced2354e034dc0980dd47c51
Diffstat (limited to 'examples/widgets/widgets/tetrix/tetrixboard.cpp')
-rw-r--r-- | examples/widgets/widgets/tetrix/tetrixboard.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/widgets/widgets/tetrix/tetrixboard.cpp b/examples/widgets/widgets/tetrix/tetrixboard.cpp index ef3ac4fc38..c1192f264d 100644 --- a/examples/widgets/widgets/tetrix/tetrixboard.cpp +++ b/examples/widgets/widgets/tetrix/tetrixboard.cpp @@ -50,16 +50,16 @@ #include "tetrixboard.h" -#include <QtWidgets> +#include <QKeyEvent> +#include <QLabel> +#include <QPainter> //! [0] TetrixBoard::TetrixBoard(QWidget *parent) - : QFrame(parent) + : QFrame(parent), isStarted(false), isPaused(false) { setFrameStyle(QFrame::Panel | QFrame::Sunken); setFocusPolicy(Qt::StrongFocus); - isStarted = false; - isPaused = false; clearBoard(); nextPiece.setRandomShape(); @@ -396,7 +396,7 @@ bool TetrixBoard::tryMove(const TetrixPiece &newPiece, int newX, int newY) //! [36] void TetrixBoard::drawSquare(QPainter &painter, int x, int y, TetrixShape shape) { - static const QRgb colorTable[8] = { + static constexpr QRgb colorTable[8] = { 0x000000, 0xCC6666, 0x66CC66, 0x6666CC, 0xCCCC66, 0xCC66CC, 0x66CCCC, 0xDAAA00 }; |