Merge tag 'upstream/2.5.1'

[minitube] / src / searchview.h

diff --git a/src/searchview.h b/src/searchview.h
index f513c61e9e9f70fd9ed548eb22cab948d637a51c..01895eb7147fcc9c20832ee44b1eea2cc5d0e78e 100644 (file)
--- a/src/searchview.h
+++ b/src/searchview.h
@@ -27,13 +27,13 @@ $END_LICENSE */
 #endif
 #include "view.h"
 
-class SearchLineEdit;
+class SearchWidget;
 class SearchParams;
 class YTSuggester;
 class ChannelSuggest;
 class Suggestion;
 
-class SearchView : public QWidget, public View {
+class SearchView : public View {
 
     Q_OBJECT
 
@@ -44,10 +44,10 @@ public:
 
 public slots:
     void appear();
-    void disappear() { }
-    void watch(QString query);
-    void watchChannel(QString channel);
-    void watchKeywords(QString query);
+    void disappear();
+    void watch(const QString &query);
+    void watchChannel(const QString &channelId);
+    void watchKeywords(const QString &query);
 
 signals:
     void search(SearchParams*);
@@ -66,7 +66,7 @@ private:
     ChannelSuggest *channelSuggest;
 
     QComboBox *typeCombo;
-    SearchLineEdit *queryEdit;
+    SearchWidget *queryEdit;
     QLabel *recentKeywordsLabel;
     QBoxLayout *recentKeywordsLayout;
     QLabel *recentChannelsLabel;
@@ -74,6 +74,8 @@ private:
     QLabel *message;
     QPushButton *watchButton;
 
+    QStringList recentKeywords;
+    QStringList recentChannels;
 };
 
 #endif // __SEARCHVIEW_H__