New upstream version 2.9

[minitube] / src / ytregions.h

diff --git a/src/ytregions.h b/src/ytregions.h
index 029c0b9f84403aaf7c555e92810951c7c60c3634..6dfe4b09fd8e955fa6bcd60c155f241e588fb17b 100644 (file)
--- a/src/ytregions.h
+++ b/src/ytregions.h
@@ -1,7 +1,27 @@
+/* $BEGIN_LICENSE
+
+This file is part of Minitube.
+Copyright 2009, Flavio Tordini <flavio.tordini@gmail.com>
+
+Minitube is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Minitube is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
+
+$END_LICENSE */
+
 #ifndef YTREGIONS_H
 #define YTREGIONS_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 struct YTRegion {
     QString id;
@@ -13,18 +33,20 @@ struct YTRegion {
 
 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 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();
 
 };