diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-12-23 10:03:12 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:55:52 +0000 |
commit | 1175c3b5405015a27bc28d836e96582f02d3ce00 (patch) | |
tree | 9d466f156414b29b4264acf748860283ec96c499 /examples | |
parent | 083d12af7be12a6076e1be779452909f37262a61 (diff) |
Modernize code base
Run clang-tidy over the code base with some code modernization
options.
Change-Id: I9e74d1225bce333e74224e3b92c02c7e9884d8f5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'examples')
8 files changed, 25 insertions, 26 deletions
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp index f934f8788..b7cbe13a4 100644 --- a/examples/multimedia/spectrum/app/engine.cpp +++ b/examples/multimedia/spectrum/app/engine.cpp @@ -82,18 +82,18 @@ Engine::Engine(QObject *parent) , m_mode(QAudio::AudioInput) , m_state(QAudio::StoppedState) , m_generateTone(false) - , m_file(0) - , m_analysisFile(0) + , m_file(nullptr) + , m_analysisFile(nullptr) , m_availableAudioInputDevices (QAudioDeviceInfo::availableDevices(QAudio::AudioInput)) , m_audioInputDevice(QAudioDeviceInfo::defaultInputDevice()) - , m_audioInput(0) - , m_audioInputIODevice(0) + , m_audioInput(nullptr) + , m_audioInputIODevice(nullptr) , m_recordPosition(0) , m_availableAudioOutputDevices (QAudioDeviceInfo::availableDevices(QAudio::AudioOutput)) , m_audioOutputDevice(QAudioDeviceInfo::defaultOutputDevice()) - , m_audioOutput(0) + , m_audioOutput(nullptr) , m_playPosition(0) , m_bufferPosition(0) , m_bufferLength(0) @@ -102,7 +102,6 @@ Engine::Engine(QObject *parent) , m_rmsLevel(0.0) , m_peakLevel(0.0) , m_spectrumBufferLength(0) - , m_spectrumAnalyser() , m_spectrumPosition(0) , m_count(0) { @@ -451,11 +450,11 @@ void Engine::spectrumChanged(const FrequencySpectrum &spectrum) void Engine::resetAudioDevices() { delete m_audioInput; - m_audioInput = 0; - m_audioInputIODevice = 0; + m_audioInput = nullptr; + m_audioInputIODevice = nullptr; setRecordPosition(0); delete m_audioOutput; - m_audioOutput = 0; + m_audioOutput = nullptr; setPlayPosition(0); m_spectrumPosition = 0; setLevel(0.0, 0.0, 0); @@ -469,9 +468,9 @@ void Engine::reset() setFormat(QAudioFormat()); m_generateTone = false; delete m_file; - m_file = 0; + m_file = nullptr; delete m_analysisFile; - m_analysisFile = 0; + m_analysisFile = nullptr; m_buffer.clear(); m_bufferPosition = 0; m_bufferLength = 0; @@ -622,7 +621,7 @@ void Engine::stopRecording() QCoreApplication::instance()->processEvents(); m_audioInput->disconnect(); } - m_audioInputIODevice = 0; + m_audioInputIODevice = nullptr; #ifdef DUMP_AUDIO dumpData(); diff --git a/examples/multimedia/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp index d6163f7f9..ff063f53c 100644 --- a/examples/multimedia/spectrum/app/mainwidget.cpp +++ b/examples/multimedia/spectrum/app/mainwidget.cpp @@ -93,9 +93,9 @@ MainWidget::MainWidget(QWidget *parent) this)) , m_toneGeneratorDialog(new ToneGeneratorDialog(this)) , m_modeMenu(new QMenu(this)) - , m_loadFileAction(0) - , m_generateToneAction(0) - , m_recordAction(0) + , m_loadFileAction(nullptr) + , m_generateToneAction(nullptr) + , m_recordAction(nullptr) { m_spectrograph->setParams(SpectrumNumBands, SpectrumLowFreq, SpectrumHighFreq); diff --git a/examples/multimedia/spectrum/app/spectrumanalyser.cpp b/examples/multimedia/spectrum/app/spectrumanalyser.cpp index 6daa1c6aa..d0d1d6cf5 100644 --- a/examples/multimedia/spectrum/app/spectrumanalyser.cpp +++ b/examples/multimedia/spectrum/app/spectrumanalyser.cpp @@ -74,7 +74,7 @@ SpectrumAnalyserThread::SpectrumAnalyserThread(QObject *parent) { #ifdef SPECTRUM_ANALYSER_SEPARATE_THREAD // moveToThread() cannot be called on a QObject with a parent - setParent(0); + setParent(nullptr); moveToThread(m_thread); m_thread->start(); #endif diff --git a/examples/multimedia/spectrum/app/waveform.cpp b/examples/multimedia/spectrum/app/waveform.cpp index 3e7462157..f0b6de672 100644 --- a/examples/multimedia/spectrum/app/waveform.cpp +++ b/examples/multimedia/spectrum/app/waveform.cpp @@ -189,7 +189,7 @@ void Waveform::initialize(const QAudioFormat &format, qint64 audioBufferSize, qi << "windowLength" << m_windowLength << "nTiles" << nTiles; - m_pixmaps.fill(0, nTiles); + m_pixmaps.fill(nullptr, nTiles); m_tiles.resize(nTiles); createPixmaps(rect().size()); diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp index 2a9900c2b..a3daec3aa 100644 --- a/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp +++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp @@ -60,10 +60,10 @@ VideoPlayer::VideoPlayer(QWidget *parent) : QWidget(parent) - , mediaPlayer(0, QMediaPlayer::VideoSurface) - , videoItem(0) - , playButton(0) - , positionSlider(0) + , mediaPlayer(nullptr, QMediaPlayer::VideoSurface) + , videoItem(nullptr) + , playButton(nullptr) + , positionSlider(nullptr) { videoItem = new VideoItem; diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp index 5c1ca4221..4ee3c5ea9 100644 --- a/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp +++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp @@ -57,9 +57,9 @@ VideoPlayer::VideoPlayer(QWidget *parent) : QWidget(parent) - , mediaPlayer(0, QMediaPlayer::VideoSurface) - , playButton(0) - , positionSlider(0) + , mediaPlayer(nullptr, QMediaPlayer::VideoSurface) + , playButton(nullptr) + , positionSlider(nullptr) { VideoWidget *videoWidget = new VideoWidget; diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp index 12ac34a35..aae032ca3 100644 --- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp +++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp @@ -58,7 +58,7 @@ //! [0] VideoWidget::VideoWidget(QWidget *parent) : QWidget(parent) - , surface(0) + , surface(nullptr) { setAutoFillBackground(false); setAttribute(Qt::WA_NoSystemBackground, true); diff --git a/examples/multimediawidgets/player/histogramwidget.cpp b/examples/multimediawidgets/player/histogramwidget.cpp index bb214cad5..e6ada3cde 100644 --- a/examples/multimediawidgets/player/histogramwidget.cpp +++ b/examples/multimediawidgets/player/histogramwidget.cpp @@ -65,7 +65,7 @@ public: void setLevel(qreal level); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: qreal m_level = 0; |