[Development] Qt 5.3 header diff: QtLocation

[Sune Vuorela]

On 2014-04-22, Thiago Macieira <thiago.macieira at intel.com> wrote:
> -    QGeoCodingManagerEngine(const QMap<QString, QVariant> &parameters, QObject *parent = 0);
> +    QGeoCodingManagerEngine(const QVariantMap &parameters, QObject *parent = 0);

Given it is just changes to typedefs, it should be okay. There are quite
many of those across this diff.

> diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h
> index b535a13..164c4df 100644
> --- a/src/location/places/qplacecontentrequest.h
> +++ b/src/location/places/qplacecontentrequest.h
> @@ -65,8 +65,12 @@ public:
>      QPlaceContent::Type contentType() const;
>      void setContentType(QPlaceContent::Type type);
>  
> -    int offset() const;
> -    void setOffset(int offset);

This looks wrong


> --- a/src/location/places/qplacemanager.h
> +++ b/src/location/places/qplacemanager.h
> @@ -76,7 +76,7 @@ public:
>  
>      QPlaceDetailsReply *getPlaceDetails(const QString &placeId) const;
>  
> -    QPlaceContentReply *getPlaceContent(const QString &placeId, const QPlaceContentRequest &request) const;
> +    QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &request) const;
>  
>      QPlaceSearchReply *search(const QPlaceSearchRequest &query) const;
>  

This also looks wrong


> diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
> index ee01963..0eefa7c 100644
> --- a/src/location/places/qplacemanagerengine.h
> +++ b/src/location/places/qplacemanagerengine.h
> @@ -66,8 +66,7 @@ public:
>  
>      virtual QPlaceDetailsReply *getPlaceDetails(const QString &placeId);
>  
> -    virtual QPlaceContentReply *getPlaceContent(const QString &placeId,
> -                                                const QPlaceContentRequest &request);
> +    virtual QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &request);
>  
>      virtual QPlaceSearchReply *search(const QPlaceSearchRequest &request);
>  

And this one as well

> diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h
> index 65ca3fe..34a6a1d 100644
> --- a/src/location/places/qplacesearchrequest.h
> +++ b/src/location/places/qplacesearchrequest.h
> @@ -94,8 +94,6 @@ public:
>      RelevanceHint relevanceHint() const;
>      void setRelevanceHint(RelevanceHint hint);
>  
> -    int offset() const;
> -    void setOffset(int offset);
>      int limit() const;
>      void setLimit(int limit);

This one too.

/Sune