diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2014-02-02 14:05:10 -0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-03 23:49:44 +0100 |
commit | 8224fdc2791e0062311f71e8d616a71c2614f903 (patch) | |
tree | a8372a169c39da12c5dc3081ce8c60afd55ac20c /src | |
parent | 5c1ab3eb722e226a7266998e4a0f1cadf90e1c5a (diff) |
Normalize signal & slot signatures in connection
Profiling shows Qt Creator spends 2% of its load time normalizing
Change-Id: I50c4f66f30debd49c37109dd2460925dc22af605
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp | 4 | ||||
-rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp | 2 | ||||
-rw-r--r-- | src/nfc/qnearfieldmanager_qnx.cpp | 10 | ||||
-rw-r--r-- | src/nfc/qnx/qnxnfcmanager.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp index 6d160f52..56459e72 100644 --- a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp +++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp @@ -67,8 +67,8 @@ if (localDevice.isValid()) { //! [discovery] // Create a discovery agent and connect to its signals QBluetoothDiscoveryAgent *discoveryAgent = new QBluetoothDiscoveryAgent(this); -connect(discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&)), - this, SLOT(deviceDiscovered(const QBluetoothDeviceInfo&))); +connect(discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)), + this, SLOT(deviceDiscovered(QBluetoothDeviceInfo))); // Start a discovery discoveryAgent->start(); diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp index e39a26af..135fe2b7 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp @@ -392,7 +392,7 @@ void QDeclarativeBluetoothDiscoveryModel::setRunning(bool running) } else { if (!d->m_serviceAgent) { d->m_serviceAgent = new QBluetoothServiceDiscoveryAgent(this); - connect(d->m_serviceAgent, SIGNAL(serviceDiscovered(const QBluetoothServiceInfo&)), this, SLOT(serviceDiscovered(const QBluetoothServiceInfo&))); + connect(d->m_serviceAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)), this, SLOT(serviceDiscovered(QBluetoothServiceInfo))); connect(d->m_serviceAgent, SIGNAL(finished()), this, SLOT(finishedDiscovery())); connect(d->m_serviceAgent, SIGNAL(canceled()), this, SLOT(finishedDiscovery())); connect(d->m_serviceAgent, SIGNAL(error(QBluetoothServiceDiscoveryAgent::Error)), this, SLOT(errorDiscovery(QBluetoothServiceDiscoveryAgent::Error))); diff --git a/src/nfc/qnearfieldmanager_qnx.cpp b/src/nfc/qnearfieldmanager_qnx.cpp index e405ecc0..b09a6ed4 100644 --- a/src/nfc/qnearfieldmanager_qnx.cpp +++ b/src/nfc/qnearfieldmanager_qnx.cpp @@ -52,7 +52,7 @@ QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl() : m_handlerID(0) { QNXNFCManager::instance()->registerForNewInstance(); - connect(QNXNFCManager::instance(), SIGNAL(ndefMessage(const QNdefMessage&, QNearFieldTarget *)), this, SLOT(handleMessage(const QNdefMessage&, QNearFieldTarget *))); + connect(QNXNFCManager::instance(), SIGNAL(ndefMessage(QNdefMessage,QNearFieldTarget*)), this, SLOT(handleMessage(QNdefMessage,QNearFieldTarget*))); m_requestedModes = QNearFieldManager::NdefWriteTargetAccess; qQNXNFCDebug() << "Nearfieldmanager created"; @@ -74,8 +74,8 @@ bool QNearFieldManagerPrivateImpl::startTargetDetection() { qQNXNFCDebug() << "Starting targetdetection in nearfieldmanager"; if (QNXNFCManager::instance()->startTargetDetection()) { - connect(QNXNFCManager::instance(), SIGNAL(targetDetected(QNearFieldTarget *, const QList<QNdefMessage>&)), - this, SLOT(newTarget(QNearFieldTarget *, const QList<QNdefMessage>&))); + connect(QNXNFCManager::instance(), SIGNAL(targetDetected(QNearFieldTarget*,QList<QNdefMessage>)), + this, SLOT(newTarget(QNearFieldTarget*,QList<QNdefMessage>))); return true; } else { qWarning()<<Q_FUNC_INFO<<"Could not start Target detection"; @@ -85,8 +85,8 @@ bool QNearFieldManagerPrivateImpl::startTargetDetection() void QNearFieldManagerPrivateImpl::stopTargetDetection() { - disconnect(QNXNFCManager::instance(), SIGNAL(targetDetected(NearFieldTarget *, const QList<QNdefMessage> &)), - this, SLOT(newTarget(NearFieldTarget *, const QList<QNdefMessage> &))); + disconnect(QNXNFCManager::instance(), SIGNAL(targetDetected(NearFieldTarget*,QList<QNdefMessage>)), + this, SLOT(newTarget(NearFieldTarget*,QList<QNdefMessage>))); QNXNFCManager::instance()->unregisterTargetDetection(this); } diff --git a/src/nfc/qnx/qnxnfcmanager.cpp b/src/nfc/qnx/qnxnfcmanager.cpp index 2b644b30..d4736746 100644 --- a/src/nfc/qnx/qnxnfcmanager.cpp +++ b/src/nfc/qnx/qnxnfcmanager.cpp @@ -154,7 +154,7 @@ QNXNFCManager::QNXNFCManager() ndefEventFilter = new QNXNFCEventFilter(); ndefEventFilter->installOnEventDispatcher(QAbstractEventDispatcher::instance()); - connect(ndefEventFilter, SIGNAL(ndefEvent(const QNdefMessage&)), this, SLOT(invokeNdefMessage(const QNdefMessage&))); + connect(ndefEventFilter, SIGNAL(ndefEvent(QNdefMessage)), this, SLOT(invokeNdefMessage(QNdefMessage))); } QNXNFCManager::~QNXNFCManager() |