Upload 3.9.3-2 to unstable

[minitube] / src / ytregions.h

diff --git a/src/ytregions.h b/src/ytregions.h
index 1ea5e8925c0049b7b67e5856d11dc9622a2d5d40..4e10ef3b97b8d9a0aa729288794fb7de54a706ea 100644 (file)
--- a/src/ytregions.h
+++ b/src/ytregions.h
@@ -21,10 +21,7 @@ $END_LICENSE */
 #ifndef YTREGIONS_H
 #define YTREGIONS_H
 
-#include <QtGui>
-#if QT_VERSION >= 0x050000
 #include <QtWidgets>
-#endif
 
 struct YTRegion {
     QString id;
@@ -39,17 +36,17 @@ class YTRegions : public QObject {
     Q_OBJECT
 
 public:
-    static const QList<YTRegion> & list();
+    static const QVector<YTRegion> & list();
     static const YTRegion & localRegion();
-    static const YTRegion & worldwideRegion();
-    static void setRegion(QString regionId);
+    static const YTRegion & defaultRegion();
+    static void setRegion(const QString &regionId);
     static QString currentRegionId();
-    static YTRegion currentRegion();
-    static QIcon iconForRegionId(QString regionId);
+    static const YTRegion &currentRegion();
+    static QIcon iconForRegionId(const QString &regionId);
 
 private:
-    static YTRegion r(QString name, QString id);
-    static YTRegion regionById(QString id);
+    static YTRegion r(const QString &name, const QString &id);
+    static const YTRegion &regionById(const QString &id);
     YTRegions();
 
 };