Imported Upstream version 2.1.3

[minitube] / src / global.h

diff --git a/src/global.h b/src/global.h
index 8ecb0b2af83ec19c9a4a93ec32da71799c5de9ee..6057a83a56e97a033ade4fac2dd9b352944feff1 100644 (file)
--- a/src/global.h
+++ b/src/global.h
@@ -1,3 +1,23 @@
+/* $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
 
@@ -8,23 +28,18 @@
 #include <QNetworkProxyFactory>
 #include <cstdlib>
 #include "networkaccess.h"
+#include "diskcache.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() {
@@ -123,33 +138,24 @@ namespace The {
         }
     }
 
-    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;
+            QNetworkDiskCache *cache = new DiskCache();
+            QString cacheLocation = QDesktopServices::storageLocation(
+                        QDesktopServices::DataLocation);
             cache->setCacheDirectory(cacheLocation);
             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;
     }
 
 }