Merge tag 'upstream/2.1.5'

[minitube] / src / channelsuggest.cpp

diff --git a/src/channelsuggest.cpp b/src/channelsuggest.cpp
index ccec4a0eb6cba73455aac9fc15ae1eef8ccf9170..6d0d1ff265ba3afa311f33e66f1f8b0c1b20985b 100644 (file)
--- a/src/channelsuggest.cpp
+++ b/src/channelsuggest.cpp
@@ -1,3 +1,23 @@
+/* $BEGIN_LICENSE
+
+This file is part of Minitube.
+Copyright 2009, Flavio Tordini <flavio.tordini@gmail.com>
+
+Minitube is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Minitube is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
+
+$END_LICENSE */
+
 #include "channelsuggest.h"
 #include "networkaccess.h"
 
@@ -5,23 +25,14 @@ namespace The {
     NetworkAccess* http();
 }
 
-ChannelSuggest::ChannelSuggest(QObject *parent) : Suggester() {
+ChannelSuggest::ChannelSuggest(QObject *parent) : Suggester(parent) {
 
 }
 
 void ChannelSuggest::suggest(QString query) {
-
-    /* // TODO how to localize results?
-    QString locale = QLocale::system().name().replace("_", "-");
-    // case for system locales such as "C"
-    if (locale.length() < 2) {
-        locale = "en-US";
-    }*/
-
-    QUrl url("http://www.youtube.com/results?search_type=search_users");
+    QUrl url("http://www.youtube.com/results");
+    url.addQueryItem("search_type", "search_users");
     url.addQueryItem("search_query", query);
-    // url.addQueryItem("hl", "it-IT");
-
     QObject *reply = The::http()->get(url);
     connect(reply, SIGNAL(data(QByteArray)), SLOT(handleNetworkData(QByteArray)));
 }