diff options
5 files changed, 32 insertions, 19 deletions
diff --git a/src/location/places/qplacesearchrequest.cpp b/src/location/places/qplacesearchrequest.cpp index c202a838..e1476304 100644 --- a/src/location/places/qplacesearchrequest.cpp +++ b/src/location/places/qplacesearchrequest.cpp @@ -64,16 +64,12 @@ public: }; QPlaceSearchRequestPrivate::QPlaceSearchRequestPrivate() - : QPlaceRequestPrivate(), - dymNumber(0), - searchArea(0), - scope(QPlaceManager::NoScope) +: QPlaceRequestPrivate(), searchArea(0), dymNumber(0), scope(QPlaceManager::NoScope) { } QPlaceSearchRequestPrivate::QPlaceSearchRequestPrivate(const QPlaceSearchRequestPrivate &other) - : QPlaceRequestPrivate(other), - dymNumber(0) +: QPlaceRequestPrivate(other) { this->searchTerm = other.searchTerm; this->categories = other.categories; diff --git a/src/location/qgeoplace.cpp b/src/location/qgeoplace.cpp index 39ca5ec8..738530e5 100644 --- a/src/location/qgeoplace.cpp +++ b/src/location/qgeoplace.cpp @@ -510,17 +510,17 @@ QGeoPlacePrivate::QGeoPlacePrivate(const QGeoPlacePrivate &other) rating(other.rating), suppliers(other.suppliers), feeds(other.feeds), - contentCollections(other.contentCollections), - contentCounts(other.contentCounts), name(other.name), placeId(other.placeId), tags(other.tags), - detailsFetched(other.detailsFetched), + contentCollections(other.contentCollections), + contentCounts(other.contentCounts), primaryPhone(other.primaryPhone), primaryFax(other.primaryFax), primaryEmail(other.primaryEmail), primaryUrl(other.primaryUrl), - extendedAttributes(other.extendedAttributes) + extendedAttributes(other.extendedAttributes), + detailsFetched(other.detailsFetched) { } diff --git a/src/plugins/geoservices/nokia/places/qplacecontentreplyimpl.cpp b/src/plugins/geoservices/nokia/places/qplacecontentreplyimpl.cpp index 6f4af882..4e10f0f3 100644 --- a/src/plugins/geoservices/nokia/places/qplacecontentreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/places/qplacecontentreplyimpl.cpp @@ -57,14 +57,17 @@ QT_USE_NAMESPACE /*! Constructor. */ -QPlaceContentReplyImpl::QPlaceContentReplyImpl(QPlaceContent::Type type, QPlaceRestReply *reply, QObject *parent) : - QPlaceContentReply(parent), contentType(type), - restReply(reply) +QPlaceContentReplyImpl::QPlaceContentReplyImpl(QPlaceContent::Type type, QPlaceRestReply *reply, + QObject *parent) +: QPlaceContentReply(parent), restReply(reply), contentType(type), startNumber(0) + { if (contentType == QPlaceContent::ImageType) parser = new QPlaceJSonMediaParser(this); else if (contentType == QPlaceContent::ReviewType) parser = new QPlaceJSonReviewParser(this); + else + parser = 0; if (restReply) { restReply->setParent(this); diff --git a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp index 417aa2ed..916932e4 100644 --- a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp +++ b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp @@ -896,8 +896,11 @@ void QPlaceJSonDetailsParser::processAdContentBusinessHours(const QScriptValue & } } -void QPlaceJSonDetailsParser::processAdContentClosingsNotes(const QScriptValue &content, QGeoPlace*targetPlace) +void QPlaceJSonDetailsParser::processAdContentClosingsNotes(const QScriptValue &content, + QGeoPlace *targetPlace) { + Q_UNUSED(targetPlace) + QScriptValue value = content.property(place_adcontent_hours_annualclosingsnote_element); if (value.isValid()) { if (value.isArray()) { @@ -938,8 +941,11 @@ QString QPlaceJSonDetailsParser::processAdContentClosingsNote(const QScriptValue return ret; } -void QPlaceJSonDetailsParser::processAdContentOpeningHours(const QScriptValue &content, QGeoPlace*targetPlace) +void QPlaceJSonDetailsParser::processAdContentOpeningHours(const QScriptValue &content, + QGeoPlace *targetPlace) { + Q_UNUSED(targetPlace) + QScriptValue value = content.property(place_adcontent_hours_open_hours_element); if (value.isValid()) { if (value.isArray()) { diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp index cb9598a1..ad29c4e9 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp @@ -246,18 +246,26 @@ QPlaceManager::ConnectivityModes QPlaceManagerEngineNokia::supportedConnectivity return QPlaceManager::OnlineMode; } -QPlaceSaveReply *QPlaceManagerEngineNokia::savePlace(const QGeoPlace &place, QPlaceManager::VisibilityScope scope) { +QPlaceSaveReply *QPlaceManagerEngineNokia::savePlace(const QGeoPlace &place, + QPlaceManager::VisibilityScope scope) +{ + Q_UNUSED(place) + Q_UNUSED(scope) + //TODO: implementation - return NULL; + return 0; } QPlaceManager::VisibilityScopes QPlaceManagerEngineNokia::supportedSaveVisibilityScopes() const { return QPlaceManager::NoScope; } -QPlaceReply *QPlaceManagerEngineNokia::removePlace(const QGeoPlace &place) { +QPlaceReply *QPlaceManagerEngineNokia::removePlace(const QGeoPlace &place) +{ + Q_UNUSED(place) + //TODO: implementation - return NULL; + return 0; } QPlaceReply *QPlaceManagerEngineNokia::initializeCategories() |