From c9ec0c206544b37139057932a6dceed88565a75f Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Fri, 21 Jun 2013 10:50:48 +0200
Subject: Doc: Update Tweet Search Demo to use Twitter Search API v1.1

Twitter REST API v1 is no longer supported. This change updates the
Tweet Search Demo to use the new version (v1.1). Specifically,
    - Use of OAuth tokens (authentication required in v1.1)
    - JSON parsing for results instead of XML
    - Use of url/hashtag/username entities returned in search results

Also, update the documentation to discuss authentication and
registering the application to dev.twitter.com.

Task-number: QTBUG-31745
Change-Id: I00cd7b07f065babb03483daabe8df22f22995c29
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
---
 examples/quick/demos/tweetsearch/tweetsearch.qml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'examples/quick/demos/tweetsearch/tweetsearch.qml')

diff --git a/examples/quick/demos/tweetsearch/tweetsearch.qml b/examples/quick/demos/tweetsearch/tweetsearch.qml
index d7e77ceb4b..19d3b5e708 100644
--- a/examples/quick/demos/tweetsearch/tweetsearch.qml
+++ b/examples/quick/demos/tweetsearch/tweetsearch.qml
@@ -40,6 +40,7 @@
 
 import QtQuick 2.0
 import "content"
+import "content/tweetsearch.js" as Helper
 
 Rectangle {
     id: main
@@ -47,7 +48,6 @@ Rectangle {
     height: 480
     color: "#d6d6d6"
 
-    property string searchTerms: ""
     property int inAnimDur: 250
     property int counter: 0
     property alias isLoading: tweetsModel.isLoading
@@ -85,13 +85,15 @@ Rectangle {
         onTriggered: {
             main.counter--;
             var id = tweetsModel.model.get(idx[main.counter]).id
-            mainListView.add( { "statusText": tweetsModel.model.get(main.counter).content,
-                                 "name": tweetsModel.model.get(main.counter).name,
-                                 "userImage": tweetsModel.model.get(main.counter).image,
-                                 "source": tweetsModel.model.get(main.counter).source,
-                                 "id": id,
-                                 "uri": tweetsModel.model.get(main.counter).uri,
-                                 "published": tweetsModel.model.get(main.counter).published } );
+            var item = tweetsModel.model.get(main.counter)
+            mainListView.add( { "statusText": Helper.insertLinks(item.text, item.entities),
+                                "twitterName": item.user.screen_name,
+                                "name" : item.user.name,
+                                "userImage": item.user.profile_image_url,
+                                "source": item.source,
+                                "id": id,
+                                 "uri": Helper.insertLinks(item.user.url, item.user.entities),
+                                "published": item.created_at } );
             ids.push(id)
         }
     }
@@ -107,7 +109,7 @@ Rectangle {
             PropertyAction { property: "appear"; value: 250 }
         }
 
-        onDragEnded: if (header.refresh) { tweetsModel.model.reload() }
+        onDragEnded: if (header.refresh) { tweetsModel.reload() }
 
         ListHeader {
             id: header
-- 
cgit v1.2.3