From f17d33bebbb2d19abf725c20ee81a2dbe8658c9e Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Wed, 18 Jul 2018 11:01:32 +0200 Subject: Doc: Update Tetrix example Use new connect syntax throughout the example. Task-number: QTBUG-69503 Change-Id: I5ab1453318e60586a9655ecb58263778c02aba4f Reviewed-by: Jesus Fernandez --- examples/widgets/widgets/tetrix/tetrixwindow.cpp | 31 ++++++++++++++++-------- 1 file changed, 21 insertions(+), 10 deletions(-) (limited to 'examples') 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(&QLCDNumber::display)); + connect(board, &TetrixBoard::levelChanged, + levelLcd, qOverload(&QLCDNumber::display)); + connect(board, &TetrixBoard::linesRemovedChanged, + linesLcd, qOverload(&QLCDNumber::display)); +#else + connect(board, &TetrixBoard::scoreChanged, + scoreLcd, QOverload::of(&QLCDNumber::display)); + connect(board, &TetrixBoard::levelChanged, + levelLcd, QOverload::of(&QLCDNumber::display)); + connect(board, &TetrixBoard::linesRemovedChanged, + linesLcd, QOverload::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] -- cgit v1.2.3