summaryrefslogtreecommitdiffstats
path: root/src/mobility
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2011-03-03 14:47:46 +1000
committerAaron McCarthy <aaron.mccarthy@nokia.com>2011-03-04 14:06:58 +1000
commitf5580cf430b071f840262b6350defe03cd36e0b9 (patch)
treeee8f40f182411c8a658328568a50f53061454a5c /src/mobility
parent498c809da363d90c2f0fdf7cbcae0f6f6e3ffcb9 (diff)
Support NFC QNearFieldManager::targetLost() signal.
Diffstat (limited to 'src/mobility')
-rw-r--r--src/mobility/mobilitymanager.cpp15
-rw-r--r--src/mobility/mobilitymanager.h3
2 files changed, 13 insertions, 5 deletions
diff --git a/src/mobility/mobilitymanager.cpp b/src/mobility/mobilitymanager.cpp
index f1caa37..b9b37af 100644
--- a/src/mobility/mobilitymanager.cpp
+++ b/src/mobility/mobilitymanager.cpp
@@ -502,8 +502,10 @@ void MobilityClient::setRequestsSensors()
void MobilityClient::setRequestsNfc()
{
- connect(mMobilityServer->mMobility->mNfcUi, SIGNAL(targetInRange(QByteArray)),
- SLOT(sendNfcTargetInRange(QByteArray)));
+ connect(mMobilityServer->mMobility->mNfcUi, SIGNAL(targetEnteringProximity(QByteArray)),
+ SLOT(sendNfcTargetEnteringProximity(QByteArray)));
+ connect(mMobilityServer->mMobility->mNfcUi, SIGNAL(targetLeavingProximity(QByteArray)),
+ SLOT(sendNfcTargetLeavingProximity(QByteArray)));
}
void MobilityClient::setRequestsOrganizer()
@@ -990,9 +992,14 @@ void MobilityClient::sendEffectStateChange(int effectId, QtMobility::QFeedbackEf
"setFeedbackEffectState", effectId, static_cast<int>(state));
}
-void MobilityClient::sendNfcTargetInRange(const QByteArray &uid)
+void MobilityClient::sendNfcTargetEnteringProximity(const QByteArray &uid)
{
QtSimulatorPrivate::RemoteMetacall<void>::call(mSendSocket, QtSimulatorPrivate::NoSync,
- "targetInRange", uid);
+ "targetEnteringProximity", uid);
}
+void MobilityClient::sendNfcTargetLeavingProximity(const QByteArray &uid)
+{
+ QtSimulatorPrivate::RemoteMetacall<void>::call(mSendSocket, QtSimulatorPrivate::NoSync,
+ "targetLeavingProximity", uid);
+}
diff --git a/src/mobility/mobilitymanager.h b/src/mobility/mobilitymanager.h
index f765ffe..d5ab70f 100644
--- a/src/mobility/mobilitymanager.h
+++ b/src/mobility/mobilitymanager.h
@@ -121,7 +121,8 @@ public slots:
void sendCameraRemoved(const QString &name);
void sendCameraChanged(const QString &name, const CameraUi::CameraData::CameraDetails &newDetails);
- void sendNfcTargetInRange(const QByteArray &uid);
+ void sendNfcTargetEnteringProximity(const QByteArray &uid);
+ void sendNfcTargetLeavingProximity(const QByteArray &uid);
private slots:
void disconnect();