diff options
Diffstat (limited to 'examples/widgets/widgets/tetrix')
-rw-r--r-- | examples/widgets/widgets/tetrix/main.cpp | 6 | ||||
-rw-r--r-- | examples/widgets/widgets/tetrix/tetrixboard.cpp | 10 | ||||
-rw-r--r-- | examples/widgets/widgets/tetrix/tetrixboard.h | 2 | ||||
-rw-r--r-- | examples/widgets/widgets/tetrix/tetrixpiece.cpp | 6 | ||||
-rw-r--r-- | examples/widgets/widgets/tetrix/tetrixwindow.cpp | 3 | ||||
-rw-r--r-- | examples/widgets/widgets/tetrix/tetrixwindow.h | 3 |
6 files changed, 13 insertions, 17 deletions
diff --git a/examples/widgets/widgets/tetrix/main.cpp b/examples/widgets/widgets/tetrix/main.cpp index 2698190e76..92f245ca14 100644 --- a/examples/widgets/widgets/tetrix/main.cpp +++ b/examples/widgets/widgets/tetrix/main.cpp @@ -48,12 +48,10 @@ ** ****************************************************************************/ -#include <QtWidgets> - -#include <stdlib.h> - #include "tetrixwindow.h" +#include <QApplication> + int main(int argc, char *argv[]) { QApplication app(argc, argv); diff --git a/examples/widgets/widgets/tetrix/tetrixboard.cpp b/examples/widgets/widgets/tetrix/tetrixboard.cpp index 222ab1fb4d..ef3ac4fc38 100644 --- a/examples/widgets/widgets/tetrix/tetrixboard.cpp +++ b/examples/widgets/widgets/tetrix/tetrixboard.cpp @@ -48,10 +48,10 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "tetrixboard.h" +#include <QtWidgets> + //! [0] TetrixBoard::TetrixBoard(QWidget *parent) : QFrame(parent) @@ -358,7 +358,7 @@ void TetrixBoard::showNextPiece() QPixmap pixmap(dx * squareWidth(), dy * squareHeight()); QPainter painter(&pixmap); - painter.fillRect(pixmap.rect(), nextPieceLabel->palette().background()); + painter.fillRect(pixmap.rect(), nextPieceLabel->palette().window()); for (int i = 0; i < 4; ++i) { int x = nextPiece.x(i) - nextPiece.minX(); @@ -405,11 +405,11 @@ void TetrixBoard::drawSquare(QPainter &painter, int x, int y, TetrixShape shape) painter.fillRect(x + 1, y + 1, squareWidth() - 2, squareHeight() - 2, color); - painter.setPen(color.light()); + painter.setPen(color.lighter()); painter.drawLine(x, y + squareHeight() - 1, x, y); painter.drawLine(x, y, x + squareWidth() - 1, y); - painter.setPen(color.dark()); + painter.setPen(color.darker()); painter.drawLine(x + 1, y + squareHeight() - 1, x + squareWidth() - 1, y + squareHeight() - 1); painter.drawLine(x + squareWidth() - 1, y + squareHeight() - 1, diff --git a/examples/widgets/widgets/tetrix/tetrixboard.h b/examples/widgets/widgets/tetrix/tetrixboard.h index 7c6871dfbd..86bcfa4d6e 100644 --- a/examples/widgets/widgets/tetrix/tetrixboard.h +++ b/examples/widgets/widgets/tetrix/tetrixboard.h @@ -67,7 +67,7 @@ class TetrixBoard : public QFrame Q_OBJECT public: - TetrixBoard(QWidget *parent = 0); + TetrixBoard(QWidget *parent = nullptr); void setNextPieceLabel(QLabel *label); QSize sizeHint() const override; diff --git a/examples/widgets/widgets/tetrix/tetrixpiece.cpp b/examples/widgets/widgets/tetrix/tetrixpiece.cpp index 3d8fa86860..b1b3ca9a99 100644 --- a/examples/widgets/widgets/tetrix/tetrixpiece.cpp +++ b/examples/widgets/widgets/tetrix/tetrixpiece.cpp @@ -48,12 +48,10 @@ ** ****************************************************************************/ -#include <QtCore> - -#include <stdlib.h> - #include "tetrixpiece.h" +#include <QtCore> + //! [0] void TetrixPiece::setRandomShape() { diff --git a/examples/widgets/widgets/tetrix/tetrixwindow.cpp b/examples/widgets/widgets/tetrix/tetrixwindow.cpp index 7e951aceb8..970a38c1dc 100644 --- a/examples/widgets/widgets/tetrix/tetrixwindow.cpp +++ b/examples/widgets/widgets/tetrix/tetrixwindow.cpp @@ -54,7 +54,8 @@ #include "tetrixwindow.h" //! [0] -TetrixWindow::TetrixWindow() +TetrixWindow::TetrixWindow(QWidget *parent) + : QWidget(parent) { board = new TetrixBoard; //! [0] diff --git a/examples/widgets/widgets/tetrix/tetrixwindow.h b/examples/widgets/widgets/tetrix/tetrixwindow.h index a21cef2ecf..3743d6cd2a 100644 --- a/examples/widgets/widgets/tetrix/tetrixwindow.h +++ b/examples/widgets/widgets/tetrix/tetrixwindow.h @@ -51,7 +51,6 @@ #ifndef TETRIXWINDOW_H #define TETRIXWINDOW_H -#include <QFrame> #include <QWidget> QT_BEGIN_NAMESPACE @@ -67,7 +66,7 @@ class TetrixWindow : public QWidget Q_OBJECT public: - TetrixWindow(); + TetrixWindow(QWidget *parent = nullptr); private: QLabel *createLabel(const QString &text); |