summaryrefslogtreecommitdiffstats
path: root/src/nfc
diff options
context:
space:
mode:
authorOleg Shparber <trollixx@gmail.com>2014-04-29 01:52:14 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-29 12:22:45 +0200
commit0e60ecb374b15d488cc0e10b73458e550698aec6 (patch)
tree7e1b92792e1b96e7c6470cc4191d36c7baa2fa34 /src/nfc
parent19a8f2f275f258a11c7f3a6d4d586c41ecc1cd5d (diff)
Replace Q_SIGNALS/Q_SLOTS with signals/slots in private headers
This patch fixes private headers accordingly to coding guidelines Change-Id: Id428e162207a7ae70ccfbcb172d28cab79739818 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/nfc')
-rw-r--r--src/nfc/qllcpserver_p.h2
-rw-r--r--src/nfc/qllcpsocket_p.h2
-rw-r--r--src/nfc/qllcpsocket_qnx_p.h4
-rw-r--r--src/nfc/qnearfieldmanager_qnx_p.h2
-rw-r--r--src/nfc/qnearfieldsharemanager_qnx_p.h2
-rw-r--r--src/nfc/qnearfieldsharetarget_qnx_p.h2
-rw-r--r--src/nfc/qnx/qnxnfceventfilter_p.h2
-rw-r--r--src/nfc/qnx/qnxnfcmanager_p.h4
-rw-r--r--src/nfc/qnx/qnxnfcsharemanager_p.h2
9 files changed, 11 insertions, 11 deletions
diff --git a/src/nfc/qllcpserver_p.h b/src/nfc/qllcpserver_p.h
index 5d72f558..e409a1cd 100644
--- a/src/nfc/qllcpserver_p.h
+++ b/src/nfc/qllcpserver_p.h
@@ -84,7 +84,7 @@ public:
QLlcpSocket::SocketError serverError() const;
-Q_SIGNALS:
+signals:
void newConnection();
private:
diff --git a/src/nfc/qllcpsocket_p.h b/src/nfc/qllcpsocket_p.h
index 6bda57be..cc0d26cb 100644
--- a/src/nfc/qllcpsocket_p.h
+++ b/src/nfc/qllcpsocket_p.h
@@ -121,7 +121,7 @@ public:
virtual bool waitForDisconnected(int msecs = 30000);
bool isSequential() const;
-Q_SIGNALS:
+signals:
void connected();
void disconnected();
void error(QLlcpSocket::SocketError socketError);
diff --git a/src/nfc/qllcpsocket_qnx_p.h b/src/nfc/qllcpsocket_qnx_p.h
index 32968695..f6e50215 100644
--- a/src/nfc/qllcpsocket_qnx_p.h
+++ b/src/nfc/qllcpsocket_qnx_p.h
@@ -94,7 +94,7 @@ public:
void dataRead(QByteArray&);
void dataWritten();
-public Q_SLOTS:
+public slots:
void disconnectFromService();
private:
@@ -115,7 +115,7 @@ private:
Idle, Reading, Writing
} socketState;
-private Q_SLOTS:
+private slots:
void read();
void enteringIdle();
};
diff --git a/src/nfc/qnearfieldmanager_qnx_p.h b/src/nfc/qnearfieldmanager_qnx_p.h
index 323f85b8..a344c37a 100644
--- a/src/nfc/qnearfieldmanager_qnx_p.h
+++ b/src/nfc/qnearfieldmanager_qnx_p.h
@@ -74,7 +74,7 @@ public:
void releaseAccess(QNearFieldManager::TargetAccessModes accessModes);
-private Q_SLOTS:
+private slots:
void handleMessage(const QNdefMessage&, QNearFieldTarget *);
void newTarget(QNearFieldTarget *target, const QList<QNdefMessage> &);
diff --git a/src/nfc/qnearfieldsharemanager_qnx_p.h b/src/nfc/qnearfieldsharemanager_qnx_p.h
index 5d973bcf..9cb4b48e 100644
--- a/src/nfc/qnearfieldsharemanager_qnx_p.h
+++ b/src/nfc/qnearfieldsharemanager_qnx_p.h
@@ -62,7 +62,7 @@ public:
QNearFieldShareManager::ShareModes shareModes() const;
QNearFieldShareManager::ShareError shareError() const;
-private Q_SLOTS:
+private slots:
void onShareModeChanged(bb::system::NfcShareMode::Type mode);
void onError(bb::system::NfcShareError::Type error);
void onFinished(bb::system::NfcShareSuccess::Type result);
diff --git a/src/nfc/qnearfieldsharetarget_qnx_p.h b/src/nfc/qnearfieldsharetarget_qnx_p.h
index 16bf429f..e0925110 100644
--- a/src/nfc/qnearfieldsharetarget_qnx_p.h
+++ b/src/nfc/qnearfieldsharetarget_qnx_p.h
@@ -65,7 +65,7 @@ public:
bool isShareInProgress() const;
QNearFieldShareManager::ShareError shareError() const;
-private Q_SLOTS:
+private slots:
void onShareModeChanged(bb::system::NfcShareMode::Type mode);
void onError(bb::system::NfcShareError::Type error);
void onFinished(bb::system::NfcShareSuccess::Type result);
diff --git a/src/nfc/qnx/qnxnfceventfilter_p.h b/src/nfc/qnx/qnxnfceventfilter_p.h
index 9b10ed57..afcd0777 100644
--- a/src/nfc/qnx/qnxnfceventfilter_p.h
+++ b/src/nfc/qnx/qnxnfceventfilter_p.h
@@ -66,7 +66,7 @@ private:
QAbstractNativeEventFilter *prevFilter;
-Q_SIGNALS:
+signals:
void ndefEvent(const QNdefMessage &msg);
};
diff --git a/src/nfc/qnx/qnxnfcmanager_p.h b/src/nfc/qnx/qnxnfcmanager_p.h
index 70729c41..1fc6205d 100644
--- a/src/nfc/qnx/qnxnfcmanager_p.h
+++ b/src/nfc/qnx/qnxnfcmanager_p.h
@@ -114,7 +114,7 @@ private:
void setupInvokeTarget();
-private Q_SLOTS:
+private slots:
void newNfcEvent(int fd);
void invokeNdefMessage(const QNdefMessage &);
@@ -126,7 +126,7 @@ public:
QNdefMessage decodeMessage(nfc_ndef_message_t *nextMessage);
-Q_SIGNALS:
+signals:
void newLlcpConnection(nfc_target_t *);
void ndefMessage(const QNdefMessage &, QNearFieldTarget *);
void targetDetected(QNearFieldTarget *, const QList<QNdefMessage> &);
diff --git a/src/nfc/qnx/qnxnfcsharemanager_p.h b/src/nfc/qnx/qnxnfcsharemanager_p.h
index ae6511eb..4b143653 100644
--- a/src/nfc/qnx/qnxnfcsharemanager_p.h
+++ b/src/nfc/qnx/qnxnfcsharemanager_p.h
@@ -77,7 +77,7 @@ private:
bb::system::NfcShareManager *_manager;
static const char *RECORD_NDEF;
-Q_SIGNALS:
+signals:
void shareModeChanged(bb::system::NfcShareMode::Type);
void error(bb::system::NfcShareError::Type);
void finished(bb::system::NfcShareSuccess::Type);