New upstream version 2.9

[minitube] / src / mediaview.h

diff --git a/src/mediaview.h b/src/mediaview.h
index 54024987cab435c981916bb18a0cc50240c8b039..ae0b6fd3c432fbc0156709ffdd1e76ed8c442cbe 100644 (file)
--- a/src/mediaview.h
+++ b/src/mediaview.h
@@ -21,10 +21,7 @@ $END_LICENSE */
 #ifndef __MEDIAVIEW_H__
 #define __MEDIAVIEW_H__
 
-#include <QtGui>
-#if QT_VERSION >= 0x050000
 #include <QtWidgets>
-#endif
 #include <QtNetwork>
 #ifdef APP_PHONON
 #include <phonon/mediaobject.h>
@@ -46,10 +43,6 @@ class VideoSource;
 class SnapshotSettings;
 #endif
 
-namespace The {
-QHash<QString, QAction*>* globalActions();
-}
-
 class MediaView : public View {
 
     Q_OBJECT
@@ -64,7 +57,7 @@ public:
 #ifdef APP_PHONON
     void setMediaObject(Phonon::MediaObject *mediaObject);
 #endif
-    const QList<VideoSource*> & getHistory() { return history; }
+    const QVector<VideoSource*> & getHistory() { return history; }
     int getHistoryIndex();
     PlaylistModel* getPlaylistModel() { return playlistModel; }
     const QString &getCurrentVideoId();
@@ -85,13 +78,15 @@ public slots:
     void openInBrowser();
     void shareViaTwitter();
     void shareViaFacebook();
-    void shareViaBuffer();
     void shareViaEmail();
     void removeSelected();
     void moveUpSelected();
     void moveDownSelected();
-    bool isPlaylistVisible();
-    void setPlaylistVisible(bool visible=true);
+    bool isSidebarVisible();
+    void setSidebarVisibility(bool visible);
+    SidebarWidget *getSidebar() { return sidebar; }
+    void removeSidebar();
+    void restoreSidebar();
     void saveSplitterState();
     void downloadVideo();
 #ifdef APP_SNAPSHOT
@@ -106,14 +101,13 @@ public slots:
     void goForward();
     void toggleSubscription();
     void adjustWindowSize();
-    void maybeAdjustWindowSize();
 
 private slots:
     // list/model
     void itemActivated(const QModelIndex &index);
     void selectionChanged (const QItemSelection & selected, const QItemSelection & deselected);
     void activeRowChanged(int);
-    void selectVideos(QList<Video*> videos);
+    void selectVideos(const QVector<Video*> &videos);
     void gotStreamUrl(QUrl streamUrl);
     void handleError(const QString &message);
     // phonon
@@ -121,10 +115,6 @@ private slots:
     void stateChanged(Phonon::State newState, Phonon::State oldState);
 #endif
     void aboutToFinish();
-#ifdef APP_ACTIVATION
-    void demoMessage();
-    void updateContinueButton(int);
-#endif
     void startPlaying();
     void downloadStatusChanged();
     void playbackFinished();
@@ -164,8 +154,8 @@ private:
 #endif
 
     DownloadItem *downloadItem;
-    QList<VideoSource*> history;
-    QList<QAction*> currentVideoActions;
+    QVector<VideoSource*> history;
+    QVector<QAction*> currentVideoActions;
 
     qint64 currentVideoSize;