+/* $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 GLOBAL_H
#define GLOBAL_H
#include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
#include <QStringList>
#include <QNetworkProxy>
#include <QNetworkAccessManager>
#include <QNetworkProxyFactory>
#include <cstdlib>
#include "networkaccess.h"
+#include "diskcache.h"
+#include "compatibility/pathsservice.h"
namespace The {
- static QMap<QString, QAction*> *g_actions = 0;
-
- QMap<QString, QAction*>* globalActions() {
- if (!g_actions)
- g_actions = new QMap<QString, QAction*>;
- return g_actions;
+ QHash<QString, QAction*>* globalActions() {
+ static QHash<QString, QAction*> *actions = new QHash<QString, QAction*>;
+ return actions;
}
- static QMap<QString, QMenu*> *g_menus = 0;
-
- QMap<QString, QMenu*>* globalMenus() {
- if (!g_menus)
- g_menus = new QMap<QString, QMenu*>;
- return g_menus;
+ QHash<QString, QMenu*>* globalMenus() {
+ static QHash<QString, QMenu*> *menus = new QHash<QString, QMenu*>;
+ return menus;
}
void maybeSetSystemProxy() {
QStringList http_proxy_list = http_proxy.split(QChar('@'));
QStringList http_proxy_user_pass = http_proxy_list[0].split(QChar(':'));
if (http_proxy_user_pass.size() > 0) {
- proxy_user = http_proxy_user_pass[0];
+ proxy_user = QUrl::fromPercentEncoding(http_proxy_user_pass[0].toUtf8());
}
if (http_proxy_user_pass.size() == 2) {
- proxy_pass = http_proxy_user_pass[1];
+ proxy_pass = QUrl::fromPercentEncoding(http_proxy_user_pass[1].toUtf8());
}
if (http_proxy_list.size() > 1) {
http_proxy = http_proxy_list[1];
}
}
- static QNetworkAccessManager *nam = 0;
-
QNetworkAccessManager* networkAccessManager() {
+ static QNetworkAccessManager *nam = 0;
if (!nam) {
networkHttpProxySetting();
maybeSetSystemProxy();
nam = new QNetworkAccessManager();
-
- // A simple disk based cache
- /*
- QNetworkDiskCache *cache = new QNetworkDiskCache();
- QString cacheLocation = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
- qDebug() << cacheLocation;
- cache->setCacheDirectory(cacheLocation);
+ QNetworkDiskCache *cache = new DiskCache();
+ cache->setCacheDirectory(Paths::getCacheLocation());
nam->setCache(cache);
- */
}
return nam;
}
- static NetworkAccess *g_http = 0;
NetworkAccess* http() {
- if (!g_http) {
- // qDebug() << "Creating NetworkAccess";
- g_http = new NetworkAccess();
- }
- return g_http;
+ static NetworkAccess *na = new NetworkAccess();
+ return na;
}
}