Change global actions to QHash

diff --git a/src/global.h b/src/global.h
index 47872a16d09e7e55caaf76fc1c4c3e243c6ed5a6..d2aad7a0c6571103cb1791934e7d3f5c2b0c3dd6 100644 (file)
--- a/src/global.h
+++ b/src/global.h
@@ -12,18 +12,14 @@
 
 namespace The {
 
-    QMap<QString, QAction*>* globalActions() {
-        static QMap<QString, QAction*> *g_actions = 0;
-        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;
     }
 
-    QMap<QString, QMenu*>* globalMenus() {
-        static QMap<QString, QMenu*> *g_menus = 0;
-        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() {
@@ -138,8 +134,8 @@ namespace The {
     }
 
     NetworkAccess* http() {
-        static NetworkAccess *g_http = new NetworkAccess();
-        return g_http;
+        static NetworkAccess *na = new NetworkAccess();
+        return na;
     }
 
 }

diff --git a/src/refinesearchwidget.cpp b/src/refinesearchwidget.cpp
index 77a46b392569ab82c0aa4ddc1eae9d912961f337..f1a140ee827d6e457a518b85520bdc5f21fec36f 100644 (file)
--- a/src/refinesearchwidget.cpp
+++ b/src/refinesearchwidget.cpp
@@ -6,7 +6,7 @@
 #endif
 
 namespace The {
-QMap<QString, QAction*>* globalActions();
+QHash<QString, QAction*>* globalActions();
 }
 
 RefineSearchWidget::RefineSearchWidget(QWidget *parent) :
@@ -198,16 +198,17 @@ void RefineSearchWidget::actionTriggered(QAction *action) {
     QString paramName = bar->property("paramName").toString();
     QVariant paramValue = action->property("paramValue");
 
-    qDebug() << "param changed" << paramName << paramValue;
+    // qDebug() << "param changed" << paramName << paramValue;
     emit paramChanged(paramName, paramValue);
 
-    qDebug() << __PRETTY_FUNCTION__;
     dirty = true;
 }
 
 void RefineSearchWidget::setSearchParams(SearchParams *params) {
     setup();
 
+    qDebug() << (params != 0);
+
     The::globalActions()->value("refine-search")->setEnabled(params);
     setEnabled(params);
 

diff --git a/src/sidebarwidget.cpp b/src/sidebarwidget.cpp
index ceccad73cc383500339b6ecd02473f94ef6c8d97..5a5647fe2f83c00cc98053e9109c4a7539e1ed49 100644 (file)
--- a/src/sidebarwidget.cpp
+++ b/src/sidebarwidget.cpp
@@ -7,7 +7,7 @@
 #endif
 
 namespace The {
-QMap<QString, QAction*>* globalActions();
+QHash<QString, QAction*>* globalActions();
 }
 
 SidebarWidget::SidebarWidget(QWidget *parent) :

diff --git a/src/standardfeedsview.cpp b/src/standardfeedsview.cpp
index f6fedd7d760da9f4052c9c3ba00a06d327cf3fb5..1aae3e370edf0ce5651c04b1c489f6cbe85f19f5 100644 (file)
--- a/src/standardfeedsview.cpp
+++ b/src/standardfeedsview.cpp
@@ -6,7 +6,7 @@
 #include "mainwindow.h"
 
 namespace The {
-QMap<QString, QAction*>* globalActions();
+QHash<QString, QAction*>* globalActions();
 }
 
 static const int cols = 5;