Merge tag 'upstream/2.3'

[minitube] / src / channelview.h

diff --git a/src/channelview.h b/src/channelview.h
index a5013c9571b9bd35c49cb6a605df8e5c09eecd07..a108a4c4b81865e9edf3ce9af662b548f3ea9c3e 100644 (file)
--- a/src/channelview.h
+++ b/src/channelview.h
@@ -22,6 +22,9 @@ $END_LICENSE */
 #define CHANNELSVIEW_H
 
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 #include "view.h"
 
 class VideoSource;
@@ -42,6 +45,7 @@ public slots:
     void disappear();
 
 protected:
+    void mousePressEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
     void leaveEvent(QEvent *event);
     void paintEvent(QPaintEvent *event);
@@ -58,6 +62,7 @@ private:
 private slots:
     void itemEntered(const QModelIndex &index);
     void itemActivated(const QModelIndex &index);
+    void showContextMenu(const QPoint &point);
     void toggleShowUpdated(bool enable);
     void setSortBy(SortBy sortBy);
     void setSortByName() { setSortBy(SortByName); }
@@ -67,9 +72,9 @@ private slots:
     void setSortByMostWatched() { setSortBy(SortByMostWatched); }
     void markAllAsWatched();
     void unwatchedCountChanged(int count);
+    void updateQuery(bool transition = false);
 
 private:
-    void updateQuery(bool transition = false);
     void setupActions();
 
     ChannelModel *channelsModel;