diff options
| author | Oleg Shparber <trollixx@gmail.com> | 2014-04-29 01:19:58 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-29 12:22:45 +0200 |
| commit | 19a8f2f275f258a11c7f3a6d4d586c41ecc1cd5d (patch) | |
| tree | a4773bfb5d7e34ec32164c37c6ebc255c2977107 /src/nfc | |
| parent | 29db481f5aa1c71072a0185537933a0fc7c19083 (diff) | |
Replace all occurrences of Q_EMIT with emit
Change-Id: Ieec72048837abe70b0187086b265bcde96c7d6cd
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/nfc')
| -rw-r--r-- | src/nfc/qnearfieldtarget_qnx_p.h | 12 | ||||
| -rw-r--r-- | src/nfc/qnx/qnxnfceventfilter.cpp | 2 | ||||
| -rw-r--r-- | src/nfc/qnx/qnxnfcmanager.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/nfc/qnearfieldtarget_qnx_p.h b/src/nfc/qnearfieldtarget_qnx_p.h index faff94e2..f3029fb1 100644 --- a/src/nfc/qnearfieldtarget_qnx_p.h +++ b/src/nfc/qnearfieldtarget_qnx_p.h @@ -124,7 +124,7 @@ public: QNearFieldTarget::RequestId readNdefMessages() { for (int i = 0; i < m_ndefMessages.size(); i++) { - Q_EMIT QNearFieldTarget::ndefMessageRead(m_ndefMessages.at(i)); + emit QNearFieldTarget::ndefMessageRead(m_ndefMessages.at(i)); } QNearFieldTarget::RequestId requestId = QNearFieldTarget::RequestId(new QNearFieldTarget::RequestIdPrivate()); QMetaObject::invokeMethod(this, "requestCompleted", Qt::QueuedConnection, @@ -149,7 +149,7 @@ public: tagType = TAG_TYPE_ISO_15693_3; //We don't support this tag if (!isSupported) { - Q_EMIT QNearFieldTarget::error(QNearFieldTarget::UnsupportedError, QNearFieldTarget::RequestId()); + emit QNearFieldTarget::error(QNearFieldTarget::UnsupportedError, QNearFieldTarget::RequestId()); return QNearFieldTarget::RequestId(); } } @@ -157,11 +157,11 @@ public: m_cmdRespons = reinterpret_cast<char *> malloc (max_nfc_command_length); nfc_result_t result = nfc_tag_transceive (m_target, tagType, command.data(), command.length(), m_cmdRespons, max_nfc_command_length, &m_cmdResponseLength); if (result != NFC_RESULT_SUCCESS) { - Q_EMIT QNearFieldTarget::error(QNearFieldTarget::UnknownError, QNearFieldTarget::RequestId()); + emit QNearFieldTarget::error(QNearFieldTarget::UnknownError, QNearFieldTarget::RequestId()); qWarning() << Q_FUNC_INFO << "nfc_tag_transceive failed" } #else - Q_EMIT QNearFieldTarget::error(QNearFieldTarget::UnsupportedError, QNearFieldTarget::RequestId()); + emit QNearFieldTarget::error(QNearFieldTarget::UnsupportedError, QNearFieldTarget::RequestId()); return QNearFieldTarget::RequestId(); #endif } @@ -185,7 +185,7 @@ public: if (result != NFC_RESULT_SUCCESS) { qWarning() << Q_FUNC_INFO << "Could not convert QNdefMessage to byte array" << result; nfc_delete_ndef_message(newMessage, true); - Q_EMIT QNearFieldTarget::error(QNearFieldTarget::UnknownError, + emit QNearFieldTarget::error(QNearFieldTarget::UnknownError, QNearFieldTarget::RequestId()); return QNearFieldTarget::RequestId(); } @@ -195,7 +195,7 @@ public: if (result != NFC_RESULT_SUCCESS) { qWarning() << Q_FUNC_INFO << "Could not write message"; - Q_EMIT QNearFieldTarget::error(QNearFieldTarget::NdefWriteError, + emit QNearFieldTarget::error(QNearFieldTarget::NdefWriteError, QNearFieldTarget::RequestId()); return QNearFieldTarget::RequestId(); diff --git a/src/nfc/qnx/qnxnfceventfilter.cpp b/src/nfc/qnx/qnxnfceventfilter.cpp index eed1a280..907fdccf 100644 --- a/src/nfc/qnx/qnxnfceventfilter.cpp +++ b/src/nfc/qnx/qnxnfceventfilter.cpp @@ -94,7 +94,7 @@ bool QNXNFCEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes qQNXNFCDebug() << "Got Invoke event" << uri << "Type" << type; - Q_EMIT ndefEvent(message); + emit ndefEvent(message); } return false; diff --git a/src/nfc/qnx/qnxnfcmanager.cpp b/src/nfc/qnx/qnxnfcmanager.cpp index a93068fd..edc2d2be 100644 --- a/src/nfc/qnx/qnxnfcmanager.cpp +++ b/src/nfc/qnx/qnxnfcmanager.cpp @@ -220,7 +220,7 @@ void QNXNFCManager::newNfcEvent(int fd) void QNXNFCManager::invokeNdefMessage(const QNdefMessage &msg) { - Q_EMIT ndefMessage(msg, 0); + emit ndefMessage(msg, 0); } void QNXNFCManager::llcpReadComplete(nfc_event_t *nfcEvent) |