Imported Upstream version 2.3

[minitube] / src / channelsuggest.cpp

diff --git a/src/channelsuggest.cpp b/src/channelsuggest.cpp
index 6d0d1ff265ba3afa311f33e66f1f8b0c1b20985b..c252802f3455e34ce7ba45c0f64da0c1067dd538 100644 (file)
--- a/src/channelsuggest.cpp
+++ b/src/channelsuggest.cpp
@@ -29,16 +29,27 @@ ChannelSuggest::ChannelSuggest(QObject *parent) : Suggester(parent) {
 
 }
 
-void ChannelSuggest::suggest(QString query) {
+void ChannelSuggest::suggest(const QString &query) {
     QUrl url("http://www.youtube.com/results");
+#if QT_VERSION >= 0x050000
+        {
+            QUrl &u = url;
+            QUrlQuery url;
+#endif
     url.addQueryItem("search_type", "search_users");
     url.addQueryItem("search_query", query);
+#if QT_VERSION >= 0x050000
+            u.setQuery(url);
+        }
+#endif
     QObject *reply = The::http()->get(url);
     connect(reply, SIGNAL(data(QByteArray)), SLOT(handleNetworkData(QByteArray)));
 }
 
 void ChannelSuggest::handleNetworkData(QByteArray data) {
     QStringList choices;
+    QList<Suggestion*> suggestions;
+
     QString html = QString::fromUtf8(data);
     QRegExp re("/user/([a-zA-Z0-9]+)");
 
@@ -47,11 +58,12 @@ void ChannelSuggest::handleNetworkData(QByteArray data) {
         // qDebug() << re.cap(0) << re.cap(1);
         QString choice = re.cap(1);
         if (!choices.contains(choice, Qt::CaseInsensitive)) {
+            suggestions << new Suggestion(choice);
             choices << choice;
             if (choices.size() == 10) break;
         }
         pos += re.matchedLength();
     }
 
-    emit ready(choices);
+    emit ready(suggestions);
 }