From 19a8f2f275f258a11c7f3a6d4d586c41ecc1cd5d Mon Sep 17 00:00:00 2001
From: Oleg Shparber <trollixx@gmail.com>
Date: Tue, 29 Apr 2014 01:19:58 -0700
Subject: [PATCH] Replace all occurrences of Q_EMIT with emit
Change-Id: Ieec72048837abe70b0187086b265bcde96c7d6cd
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
---
.../picturetransfer/filetransfer.cpp | 2 +-
examples/bluetooth/pingpong/pingpong.cpp | 24 +++++++++----------
.../qbluetoothdevicediscoveryagent_qnx.cpp | 2 +-
src/bluetooth/qbluetoothlocaldevice_qnx.cpp | 8 +++----
src/bluetooth/qbluetoothsocket_qnx.cpp | 4 ++--
src/bluetooth/qbluetoothtransferreply_qnx.cpp | 10 ++++----
.../qdeclarativebluetoothdiscoverymodel.cpp | 4 ++--
src/imports/nfc/qdeclarativendeffilter.cpp | 2 +-
src/nfc/qnearfieldtarget_qnx_p.h | 12 +++++-----
src/nfc/qnx/qnxnfceventfilter.cpp | 2 +-
src/nfc/qnx/qnxnfcmanager.cpp | 2 +-
11 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/examples/bluetooth/picturetransfer/filetransfer.cpp b/examples/bluetooth/picturetransfer/filetransfer.cpp
index 7cfd041d..6f0a25b2 100644
--- a/examples/bluetooth/picturetransfer/filetransfer.cpp
+++ b/examples/bluetooth/picturetransfer/filetransfer.cpp
@@ -63,5 +63,5 @@ void FileTransfer::initTransfer(QString address, QString fileName)
void FileTransfer::updateProgress(qint64 transferred, qint64 total)
{
m_progress = ((float)transferred)/((float)total);
- Q_EMIT progressChanged();
+ emit progressChanged();
}
diff --git a/examples/bluetooth/pingpong/pingpong.cpp b/examples/bluetooth/pingpong/pingpong.cpp
index d65a56a8..6d9466e9 100644
--- a/examples/bluetooth/pingpong/pingpong.cpp
+++ b/examples/bluetooth/pingpong/pingpong.cpp
@@ -60,7 +60,7 @@ PingPong::~PingPong()
void PingPong::startGame()
{
m_showDialog = false;
- Q_EMIT showDialogChanged();
+ emit showDialogChanged();
//! [Start the game]
if (m_role == 1)
updateDirection();
@@ -91,7 +91,7 @@ void PingPong::update()
size.append(size1);
size.append(" \n");
socket->write(size.constData());
- Q_EMIT ballChanged();
+ emit ballChanged();
}
else if (m_role == 2) {
size.setNum(m_rightBlockY);
@@ -111,7 +111,7 @@ void PingPong::setSize(const float &x, const float &y)
m_targetY = m_boardHeight/2;
m_ballPreviousX = m_ballX = m_boardWidth/2;
m_ballPreviousY = m_ballY = m_boardHeight - m_boardWidth/54;
- Q_EMIT ballChanged();
+ emit ballChanged();
}
void PingPong::updateBall(const float &bX, const float &bY)
@@ -176,7 +176,7 @@ void PingPong::checkBoundaries()
result.append(" \n");
socket->write(result);
qDebug() << result;
- Q_EMIT resultChanged();
+ emit resultChanged();
}
else if (m_ballX < 0) {
m_resultRight++;
@@ -196,7 +196,7 @@ void PingPong::checkBoundaries()
result.append(res);
result.append(" \n");
socket->write(result);
- Q_EMIT resultChanged();
+ emit resultChanged();
}
}
@@ -240,7 +240,7 @@ void PingPong::startServer()
setMessage(QStringLiteral("Server started, waiting for the client. You are the left player."));
// m_role is set to 1 if it is a server
m_role = 1;
- Q_EMIT roleChanged();
+ emit roleChanged();
}
void PingPong::startClient()
@@ -259,7 +259,7 @@ void PingPong::startClient()
setMessage(QStringLiteral("Starting server discovery. You are the right player"));
// m_role is set to 2 if it is a client
m_role = 2;
- Q_EMIT roleChanged();
+ emit roleChanged();
}
void PingPong::clientConnected()
@@ -380,7 +380,7 @@ void PingPong::readSocket()
QByteArray rightSide = result.at(2);
m_resultLeft = leftSide.toInt();
m_resultRight = rightSide.toInt();
- Q_EMIT resultChanged();
+ emit resultChanged();
checkResult();
}
}
@@ -401,7 +401,7 @@ void PingPong::readSocket()
if (boardSize.size() > 1) {
QByteArray rightBlockY = boardSize.at(0);
m_rightBlockY = m_proportionY * rightBlockY.toFloat();
- Q_EMIT rightBlockChanged();
+ emit rightBlockChanged();
}
}
else if (m_role == 2) {
@@ -413,8 +413,8 @@ void PingPong::readSocket()
m_ballX = m_proportionX * ballX.toFloat();
m_ballY = m_proportionY * ballY.toFloat();
m_leftBlockY = m_proportionY * leftBlockY.toFloat();
- Q_EMIT leftBlockChanged();
- Q_EMIT ballChanged();
+ emit leftBlockChanged();
+ emit ballChanged();
}
}
}
@@ -423,7 +423,7 @@ void PingPong::setMessage(const QString &message)
{
m_showDialog = true;
m_message = message;
- Q_EMIT showDialogChanged();
+ emit showDialogChanged();
}
int PingPong::role() const
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
index f562486b..60dbc07f 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
@@ -225,7 +225,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::controlReply(ppsResult result)
qCWarning(QT_BT_QNX) << "A PPS Bluetooth error occurred:";
lastError = QBluetoothDeviceDiscoveryAgent::InputOutputError;
errorString = result.errorMsg;
- Q_EMIT q_ptr->error(QBluetoothDeviceDiscoveryAgent::InputOutputError);
+ emit q_ptr->error(QBluetoothDeviceDiscoveryAgent::InputOutputError);
stop();
}
processNextOp();
diff --git a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
index b2e46194..6c6dc1aa 100644
--- a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
@@ -372,7 +372,7 @@ void QBluetoothLocalDevicePrivate::controlEvent(ppsResult result)
QBluetoothLocalDevice::HostMode newHostMode = hostMode();
qCDebug(QT_BT_QNX) << "New Host mode" << newHostMode;
connectedDevices();
- Q_EMIT q_ptr->hostModeStateChanged(newHostMode);
+ emit q_ptr->hostModeStateChanged(newHostMode);
}
} else if (result.msg == QStringLiteral("pairing_complete")) {
qCDebug(QT_BT_QNX) << "pairing completed";
@@ -388,18 +388,18 @@ void QBluetoothLocalDevicePrivate::controlEvent(ppsResult result)
pairingStatus = QBluetoothLocalDevice::AuthorizedPaired;
}
qCDebug(QT_BT_QNX) << "pairing completed" << address.toString();
- Q_EMIT q_ptr->pairingFinished(address, pairingStatus);
+ emit q_ptr->pairingFinished(address, pairingStatus);
}
} else if (result.msg == QStringLiteral("device_deleted")) {
qCDebug(QT_BT_QNX) << "device deleted";
if (result.dat.contains(QStringLiteral("addr"))) {
const QBluetoothAddress address = QBluetoothAddress(
result.dat.at(result.dat.indexOf(QStringLiteral("addr")) + 1));
- Q_EMIT q_ptr->pairingFinished(address, QBluetoothLocalDevice::Unpaired);
+ emit q_ptr->pairingFinished(address, QBluetoothLocalDevice::Unpaired);
}
} else if (result.msg == QStringLiteral("radio_shutdown")) {
qCDebug(QT_BT_QNX) << "radio shutdown";
- Q_EMIT q_ptr->hostModeStateChanged(QBluetoothLocalDevice::HostPoweredOff);
+ emit q_ptr->hostModeStateChanged(QBluetoothLocalDevice::HostPoweredOff);
}
}
diff --git a/src/bluetooth/qbluetoothsocket_qnx.cpp b/src/bluetooth/qbluetoothsocket_qnx.cpp
index ad4359e2..6e5c26ec 100644
--- a/src/bluetooth/qbluetoothsocket_qnx.cpp
+++ b/src/bluetooth/qbluetoothsocket_qnx.cpp
@@ -177,7 +177,7 @@ void QBluetoothSocketPrivate::abort()
::close(socket);
q->setSocketState(QBluetoothSocket::UnconnectedState);
- Q_EMIT q->disconnected();
+ emit q->disconnected();
isServerSocket = false;
}
@@ -231,7 +231,7 @@ qint64 QBluetoothSocketPrivate::writeData(const char *data, qint64 maxSize)
return -1;
}
- Q_EMIT q->bytesWritten(maxSize);
+ emit q->bytesWritten(maxSize);
return maxSize;
} else {
diff --git a/src/bluetooth/qbluetoothtransferreply_qnx.cpp b/src/bluetooth/qbluetoothtransferreply_qnx.cpp
index 3f22d536..f2fea315 100644
--- a/src/bluetooth/qbluetoothtransferreply_qnx.cpp
+++ b/src/bluetooth/qbluetoothtransferreply_qnx.cpp
@@ -114,7 +114,7 @@ bool QBluetoothTransferReplyQnx::start()
m_error = QBluetoothTransferReply::ResourceBusyError;
m_finished = true;
m_running = false;
- Q_EMIT finished(this);
+ emit finished(this);
return false;
}
if (!source->isReadable()) {
@@ -123,7 +123,7 @@ bool QBluetoothTransferReplyQnx::start()
m_error = QBluetoothTransferReply::IODeviceNotReadableError;
m_finished = true;
m_running = false;
- Q_EMIT finished(this);
+ emit finished(this);
return false;
}
QString fileName = agentPath + QStringLiteral("Qt5OPP_tmp");
@@ -223,7 +223,7 @@ void QBluetoothTransferReplyQnx::controlEvent(ppsResult result)
m_errorStr = result.errorMsg;
m_error = QBluetoothTransferReply::UnknownError;
// }
- Q_EMIT finished(this);
+ emit finished(this);
} else if (result.msg == QStringLiteral("opp_update")) {
bool ok;
qint64 sentBytes = result.dat.at(result.dat.indexOf(QStringLiteral("sent")) + 1).toDouble(&ok);
@@ -237,13 +237,13 @@ void QBluetoothTransferReplyQnx::controlEvent(ppsResult result)
return;
}
qCDebug(QT_BT_QNX) << "opp update" << sentBytes << totalBytes;
- Q_EMIT transferProgress(sentBytes, totalBytes);
+ emit transferProgress(sentBytes, totalBytes);
} else if (result.msg == QStringLiteral("opp_complete")) {
qCDebug(QT_BT_QNX) << "opp complete";
removeTempFile();
m_finished = true;
m_running = false;
- Q_EMIT finished(this);
+ emit finished(this);
}
}
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
index 842d042d..bb1d327c 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
@@ -417,7 +417,7 @@ void QDeclarativeBluetoothDiscoveryModel::setRunning(bool running)
}
}
- Q_EMIT runningChanged();
+ emit runningChanged();
}
/*!
@@ -471,5 +471,5 @@ QString QDeclarativeBluetoothDiscoveryModel::remoteAddress()
void QDeclarativeBluetoothDiscoveryModel::setRemoteAddress(QString address)
{
d->m_remoteAddress = address;
- Q_EMIT remoteAddressChanged();
+ emit remoteAddressChanged();
}
diff --git a/src/imports/nfc/qdeclarativendeffilter.cpp b/src/imports/nfc/qdeclarativendeffilter.cpp
index 5d1dd43f..74191f3e 100644
--- a/src/imports/nfc/qdeclarativendeffilter.cpp
+++ b/src/imports/nfc/qdeclarativendeffilter.cpp
@@ -129,7 +129,7 @@ void QDeclarativeNdefFilter::setTypeNameFormat(QQmlNdefRecord::TypeNameFormat fo
return;
m_typeNameFormat = format;
- Q_EMIT(typeNameFormatChanged());
+ emit typeNameFormatChanged();
}
int QDeclarativeNdefFilter::minimum() const
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)
--
GitLab