diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/multimedia/spectrum/app/engine.cpp | 8 | ||||
-rw-r--r-- | examples/multimedia/spectrum/app/settingsdialog.cpp | 5 | ||||
-rw-r--r-- | examples/multimedia/spectrum/app/waveform.cpp | 5 |
3 files changed, 6 insertions, 12 deletions
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp index a60904e5e..fd977785b 100644 --- a/examples/multimedia/spectrum/app/engine.cpp +++ b/examples/multimedia/spectrum/app/engine.cpp @@ -585,12 +585,11 @@ bool Engine::selectFormat() format.setCodec("audio/pcm"); format.setSampleSize(16); format.setSampleType(QAudioFormat::SignedInt); - int sampleRate, channels; - foreach (sampleRate, sampleRatesList) { + for (int sampleRate : qAsConst(sampleRatesList)) { if (foundSupportedFormat) break; format.setSampleRate(sampleRate); - foreach (channels, channelsList) { + for (int channels : qAsConst(channelsList)) { format.setChannelCount(channels); const bool inputSupport = m_generateTone || m_audioInputDevice.isFormatSupported(format); @@ -752,8 +751,7 @@ void Engine::createOutputDir() // Ensure output directory exists and is empty if (m_outputDir.exists()) { const QStringList files = m_outputDir.entryList(QDir::Files); - QString file; - foreach (file, files) + for (const QString &file : files) m_outputDir.remove(file); } else { QDir::current().mkdir("output"); diff --git a/examples/multimedia/spectrum/app/settingsdialog.cpp b/examples/multimedia/spectrum/app/settingsdialog.cpp index f1723077e..889fcf639 100644 --- a/examples/multimedia/spectrum/app/settingsdialog.cpp +++ b/examples/multimedia/spectrum/app/settingsdialog.cpp @@ -72,11 +72,10 @@ SettingsDialog::SettingsDialog( // Populate combo boxes - QAudioDeviceInfo device; - foreach (device, availableInputDevices) + for (const QAudioDeviceInfo &device : availableInputDevices) m_inputDeviceComboBox->addItem(device.deviceName(), QVariant::fromValue(device)); - foreach (device, availableOutputDevices) + for (const QAudioDeviceInfo &device : availableOutputDevices) m_outputDeviceComboBox->addItem(device.deviceName(), QVariant::fromValue(device)); diff --git a/examples/multimedia/spectrum/app/waveform.cpp b/examples/multimedia/spectrum/app/waveform.cpp index 33e0297bc..d0058b2e3 100644 --- a/examples/multimedia/spectrum/app/waveform.cpp +++ b/examples/multimedia/spectrum/app/waveform.cpp @@ -243,10 +243,7 @@ void Waveform::audioPositionChanged(qint64 position) void Waveform::deletePixmaps() { - QPixmap *pixmap; - foreach (pixmap, m_pixmaps) - delete pixmap; - m_pixmaps.clear(); + qDeleteAll(qExchange(m_pixmaps, {})); } void Waveform::createPixmaps(const QSize &widgetSize) |