Imported Upstream version 2.4

[minitube] / src / ytsuggester.cpp

diff --git a/src/ytsuggester.cpp b/src/ytsuggester.cpp
index c526b30079c8d4ce5ee165d596b376bbaa4254f3..86be974049e66aeb912865224e466cc7f4c8f3fe 100644 (file)
--- a/src/ytsuggester.cpp
+++ b/src/ytsuggester.cpp
@@ -19,20 +19,17 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include "ytsuggester.h"
-#include <QtXml>
 #include "networkaccess.h"
 
-#define GSUGGEST_URL "http://suggestqueries.google.com/complete/search?ds=yt&output=toolbar&hl=%1&q=%2"
-
 namespace The {
-    NetworkAccess* http();
+NetworkAccess* http();
 }
 
 YTSuggester::YTSuggester(QObject *parent) : Suggester(parent) {
 
 }
 
-void YTSuggester::suggest(QString query) {
+void YTSuggester::suggest(const QString &query) {
     if (query.startsWith("http")) return;
 
 #if QT_VERSION >= 0x040800
@@ -46,24 +43,26 @@ void YTSuggester::suggest(QString query) {
         locale = "en-US";
     }
 
-    QString url = QString(GSUGGEST_URL).arg(locale, query);
+    QString url =
+            QString("https://suggestqueries.google.com/complete/search?ds=yt&output=toolbar&hl=%1&q=%2")
+            .arg(locale, query);
 
     QObject *reply = The::http()->get(url);
     connect(reply, SIGNAL(data(QByteArray)), SLOT(handleNetworkData(QByteArray)));
 }
 
 void YTSuggester::handleNetworkData(QByteArray response) {
-    QStringList choices;
-
+    QList<Suggestion*> suggestions;
     QXmlStreamReader xml(response);
     while (!xml.atEnd()) {
         xml.readNext();
         if (xml.tokenType() == QXmlStreamReader::StartElement) {
             if (xml.name() == QLatin1String("suggestion")) {
                 QStringRef str = xml.attributes().value("data");
-                choices << str.toString();
+                QString value = str.toString();
+                suggestions << new Suggestion(value);
             }
         }
     }
-    emit ready(choices);
+    emit ready(suggestions);
 }