diff options
| author | Paul Wicking <paulwicking@gmail.com> | 2018-07-18 11:01:32 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2018-07-19 18:22:12 +0000 |
| commit | f17d33bebbb2d19abf725c20ee81a2dbe8658c9e (patch) | |
| tree | 3686895e949d6929d8269ffe5c2bb2ee1cec9a43 /examples/widgets/widgets | |
| parent | 8d77bcc5627bceff54b8c0498ff6d083ef3a018e (diff) | |
Doc: Update Tetrix example
Use new connect syntax throughout the example.
Task-number: QTBUG-69503
Change-Id: I5ab1453318e60586a9655ecb58263778c02aba4f
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Diffstat (limited to 'examples/widgets/widgets')
| -rw-r--r-- | examples/widgets/widgets/tetrix/tetrixwindow.cpp | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/examples/widgets/widgets/tetrix/tetrixwindow.cpp b/examples/widgets/widgets/tetrix/tetrixwindow.cpp index 43fbdcdea8..7e951aceb8 100644 --- a/examples/widgets/widgets/tetrix/tetrixwindow.cpp +++ b/examples/widgets/widgets/tetrix/tetrixwindow.cpp @@ -83,14 +83,25 @@ TetrixWindow::TetrixWindow() pauseButton->setFocusPolicy(Qt::NoFocus); //! [3] //! [4] - connect(startButton, SIGNAL(clicked()), board, SLOT(start())); + connect(startButton, &QPushButton::clicked, board, &TetrixBoard::start); //! [4] //! [5] - connect(quitButton , SIGNAL(clicked()), qApp, SLOT(quit())); - connect(pauseButton, SIGNAL(clicked()), board, SLOT(pause())); - connect(board, SIGNAL(scoreChanged(int)), scoreLcd, SLOT(display(int))); - connect(board, SIGNAL(levelChanged(int)), levelLcd, SLOT(display(int))); - connect(board, SIGNAL(linesRemovedChanged(int)), - linesLcd, SLOT(display(int))); + connect(quitButton , &QPushButton::clicked, qApp, &QApplication::quit); + connect(pauseButton, &QPushButton::clicked, board, &TetrixBoard::pause); +#if __cplusplus >= 201402L + connect(board, &TetrixBoard::scoreChanged, + scoreLcd, qOverload<int>(&QLCDNumber::display)); + connect(board, &TetrixBoard::levelChanged, + levelLcd, qOverload<int>(&QLCDNumber::display)); + connect(board, &TetrixBoard::linesRemovedChanged, + linesLcd, qOverload<int>(&QLCDNumber::display)); +#else + connect(board, &TetrixBoard::scoreChanged, + scoreLcd, QOverload<int>::of(&QLCDNumber::display)); + connect(board, &TetrixBoard::levelChanged, + levelLcd, QOverload<int>::of(&QLCDNumber::display)); + connect(board, &TetrixBoard::linesRemovedChanged, + linesLcd, QOverload<int>::of(&QLCDNumber::display)); +#endif //! [5] //! [6] @@ -117,9 +128,9 @@ TetrixWindow::TetrixWindow() //! [7] QLabel *TetrixWindow::createLabel(const QString &text) { - QLabel *lbl = new QLabel(text); - lbl->setAlignment(Qt::AlignHCenter | Qt::AlignBottom); - return lbl; + QLabel *label = new QLabel(text); + label->setAlignment(Qt::AlignHCenter | Qt::AlignBottom); + return label; } //! [7] |