4 files changed, 11 insertions, 17 deletions
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 7e11d012b..fd977785b 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -570,14 +570,14 @@ bool Engine::selectFormat()
 
         sampleRatesList += m_audioOutputDevice.supportedSampleRates();
         sampleRatesList = sampleRatesList.toSet().toList(); // remove duplicates
-        qSort(sampleRatesList);
+        std::sort(sampleRatesList.begin(), sampleRatesList.end());
         ENGINE_DEBUG << "Engine::initialize frequenciesList" << sampleRatesList;
 
         QList<int> channelsList;
         channelsList += m_audioInputDevice.supportedChannelCounts();
         channelsList += m_audioOutputDevice.supportedChannelCounts();
         channelsList = channelsList.toSet().toList();
-        qSort(channelsList);
+        std::sort(channelsList.begin(), channelsList.end());
         ENGINE_DEBUG << "Engine::initialize channelsList" << channelsList;
 
         QAudioFormat format;
@@ -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/levelmeter.h b/examples/multimedia/spectrum/app/levelmeter.h
index 860e07ffc..987f90e8f 100644
--- a/examples/multimedia/spectrum/app/levelmeter.h
+++ b/examples/multimedia/spectrum/app/levelmeter.h
@@ -51,7 +51,7 @@
 #ifndef LEVELMETER_H
 #define LEVELMETER_H
 
-#include <QTime>
+#include <QElapsedTimer>
 #include <QWidget>
 
 /**
@@ -99,7 +99,7 @@ private:
     /**
      * Time at which m_peakLevel was last changed.
      */
-    QTime m_peakLevelChanged;
+    QElapsedTimer m_peakLevelChanged;
 
     /**
      * Rate at which peak level bar decays.
@@ -116,7 +116,7 @@ private:
     /**
      * Time at which m_peakHoldLevel was last changed.
      */
-    QTime m_peakHoldLevelChanged;
+    QElapsedTimer m_peakHoldLevelChanged;
 
     QTimer *m_redrawTimer;
 
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)