From kde-commits  Tue Mar 24 14:35:28 2009
From: Shashank Singh <shashank.personal () gmail ! com>
Date: Tue, 24 Mar 2009 14:35:28 +0000
To: kde-commits
Subject: KDE/kdeedu/marble/src/plugins/render/twitter
Message-Id: <1237905328.417850.27220.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=123790534203174

SVN commit 943791 by ssingh:

[1]library name is twitter
[2]removed redudant code


 M  +1 -1      CMakeLists.txt  
 M  +15 -34    jsonparser.cpp  


--- trunk/KDE/kdeedu/marble/src/plugins/render/twitter/CMakeLists.txt #943790:943791
@@ -10,4 +10,4 @@
 set( twitter_SRCS twitterPlugin.cpp jsonparser.cpp )
 
 marble_add_plugin( twitter ${twitter_SRCS} )
-target_link_libraries( Panoramio ${QT_QTSCRIPT_LIBRARY} )
+target_link_libraries( twitter ${QT_QTSCRIPT_LIBRARY} )
--- trunk/KDE/kdeedu/marble/src/plugins/render/twitter/jsonparser.cpp #943790:943791
@@ -18,21 +18,6 @@
 
 twitterDataStructure jsonParser::parseObjectOnPosition(const QString &content , int requiredObjectPosition)
 {
-
- /*   QString temp = "var myJSONObject =" + content;
-    myEngine.evaluate(temp);
-
-    dataStorage.user = myEngine.evaluate(QString("return myJSONObject.photos[")
-                                         + QString::number(requiredObjectPosition)
-                                         + QString("].user;")).toString();
-    dataStorage.location = myEngine.evaluate(QString("return myJSONObject.photos[")
-                           + QString::number(requiredObjectPosition)
-                           + QString("].location;")).toString();
-    dataStorage.text = myEngine.evaluate(QString("return myJSONObject.photos[")
-                                         + QString::number(requiredObjectPosition)
-                                         + QString("].text;")).toString();
-
-*/
     return dataStorage;
 }
 
@@ -40,9 +25,8 @@
 {
     QString temp = "var myJSONObject =  { \"twitter\":" + content + "}";
     int iterator = 0;//the count starts fom one
-//qDebug()<<"::::::::::::::::::::::::"<<temp;
-if (temp != "Twitter is down for database maintenance. It will return in about 30 minutes")
-{
+    if (temp != "Twitter is down for database maintenance. It will return in about 30 minutes")
+    {
 	myEngine.evaluate(QString("function userName(k){return myJSONObject.twitter[k].user.name};"));
 	myEngine.evaluate(QString("function userLocation(k){return myJSONObject.twitter[k].user.location};"));
 	myEngine.evaluate(QString("function userText(k){return myJSONObject.twitter[k].text};"));
@@ -57,36 +41,33 @@
 	parsedJsonOutput.insert(iterator , dataStorage);
 
         ++iterator;
+      }
     }
-//qDebug()<<"::::::::::::::::::::::"<<dataStorage.user;
-
-//qDebug()<<":::::::::::::::::parsed Output"<<parsedJsonOutput[0].location;
-}
-else 
-{
+   else 
+    {
 //twitter is down :(
-dataStorage.user="@Twitter Plugin";
-dataStorage.location="Equator";
-dataStorage.text="Twitter is down , Please try in 30 minutes " ;
-parsedJsonOutput<<dataStorage;
+      dataStorage.user="@Twitter Plugin";
+      dataStorage.location="Equator";
+      dataStorage.text="Twitter is down , Please try in 30 minutes " ;
+      parsedJsonOutput<<dataStorage;
 
-}
+    }
    return parsedJsonOutput;
 }
 
 googleMapDataStructure jsonParser::geoCodingAPIparseObject(QString content)
 {
-     qDebug() << "in geoCodingAPIparseObject";
+    qDebug() << "in geoCodingAPIparseObject";
     QString temp = "var myJSONObject = " + content;
 
     googleMapDataStructure returnStructure;
-	myEngine.evaluate("function lat(){return myJSONObject.Placemark[0].Point.coordinates[0]}");
-	myEngine.evaluate("function lon(){return myJSONObject.Placemark[0].Point.coordinates[1]}");
+    myEngine.evaluate("function lat(){return myJSONObject.Placemark[0].Point.coordinates[0]}");
+    myEngine.evaluate("function lon(){return myJSONObject.Placemark[0].Point.coordinates[1]}");
     myEngine.evaluate(temp);
 
     returnStructure.lon = myEngine.evaluate("lon()").toNumber();
- returnStructure.lat = myEngine.evaluate("lat()").toNumber();
-     qDebug() << "twitter lan lon text=" << returnStructure.lat << returnStructure.lon;
+    returnStructure.lat = myEngine.evaluate("lat()").toNumber();
+    qDebug() << "twitter lan lon text=" << returnStructure.lat << returnStructure.lon;
     return returnStructure;
 }