New upstream version 2.9

[minitube] / src / ytchannel.h

diff --git a/src/ytchannel.h b/src/ytchannel.h
index fea95aa992c20e702672f3ac9244ae74edf87a02..0687257b2839293ac5ec7550d2cba85dc464a4c8 100644 (file)
--- a/src/ytchannel.h
+++ b/src/ytchannel.h
@@ -21,10 +21,7 @@ $END_LICENSE */
 #ifndef YTCHANNEL_H
 #define YTCHANNEL_H
 
-#include <QtGui>
-#if QT_VERSION >= 0x050000
 #include <QtWidgets>
-#endif
 #include <QtNetwork>
 
 class YTChannel : public QObject {
@@ -64,7 +61,7 @@ public:
 
     QString latestVideoId();
 
-    static QList<YTChannel*> getCachedChannels() { return cache.values(); }
+    static const QHash<QString, YTChannel*> &getCachedChannels() { return cache; }
 
 public slots:
     void updateWatched();
@@ -78,7 +75,7 @@ signals:
 
 private slots:
     void parseResponse(const QByteArray &bytes);
-    void requestError(QNetworkReply *reply);
+    void requestError(const QString &message);
     void storeThumbnail(const QByteArray &bytes);
 
 private: