diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/widgets/widgets/movie | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/widgets/widgets/movie')
-rw-r--r-- | examples/widgets/widgets/movie/movieplayer.cpp | 27 | ||||
-rw-r--r-- | examples/widgets/widgets/movie/movieplayer.h | 2 |
2 files changed, 14 insertions, 15 deletions
diff --git a/examples/widgets/widgets/movie/movieplayer.cpp b/examples/widgets/widgets/movie/movieplayer.cpp index 61e85537a3..182b258a82 100644 --- a/examples/widgets/widgets/movie/movieplayer.cpp +++ b/examples/widgets/widgets/movie/movieplayer.cpp @@ -48,10 +48,10 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "movieplayer.h" +#include <QtWidgets> + MoviePlayer::MoviePlayer(QWidget *parent) : QWidget(parent) { @@ -69,13 +69,12 @@ MoviePlayer::MoviePlayer(QWidget *parent) createControls(); createButtons(); - connect(movie, SIGNAL(frameChanged(int)), this, SLOT(updateFrameSlider())); - connect(movie, SIGNAL(stateChanged(QMovie::MovieState)), - this, SLOT(updateButtons())); - connect(fitCheckBox, SIGNAL(clicked()), this, SLOT(fitToWindow())); - connect(frameSlider, SIGNAL(valueChanged(int)), this, SLOT(goToFrame(int))); - connect(speedSpinBox, SIGNAL(valueChanged(int)), - movie, SLOT(setSpeed(int))); + connect(movie, &QMovie::frameChanged, this, &MoviePlayer::updateFrameSlider); + connect(movie, &QMovie::stateChanged, this, &MoviePlayer::updateButtons); + connect(fitCheckBox, &QCheckBox::clicked, this, &MoviePlayer::fitToWindow); + connect(frameSlider, &QSlider::valueChanged, this, &MoviePlayer::goToFrame); + connect(speedSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), + movie, &QMovie::setSpeed); mainLayout = new QVBoxLayout; mainLayout->addWidget(movieLabel); @@ -182,32 +181,32 @@ void MoviePlayer::createButtons() openButton->setIcon(style()->standardIcon(QStyle::SP_DialogOpenButton)); openButton->setIconSize(iconSize); openButton->setToolTip(tr("Open File")); - connect(openButton, SIGNAL(clicked()), this, SLOT(open())); + connect(openButton, &QToolButton::clicked, this, &MoviePlayer::open); playButton = new QToolButton; playButton->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); playButton->setIconSize(iconSize); playButton->setToolTip(tr("Play")); - connect(playButton, SIGNAL(clicked()), movie, SLOT(start())); + connect(playButton, &QToolButton::clicked, movie, &QMovie::start); pauseButton = new QToolButton; pauseButton->setCheckable(true); pauseButton->setIcon(style()->standardIcon(QStyle::SP_MediaPause)); pauseButton->setIconSize(iconSize); pauseButton->setToolTip(tr("Pause")); - connect(pauseButton, SIGNAL(clicked(bool)), movie, SLOT(setPaused(bool))); + connect(pauseButton, &QToolButton::clicked, movie, &QMovie::setPaused); stopButton = new QToolButton; stopButton->setIcon(style()->standardIcon(QStyle::SP_MediaStop)); stopButton->setIconSize(iconSize); stopButton->setToolTip(tr("Stop")); - connect(stopButton, SIGNAL(clicked()), movie, SLOT(stop())); + connect(stopButton, &QToolButton::clicked, movie, &QMovie::stop); quitButton = new QToolButton; quitButton->setIcon(style()->standardIcon(QStyle::SP_DialogCloseButton)); quitButton->setIconSize(iconSize); quitButton->setToolTip(tr("Quit")); - connect(quitButton, SIGNAL(clicked()), this, SLOT(close())); + connect(quitButton, &QToolButton::clicked, this, &MoviePlayer::close); buttonsLayout = new QHBoxLayout; buttonsLayout->addStretch(); diff --git a/examples/widgets/widgets/movie/movieplayer.h b/examples/widgets/widgets/movie/movieplayer.h index 9fa9604025..7d143bd37c 100644 --- a/examples/widgets/widgets/movie/movieplayer.h +++ b/examples/widgets/widgets/movie/movieplayer.h @@ -70,7 +70,7 @@ class MoviePlayer : public QWidget Q_OBJECT public: - MoviePlayer(QWidget *parent = 0); + MoviePlayer(QWidget *parent = nullptr); void openFile(const QString &fileName); private slots: |