X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fytregions.h;h=6dfe4b09fd8e955fa6bcd60c155f241e588fb17b;hb=refs%2Ftags%2Fupstream%2F2.9;hp=c0d7e4eadfb952ff97a709be1ae8823d655b5ff6;hpb=994e6e5e95196b0e36c680b1fd496f12d71739c9;p=minitube diff --git a/src/ytregions.h b/src/ytregions.h index c0d7e4e..6dfe4b0 100644 --- a/src/ytregions.h +++ b/src/ytregions.h @@ -21,10 +21,7 @@ $END_LICENSE */ #ifndef YTREGIONS_H #define YTREGIONS_H -#include -#if QT_VERSION >= 0x050000 #include -#endif struct YTRegion { QString id; @@ -39,17 +36,17 @@ class YTRegions : public QObject { Q_OBJECT public: - static const QList & list(); + static const QVector & list(); static const YTRegion & localRegion(); static const YTRegion & worldwideRegion(); static void setRegion(const QString ®ionId); static QString currentRegionId(); - static YTRegion currentRegion(); + static const YTRegion ¤tRegion(); static QIcon iconForRegionId(const QString ®ionId); private: static YTRegion r(const QString &name, const QString &id); - static YTRegion regionById(const QString &id); + static const YTRegion ®ionById(const QString &id); YTRegions(); };