New upstream version 2.9

[minitube] / src / channelview.h

diff --git a/src/channelview.h b/src/channelview.h
index a108a4c4b81865e9edf3ce9af662b548f3ea9c3e..35c709b69da2bb10e141b55849a4ff71d0212247 100644 (file)
--- a/src/channelview.h
+++ b/src/channelview.h
@@ -21,16 +21,15 @@ $END_LICENSE */
 #ifndef CHANNELSVIEW_H
 #define CHANNELSVIEW_H
 
-#include <QtGui>
-#if QT_VERSION >= 0x050000
 #include <QtWidgets>
-#endif
+
 #include "view.h"
 
 class VideoSource;
 class ChannelModel;
+class ChannelListView;
 
-class ChannelView : public QListView, public View {
+class ChannelView : public View {
 
     Q_OBJECT
 
@@ -44,12 +43,6 @@ public slots:
     void appear();
     void disappear();
 
-protected:
-    void mousePressEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-    void leaveEvent(QEvent *event);
-    void paintEvent(QPaintEvent *event);
-
 private:
     enum SortBy {
         SortByName = 0,
@@ -60,7 +53,6 @@ private:
     };
 
 private slots:
-    void itemEntered(const QModelIndex &index);
     void itemActivated(const QModelIndex &index);
     void showContextMenu(const QPoint &point);
     void toggleShowUpdated(bool enable);
@@ -76,12 +68,13 @@ private slots:
 
 private:
     void setupActions();
+    QString noSubscriptionsMessage();
 
+    ChannelListView *listView;
     ChannelModel *channelsModel;
-    QList<QAction*> statusActions;
+    QVector<QAction*> statusActions;
     bool showUpdated;
     SortBy sortBy;
-    QString errorMessage;
     QAction *markAsWatchedAction;
 
 };