Imported Upstream version 2.4

[minitube] / src / ytsearch.h

diff --git a/src/ytsearch.h b/src/ytsearch.h
index 7ed282cc7ffbaed7ae6e8420947b1ca5a5205e8b..be2a0c162ed742b33335b1c182fe72f59c98756b 100644 (file)
--- a/src/ytsearch.h
+++ b/src/ytsearch.h
@@ -22,30 +22,29 @@ $END_LICENSE */
 #define YTSEARCH_H
 
 #include <QtNetwork>
-#include "videosource.h"
+#include "paginatedvideosource.h"
 
 class SearchParams;
 class Video;
 
-class YTSearch : public VideoSource {
+class YTSearch : public PaginatedVideoSource {
 
     Q_OBJECT
 
 public:
     YTSearch(SearchParams *params, QObject *parent = 0);
-    void loadVideos(int max, int skip);
-    virtual void abort();
-    virtual const QStringList & getSuggestions();
-    static QString videoIdFromUrl(QString url);
+    void loadVideos(int max, int startIndex);
+    void abort();
+    const QStringList & getSuggestions();
     QString getName();
+    QList<QAction*> getActions();
     SearchParams* getSearchParams() const { return searchParams; }
+    static QString videoIdFromUrl(QString url);
 
     bool operator==(const YTSearch &other) const {
         return searchParams == other.getSearchParams();
     }
 
-    QList<QAction*> getActions();
-
 private slots:
     void parseResults(QByteArray data);
     void requestError(QNetworkReply *reply);
@@ -55,8 +54,6 @@ private:
     bool aborted;
     QStringList suggestions;
     QString name;
-
-    QString userId;
 };
 
 #endif // YTSEARCH_H