[Development] Qt 5.3 header diff: QtLocation

Thiago Macieira Tue, 22 Apr 2014 14:35:20 -0700

http://macieira.org/~thiago/qt-5.3/QtLocation.diff

diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index aa2839a..11862db 100644
--- a/src/location/maps/qgeocodingmanagerengine.h
+++ b/src/location/maps/qgeocodingmanagerengine.h
@@ -56,7 +56,7 @@ class Q_LOCATION_EXPORT QGeoCodingManagerEngine : public QObject
 {
     Q_OBJECT
 public:
-    QGeoCodingManagerEngine(const QMap<QString, QVariant> &parameters, QObject *parent = 0);
+    QGeoCodingManagerEngine(const QVariantMap &parameters, QObject *parent = 0);
     virtual ~QGeoCodingManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index dc22b0a..96a052f 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -88,6 +88,7 @@ protected:
     void setFinished(bool finished);
 
     void setRoutes(const QList<QGeoRoute> &routes);
+    void addRoutes(const QList<QGeoRoute> &routes);
 
 private:
     QGeoRouteReplyPrivate *d_ptr;
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index d9ff681..72dfc37 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -42,22 +42,20 @@
 #ifndef QGEOROUTINGMANAGER_H
 #define QGEOROUTINGMANAGER_H
 
+#include <QtCore/QObject>
+#include <QtCore/QLocale>
 #include <QtLocation/QGeoRouteRequest>
 #include <QtLocation/QGeoRouteReply>
 
-#include <QObject>
-#include <QMap>
-
 QT_BEGIN_NAMESPACE
 
-class QLocale;
-
 class QGeoRoutingManagerEngine;
 class QGeoRoutingManagerPrivate;
 
 class Q_LOCATION_EXPORT QGeoRoutingManager : public QObject
 {
     Q_OBJECT
+
 public:
     ~QGeoRoutingManager();
 
@@ -76,6 +74,8 @@ public:
 
     void setLocale(const QLocale &locale);
     QLocale locale() const;
+    void setMeasurementSystem(QLocale::MeasurementSystem system);
+    QLocale::MeasurementSystem measurementSystem() const;
 
 Q_SIGNALS:
     void finished(QGeoRouteReply *reply);
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index fa05b98..1e05b89 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -42,23 +42,21 @@
 #ifndef QGEOROUTINGMANAGERENGINE_H
 #define QGEOROUTINGMANAGERENGINE_H
 
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QLocale>
 #include <QtLocation/QGeoRouteRequest>
 #include <QtLocation/QGeoRouteReply>
 
-#include <QObject>
-#include <QMap>
-
 QT_BEGIN_NAMESPACE
 
-class QLocale;
-
 class QGeoRoutingManagerEnginePrivate;
 
 class Q_LOCATION_EXPORT QGeoRoutingManagerEngine : public QObject
 {
     Q_OBJECT
 public:
-    QGeoRoutingManagerEngine(const QMap<QString, QVariant> &parameters, QObject *parent = 0);
+    QGeoRoutingManagerEngine(const QVariantMap &parameters, QObject *parent = 0);
     virtual ~QGeoRoutingManagerEngine();
 
     QString managerName() const;
@@ -76,6 +74,8 @@ public:
 
     void setLocale(const QLocale &locale);
     QLocale locale() const;
+    void setMeasurementSystem(QLocale::MeasurementSystem system);
+    QLocale::MeasurementSystem measurementSystem() const;
 
 Q_SIGNALS:
     void finished(QGeoRouteReply *reply);
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h
index 28c27ef..b284330 100644
--- a/src/location/maps/qgeoserviceproviderfactory.h
+++ b/src/location/maps/qgeoserviceproviderfactory.h
@@ -55,16 +55,16 @@ class Q_LOCATION_EXPORT QGeoServiceProviderFactory
 public:
     virtual ~QGeoServiceProviderFactory() {}
 
-    virtual QGeoCodingManagerEngine *createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+    virtual QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
-    virtual QGeoMappingManagerEngine *createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
+    virtual QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
-    virtual QGeoRoutingManagerEngine *createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
+    virtual QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
-    virtual QPlaceManagerEngine *createPlaceManagerEngine(const QMap<QString, QVariant> &parameters,
+    virtual QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
 };
diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h
index 8d781a4..dcdcddc 100644
--- a/src/location/places/qplacecontentreply.h
+++ b/src/location/places/qplacecontentreply.h
@@ -65,10 +65,15 @@ public:
 
     QPlaceContentRequest request() const;
 
+    QPlaceContentRequest previousPageRequest() const;
+    QPlaceContentRequest nextPageRequest() const;
+
 protected:
     void setContent(const QPlaceContent::Collection &content);
     void setTotalCount(int total);
     void setRequest(const QPlaceContentRequest &request);
+    void setPreviousPageRequest(const QPlaceContentRequest &previous);
+    void setNextPageRequest(const QPlaceContentRequest &next);
 
 private:
     Q_DISABLE_COPY(QPlaceContentReply)
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);
+    QString placeId() const;
+    void setPlaceId(const QString &identifier);
+
+    QVariant contentContext() const;
+    void setContentContext(const QVariant &context);
+
     int limit() const;
     void setLimit(int limit);
 
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index 786fdc1..a29e5ea 100644
--- 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;
 
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
@@ -58,7 +58,7 @@ class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject
     Q_OBJECT
 
 public:
-    QPlaceManagerEngine(const QMap<QString, QVariant> &parameters, QObject *parent = 0);
+    QPlaceManagerEngine(const QVariantMap &parameters, QObject *parent = 0);
     virtual ~QPlaceManagerEngine();
 
     QString managerName() const;
@@ -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);
 
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index 4266b98..51cb315 100644
--- a/src/location/places/qplacesearchreply.h
+++ b/src/location/places/qplacesearchreply.h
@@ -44,11 +44,12 @@
 
 #include <QtLocation/QPlaceReply>
 #include <QtLocation/QPlaceSearchResult>
-#include <QtLocation/QPlaceSearchRequest>
 
 QT_BEGIN_NAMESPACE
 
+class QPlaceSearchResult;
 class QPlaceSearchReplyPrivate;
+
 class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply
 {
     Q_OBJECT
@@ -61,9 +62,15 @@ public:
     QList<QPlaceSearchResult> results() const;
     QPlaceSearchRequest request() const;
 
+    QPlaceSearchRequest previousPageRequest() const;
+    QPlaceSearchRequest nextPageRequest() const;
+
 protected:
     void setResults(const QList<QPlaceSearchResult> &results);
     void setRequest(const QPlaceSearchRequest &request);
+    void setPreviousPageRequest(const QPlaceSearchRequest &previous);
+    void setNextPageRequest(const QPlaceSearchRequest &next);
+
 private:
     Q_DISABLE_COPY(QPlaceSearchReply)
     Q_DECLARE_PRIVATE(QPlaceSearchReply)
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);

_______________________________________________
Development mailing list
[email protected]
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.3 header diff: QtLocation

Reply via email to