diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-02-02 14:07:07 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-03 20:12:35 +0100 |
| commit | e4035bf6d01c2105f64b5d548ccea51c7a48ef8d (patch) | |
| tree | e82fad8e2b7f67c7729708035f13e68f1b4b9c89 /src/multimedia | |
| parent | 6f8ccc88e827aeb09f6f9c7219f2d5f5013c6ebb (diff) | |
Normalize signal & slot signatures in connection
Profiling shows Qt Creator spends 2% of its load time normalizing
Change-Id: I1a4bef16be79ced35c47da865153ebe1bee22f9c
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/camera/qcameraimagecapture.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/playback/playlistfileparser.cpp | 8 | ||||
| -rw-r--r-- | src/multimedia/playback/qmedianetworkplaylistprovider.cpp | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index 0471ef3b0..409db4947 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -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)), diff --git a/src/multimedia/playback/playlistfileparser.cpp b/src/multimedia/playback/playlistfileparser.cpp index 1dc93aa7a..ae14d2159 100644 --- a/src/multimedia/playback/playlistfileparser.cpp +++ b/src/multimedia/playback/playlistfileparser.cpp @@ -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; } diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp index ca8e78b07..a8d8c4b04 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp +++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp @@ -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() |