diff options
author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2017-09-14 09:56:30 +0200 |
---|---|---|
committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2017-09-28 14:00:26 +0000 |
commit | 62d72daf70fed1d7fa1c38bd52468b6536ec6cad (patch) | |
tree | 867428c277ac8cc0fcfa5c15003d6ad5b43f03cd /examples/multimediawidgets/player/playercontrols.h | |
parent | 61b0771e832cad41c726995aafd7bea705909bdd (diff) |
Modernize the Player example
Fixed memory leak.
Renamed members, avoided passing args by copy.
Changed the style of member initialization.
Changed 0 to nullptr.
Changed to new signal/slot style if possible.
Removed Q_WS_SIMULATOR ifdef.
Changed signal/slot connection style.
Task-number: QTBUG-60627
Change-Id: I85bd6e56fe87f4e17f3c9964d6d1fdcb8202c519
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'examples/multimediawidgets/player/playercontrols.h')
-rw-r--r-- | examples/multimediawidgets/player/playercontrols.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/examples/multimediawidgets/player/playercontrols.h b/examples/multimediawidgets/player/playercontrols.h index d29a06d6c..d44ae6c4a 100644 --- a/examples/multimediawidgets/player/playercontrols.h +++ b/examples/multimediawidgets/player/playercontrols.h @@ -55,7 +55,7 @@ class PlayerControls : public QWidget Q_OBJECT public: - PlayerControls(QWidget *parent = 0); + explicit PlayerControls(QWidget *parent = nullptr); QMediaPlayer::State state() const; int volume() const; @@ -85,15 +85,15 @@ private slots: void onVolumeSliderValueChanged(); private: - QMediaPlayer::State playerState; - bool playerMuted; - QAbstractButton *playButton; - QAbstractButton *stopButton; - QAbstractButton *nextButton; - QAbstractButton *previousButton; - QAbstractButton *muteButton; - QAbstractSlider *volumeSlider; - QComboBox *rateBox; + QMediaPlayer::State m_playerState = QMediaPlayer::StoppedState; + bool m_playerMuted = false; + QAbstractButton *m_playButton = nullptr; + QAbstractButton *m_stopButton = nullptr; + QAbstractButton *m_nextButton = nullptr; + QAbstractButton *m_previousButton = nullptr; + QAbstractButton *m_muteButton = nullptr; + QAbstractSlider *m_volumeSlider = nullptr; + QComboBox *m_rateBox = nullptr; }; #endif // PLAYERCONTROLS_H |