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

Normalize signal & slot signatures in connection

Browse Source 
Profiling shows Qt Creator spends 2% of its load time normalizing

Change-Id: I1a4bef16be79ced35c47da865153ebe1bee22f9c
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Thiago Macieira
2014-02-02 14:07:07 -08:00
committed by The Qt Project
parent 6f8ccc88e8
commit e4035bf6d0
15 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/camera/qcameraimagecapture.cpp
View File

@@ -266,8 +266,8 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject)
this, SIGNAL(imageMetadataAvailable(int,QString,QVariant)));
connect(d->control, SIGNAL(imageAvailable(int,QVideoFrame)),
this, SIGNAL(imageAvailable(int,QVideoFrame)));
connect(d->control, SIGNAL(imageSaved(int, QString)),
this, SIGNAL(imageSaved(int, QString)));
connect(d->control, SIGNAL(imageSaved(int,QString)),
this, SIGNAL(imageSaved(int,QString)));
connect(d->control, SIGNAL(readyForCaptureChanged(bool)),
this, SLOT(_q_readyChanged(bool)));
connect(d->control, SIGNAL(error(int,int,QString)),

8
src/multimedia/playback/playlistfileparser.cpp
View File

@@ -396,8 +396,8 @@ void QPlaylistFileParserPrivate::processLine(int startIndex, int length)
Q_ASSERT(m_currentParser);
connect(m_currentParser, SIGNAL(newItem(QVariant)), q, SIGNAL(newItem(QVariant)));
connect(m_currentParser, SIGNAL(finished()), q, SLOT(_q_handleParserFinished()));
connect(m_currentParser, SIGNAL(error(QPlaylistFileParser::ParserError, QString)),
q, SLOT(_q_handleParserError(QPlaylistFileParser::ParserError, QString)));
connect(m_currentParser, SIGNAL(error(QPlaylistFileParser::ParserError,QString)),
q, SLOT(_q_handleParserError(QPlaylistFileParser::ParserError,QString)));
}
QString line;
@@ -583,8 +583,8 @@ void QPlaylistFileParser::stop()
if (d->m_currentParser) {
disconnect(d->m_currentParser, SIGNAL(newItem(QVariant)), this, SIGNAL(newItem(QVariant)));
disconnect(d->m_currentParser, SIGNAL(finished()), this, SLOT(_q_handleParserFinished()));
disconnect(d->m_currentParser, SIGNAL(error(QPlaylistFileParser::ParserError, QString)),
this, SLOT(_q_handleParserError(QPlaylistFileParser::ParserError, QString)));
disconnect(d->m_currentParser, SIGNAL(error(QPlaylistFileParser::ParserError,QString)),
this, SLOT(_q_handleParserError(QPlaylistFileParser::ParserError,QString)));
d->m_currentParser->deleteLater();
d->m_currentParser = 0;
}

8
src/multimedia/playback/qmedianetworkplaylistprovider.cpp
View File

@@ -113,11 +113,11 @@ QMediaNetworkPlaylistProvider::QMediaNetworkPlaylistProvider(QObject *parent)
:QMediaPlaylistProvider(*new QMediaNetworkPlaylistProviderPrivate, parent)
{
d_func()->q_ptr = this;
connect(&d_func()->parser, SIGNAL(newItem(const QVariant&)),
this, SLOT(_q_handleNewItem(const QVariant&)));
connect(&d_func()->parser, SIGNAL(newItem(QVariant)),
this, SLOT(_q_handleNewItem(QVariant)));
connect(&d_func()->parser, SIGNAL(finished()), this, SIGNAL(loaded()));
connect(&d_func()->parser, SIGNAL(error(QPlaylistFileParser::ParserError, const QString &)),
this, SLOT(_q_handleParserError(QPlaylistFileParser::ParserError, const QString &)));
connect(&d_func()->parser, SIGNAL(error(QPlaylistFileParser::ParserError,QString)),
this, SLOT(_q_handleParserError(QPlaylistFileParser::ParserError,QString)));
}
QMediaNetworkPlaylistProvider::~QMediaNetworkPlaylistProvider()