$END_LICENSE */
#include "channelsuggest.h"
-#include "networkaccess.h"
-#include "compatibility/qurlqueryhelper.h"
-
-namespace The {
- NetworkAccess* http();
-}
+#include "http.h"
+#include "httputils.h"
ChannelSuggest::ChannelSuggest(QObject *parent) : Suggester(parent) {
void ChannelSuggest::suggest(const QString &query) {
QUrl url("https://www.youtube.com/results");
- {
- QUrlQueryHelper urlHelper(url);
- urlHelper.addQueryItem("search_type", "search_users");
- urlHelper.addQueryItem("search_query", query);
- }
+ QUrlQuery q;
+ q.addQueryItem("search_type", "search_users");
+ q.addQueryItem("search_query", query);
+ url.setQuery(q);
- QObject *reply = The::http()->get(url);
+ QObject *reply = HttpUtils::yt().get(url);
connect(reply, SIGNAL(data(QByteArray)), SLOT(handleNetworkData(QByteArray)));
}
void ChannelSuggest::handleNetworkData(QByteArray data) {
+ const int maxSuggestions = 10;
QStringList choices;
- QList<Suggestion*> suggestions;
+ choices.reserve(maxSuggestions);
+ QVector<Suggestion*> suggestions;
+ suggestions.reserve(maxSuggestions);
QString html = QString::fromUtf8(data);
QRegExp re("/(?:user|channel)/[a-zA-Z0-9]+[^>]+data-ytid=[\"']([^\"']+)[\"'][^>]+>([a-zA-Z0-9 ]+)</a>");
QString channelId = re.cap(1);
suggestions << new Suggestion(choice, "channel", channelId);
choices << choice;
- if (choices.size() == 10) break;
+ if (choices.size() == maxSuggestions) break;
}
pos += re.matchedLength();
}