diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2019-07-11 09:54:15 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-11 09:15:13 +0000 |
commit | 940306f134ded0a323821526d09f12670495b29c (patch) | |
tree | bacd1bfdcb689810739f3b2eb0fc1402d38434d1 /examples | |
parent | 962371cbe3f01f3c30991522de1d03c8dfd77164 (diff) |
Eradicate all but one Q_FOREACH loop
Q_FOREACH is going to be deprecated, or at the very least banned from
use in Qt code.
All these are trivial in the sense that the loop body clearly doesn't
modify the container over which we iterate, and that the container is
const, or trivially marked as such.
In one case, replaced Q_FOREACH + delete + clear() with
qDeleteAll(qExchange()), in three others, replaced Qt containers with
statically-known content with plain C arrays.
Change-Id: I718821811370f0cfefac3893283572d39a7d957d
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
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) |