[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [akonadi-google/wip-v0.3] libkgoogle: Rename FeedData::nextLink to FeedData::nextPageUrl
From:       Dan_Vrátil <dan () progdan ! cz>
Date:       2012-03-10 16:50:15
Message-ID: 20120310165015.28CBDA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit f08c57e2acb09d4bdc0af1f655c38c3f5fc7a969 by Dan Vrátil.
Committed on 10/03/2012 at 17:49.
Pushed by dvratil into branch 'wip-v0.3'.

Rename FeedData::nextLink to FeedData::nextPageUrl

M  +2    -2    libkgoogle/accessmanager_p.cpp
M  +1    -1    libkgoogle/common.h
M  +4    -4    libkgoogle/services/calendar.cpp
M  +1    -1    libkgoogle/services/contacts.cpp
M  +2    -2    libkgoogle/services/tasks.cpp

http://commits.kde.org/akonadi-google/f08c57e2acb09d4bdc0af1f655c38c3f5fc7a969

diff --git a/libkgoogle/accessmanager_p.cpp b/libkgoogle/accessmanager_p.cpp
index 882fa34..6bdc5b0 100644
--- a/libkgoogle/accessmanager_p.cpp
+++ b/libkgoogle/accessmanager_p.cpp
@@ -189,8 +189,8 @@ void AccessManagerPrivate::nam_replyReceived(QNetworkReply* \
reply)  processedItems = feedData->startIndex;
         totalItems = feedData->totalResults;
 
-        if (feedData->nextLink.isValid()) {
-            QUrl url(feedData->nextLink);
+        if (feedData->nextPageUrl.isValid()) {
+            QUrl url(feedData->nextPageUrl);
             new_request.setUrl(request->url().toString());
             new_request.removeAllQueryItems("start-index");
             new_request.removeAllQueryItems("max-results");
diff --git a/libkgoogle/common.h b/libkgoogle/common.h
index deadd75..dc331e6 100644
--- a/libkgoogle/common.h
+++ b/libkgoogle/common.h
@@ -196,7 +196,7 @@ typedef struct FeedData {
     int startIndex;     /// Index of first item on current feed page.
     int itemsPerPage;   /// Number of items per feed page. This will be same  for \
all pages (except for the last one which can be shorter).  int totalResults;   /// \
                Number of all items.
-    QUrl nextLink;      /// Link to next page of feed.
+    QUrl nextPageUrl;   /// Link to next page of feed.
 } FeedData;
 
 
diff --git a/libkgoogle/services/calendar.cpp b/libkgoogle/services/calendar.cpp
index 36a46ca..644fb96 100644
--- a/libkgoogle/services/calendar.cpp
+++ b/libkgoogle/services/calendar.cpp
@@ -117,16 +117,16 @@ QList< KGoogle::Object* > \
                Services::Calendar::parseJSONFeed(const QByteArray& js
         list = CalendarPrivate::parseCalendarJSONFeed(data["items"].toList());
 
         if (feedData && data.contains("nextPageToken")) {
-            feedData->nextLink = fetchCalendarsUrl();
-            feedData->nextLink.addQueryItem("pageToken", \
data["nextPageToken"].toString()); +            feedData->nextPageUrl = \
fetchCalendarsUrl(); +            feedData->nextPageUrl.addQueryItem("pageToken", \
data["nextPageToken"].toString());  }
 
     } else if (data["kind"] == "calendar#events") {
         list = CalendarPrivate::parseEventJSONFeed(data["items"].toList());
 
         if (feedData && data.contains("nextPageToken") && data.contains("id")) {
-            feedData->nextLink = fetchEventsUrl(data["id"].toString());
-            feedData->nextLink.addQueryItem("pageToken", \
data["nextPageToken"].toString()); +            feedData->nextPageUrl = \
fetchEventsUrl(data["id"].toString()); +            \
feedData->nextPageUrl.addQueryItem("pageToken", data["nextPageToken"].toString());  }
     }
 
diff --git a/libkgoogle/services/contacts.cpp b/libkgoogle/services/contacts.cpp
index 8eb3da0..9fd85e0 100644
--- a/libkgoogle/services/contacts.cpp
+++ b/libkgoogle/services/contacts.cpp
@@ -107,7 +107,7 @@ QList< KGoogle::Object* > Contacts::parseJSONFeed(const \
QByteArray& jsonFeed, Fe  foreach(QVariant l, links) {
             QVariantMap link = l.toMap();
             if (link["rel"].toString() == "next") {
-                feedData->nextLink = link["href"].toUrl();
+                feedData->nextPageUrl = link["href"].toUrl();
                 break;
             }
         }
diff --git a/libkgoogle/services/tasks.cpp b/libkgoogle/services/tasks.cpp
index 25298bf..2b9e581 100644
--- a/libkgoogle/services/tasks.cpp
+++ b/libkgoogle/services/tasks.cpp
@@ -102,8 +102,8 @@ QList< KGoogle::Object* > Tasks::parseJSONFeed(const QByteArray& \
jsonFeed, FeedD  feedData->startIndex = 0;
         feedData->totalResults = 0;
         if (feed.contains("nextPageToken")) {
-            feedData->nextLink = fetchTaskListsUrl();
-            feedData->nextLink.addQueryItem("pageToken", \
feed["nextPageToken"].toString()); +            feedData->nextPageUrl = \
fetchTaskListsUrl(); +            feedData->nextPageUrl.addQueryItem("pageToken", \
feed["nextPageToken"].toString());  }
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]