slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prefer to use normalised signal/slot signatures

Browse Source 
Change-Id: I48ae4b46f7a0342a1436ba78958b057e919e3a8a
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Sergio Ahumada
2014-03-02 11:43:58 +01:00
committed by The Qt Project
parent d45a02e8c9
commit d5dfef66bb
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/multimediawidgets/player/player.cpp
View File

@@ -104,7 +104,7 @@ Player::Player(QWidget *parent)
histogramLayout->addWidget(histogram, 1); histogramLayout->addWidget(histogram, 1);
probe = new QVideoProbe(this); probe = new QVideoProbe(this);
connect(probe, SIGNAL(videoFrameProbed(const QVideoFrame&)), histogram, SLOT(processFrame(QVideoFrame))); connect(probe, SIGNAL(videoFrameProbed(QVideoFrame)), histogram, SLOT(processFrame(QVideoFrame)));
probe->setSource(player); probe->setSource(player);
QPushButton *openButton = new QPushButton(tr("Open"), this); QPushButton *openButton = new QPushButton(tr("Open"), this);

8
tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
View File

@@ -736,9 +736,9 @@ void tst_QMediaPlayerBackend::probes()
QAudioProbe *audioProbe = new QAudioProbe; QAudioProbe *audioProbe = new QAudioProbe;
ProbeDataHandler probeHandler; ProbeDataHandler probeHandler;
connect(videoProbe, SIGNAL(videoFrameProbed(const QVideoFrame&)), &probeHandler, SLOT(processFrame(QVideoFrame))); connect(videoProbe, SIGNAL(videoFrameProbed(QVideoFrame)), &probeHandler, SLOT(processFrame(QVideoFrame)));
connect(videoProbe, SIGNAL(flush()), &probeHandler, SLOT(flushVideo())); connect(videoProbe, SIGNAL(flush()), &probeHandler, SLOT(flushVideo()));
connect(audioProbe, SIGNAL(audioBufferProbed(const QAudioBuffer&)), &probeHandler, SLOT(processBuffer(QAudioBuffer))); connect(audioProbe, SIGNAL(audioBufferProbed(QAudioBuffer)), &probeHandler, SLOT(processBuffer(QAudioBuffer)));
connect(audioProbe, SIGNAL(flush()), &probeHandler, SLOT(flushAudio())); connect(audioProbe, SIGNAL(flush()), &probeHandler, SLOT(flushAudio()));
QVERIFY(videoProbe->setSource(player)); QVERIFY(videoProbe->setSource(player));
@@ -762,8 +762,8 @@ void tst_QMediaPlayerBackend::playlist()
{ {
QMediaPlayer player; QMediaPlayer player;
QSignalSpy mediaSpy(&player, SIGNAL(mediaChanged(const QMediaContent&))); QSignalSpy mediaSpy(&player, SIGNAL(mediaChanged(QMediaContent)));
QSignalSpy currentMediaSpy(&player, SIGNAL(currentMediaChanged(const QMediaContent&))); QSignalSpy currentMediaSpy(&player, SIGNAL(currentMediaChanged(QMediaContent)));
QSignalSpy stateSpy(&player, SIGNAL(stateChanged(QMediaPlayer::State))); QSignalSpy stateSpy(&player, SIGNAL(stateChanged(QMediaPlayer::State)));
QSignalSpy errorSpy(&player, SIGNAL(error(QMediaPlayer::Error))); QSignalSpy errorSpy(&player, SIGNAL(error(QMediaPlayer::Error)));