Fix some compiler warnings

Change-Id: Ia25756c626ac2734e33b7a4d537925d302ac2cc3
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

9 files changed, 27 insertions, 34 deletions

diff --git a/examples/multimedia/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp
index ff063f53c..7dea3313d 100644
--- a/examples/multimedia/spectrum/app/mainwidget.cpp
+++ b/examples/multimedia/spectrum/app/mainwidget.cpp
@@ -262,12 +262,11 @@ void MainWidget::createUi()
     windowLayout->addWidget(m_infoMessage);
 
 #ifdef SUPERIMPOSE_PROGRESS_ON_WAVEFORM
-    QScopedPointer<QHBoxLayout> waveformLayout(new QHBoxLayout);
+    std::unique_ptr<QHBoxLayout> waveformLayout(new QHBoxLayout);
     waveformLayout->addWidget(m_progressBar);
     m_progressBar->setMinimumHeight(m_waveform->minimumHeight());
     waveformLayout->setContentsMargins(0, 0, 0, 0);
-    m_waveform->setLayout(waveformLayout.data());
-    waveformLayout.take();
+    m_waveform->setLayout(waveformLayout.release());
     windowLayout->addWidget(m_waveform);
 #else
 #ifndef DISABLE_WAVEFORM
@@ -278,11 +277,10 @@ void MainWidget::createUi()
 
     // Spectrograph and level meter
 
-    QScopedPointer<QHBoxLayout> analysisLayout(new QHBoxLayout);
+    std::unique_ptr<QHBoxLayout> analysisLayout(new QHBoxLayout);
     analysisLayout->addWidget(m_spectrograph);
     analysisLayout->addWidget(m_levelMeter);
-    windowLayout->addLayout(analysisLayout.data());
-    analysisLayout.take();
+    windowLayout->addLayout(analysisLayout.release());
 
     // Button panel
 
@@ -314,7 +312,7 @@ void MainWidget::createUi()
     m_settingsButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     m_settingsButton->setMinimumSize(buttonSize);
 
-    QScopedPointer<QHBoxLayout> buttonPanelLayout(new QHBoxLayout);
+    std::unique_ptr<QHBoxLayout> buttonPanelLayout(new QHBoxLayout);
     buttonPanelLayout->addStretch();
     buttonPanelLayout->addWidget(m_modeButton);
     buttonPanelLayout->addWidget(m_recordButton);
@@ -324,13 +322,11 @@ void MainWidget::createUi()
 
     QWidget *buttonPanel = new QWidget(this);
     buttonPanel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    buttonPanel->setLayout(buttonPanelLayout.data());
-    buttonPanelLayout.take(); // ownership transferred to buttonPanel
+    buttonPanel->setLayout(buttonPanelLayout.release());
 
-    QScopedPointer<QHBoxLayout> bottomPaneLayout(new QHBoxLayout);
+    std::unique_ptr<QHBoxLayout> bottomPaneLayout(new QHBoxLayout);
     bottomPaneLayout->addWidget(buttonPanel);
-    windowLayout->addLayout(bottomPaneLayout.data());
-    bottomPaneLayout.take(); // ownership transferred to windowLayout
+    windowLayout->addLayout(bottomPaneLayout.release());
 
     // Apply layout
 
diff --git a/examples/multimedia/spectrum/app/settingsdialog.cpp b/examples/multimedia/spectrum/app/settingsdialog.cpp
index 10911c825..541bf1590 100644
--- a/examples/multimedia/spectrum/app/settingsdialog.cpp
+++ b/examples/multimedia/spectrum/app/settingsdialog.cpp
@@ -91,26 +91,23 @@ SettingsDialog::SettingsDialog(
 
     // Add widgets to layout
 
-    QScopedPointer<QHBoxLayout> inputDeviceLayout(new QHBoxLayout);
+    std::unique_ptr<QHBoxLayout> inputDeviceLayout(new QHBoxLayout);
     QLabel *inputDeviceLabel = new QLabel(tr("Input device"), this);
     inputDeviceLayout->addWidget(inputDeviceLabel);
     inputDeviceLayout->addWidget(m_inputDeviceComboBox);
-    dialogLayout->addLayout(inputDeviceLayout.data());
-    inputDeviceLayout.take(); // ownership transferred to dialogLayout
+    dialogLayout->addLayout(inputDeviceLayout.release());
 
-    QScopedPointer<QHBoxLayout> outputDeviceLayout(new QHBoxLayout);
+    std::unique_ptr<QHBoxLayout> outputDeviceLayout(new QHBoxLayout);
     QLabel *outputDeviceLabel = new QLabel(tr("Output device"), this);
     outputDeviceLayout->addWidget(outputDeviceLabel);
     outputDeviceLayout->addWidget(m_outputDeviceComboBox);
-    dialogLayout->addLayout(outputDeviceLayout.data());
-    outputDeviceLayout.take(); // ownership transferred to dialogLayout
+    dialogLayout->addLayout(outputDeviceLayout.release());
 
-    QScopedPointer<QHBoxLayout> windowFunctionLayout(new QHBoxLayout);
+    std::unique_ptr<QHBoxLayout> windowFunctionLayout(new QHBoxLayout);
     QLabel *windowFunctionLabel = new QLabel(tr("Window function"), this);
     windowFunctionLayout->addWidget(windowFunctionLabel);
     windowFunctionLayout->addWidget(m_windowFunctionComboBox);
-    dialogLayout->addLayout(windowFunctionLayout.data());
-    windowFunctionLayout.take(); // ownership transferred to dialogLayout
+    dialogLayout->addLayout(windowFunctionLayout.release());
 
     // Connect
     connect(m_inputDeviceComboBox, QOverload<int>::of(&QComboBox::activated),
diff --git a/src/multimedia/platform/darwin/camera/avfimagecapturecontrol.mm b/src/multimedia/platform/darwin/camera/avfimagecapturecontrol.mm
index b019cf2ef..ddcf693b5 100644
--- a/src/multimedia/platform/darwin/camera/avfimagecapturecontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfimagecapturecontrol.mm
@@ -65,7 +65,7 @@ AVFImageCaptureControl::AVFImageCaptureControl(AVFCameraService *service, QObjec
     m_stillImageOutput = [[AVCaptureStillImageOutput alloc] init];
 
     NSDictionary *outputSettings = [[NSDictionary alloc] initWithObjectsAndKeys:
-                                        AVVideoCodecJPEG, AVVideoCodecKey, nil];
+                                        AVVideoCodecTypeJPEG, AVVideoCodecKey, nil];
 
     [m_stillImageOutput setOutputSettings:outputSettings];
     [outputSettings release];
@@ -137,7 +137,7 @@ int AVFImageCaptureControl::capture(const QString &fileName)
             messageParts << QString::fromUtf8([[error localizedFailureReason] UTF8String]);
             messageParts << QString::fromUtf8([[error localizedRecoverySuggestion] UTF8String]);
 
-            QString errorMessage = messageParts.join(" ");
+            QString errorMessage = messageParts.join(QChar(u' '));
             qDebugCamera() << "Image capture failed:" << errorMessage;
 
             QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
@@ -218,7 +218,7 @@ void AVFImageCaptureControl::onNewViewfinderFrame(const QVideoFrame &frame)
     CaptureRequest request = m_captureRequests.dequeue();
     Q_EMIT imageExposed(request.captureId);
 
-    QtConcurrent::run(&AVFImageCaptureControl::makeCapturePreview, this,
+    (void) QtConcurrent::run(&AVFImageCaptureControl::makeCapturePreview, this,
                       request,
                       frame,
                       0 /* rotation */);
diff --git a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
index c48d77004..40e10bc60 100644
--- a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
@@ -112,7 +112,7 @@ QT_USE_NAMESPACE
         messageParts << QString::fromUtf8([[error localizedFailureReason] UTF8String]);
         messageParts << QString::fromUtf8([[error localizedRecoverySuggestion] UTF8String]);
 
-        QString errorMessage = messageParts.join(" ");
+        QString errorMessage = messageParts.join(QChar(u' '));
 
         QMetaObject::invokeMethod(m_recorder, "handleRecordingFailed", Qt::QueuedConnection,
                                   Q_ARG(QString, errorMessage));
diff --git a/src/multimedia/platform/darwin/camera/avfstoragelocation.mm b/src/multimedia/platform/darwin/camera/avfstoragelocation.mm
index 1855f8ec7..46671e938 100644
--- a/src/multimedia/platform/darwin/camera/avfstoragelocation.mm
+++ b/src/multimedia/platform/darwin/camera/avfstoragelocation.mm
@@ -102,7 +102,7 @@ QString AVFStorageLocation::generateFileName(const QString &prefix, const QDir &
 
     if (lastClip == 0) {
         //first run, find the maximum clip number during the fist capture
-        const auto list = dir.entryList(QStringList() << QString("%1*.%2").arg(prefix).arg(ext));
+        const auto list = dir.entryList(QStringList() << QString::fromUtf8("%1*.%2").arg(prefix).arg(ext));
         for (const QString &fileName : list) {
             int imgNumber = QStringView{fileName}.mid(prefix.length(), fileName.size()-prefix.length()-ext.length()-1).toInt();
             lastClip = qMax(lastClip, imgNumber);
@@ -113,7 +113,7 @@ QString AVFStorageLocation::generateFileName(const QString &prefix, const QDir &
     //don't just rely on cached lastClip value,
     //someone else may create a file after camera started
     while (true) {
-        QString name = QString("%1%2.%3").arg(prefix)
+        QString name = QString::fromUtf8("%1%2.%3").arg(prefix)
                                          .arg(lastClip+1,
                                          4, //fieldWidth
                                          10,
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession.mm
index 9583b417c..4dc490cf5 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession.mm
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession.mm
@@ -551,7 +551,7 @@ static void setURL(void *observer, const QByteArray &url, const QString &mimeTyp
 
 static void setStreamURL(void *observer, const QByteArray &url)
 {
-    setURL(observer, QByteArrayLiteral("iodevice://") + url, QFileInfo(url).suffix());
+    setURL(observer, QByteArrayLiteral("iodevice://") + url, QFileInfo(QString::fromUtf8(url)).suffix());
 }
 
 void AVFMediaPlayerSession::setMedia(const QUrl &content, QIODevice *stream)
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol.mm b/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol.mm
index 4cb467296..19eeb877e 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol.mm
+++ b/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol.mm
@@ -70,11 +70,11 @@ public:
     {
     }
 
-    MapMode mapMode() const { return NotMapped; }
-    MapData map(MapMode mode) override { return {}; }
-    void unmap() {}
+    MapMode mapMode() const override { return NotMapped; }
+    MapData map(MapMode /*mode*/) override { return {}; }
+    void unmap() override {}
 
-    QVariant handle() const
+    QVariant handle() const override
     {
         return QVariant::fromValue<unsigned long long>(m_texture);
     }
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index cfedf5072..d8adcb7d6 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -266,7 +266,7 @@ QMediaPlayer::QMediaPlayer(QObject *parent):
     d->playerInterface = static_cast<QMediaPlatformPlayerInterface *>(service());
     if (!d->playerInterface) {
         qWarning() << "QPlatformMediaPlayerInterface not implemented!";
-        d->_q_error(QMediaPlayer::ServiceMissingError, "QMediaPlayer is not supported.");
+        d->_q_error(QMediaPlayer::ServiceMissingError, QString::fromUtf8("QMediaPlayer is not supported."));
         return;
     }
 
diff --git a/src/multimedia/qmediapluginloader.cpp b/src/multimedia/qmediapluginloader.cpp
index db9f2e638..32ce36f86 100644
--- a/src/multimedia/qmediapluginloader.cpp
+++ b/src/multimedia/qmediapluginloader.cpp
@@ -103,7 +103,7 @@ void QMediaPluginLoader::loadMetadata()
         QJsonObject jsonobj = meta.at(i).value(QStringLiteral("MetaData")).toObject();
         QJsonArray arr = jsonobj.value(QStringLiteral("Services")).toArray();
 
-        for (const QJsonValue &value : qAsConst(arr)) {
+        for (QJsonValue value : qAsConst(arr)) {
             QString key = value.toString();
 
             if (m_map.contains(key)) {