Merge tag 'upstream/2.5.1'

[minitube] / src / searchview.h

diff --git a/src/searchview.h b/src/searchview.h
index 4fcf5042c0ce3274c173fd4ce4fef389793d744e..01895eb7147fcc9c20832ee44b1eea2cc5d0e78e 100644 (file)
--- a/src/searchview.h
+++ b/src/searchview.h
@@ -1,15 +1,39 @@
+/* $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 */
+
 #ifndef __SEARCHVIEW_H__
 #define __SEARCHVIEW_H__
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#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
 
@@ -20,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*);
@@ -35,13 +59,14 @@ private slots:
     void watch();
     void textChanged(const QString &text);
     void searchTypeChanged(int index);
+    void suggestionAccepted(Suggestion *suggestion);
 
 private:
     YTSuggester *youtubeSuggest;
     ChannelSuggest *channelSuggest;
 
     QComboBox *typeCombo;
-    SearchLineEdit *queryEdit;
+    SearchWidget *queryEdit;
     QLabel *recentKeywordsLabel;
     QBoxLayout *recentKeywordsLayout;
     QLabel *recentChannelsLabel;
@@ -49,6 +74,8 @@ private:
     QLabel *message;
     QPushButton *watchButton;
 
+    QStringList recentKeywords;
+    QStringList recentChannels;
 };
 
 #endif // __SEARCHVIEW_H__