From 1ab734248cba1c08e5e095be5a97dd1042b212be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20B=C3=BCrger?= Date: Tue, 15 Nov 2011 16:10:24 +0100 Subject: renaming nld into locationd Change-Id: I9c207594d025a86729df300b3ad128574951aecb Reviewed-by: Alex --- src/location/qgeosatelliteinfosource_npe_backend.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/location/qgeosatelliteinfosource_npe_backend.cpp') diff --git a/src/location/qgeosatelliteinfosource_npe_backend.cpp b/src/location/qgeosatelliteinfosource_npe_backend.cpp index 4b90e32a..8717c7b7 100644 --- a/src/location/qgeosatelliteinfosource_npe_backend.cpp +++ b/src/location/qgeosatelliteinfosource_npe_backend.cpp @@ -43,13 +43,13 @@ #include -// API for socket communication towards nld +// API for socket communication towards locationd const QString ksatelliteStartUpdates = QLatin1String("satelliteStartUpdates"); const QString ksatelliteRequestUpdate = QLatin1String("satelliteRequestUpdate"); const QString ksatelliteStopUpdates = QLatin1String("satelliteStopUpdates"); const QString ksatelliteInfoUpdate = QLatin1String("satelliteInfoUpdate"); -// Attributes for socket communication towards nld +// Attributes for socket communication towards locationd const QString ksatId = QLatin1String("satId"); const QString kazimuth = QLatin1String("azimuth"); const QString kelevation = QLatin1String("elevation"); @@ -78,7 +78,7 @@ QGeoSatelliteInfoSourceNpeBackend::QGeoSatelliteInfoSourceNpeBackend(QObject *pa bool QGeoSatelliteInfoSourceNpeBackend::init() { struct stat buf; - if (stat("/var/run/nld/nld.socket", &buf) == 0) { + if (stat("/var/run/locationd/locationd.socket", &buf) == 0) { mSocket = new QLocalSocket(this); if (mSocket) { connect(mSocket, SIGNAL(connected()), this, SLOT(onSocketConnected())); @@ -87,7 +87,7 @@ bool QGeoSatelliteInfoSourceNpeBackend::init() if (mStream) { connect(mStream, SIGNAL(receive(const QVariantMap&)), this, SLOT(onStreamReceived(const QVariantMap&)), Qt::QueuedConnection); } - mSocket->connectToServer("/var/run/nld/nld.socket"); + mSocket->connectToServer("/var/run/locationd/locationd.socket"); return(mSocket->waitForConnected(500)); // wait up to 0.5 seconds to get connected, otherwise return false } } @@ -144,7 +144,7 @@ void QGeoSatelliteInfoSourceNpeBackend::requestTimerExpired() void QGeoSatelliteInfoSourceNpeBackend::onStreamReceived(const QVariantMap& map) { - // this slot handles the communication received from nld socket + // this slot handles the communication received from locationd socket if (map.contains(JsonDbString::kActionStr)) { QString action = map.value(JsonDbString::kActionStr).toString(); -- cgit v1.2.1