Remove offset attribute from place search requests.

Not all service providers support arbitrary search offsets. The offset
attribute has been removed, instead service providers can supply a
previous and next search query in the form of a QPlaceSearchRequest.

Change-Id: If68e969b06f909f3fa62718656cbef70d1bf84a6
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

1 files changed, 55 insertions, 7 deletions

diff --git a/src/location/places/qplacesearchreply.cpp b/src/location/places/qplacesearchreply.cpp
index 26829607..9d89748a 100644
--- a/src/location/places/qplacesearchreply.cpp
+++ b/src/location/places/qplacesearchreply.cpp
@@ -39,23 +39,23 @@
 **
 ****************************************************************************/
 
-#include "qplacesearchreply.h"
-#include "qplacereply_p.h"
-
+#include <QtLocation/QPlaceSearchRequest>
+#include <QtLocation/QPlaceSearchReply>
+#include <QtLocation/QPlaceProposedSearchResult>
+#include <QtLocation/private/qplacereply_p.h>
 
 QT_BEGIN_NAMESPACE
+
 class QPlaceSearchReplyPrivate : public QPlaceReplyPrivate
 {
 public:
     QPlaceSearchReplyPrivate(){}
     QList<QPlaceSearchResult> results;
     QPlaceSearchRequest searchRequest;
+    QPlaceSearchRequest previousPageRequest;
+    QPlaceSearchRequest nextPageRequest;
 };
 
-QT_END_NAMESPACE
-
-QT_USE_NAMESPACE
-
 /*!
     \class QPlaceSearchReply
     \inmodule QtLocation
@@ -121,6 +121,30 @@ QPlaceSearchRequest QPlaceSearchReply::request() const
 }
 
 /*!
+    Returns a place search request which can be used to request the previous page of search
+    results. An empty place search request is returned if there is no previous page of results.
+
+    \sa nextPageRequest(), setPreviousPageRequest()
+*/
+QPlaceSearchRequest QPlaceSearchReply::previousPageRequest() const
+{
+    Q_D(const QPlaceSearchReply);
+    return d->previousPageRequest;
+}
+
+/*!
+    Returns a place search request which can be used to request the next page of search results. An
+    empty place search request is returned if there is no next page of results.
+
+    \sa previousPageRequest(), setNextPageRequest()
+*/
+QPlaceSearchRequest QPlaceSearchReply::nextPageRequest() const
+{
+    Q_D(const QPlaceSearchReply);
+    return d->nextPageRequest;
+}
+
+/*!
     Sets the search \a request used to generate this reply.
 */
 void QPlaceSearchReply::setRequest(const QPlaceSearchRequest &request)
@@ -128,3 +152,27 @@ void QPlaceSearchReply::setRequest(const QPlaceSearchRequest &request)
     Q_D(QPlaceSearchReply);
     d->searchRequest = request;
 }
+
+/*!
+    Sets the previous page of search results request to \a previous.
+
+    \sa previousPageRequest()
+*/
+void QPlaceSearchReply::setPreviousPageRequest(const QPlaceSearchRequest &previous)
+{
+    Q_D(QPlaceSearchReply);
+    d->previousPageRequest = previous;
+}
+
+/*!
+    Sets the next page of search results request to \a next.
+
+    \sa nextPageRequest()
+*/
+void QPlaceSearchReply::setNextPageRequest(const QPlaceSearchRequest &next)
+{
+    Q_D(QPlaceSearchReply);
+    d->nextPageRequest = next;
+}
+
+QT_END_NAMESPACE