summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/multimedia/audioinput/audioinput.cpp4
-rw-r--r--examples/multimedia/audiooutput/audiooutput.cpp2
-rw-r--r--examples/multimedia/spectrum/app/engine.cpp6
-rw-r--r--examples/multimedia/spectrum/app/levelmeter.cpp2
-rw-r--r--examples/multimedia/spectrum/app/mainwidget.cpp4
-rw-r--r--examples/multimedia/spectrum/app/spectrograph.cpp4
-rw-r--r--examples/multimedia/spectrum/app/spectrumanalyser.cpp4
-rw-r--r--examples/multimedia/spectrum/app/tonegenerator.cpp2
-rw-r--r--src/gsttools/qgstreamervideooverlay.cpp8
-rw-r--r--src/imports/multimedia/multimedia.cpp2
-rw-r--r--src/multimedia/audio/qsoundeffect_qaudio_p.cpp4
-rw-r--r--src/multimedia/recording/qmediarecorder.cpp4
-rw-r--r--src/plugins/alsa/qalsaaudioinput.cpp4
-rw-r--r--src/plugins/alsa/qalsaaudiooutput.cpp4
-rw-r--r--src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.cpp2
-rw-r--r--src/plugins/android/src/mediacapture/qandroidcapturesession.cpp6
-rw-r--r--src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.cpp4
-rw-r--r--src/plugins/audiocapture/audiocaptureservice.cpp2
-rw-r--r--src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.mm2
-rw-r--r--src/plugins/avfoundation/camera/avfcameraexposurecontrol.mm16
-rw-r--r--src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm2
-rw-r--r--src/plugins/avfoundation/camera/avfcamerasession.mm2
-rw-r--r--src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm4
-rw-r--r--src/plugins/avfoundation/camera/avfimageencodercontrol.mm2
-rw-r--r--src/plugins/avfoundation/camera/avfmediaassetwriter.mm2
-rw-r--r--src/plugins/avfoundation/camera/avfmediarecordercontrol.mm4
-rw-r--r--src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm4
-rw-r--r--src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.mm2
-rw-r--r--src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm6
-rw-r--r--src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm2
-rw-r--r--src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm2
-rw-r--r--src/plugins/coreaudio/coreaudiooutput.mm8
-rw-r--r--src/plugins/coreaudio/coreaudiosessionmanager.mm2
-rw-r--r--src/plugins/directshow/common/directshowbasefilter.cpp2
-rw-r--r--src/plugins/directshow/common/directshowpin.cpp8
-rw-r--r--src/plugins/directshow/player/directshowiosource.cpp2
-rw-r--r--src/plugins/directshow/player/directshowplayerservice.cpp12
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp2
-rw-r--r--src/plugins/gstreamer/camerabin/camerabincontainer.cpp2
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp2
-rw-r--r--src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp2
-rw-r--r--src/plugins/pulseaudio/qaudioinput_pulse.cpp12
-rw-r--r--src/plugins/pulseaudio/qaudiooutput_pulse.cpp16
-rw-r--r--src/plugins/pulseaudio/qpulseaudioengine.cpp2
-rw-r--r--src/plugins/qnx-audio/audio/qnxaudioinput.cpp4
-rw-r--r--src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.cpp2
-rw-r--r--src/plugins/qnx/camera/bbcameraservice.cpp2
-rw-r--r--src/plugins/qnx/camera/bbcamerasession.cpp10
-rw-r--r--src/plugins/qnx/camera/bbcamerazoomcontrol.cpp2
-rw-r--r--src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp2
-rw-r--r--src/plugins/qnx/neutrinoserviceplugin.cpp2
-rw-r--r--src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp2
-rw-r--r--src/plugins/windowsaudio/qwindowsaudioinput.cpp10
-rw-r--r--src/plugins/windowsaudio/qwindowsaudiooutput.cpp10
-rw-r--r--src/plugins/wmf/decoder/mfdecodersourcereader.cpp2
-rw-r--r--src/plugins/wmf/player/mfvideorenderercontrol.cpp2
-rw-r--r--tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp2
-rw-r--r--tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp2
58 files changed, 122 insertions, 122 deletions
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 86da20d51..611500c41 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -122,8 +122,8 @@ void AudioInfo::stop()
qint64 AudioInfo::readData(char *data, qint64 maxlen)
{
- Q_UNUSED(data)
- Q_UNUSED(maxlen)
+ Q_UNUSED(data);
+ Q_UNUSED(maxlen);
return 0;
}
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index 69b4470be..b6eb41f69 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -83,7 +83,7 @@ void Generator::generateData(const QAudioFormat &format, qint64 durationUs, int
qint64 length = (format.sampleRate() * format.channelCount() * (format.sampleSize() / 8))
* durationUs / 1000000;
Q_ASSERT(length % sampleBytes == 0);
- Q_UNUSED(sampleBytes) // suppress warning in release builds
+ Q_UNUSED(sampleBytes); // suppress warning in release builds
m_buffer.resize(length);
unsigned char *ptr = reinterpret_cast<unsigned char *>(m_buffer.data());
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index d188259dc..f934f8788 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -675,8 +675,8 @@ void Engine::setPlayPosition(qint64 position, bool forceEmit)
void Engine::calculateLevel(qint64 position, qint64 length)
{
#ifdef DISABLE_LEVEL
- Q_UNUSED(position)
- Q_UNUSED(length)
+ Q_UNUSED(position);
+ Q_UNUSED(length);
#else
Q_ASSERT(position + length <= m_bufferPosition + m_dataLength);
@@ -707,7 +707,7 @@ void Engine::calculateLevel(qint64 position, qint64 length)
void Engine::calculateSpectrum(qint64 position)
{
#ifdef DISABLE_SPECTRUM
- Q_UNUSED(position)
+ Q_UNUSED(position);
#else
Q_ASSERT(position + m_spectrumBufferLength <= m_bufferPosition + m_dataLength);
Q_ASSERT(0 == m_spectrumBufferLength % 2); // constraint of FFT algorithm
diff --git a/examples/multimedia/spectrum/app/levelmeter.cpp b/examples/multimedia/spectrum/app/levelmeter.cpp
index 1c720905c..f0c66eeb3 100644
--- a/examples/multimedia/spectrum/app/levelmeter.cpp
+++ b/examples/multimedia/spectrum/app/levelmeter.cpp
@@ -133,7 +133,7 @@ void LevelMeter::redrawTimerExpired()
void LevelMeter::paintEvent(QPaintEvent *event)
{
- Q_UNUSED(event)
+ Q_UNUSED(event);
QPainter painter(this);
painter.fillRect(rect(), Qt::black);
diff --git a/examples/multimedia/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp
index 235608a05..d6163f7f9 100644
--- a/examples/multimedia/spectrum/app/mainwidget.cpp
+++ b/examples/multimedia/spectrum/app/mainwidget.cpp
@@ -167,7 +167,7 @@ void MainWidget::errorMessage(const QString &heading, const QString &detail)
void MainWidget::timerEvent(QTimerEvent *event)
{
Q_ASSERT(event->timerId() == m_infoMessageTimerId);
- Q_UNUSED(event) // suppress warnings in release builds
+ Q_UNUSED(event); // suppress warnings in release builds
killTimer(m_infoMessageTimerId);
m_infoMessageTimerId = NullTimerId;
m_infoMessage->setText("");
@@ -178,7 +178,7 @@ void MainWidget::audioPositionChanged(qint64 position)
#ifndef DISABLE_WAVEFORM
m_waveform->audioPositionChanged(position);
#else
- Q_UNUSED(position)
+ Q_UNUSED(position);
#endif
}
diff --git a/examples/multimedia/spectrum/app/spectrograph.cpp b/examples/multimedia/spectrum/app/spectrograph.cpp
index 04ef51e80..6eaa097fc 100644
--- a/examples/multimedia/spectrum/app/spectrograph.cpp
+++ b/examples/multimedia/spectrum/app/spectrograph.cpp
@@ -86,7 +86,7 @@ void Spectrograph::setParams(int numBars, qreal lowFreq, qreal highFreq)
void Spectrograph::timerEvent(QTimerEvent *event)
{
Q_ASSERT(event->timerId() == m_timerId);
- Q_UNUSED(event) // suppress warnings in release builds
+ Q_UNUSED(event); // suppress warnings in release builds
killTimer(m_timerId);
m_timerId = NullTimerId;
m_barSelected = NullIndex;
@@ -95,7 +95,7 @@ void Spectrograph::timerEvent(QTimerEvent *event)
void Spectrograph::paintEvent(QPaintEvent *event)
{
- Q_UNUSED(event)
+ Q_UNUSED(event);
QPainter painter(this);
painter.fillRect(rect(), Qt::black);
diff --git a/examples/multimedia/spectrum/app/spectrumanalyser.cpp b/examples/multimedia/spectrum/app/spectrumanalyser.cpp
index ee024147f..6daa1c6aa 100644
--- a/examples/multimedia/spectrum/app/spectrumanalyser.cpp
+++ b/examples/multimedia/spectrum/app/spectrumanalyser.cpp
@@ -201,7 +201,7 @@ void SpectrumAnalyser::setWindowFunction(WindowFunction type)
Qt::AutoConnection,
Q_ARG(WindowFunction, type));
Q_ASSERT(b);
- Q_UNUSED(b) // suppress warnings in release builds
+ Q_UNUSED(b); // suppress warnings in release builds
}
void SpectrumAnalyser::calculate(const QByteArray &buffer,
@@ -247,7 +247,7 @@ void SpectrumAnalyser::calculate(const QByteArray &buffer,
Q_ARG(int, format.sampleRate()),
Q_ARG(int, bytesPerSample));
Q_ASSERT(b);
- Q_UNUSED(b) // suppress warnings in release builds
+ Q_UNUSED(b); // suppress warnings in release builds
#ifdef DUMP_SPECTRUMANALYSER
m_textStream << "FrequencySpectrum " << m_count << "\n";
diff --git a/examples/multimedia/spectrum/app/tonegenerator.cpp b/examples/multimedia/spectrum/app/tonegenerator.cpp
index 1718d1c69..2e549ab4f 100644
--- a/examples/multimedia/spectrum/app/tonegenerator.cpp
+++ b/examples/multimedia/spectrum/app/tonegenerator.cpp
@@ -65,7 +65,7 @@ void generateTone(const SweptTone &tone, const QAudioFormat &format, QByteArray
const int numSamples = buffer.size() / sampleBytes;
Q_ASSERT(length % sampleBytes == 0);
- Q_UNUSED(sampleBytes) // suppress warning in release builds
+ Q_UNUSED(sampleBytes); // suppress warning in release builds
unsigned char *ptr = reinterpret_cast<unsigned char *>(buffer.data());
diff --git a/src/gsttools/qgstreamervideooverlay.cpp b/src/gsttools/qgstreamervideooverlay.cpp
index d410be7d9..ea8149442 100644
--- a/src/gsttools/qgstreamervideooverlay.cpp
+++ b/src/gsttools/qgstreamervideooverlay.cpp
@@ -506,10 +506,10 @@ void QGstreamerVideoOverlay::setRenderRectangle(const QRect &rect)
if (m_videoSink && GST_IS_X_OVERLAY(m_videoSink))
gst_x_overlay_set_render_rectangle(GST_X_OVERLAY(m_videoSink), x, y , w , h);
#else
- Q_UNUSED(x)
- Q_UNUSED(y)
- Q_UNUSED(w)
- Q_UNUSED(h)
+ Q_UNUSED(x);
+ Q_UNUSED(y);
+ Q_UNUSED(w);
+ Q_UNUSED(h);
#endif
}
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index bbc48647a..69b26417b 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
static QObject *multimedia_global_object(QQmlEngine *qmlEngine, QJSEngine *jsEngine)
{
- Q_UNUSED(qmlEngine)
+ Q_UNUSED(qmlEngine);
return new QDeclarativeMultimediaGlobal(jsEngine);
}
diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
index b553671fa..90d195d3f 100644
--- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp
@@ -447,8 +447,8 @@ qint64 PrivateSoundSource::readData(char *data, qint64 len)
qint64 PrivateSoundSource::writeData(const char *data, qint64 len)
{
- Q_UNUSED(data)
- Q_UNUSED(len)
+ Q_UNUSED(data);
+ Q_UNUSED(len);
return 0;
}
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index 909cf88bb..617627985 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -182,8 +182,8 @@ void QMediaRecorderPrivate::_q_applySettings()
void QMediaRecorderPrivate::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability)
{
Q_Q(QMediaRecorder);
- Q_UNUSED(error)
- Q_UNUSED(availability)
+ Q_UNUSED(error);
+ Q_UNUSED(availability);
// Really this should not always emit, but
// we can't really tell from here (isAvailable
diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp
index 0158e3844..bff23dfe1 100644
--- a/src/plugins/alsa/qalsaaudioinput.cpp
+++ b/src/plugins/alsa/qalsaaudioinput.cpp
@@ -792,8 +792,8 @@ qint64 AlsaInputPrivate::readData( char* data, qint64 len)
qint64 AlsaInputPrivate::writeData(const char* data, qint64 len)
{
- Q_UNUSED(data)
- Q_UNUSED(len)
+ Q_UNUSED(data);
+ Q_UNUSED(len);
return 0;
}
diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp
index ee5aee989..f66e5e6e8 100644
--- a/src/plugins/alsa/qalsaaudiooutput.cpp
+++ b/src/plugins/alsa/qalsaaudiooutput.cpp
@@ -783,8 +783,8 @@ AlsaOutputPrivate::~AlsaOutputPrivate() {}
qint64 AlsaOutputPrivate::readData( char* data, qint64 len)
{
- Q_UNUSED(data)
- Q_UNUSED(len)
+ Q_UNUSED(data);
+ Q_UNUSED(len);
return 0;
}
diff --git a/src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.cpp b/src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.cpp
index 4e703f5c7..a47fa4f72 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.cpp
@@ -58,7 +58,7 @@ QVideoFrame::PixelFormat QAndroidCameraCaptureBufferFormatControl::bufferFormat(
void QAndroidCameraCaptureBufferFormatControl::setBufferFormat(QVideoFrame::PixelFormat format)
{
- Q_UNUSED(format)
+ Q_UNUSED(format);
}
QT_END_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
index 7cc3ad619..768bb4442 100644
--- a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
@@ -571,15 +571,15 @@ QAndroidCaptureSession::CaptureProfile QAndroidCaptureSession::getProfile(int id
void QAndroidCaptureSession::onError(int what, int extra)
{
- Q_UNUSED(what)
- Q_UNUSED(extra)
+ Q_UNUSED(what);
+ Q_UNUSED(extra);
stop(true);
emit error(QMediaRecorder::ResourceError, QLatin1String("Unknown error."));
}
void QAndroidCaptureSession::onInfo(int what, int extra)
{
- Q_UNUSED(extra)
+ Q_UNUSED(extra);
if (what == 800) {
// MEDIA_RECORDER_INFO_MAX_DURATION_REACHED
setState(QMediaRecorder::StoppedState);
diff --git a/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.cpp b/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.cpp
index b0f5faa01..fa68409d3 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.cpp
@@ -104,14 +104,14 @@ void QAndroidMediaRecorderControl::setState(QMediaRecorder::State state)
void QAndroidMediaRecorderControl::setMuted(bool muted)
{
// No API for this in Android
- Q_UNUSED(muted)
+ Q_UNUSED(muted);
qWarning("QMediaRecorder::setMuted() is not supported on Android.");
}
void QAndroidMediaRecorderControl::setVolume(qreal volume)
{
// No API for this in Android
- Q_UNUSED(volume)
+ Q_UNUSED(volume);
qWarning("QMediaRecorder::setVolume() is not supported on Android.");
}
diff --git a/src/plugins/audiocapture/audiocaptureservice.cpp b/src/plugins/audiocapture/audiocaptureservice.cpp
index 0036f3ef0..f06871519 100644
--- a/src/plugins/audiocapture/audiocaptureservice.cpp
+++ b/src/plugins/audiocapture/audiocaptureservice.cpp
@@ -91,7 +91,7 @@ QMediaControl *AudioCaptureService::requestControl(const char *name)
void AudioCaptureService::releaseControl(QMediaControl *control)
{
- Q_UNUSED(control)
+ Q_UNUSED(control);
}
QT_END_NAMESPACE
diff --git a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.mm b/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.mm
index 5d4b6fc1a..1aeb44ff6 100644
--- a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.mm
+++ b/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.mm
@@ -118,7 +118,7 @@ QString AVFAudioEncoderSettingsControl::codecDescription(const QString &codecNam
QList<int> AVFAudioEncoderSettingsControl::supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous) const
{
- Q_UNUSED(settings)
+ Q_UNUSED(settings);
if (continuous)
*continuous = true;
diff --git a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.mm b/src/plugins/avfoundation/camera/avfcameraexposurecontrol.mm
index 7540ab86c..62387604f 100644
--- a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcameraexposurecontrol.mm
@@ -240,7 +240,7 @@ bool AVFCameraExposureControl::isParameterSupported(ExposureParameter parameter)
|| parameter == QCameraExposureControl::ExposureCompensation
|| parameter == QCameraExposureControl::ExposureMode;
#else
- Q_UNUSED(parameter)
+ Q_UNUSED(parameter);
return false;
#endif
}
@@ -302,8 +302,8 @@ QVariantList AVFCameraExposureControl::supportedParameterRange(ExposureParameter
parameterRange << QVariant::fromValue(QCameraExposure::ExposureAuto);
}
#else
- Q_UNUSED(parameter)
- Q_UNUSED(continuous)
+ Q_UNUSED(parameter);
+ Q_UNUSED(continuous);
#endif
return parameterRange;
}
@@ -364,7 +364,7 @@ QVariant AVFCameraExposureControl::actualValue(ExposureParameter parameter) cons
}
}
#else
- Q_UNUSED(parameter)
+ Q_UNUSED(parameter);
#endif
return QVariant();
}
@@ -425,7 +425,7 @@ bool AVFCameraExposureControl::setExposureMode(const QVariant &value)
return true;
#else
- Q_UNUSED(value)
+ Q_UNUSED(value);
return false;
#endif
}
@@ -466,7 +466,7 @@ bool AVFCameraExposureControl::setExposureCompensation(const QVariant &value)
return true;
#else
- Q_UNUSED(value)
+ Q_UNUSED(value);
return false;
#endif
}
@@ -513,7 +513,7 @@ bool AVFCameraExposureControl::setShutterSpeed(const QVariant &value)
return true;
#else
- Q_UNUSED(value)
+ Q_UNUSED(value);
return false;
#endif
}
@@ -557,7 +557,7 @@ bool AVFCameraExposureControl::setISO(const QVariant &value)
return true;
#else
- Q_UNUSED(value)
+ Q_UNUSED(value);
return false;
#endif
}
diff --git a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
index 9e1bf3f84..a03d38b8c 100644
--- a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
@@ -72,7 +72,7 @@ public:
, m_mode(NotMapped)
{
#ifndef Q_OS_IOS
- Q_UNUSED(renderer)
+ Q_UNUSED(renderer);
#endif // Q_OS_IOS
CVPixelBufferRetain(m_buffer);
}
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index 6ee9c2636..ebefa07e5 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -375,7 +375,7 @@ void AVFCameraSession::processSessionStopped()
void AVFCameraSession::onCaptureModeChanged(QCamera::CaptureModes mode)
{
- Q_UNUSED(mode)
+ Q_UNUSED(mode);
const QCamera::State s = state();
if (s == QCamera::LoadedState || s == QCamera::ActiveState) {
diff --git a/src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm b/src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm
index 47dc736a1..119a1fc0a 100644
--- a/src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm
@@ -95,8 +95,8 @@ qreal AVFCameraZoomControl::currentDigitalZoom() const
void AVFCameraZoomControl::zoomTo(qreal optical, qreal digital)
{
- Q_UNUSED(optical)
- Q_UNUSED(digital)
+ Q_UNUSED(optical);
+ Q_UNUSED(digital);
if (qFuzzyCompare(CGFloat(digital), m_requestedZoomFactor))
return;
diff --git a/src/plugins/avfoundation/camera/avfimageencodercontrol.mm b/src/plugins/avfoundation/camera/avfimageencodercontrol.mm
index e858d93c4..93de3e63c 100644
--- a/src/plugins/avfoundation/camera/avfimageencodercontrol.mm
+++ b/src/plugins/avfoundation/camera/avfimageencodercontrol.mm
@@ -76,7 +76,7 @@ QString AVFImageEncoderControl::imageCodecDescription(const QString &codecName)
QList<QSize> AVFImageEncoderControl::supportedResolutions(const QImageEncoderSettings &settings,
bool *continuous) const
{
- Q_UNUSED(settings)
+ Q_UNUSED(settings);
QList<QSize> resolutions;
diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm b/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
index 2d40b9087..abe7299a8 100644
--- a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
+++ b/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
@@ -349,7 +349,7 @@ using AVFAtomicInt64 = QAtomicInteger<qint64>;
didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
fromConnection:(AVCaptureConnection *)connection
{
- Q_UNUSED(connection)
+ Q_UNUSED(connection);
if (m_state.loadAcquire() != WriterStateActive)
return;
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm b/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
index f8f4500c1..7296b7dc1 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
+++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
@@ -89,7 +89,7 @@ QT_USE_NAMESPACE
{
Q_UNUSED(captureOutput);
Q_UNUSED(fileURL);
- Q_UNUSED(connections)
+ Q_UNUSED(connections);
QMetaObject::invokeMethod(m_recorder, "handleRecordingStarted", Qt::QueuedConnection);
}
@@ -101,7 +101,7 @@ QT_USE_NAMESPACE
{
Q_UNUSED(captureOutput);
Q_UNUSED(fileURL);
- Q_UNUSED(connections)
+ Q_UNUSED(connections);
if (error) {
QStringList messageParts;
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm
index 62197e900..33064827d 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm
+++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm
@@ -316,13 +316,13 @@ void AVFMediaRecorderControlIOS::setState(QMediaRecorder::State state)
void AVFMediaRecorderControlIOS::setMuted(bool muted)
{
- Q_UNUSED(muted)
+ Q_UNUSED(muted);
qDebugCamera() << Q_FUNC_INFO << "not implemented";
}
void AVFMediaRecorderControlIOS::setVolume(qreal volume)
{
- Q_UNUSED(volume)
+ Q_UNUSED(volume);
qDebugCamera() << Q_FUNC_INFO << "not implemented";
}
diff --git a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.mm b/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.mm
index ddf833fd3..70ec38988 100644
--- a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.mm
+++ b/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.mm
@@ -93,7 +93,7 @@ AVFVideoEncoderSettingsControl::AVFVideoEncoderSettingsControl(AVFCameraService
QList<QSize> AVFVideoEncoderSettingsControl::supportedResolutions(const QVideoEncoderSettings &settings,
bool *continuous) const
{
- Q_UNUSED(settings)
+ Q_UNUSED(settings);
if (continuous)
*continuous = true;
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
index d5554c51c..61a78ac03 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
@@ -293,7 +293,7 @@ static void *AVFMediaPlayerSessionObserverCurrentItemDurationObservationContext
-(void) assetFailedToPrepareForPlayback:(NSError *)error
{
- Q_UNUSED(error)
+ Q_UNUSED(error);
QMetaObject::invokeMethod(m_session, "processMediaLoadError", Qt::AutoConnection);
#ifdef QT_DEBUG_AVF
qDebug() << Q_FUNC_INFO;
@@ -305,14 +305,14 @@ static void *AVFMediaPlayerSessionObserverCurrentItemDurationObservationContext
- (void) playerItemDidReachEnd:(NSNotification *)notification
{
- Q_UNUSED(notification)
+ Q_UNUSED(notification);
if (self.session)
QMetaObject::invokeMethod(m_session, "processEOS", Qt::AutoConnection);
}
- (void) playerItemTimeJumped:(NSNotification *)notification
{
- Q_UNUSED(notification)
+ Q_UNUSED(notification);
if (self.session)
QMetaObject::invokeMethod(m_session, "processPositionChange", Qt::AutoConnection);
}
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm
index 372b0a27a..cbaa1aa11 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm
@@ -81,7 +81,7 @@ AVFVideoFrameRenderer::~AVFVideoFrameRenderer()
void AVFVideoFrameRenderer::setPlayerLayer(AVPlayerLayer *layer)
{
- Q_UNUSED(layer)
+ Q_UNUSED(layer);
if (m_videoOutput) {
[m_videoOutput release];
m_videoOutput = nullptr;
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm b/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm
index 3dbf5e856..726dc5193 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm
@@ -196,7 +196,7 @@ void AVFVideoRendererControl::setLayer(void *playerLayer)
void AVFVideoRendererControl::updateVideoFrame(const CVTimeStamp &ts)
{
- Q_UNUSED(ts)
+ Q_UNUSED(ts);
AVPlayerLayer *playerLayer = static_cast<AVPlayerLayer*>(m_playerLayer);
diff --git a/src/plugins/coreaudio/coreaudiooutput.mm b/src/plugins/coreaudio/coreaudiooutput.mm
index b8addc1cf..ecbd67972 100644
--- a/src/plugins/coreaudio/coreaudiooutput.mm
+++ b/src/plugins/coreaudio/coreaudiooutput.mm
@@ -488,10 +488,10 @@ void CoreAudioOutput::inputReady()
OSStatus CoreAudioOutput::renderCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData)
{
- Q_UNUSED(ioActionFlags)
- Q_UNUSED(inTimeStamp)
- Q_UNUSED(inBusNumber)
- Q_UNUSED(inNumberFrames)
+ Q_UNUSED(ioActionFlags);
+ Q_UNUSED(inTimeStamp);
+ Q_UNUSED(inBusNumber);
+ Q_UNUSED(inNumberFrames);
CoreAudioOutput* d = static_cast<CoreAudioOutput*>(inRefCon);
diff --git a/src/plugins/coreaudio/coreaudiosessionmanager.mm b/src/plugins/coreaudio/coreaudiosessionmanager.mm
index 6c86f0753..372c49491 100644
--- a/src/plugins/coreaudio/coreaudiosessionmanager.mm
+++ b/src/plugins/coreaudio/coreaudiosessionmanager.mm
@@ -163,7 +163,7 @@ QT_BEGIN_NAMESPACE
-(void)audioSessionMediaServicesWereReset:(NSNotification *)notification
{
- Q_UNUSED(notification)
+ Q_UNUSED(notification);
#ifdef QT_DEBUG_COREAUDIO
qDebug("audioSession Media Services were reset");
#endif
diff --git a/src/plugins/directshow/common/directshowbasefilter.cpp b/src/plugins/directshow/common/directshowbasefilter.cpp
index 3a13dce0e..6099981cf 100644
--- a/src/plugins/directshow/common/directshowbasefilter.cpp
+++ b/src/plugins/directshow/common/directshowbasefilter.cpp
@@ -76,7 +76,7 @@ HRESULT DirectShowBaseFilter::NotifyEvent(long eventCode, LONG_PTR eventParam1,
HRESULT DirectShowBaseFilter::Run(REFERENCE_TIME tStart)
{
- Q_UNUSED(tStart)
+ Q_UNUSED(tStart);
const std::lock_guard<QRecursiveMutex> locker(m_mutex);
m_startTime = tStart;
diff --git a/src/plugins/directshow/common/directshowpin.cpp b/src/plugins/directshow/common/directshowpin.cpp
index d8129748c..d80b0b08e 100644
--- a/src/plugins/directshow/common/directshowpin.cpp
+++ b/src/plugins/directshow/common/directshowpin.cpp
@@ -360,7 +360,7 @@ bool DirectShowPin::setMediaType(const AM_MEDIA_TYPE *type)
HRESULT DirectShowPin::completeConnection(IPin *pin)
{
- Q_UNUSED(pin)
+ Q_UNUSED(pin);
return S_OK;
}
@@ -371,7 +371,7 @@ HRESULT DirectShowPin::connectionEnded()
HRESULT DirectShowPin::setActive(bool active)
{
- Q_UNUSED(active)
+ Q_UNUSED(active);
return S_OK;
}
@@ -566,7 +566,7 @@ HRESULT DirectShowInputPin::GetAllocator(IMemAllocator **ppAllocator)
HRESULT DirectShowInputPin::NotifyAllocator(IMemAllocator *pAllocator, BOOL bReadOnly)
{
- Q_UNUSED(bReadOnly)
+ Q_UNUSED(bReadOnly);
if (!pAllocator)
return E_POINTER;
@@ -584,7 +584,7 @@ HRESULT DirectShowInputPin::NotifyAllocator(IMemAllocator *pAllocator, BOOL bRea
HRESULT DirectShowInputPin::GetAllocatorRequirements(ALLOCATOR_PROPERTIES *pProps)
{
- Q_UNUSED(pProps)
+ Q_UNUSED(pProps);
return E_NOTIMPL;
}
diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp
index 5144710b7..54c043c17 100644
--- a/src/plugins/directshow/player/directshowiosource.cpp
+++ b/src/plugins/directshow/player/directshowiosource.cpp
@@ -180,7 +180,7 @@ HRESULT DirectShowIOSource::GetClassID(CLSID *pClassID)
// IMediaFilter
HRESULT DirectShowIOSource::Run(REFERENCE_TIME tStart)
{
- Q_UNUSED(tStart)
+ Q_UNUSED(tStart);
QMutexLocker locker(&m_mutex);
m_state = State_Running;
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index 3cc42dc21..ce5c9fe56 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -98,7 +98,7 @@ static QString comError(HRESULT hr)
_com_error error(hr);
return QString::fromWCharArray(error.ErrorMessage());
#else
- Q_UNUSED(hr)
+ Q_UNUSED(hr);
return QString();
#endif
}
@@ -408,7 +408,7 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker)
void DirectShowPlayerService::doSetStreamSource(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
DirectShowIOSource *source = new DirectShowIOSource(m_loop);
source->setDevice(m_stream);
@@ -1015,7 +1015,7 @@ void DirectShowPlayerService::stop()
void DirectShowPlayerService::doStop(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
if (m_executedTasks & (Play | Pause)) {
if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
control->Stop();
@@ -1247,7 +1247,7 @@ void DirectShowPlayerService::setAudioOutput(IBaseFilter *filter)
void DirectShowPlayerService::doReleaseAudioOutput(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
m_pendingTasks |= m_executedTasks & (Play | Pause);
if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
@@ -1355,7 +1355,7 @@ void DirectShowPlayerService::updateVideoProbe()
void DirectShowPlayerService::doReleaseVideoOutput(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
m_pendingTasks |= m_executedTasks & (Play | Pause);
if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
@@ -1553,7 +1553,7 @@ QT_WARNING_POP
void DirectShowPlayerService::graphEvent(QMutexLocker *locker)
{
- Q_UNUSED(locker)
+ Q_UNUSED(locker);
if (IMediaEvent *event = com_cast<IMediaEvent>(m_graph, IID_IMediaEvent)) {
long eventCode;
LONG_PTR param1;
diff --git a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
index 79c915aad..e5e253194 100644
--- a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
@@ -72,7 +72,7 @@ QString CameraBinAudioEncoder::codecDescription(const QString &codecName) const
#if QT_CONFIG(gstreamer_encodingprofiles)
return m_codecs.codecDescription(codecName);
#else
- Q_UNUSED(codecName)
+ Q_UNUSED(codecName);
return QString();
#endif
}
diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
index 1d28e1a6e..c80e2fb0c 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
@@ -68,7 +68,7 @@ QString CameraBinContainer::containerDescription(const QString &formatMimeType)
#if QT_CONFIG(gstreamer_encodingprofiles)
return m_supportedContainers.codecDescription(formatMimeType);
#else
- Q_UNUSED(formatMimeType)
+ Q_UNUSED(formatMimeType);
return QString();
#endif
}
diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
index 74ffd750e..5bba2ddb5 100644
--- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
@@ -102,7 +102,7 @@ QString CameraBinVideoEncoder::videoCodecDescription(const QString &codecName) c
#if QT_CONFIG(gstreamer_encodingprofiles)
return m_codecs.codecDescription(codecName);
#else
- Q_UNUSED(codecName)
+ Q_UNUSED(codecName);
return QString();
#endif
}
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
index c83e467a6..4363f6d3b 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
@@ -669,7 +669,7 @@ void QGstreamerCaptureSession::dumpGraph(const QString &fileName)
GstDebugGraphDetails(/*GST_DEBUG_GRAPH_SHOW_ALL |*/ GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE | GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS | GST_DEBUG_GRAPH_SHOW_STATES),
fileName.toLatin1());
#else
- Q_UNUSED(fileName)
+ Q_UNUSED(fileName);
#endif
}
diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.cpp b/src/plugins/pulseaudio/qaudioinput_pulse.cpp
index 2b5325132..3e7b4d79a 100644
--- a/src/plugins/pulseaudio/qaudioinput_pulse.cpp
+++ b/src/plugins/pulseaudio/qaudioinput_pulse.cpp
@@ -100,15 +100,15 @@ static void inputStreamStateCallback(pa_stream *stream, void *userdata)
static void inputStreamUnderflowCallback(pa_stream *stream, void *userdata)
{
- Q_UNUSED(userdata)
- Q_UNUSED(stream)
+ Q_UNUSED(userdata);
+ Q_UNUSED(stream);
qWarning() << "Got a buffer underflow!";
}
static void inputStreamOverflowCallback(pa_stream *stream, void *userdata)
{
- Q_UNUSED(stream)
- Q_UNUSED(userdata)
+ Q_UNUSED(stream);
+ Q_UNUSED(userdata);
qWarning() << "Got a buffer overflow!";
}
@@ -667,8 +667,8 @@ qint64 PulseInputPrivate::readData(char *data, qint64 len)
qint64 PulseInputPrivate::writeData(const char *data, qint64 len)
{
- Q_UNUSED(data)
- Q_UNUSED(len)
+ Q_UNUSED(data);
+ Q_UNUSED(len);
return 0;
}
diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp
index 19ddac1e5..708c3e0e3 100644
--- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp
+++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp
@@ -68,7 +68,7 @@ static void outputStreamWriteCallback(pa_stream *stream, size_t length, void *u
static void outputStreamStateCallback(pa_stream *stream, void *userdata)
{
- Q_UNUSED(userdata)
+ Q_UNUSED(userdata);
pa_stream_state_t state = pa_stream_get_state(stream);
#ifdef DEBUG_PULSE
qDebug() << "Stream state: " << QPulseAudioInternal::stateToQString(state);
@@ -90,21 +90,21 @@ static void outputStreamStateCallback(pa_stream *stream, void *userdata)
static void outputStreamUnderflowCallback(pa_stream *stream, void *userdata)
{
- Q_UNUSED(stream)
+ Q_UNUSED(stream);
((QPulseAudioOutput*)userdata)->streamUnderflowCallback();
}
static void outputStreamOverflowCallback(pa_stream *stream, void *userdata)
{
- Q_UNUSED(stream)
- Q_UNUSED(userdata)
+ Q_UNUSED(stream);
+ Q_UNUSED(userdata);
qWarning() << "Got a buffer overflow!";
}
static void outputStreamLatencyCallback(pa_stream *stream, void *userdata)
{
- Q_UNUSED(stream)
- Q_UNUSED(userdata)
+ Q_UNUSED(stream);
+ Q_UNUSED(userdata);
#ifdef DEBUG_PULSE
const pa_timing_info *info = pa_stream_get_timing_info(stream);
@@ -675,8 +675,8 @@ PulseOutputPrivate::PulseOutputPrivate(QPulseAudioOutput *audio)
qint64 PulseOutputPrivate::readData(char *data, qint64 len)
{
- Q_UNUSED(data)
- Q_UNUSED(len)
+ Q_UNUSED(data);
+ Q_UNUSED(len);
return 0;
}
diff --git a/src/plugins/pulseaudio/qpulseaudioengine.cpp b/src/plugins/pulseaudio/qpulseaudioengine.cpp
index 67ad10af1..653fea57e 100644
--- a/src/plugins/pulseaudio/qpulseaudioengine.cpp
+++ b/src/plugins/pulseaudio/qpulseaudioengine.cpp
@@ -131,7 +131,7 @@ static void sinkInfoCallback(pa_context *context, const pa_sink_info *info, int
static void sourceInfoCallback(pa_context *context, const pa_source_info *info, int isLast, void *userdata)
{
- Q_UNUSED(context)
+ Q_UNUSED(context);
QPulseAudioEngine *pulseEngine = static_cast<QPulseAudioEngine*>(userdata);
if (isLast) {
diff --git a/src/plugins/qnx-audio/audio/qnxaudioinput.cpp b/src/plugins/qnx-audio/audio/qnxaudioinput.cpp
index 9fca8a7e1..31347b7f3 100644
--- a/src/plugins/qnx-audio/audio/qnxaudioinput.cpp
+++ b/src/plugins/qnx-audio/audio/qnxaudioinput.cpp
@@ -440,8 +440,8 @@ qint64 InputPrivate::readData(char *data, qint64 len)
qint64 InputPrivate::writeData(const char *data, qint64 len)
{
- Q_UNUSED(data)
- Q_UNUSED(len)
+ Q_UNUSED(data);
+ Q_UNUSED(len);
return 0;
}
diff --git a/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.cpp b/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.cpp
index 68a3657a2..a2607ca93 100644
--- a/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.cpp
+++ b/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.cpp
@@ -57,7 +57,7 @@ QVideoFrame::PixelFormat BbCameraCaptureBufferFormatControl::bufferFormat() cons
void BbCameraCaptureBufferFormatControl::setBufferFormat(QVideoFrame::PixelFormat format)
{
- Q_UNUSED(format)
+ Q_UNUSED(format);
// Do nothing, we support only Jpeg for now
}
diff --git a/src/plugins/qnx/camera/bbcameraservice.cpp b/src/plugins/qnx/camera/bbcameraservice.cpp
index 511517e8b..2879f6981 100644
--- a/src/plugins/qnx/camera/bbcameraservice.cpp
+++ b/src/plugins/qnx/camera/bbcameraservice.cpp
@@ -135,7 +135,7 @@ QMediaControl* BbCameraService::requestControl(const char *name)
void BbCameraService::releaseControl(QMediaControl *control)
{
- Q_UNUSED(control)
+ Q_UNUSED(control);
// Implemented as a singleton, so we do nothing.
}
diff --git a/src/plugins/qnx/camera/bbcamerasession.cpp b/src/plugins/qnx/camera/bbcamerasession.cpp
index d6b0b9bd6..7b3974084 100644
--- a/src/plugins/qnx/camera/bbcamerasession.cpp
+++ b/src/plugins/qnx/camera/bbcamerasession.cpp
@@ -317,7 +317,7 @@ struct ImageCaptureData
static void imageCaptureShutterCallback(camera_handle_t handle, void *context)
{
- Q_UNUSED(handle)
+ Q_UNUSED(handle);
const ImageCaptureData *data = static_cast<ImageCaptureData*>(context);
@@ -328,7 +328,7 @@ static void imageCaptureShutterCallback(camera_handle_t handle, void *context)
static void imageCaptureImageCallback(camera_handle_t handle, camera_buffer_t *buffer, void *context)
{
- Q_UNUSED(handle)
+ Q_UNUSED(handle);
QScopedPointer<ImageCaptureData> data(static_cast<ImageCaptureData*>(context));
@@ -856,7 +856,7 @@ void BbCameraSession::closeCamera()
static void viewFinderStatusCallback(camera_handle_t handle, camera_devstatus_t status, uint16_t value, void *context)
{
- Q_UNUSED(handle)
+ Q_UNUSED(handle);
if (status == CAMERA_STATUS_FOCUS_CHANGE) {
BbCameraSession *session = static_cast<BbCameraSession*>(context);
@@ -1019,8 +1019,8 @@ void BbCameraSession::applyConfiguration()
static void videoRecordingStatusCallback(camera_handle_t handle, camera_devstatus_t status, uint16_t value, void *context)
{
- Q_UNUSED(handle)
- Q_UNUSED(value)
+ Q_UNUSED(handle);
+ Q_UNUSED(value);
if (status == CAMERA_STATUS_VIDEO_PAUSE) {
BbCameraSession *session = static_cast<BbCameraSession*>(context);
diff --git a/src/plugins/qnx/camera/bbcamerazoomcontrol.cpp b/src/plugins/qnx/camera/bbcamerazoomcontrol.cpp
index a45712c64..21f328b4f 100644
--- a/src/plugins/qnx/camera/bbcamerazoomcontrol.cpp
+++ b/src/plugins/qnx/camera/bbcamerazoomcontrol.cpp
@@ -104,7 +104,7 @@ qreal BbCameraZoomControl::currentDigitalZoom() const
void BbCameraZoomControl::zoomTo(qreal optical, qreal digital)
{
- Q_UNUSED(optical)
+ Q_UNUSED(optical);
if (m_session->status() != QCamera::ActiveStatus)
return;
diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
index 29fd082d8..aff0bae51 100644
--- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
+++ b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
@@ -119,7 +119,7 @@ bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType,
bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
#endif
{
- Q_UNUSED(result)
+ Q_UNUSED(result);
if (eventType == "screen_event_t") {
screen_event_t event = static_cast<screen_event_t>(message);
if (MmRendererVideoWindowControl *control = videoWindowControl())
diff --git a/src/plugins/qnx/neutrinoserviceplugin.cpp b/src/plugins/qnx/neutrinoserviceplugin.cpp
index 6a8d726cf..842796c83 100644
--- a/src/plugins/qnx/neutrinoserviceplugin.cpp
+++ b/src/plugins/qnx/neutrinoserviceplugin.cpp
@@ -61,7 +61,7 @@ void NeutrinoServicePlugin::release(QMediaService *service)
QMediaServiceProviderHint::Features NeutrinoServicePlugin::supportedFeatures(const QByteArray &service) const
{
- Q_UNUSED(service)
+ Q_UNUSED(service);
return QMediaServiceProviderHint::Features();
}
diff --git a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
index 70e7fbce5..b0c8f3600 100644
--- a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
@@ -392,7 +392,7 @@ void QWindowsAudioDeviceInfo::updateLists()
QList<QByteArray> QWindowsAudioDeviceInfo::availableDevices(QAudio::Mode mode)
{
- Q_UNUSED(mode)
+ Q_UNUSED(mode);
QList<QByteArray> devices;
//enumerate device fullnames through directshow api
diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.cpp b/src/plugins/windowsaudio/qwindowsaudioinput.cpp
index 3332e3067..addabbd32 100644
--- a/src/plugins/windowsaudio/qwindowsaudioinput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudioinput.cpp
@@ -87,9 +87,9 @@ QWindowsAudioInput::~QWindowsAudioInput()
void QT_WIN_CALLBACK QWindowsAudioInput::waveInProc( HWAVEIN hWaveIn, UINT uMsg,
DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
{
- Q_UNUSED(dwParam1)
- Q_UNUSED(dwParam2)
- Q_UNUSED(hWaveIn)
+ Q_UNUSED(dwParam1);
+ Q_UNUSED(dwParam2);
+ Q_UNUSED(hWaveIn);
QWindowsAudioInput* qAudio;
qAudio = (QWindowsAudioInput*)(dwInstance);
@@ -715,8 +715,8 @@ qint64 InputPrivate::readData( char* data, qint64 len)
qint64 InputPrivate::writeData(const char* data, qint64 len)
{
- Q_UNUSED(data)
- Q_UNUSED(len)
+ Q_UNUSED(data);
+ Q_UNUSED(len);
emit readyRead();
return 0;
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
index 6ccffc8b2..e0635307e 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
@@ -90,9 +90,9 @@ QWindowsAudioOutput::~QWindowsAudioOutput()
void CALLBACK QWindowsAudioOutput::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
{
- Q_UNUSED(dwParam1)
- Q_UNUSED(dwParam2)
- Q_UNUSED(hWaveOut)
+ Q_UNUSED(dwParam1);
+ Q_UNUSED(dwParam2);
+ Q_UNUSED(hWaveOut);
QWindowsAudioOutput* qAudio;
qAudio = (QWindowsAudioOutput*)(dwInstance);
@@ -642,8 +642,8 @@ OutputPrivate::~OutputPrivate() {}
qint64 OutputPrivate::readData( char* data, qint64 len)
{
- Q_UNUSED(data)
- Q_UNUSED(len)
+ Q_UNUSED(data);
+ Q_UNUSED(len);
return 0;
}
diff --git a/src/plugins/wmf/decoder/mfdecodersourcereader.cpp b/src/plugins/wmf/decoder/mfdecodersourcereader.cpp
index a45d11a2c..e907cfaf0 100644
--- a/src/plugins/wmf/decoder/mfdecodersourcereader.cpp
+++ b/src/plugins/wmf/decoder/mfdecodersourcereader.cpp
@@ -44,7 +44,7 @@ MFDecoderSourceReader::MFDecoderSourceReader(QObject *parent)
, m_sourceReader(0)
, m_source(0)
{
- Q_UNUSED(parent)
+ Q_UNUSED(parent);
}
void MFDecoderSourceReader::shutdown()
diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.cpp b/src/plugins/wmf/player/mfvideorenderercontrol.cpp
index 137fc5fc5..7b121255f 100644
--- a/src/plugins/wmf/player/mfvideorenderercontrol.cpp
+++ b/src/plugins/wmf/player/mfvideorenderercontrol.cpp
@@ -1319,7 +1319,7 @@ namespace
{
HRESULT hr = S_OK;
Q_ASSERT(pOp != NULL);
- Q_UNUSED(pOp)
+ Q_UNUSED(pOp);
hr = processSamplesFromQueue(WriteSamples);
// We are in the middle of an asynchronous operation, so if something failed, send an error.
if (FAILED(hr))
diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
index 9943ffec2..a81706ec1 100644
--- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
@@ -140,7 +140,7 @@ void tst_QAudioOutput::createSineWaveData(const QAudioFormat &format, qint64 len
const int sampleBytes = format.channelCount() * channelBytes;
Q_ASSERT(length % sampleBytes == 0);
- Q_UNUSED(sampleBytes) // suppress warning in release builds
+ Q_UNUSED(sampleBytes); // suppress warning in release builds
m_byteArray.reset(new QByteArray(length, 0));
unsigned char *ptr = reinterpret_cast<unsigned char *>(m_byteArray->data());
diff --git a/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp b/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp
index 154d25b21..47da7be19 100644
--- a/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp
+++ b/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp
@@ -70,7 +70,7 @@ public:
QString videoCodecDescription(const QString &codecName) const
{
- Q_UNUSED(codecName)
+ Q_UNUSED(codecName);
return QString();
}