Fix -Wclazy-incorrect-emit

Pick-to: 6.5
Change-Id: I1afd105a6b75e9be516b03595d254196c513be4a
Reviewed-by: Lars Knoll <lars@knoll.priv.no>

4 files changed, 52 insertions, 52 deletions

diff --git a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
index a82b5ef30..84c0043ae 100644
--- a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
+++ b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
@@ -159,7 +159,7 @@ void MFAudioDecoderControl::stop()
     if (bufferAvailable()) {
         QAudioBuffer buffer;
         m_audioBuffer.swap(buffer);
-        emit bufferAvailableChanged(false);
+        bufferAvailableChanged(false);
     }
     setIsDecoding(false);
 
@@ -186,15 +186,15 @@ void MFAudioDecoderControl::handleNewSample(QWindowsIUPointer<IMFSample> sample)
     } else {
         m_audioBuffer = QAudioBuffer(out, m_resampler.outputFormat(), sampleStartTimeUs);
 
-        emit bufferAvailableChanged(true);
-        emit bufferReady();
+        bufferAvailableChanged(true);
+        bufferReady();
     }
 }
 
 void MFAudioDecoderControl::handleSourceFinished()
 {
     stop();
-    emit finished();
+    finished();
 }
 
 void MFAudioDecoderControl::setAudioFormat(const QAudioFormat &format)
@@ -202,7 +202,7 @@ void MFAudioDecoderControl::setAudioFormat(const QAudioFormat &format)
     if (m_outputFormat == format)
         return;
     m_outputFormat = format;
-    emit formatChanged(m_outputFormat);
+    formatChanged(m_outputFormat);
 }
 
 QAudioBuffer MFAudioDecoderControl::read()
@@ -212,8 +212,8 @@ QAudioBuffer MFAudioDecoderControl::read()
     if (bufferAvailable()) {
         buffer.swap(m_audioBuffer);
         m_position = buffer.startTime() / 1000;
-        emit positionChanged(m_position);
-        emit bufferAvailableChanged(false);
+        positionChanged(m_position);
+        bufferAvailableChanged(false);
         m_decoderSourceReader->readNextSample();
     }
 
diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp
index a777e8a14..b13599444 100644
--- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp
@@ -127,14 +127,14 @@ void QWindowsMediaDeviceSession::handleStreamingStopped()
 void QWindowsMediaDeviceSession::handleStreamingError(int errorCode)
 {
     if (m_surface)
-        emit m_surface->platformVideoSink()->setVideoFrame(QVideoFrame());
+        m_surface->platformVideoSink()->setVideoFrame(QVideoFrame());
     emit streamingError(errorCode);
 }
 
 void QWindowsMediaDeviceSession::handleVideoFrameChanged(const QVideoFrame &frame)
 {
     if (m_surface)
-        emit m_surface->platformVideoSink()->setVideoFrame(frame);
+        m_surface->platformVideoSink()->setVideoFrame(frame);
     emit videoFrameChanged(frame);
 }
 
diff --git a/src/plugins/multimedia/windows/player/mfplayercontrol.cpp b/src/plugins/multimedia/windows/player/mfplayercontrol.cpp
index b5f81ac85..ae0022773 100644
--- a/src/plugins/multimedia/windows/player/mfplayercontrol.cpp
+++ b/src/plugins/multimedia/windows/player/mfplayercontrol.cpp
@@ -123,7 +123,7 @@ void MFPlayerControl::refreshState()
 #ifdef DEBUG_MEDIAFOUNDATION
     qDebug() << "MFPlayerControl::emit stateChanged" << m_state;
 #endif
-    emit stateChanged(m_state);
+    stateChanged(m_state);
 }
 
 void MFPlayerControl::handleStatusChanged()
@@ -149,7 +149,7 @@ void MFPlayerControl::handleStatusChanged()
     default:
         break;
     }
-    emit mediaStatusChanged(m_session->status());
+    mediaStatusChanged(m_session->status());
     refreshState();
 }
 
@@ -163,7 +163,7 @@ void MFPlayerControl::handleVideoAvailable()
     if (m_videoAvailable)
         return;
     m_videoAvailable = true;
-    emit videoAvailableChanged(m_videoAvailable);
+    videoAvailableChanged(m_videoAvailable);
 }
 
 void MFPlayerControl::handleAudioAvailable()
@@ -171,7 +171,7 @@ void MFPlayerControl::handleAudioAvailable()
     if (m_audioAvailable)
         return;
     m_audioAvailable = true;
-    emit audioAvailableChanged(m_audioAvailable);
+    audioAvailableChanged(m_audioAvailable);
 }
 
 void MFPlayerControl::resetAudioVideoAvailable()
@@ -183,10 +183,10 @@ void MFPlayerControl::resetAudioVideoAvailable()
     }
     if (m_audioAvailable) {
         m_audioAvailable = false;
-        emit audioAvailableChanged(m_audioAvailable);
+        audioAvailableChanged(m_audioAvailable);
     }
     if (videoDirty)
-        emit videoAvailableChanged(m_videoAvailable);
+        videoAvailableChanged(m_videoAvailable);
 }
 
 void MFPlayerControl::handleDurationUpdate(qint64 duration)
@@ -194,7 +194,7 @@ void MFPlayerControl::handleDurationUpdate(qint64 duration)
     if (m_duration == duration)
         return;
     m_duration = duration;
-    emit durationChanged(m_duration);
+    durationChanged(m_duration);
 }
 
 void MFPlayerControl::handleSeekableUpdate(bool seekable)
@@ -202,7 +202,7 @@ void MFPlayerControl::handleSeekableUpdate(bool seekable)
     if (m_seekable == seekable)
         return;
     m_seekable = seekable;
-    emit seekableChanged(m_seekable);
+    seekableChanged(m_seekable);
 }
 
 QMediaPlayer::PlaybackState MFPlayerControl::state() const
@@ -281,7 +281,7 @@ void MFPlayerControl::handleError(QMediaPlayer::Error errorCode, const QString&
 {
     if (isFatal)
         stop();
-    emit error(int(errorCode), errorString);
+    error(int(errorCode), errorString);
 }
 
 void MFPlayerControl::setActiveTrack(TrackType type, int index)
diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp
index 14d811a63..49b76e2a2 100644
--- a/src/plugins/multimedia/windows/player/mfplayersession.cpp
+++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp
@@ -179,7 +179,7 @@ void MFPlayerSession::load(const QUrl &url, QIODevice *stream)
     } else if (stream && (!stream->isReadable())) {
         close();
         changeStatus(QMediaPlayer::InvalidMedia);
-        emit error(QMediaPlayer::ResourceError, tr("Invalid stream source."), true);
+        error(QMediaPlayer::ResourceError, tr("Invalid stream source."), true);
     } else if (createSession()) {
         changeStatus(QMediaPlayer::LoadingMedia);
         m_sourceResolver->load(url, stream);
@@ -223,7 +223,7 @@ void MFPlayerSession::handleSourceError(long hr)
         break;
     }
     changeStatus(QMediaPlayer::InvalidMedia);
-    emit error(errorCode, errorString, true);
+    error(errorCode, errorString, true);
 }
 
 void MFPlayerSession::handleMediaSourceReady()
@@ -238,23 +238,23 @@ void MFPlayerSession::handleMediaSourceReady()
 
     DWORD dwCharacteristics = 0;
     mediaSource->GetCharacteristics(&dwCharacteristics);
-    emit seekableUpdate(MFMEDIASOURCE_CAN_SEEK & dwCharacteristics);
+    seekableUpdate(MFMEDIASOURCE_CAN_SEEK & dwCharacteristics);
 
     IMFPresentationDescriptor* sourcePD;
     hr = mediaSource->CreatePresentationDescriptor(&sourcePD);
     if (SUCCEEDED(hr)) {
         m_duration = 0;
         m_metaData = MFMetaData::fromNative(mediaSource);
-        emit metaDataChanged();
+        metaDataChanged();
         sourcePD->GetUINT64(MF_PD_DURATION, &m_duration);
         //convert from 100 nanosecond to milisecond
-        emit durationUpdate(qint64(m_duration / 10000));
+        durationUpdate(qint64(m_duration / 10000));
         setupPlaybackTopology(mediaSource, sourcePD);
         tracksChanged();
         sourcePD->Release();
     } else {
         changeStatus(QMediaPlayer::InvalidMedia);
-        emit error(QMediaPlayer::ResourceError, tr("Cannot create presentation descriptor."), true);
+        error(QMediaPlayer::ResourceError, tr("Cannot create presentation descriptor."), true);
     }
 }
 
@@ -319,7 +319,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
     hr = sourcePD->GetStreamDescriptorCount(&cSourceStreams);
     if (FAILED(hr)) {
         changeStatus(QMediaPlayer::InvalidMedia);
-        emit error(QMediaPlayer::ResourceError, tr("Failed to get stream count."), true);
+        error(QMediaPlayer::ResourceError, tr("Failed to get stream count."), true);
         return;
     }
 
@@ -327,7 +327,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
     hr = MFCreateTopology(&topology);
     if (FAILED(hr)) {
         changeStatus(QMediaPlayer::InvalidMedia);
-        emit error(QMediaPlayer::ResourceError, tr("Failed to create topology."), true);
+        error(QMediaPlayer::ResourceError, tr("Failed to create topology."), true);
         return;
     }
 
@@ -380,7 +380,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
                                 hr = sourceNode->ConnectOutput(0, outputNode, 0);
 
                             if (FAILED(hr)) {
-                                emit error(QMediaPlayer::FormatError, tr("Unable to play any stream."), false);
+                                error(QMediaPlayer::FormatError, tr("Unable to play any stream."), false);
                             } else {
                                 m_trackInfo[trackType].currentIndex = m_trackInfo[trackType].nativeIndexes.count() - 1;
                                 streamAdded = true;
@@ -388,10 +388,10 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
                                 m_mediaTypes |= mediaType;
                                 switch (mediaType) {
                                 case Audio:
-                                    emit audioAvailable();
+                                    audioAvailable();
                                     break;
                                 case Video:
-                                    emit videoAvailable();
+                                    videoAvailable();
                                     break;
                                 default:
                                     break;
@@ -413,7 +413,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
 
     if (succeededCount == 0) {
         changeStatus(QMediaPlayer::InvalidMedia);
-        emit error(QMediaPlayer::ResourceError, tr("Unable to play."), true);
+        error(QMediaPlayer::ResourceError, tr("Unable to play."), true);
     } else {
         if (m_trackInfo[QPlatformMediaPlayer::VideoStream].outputNodeId != TOPOID(-1))
             topology = insertMFT(topology, m_trackInfo[QPlatformMediaPlayer::VideoStream].outputNodeId);
@@ -423,7 +423,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
             m_updatingTopology = true;
         } else {
             changeStatus(QMediaPlayer::InvalidMedia);
-            emit error(QMediaPlayer::ResourceError, tr("Failed to set topology."), true);
+            error(QMediaPlayer::ResourceError, tr("Failed to set topology."), true);
         }
     }
     topology->Release();
@@ -495,7 +495,7 @@ IMFTopologyNode* MFPlayerSession::addOutputNode(MediaType mediaType, IMFTopology
 
     } else {
         // Unknown stream type.
-        emit error(QMediaPlayer::FormatError, tr("Unknown stream type."), false);
+        error(QMediaPlayer::FormatError, tr("Unknown stream type."), false);
     }
 
     if (!activate
@@ -1019,7 +1019,7 @@ void MFPlayerSession::stop(bool immediate)
                 positionChanged(0);
             }
         } else {
-            emit error(QMediaPlayer::ResourceError, tr("Failed to stop."), true);
+            error(QMediaPlayer::ResourceError, tr("Failed to stop."), true);
         }
     }
 }
@@ -1064,7 +1064,7 @@ void MFPlayerSession::start()
             m_state.setCommand(CmdStart);
             m_pendingState = CmdPending;
         } else {
-            emit error(QMediaPlayer::ResourceError, tr("failed to start playback"), true);
+            error(QMediaPlayer::ResourceError, tr("failed to start playback"), true);
         }
         PropVariantClear(&varStart);
     }
@@ -1085,7 +1085,7 @@ void MFPlayerSession::pause()
             m_state.setCommand(CmdPause);
             m_pendingState = CmdPending;
         } else {
-            emit error(QMediaPlayer::ResourceError, tr("Failed to pause."), false);
+            error(QMediaPlayer::ResourceError, tr("Failed to pause."), false);
         }
         if (m_status == QMediaPlayer::EndOfMedia) {
             setPosition(0);
@@ -1102,7 +1102,7 @@ void MFPlayerSession::changeStatus(QMediaPlayer::MediaStatus newStatus)
     qDebug() << "MFPlayerSession::changeStatus" << newStatus;
 #endif
     m_status = newStatus;
-    emit statusChanged();
+    statusChanged();
 }
 
 QMediaPlayer::MediaStatus MFPlayerSession::status() const
@@ -1119,7 +1119,7 @@ bool MFPlayerSession::createSession()
     HRESULT hr = MFCreateMediaSession(NULL, &m_session);
     if (FAILED(hr)) {
         changeStatus(QMediaPlayer::InvalidMedia);
-        emit error(QMediaPlayer::ResourceError, tr("Unable to create mediasession."), true);
+        error(QMediaPlayer::ResourceError, tr("Unable to create mediasession."), true);
         return false;
     }
 
@@ -1128,7 +1128,7 @@ bool MFPlayerSession::createSession()
     hr = m_session->BeginGetEvent(this, m_session);
     if (FAILED(hr)) {
         changeStatus(QMediaPlayer::InvalidMedia);
-        emit error(QMediaPlayer::ResourceError, tr("Unable to pull session events."), false);
+        error(QMediaPlayer::ResourceError, tr("Unable to pull session events."), false);
         close();
         return false;
     }
@@ -1207,7 +1207,7 @@ void MFPlayerSession::setPositionInternal(qint64 position, Command requestCmd)
         m_state.start = position;
         m_pendingState = SeekPending;
     } else {
-        emit error(QMediaPlayer::ResourceError, tr("Failed to seek."), true);
+        error(QMediaPlayer::ResourceError, tr("Failed to seek."), true);
     }
 }
 
@@ -1222,7 +1222,7 @@ void MFPlayerSession::setPlaybackRate(qreal rate)
 {
     if (m_scrubbing) {
         m_restoreRate = rate;
-        emit playbackRateChanged(rate);
+        playbackRateChanged(rate);
         return;
     }
     setPlaybackRateInternal(rate);
@@ -1381,7 +1381,7 @@ done:
     m_pendingRate = m_request.rate = m_state.rate = rate;
     if (rate != 0)
         m_state.isThin = isThin;
-    emit playbackRateChanged(rate);
+    playbackRateChanged(rate);
 }
 
 void MFPlayerSession::scrub(bool enableScrub)
@@ -1584,7 +1584,7 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
             sessionEvent->GetValue(&var);
             qWarning() << "handleSessionEvent: non fatal error = " << var.ulVal;
             PropVariantClear(&var);
-            emit error(QMediaPlayer::ResourceError, tr("Media session non-fatal error."), false);
+            error(QMediaPlayer::ResourceError, tr("Media session non-fatal error."), false);
         }
         break;
     case MESourceUnknown:
@@ -1604,19 +1604,19 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
                    << Qt::showbase << Qt::hex << Qt::uppercasedigits << static_cast<quint32>(hrStatus);
         switch (hrStatus) {
         case MF_E_NET_READ:
-            emit error(QMediaPlayer::NetworkError, tr("Error reading from the network."), true);
+            error(QMediaPlayer::NetworkError, tr("Error reading from the network."), true);
             break;
         case MF_E_NET_WRITE:
-            emit error(QMediaPlayer::NetworkError, tr("Error writing to the network."), true);
+            error(QMediaPlayer::NetworkError, tr("Error writing to the network."), true);
             break;
         case NS_E_FIREWALL:
-            emit error(QMediaPlayer::NetworkError, tr("Network packets might be blocked by a firewall."), true);
+            error(QMediaPlayer::NetworkError, tr("Network packets might be blocked by a firewall."), true);
             break;
         case MF_E_MEDIAPROC_WRONGSTATE:
-            emit error(QMediaPlayer::ResourceError, tr("Media session state error."), true);
+            error(QMediaPlayer::ResourceError, tr("Media session state error."), true);
             break;
         default:
-            emit error(QMediaPlayer::ResourceError, tr("Media session serious error."), true);
+            error(QMediaPlayer::ResourceError, tr("Media session serious error."), true);
             break;
         }
         break;
@@ -1629,7 +1629,7 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
             if (SUCCEEDED(sessionEvent->GetValue(&var)) && (var.vt == VT_R4))    {
                 m_state.rate = var.fltVal;
             }
-            emit playbackRateChanged(playbackRate());
+            playbackRateChanged(playbackRate());
         }
         break;
     case MESessionScrubSampleComplete :
@@ -1683,7 +1683,7 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
     case MESessionTopologySet:
         if (FAILED(hrStatus)) {
             changeStatus(QMediaPlayer::InvalidMedia);
-            emit error(QMediaPlayer::FormatError, tr("Unsupported media, a codec is missing."), true);
+            error(QMediaPlayer::FormatError, tr("Unsupported media, a codec is missing."), true);
         } else {
             if (m_audioSampleGrabberNode) {
                 IUnknown *obj = 0;
@@ -1723,11 +1723,11 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
     switch (meType) {
     case MEBufferingStarted:
         changeStatus(QMediaPlayer::StalledMedia);
-        emit bufferProgressChanged(bufferProgress());
+        bufferProgressChanged(bufferProgress());
         break;
     case MEBufferingStopped:
         changeStatus(QMediaPlayer::BufferedMedia);
-        emit bufferProgressChanged(bufferProgress());
+        bufferProgressChanged(bufferProgress());
         break;
     case MESessionEnded:
         m_pendingState = NoPending;
@@ -1870,7 +1870,7 @@ void MFPlayerSession::clear()
 
     if (!m_metaData.isEmpty()) {
         m_metaData.clear();
-        emit metaDataChanged();
+        metaDataChanged();
     }
 
     if (m_presentationClock) {