Upload 3.9.3-2 to unstable

[minitube] / src / channelview.h

diff --git a/src/channelview.h b/src/channelview.h
index f8fa2067a81092905717009702a09b12ead17a5b..6285fc3274e1ead023d1bd0b3bfec251c8633b5f 100644 (file)
--- a/src/channelview.h
+++ b/src/channelview.h
@@ -21,19 +21,20 @@ $END_LICENSE */
 #ifndef CHANNELSVIEW_H
 #define CHANNELSVIEW_H
 
-#include <QtGui>
+#include <QtWidgets>
+
 #include "view.h"
 
 class VideoSource;
 class ChannelModel;
+class ChannelListView;
 
-class ChannelView : public QListView, public View {
-
+class ChannelView : public View {
     Q_OBJECT
 
 public:
-    ChannelView(QWidget *parent = 0);
-    
+    ChannelView(QWidget *parent = nullptr);
+
 signals:
     void activated(VideoSource *videoSource);
 
@@ -41,12 +42,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,
@@ -57,7 +52,6 @@ private:
     };
 
 private slots:
-    void itemEntered(const QModelIndex &index);
     void itemActivated(const QModelIndex &index);
     void showContextMenu(const QPoint &point);
     void toggleShowUpdated(bool enable);
@@ -73,14 +67,14 @@ 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;
-
 };
 
 #endif // CHANNELSVIEW_H