diff options
| -rw-r--r-- | ui/qt/funnel_statistics.cpp | 17 | ||||
| -rw-r--r-- | ui/qt/main_application.cpp | 9 | ||||
| -rw-r--r-- | ui/qt/main_application.h | 1 |
3 files changed, 2 insertions, 25 deletions
diff --git a/ui/qt/funnel_statistics.cpp b/ui/qt/funnel_statistics.cpp index 752858e862..6066f15498 100644 --- a/ui/qt/funnel_statistics.cpp +++ b/ui/qt/funnel_statistics.cpp @@ -106,7 +106,6 @@ private: static QHash<int, QList<FunnelAction *> > funnel_actions_; const QString FunnelStatistics::action_name_ = "FunnelStatisticsAction"; -static gboolean menus_registered = FALSE; struct _funnel_ops_id_t { FunnelStatistics *funnel_statistics; @@ -348,8 +347,6 @@ void progress_window_destroy(progdlg *progress_dialog) { extern "C" { -void register_tap_listener_qt_funnel(void); - static void register_menu_cb(const char *name, register_stat_group_t group, funnel_menu_callback callback, @@ -357,11 +354,8 @@ static void register_menu_cb(const char *name, gboolean retap) { FunnelAction *funnel_action = new FunnelAction(name, callback, callback_data, retap, mainApp); - if (menus_registered) { - mainApp->appendDynamicMenuGroupItem(group, funnel_action); - } else { - mainApp->addDynamicMenuGroupItem(group, funnel_action); - } + mainApp->addDynamicMenuGroupItem(group, funnel_action); + if (!funnel_actions_.contains(group)) { funnel_actions_[group] = QList<FunnelAction *>(); } @@ -387,13 +381,6 @@ static void deregister_menu_cb(funnel_menu_callback callback) } void -register_tap_listener_qt_funnel(void) -{ - funnel_register_all_menus(register_menu_cb); - menus_registered = TRUE; -} - -void funnel_statistics_reload_menus(void) { funnel_reload_menus(deregister_menu_cb, register_menu_cb); diff --git a/ui/qt/main_application.cpp b/ui/qt/main_application.cpp index 0a42fd5b7c..2763b0b258 100644 --- a/ui/qt/main_application.cpp +++ b/ui/qt/main_application.cpp @@ -879,15 +879,6 @@ void MainApplication::addDynamicMenuGroupItem(int group, QAction *sg_action) dynamic_menu_groups_[group] << sg_action; } -void MainApplication::appendDynamicMenuGroupItem(int group, QAction *sg_action) -{ - if (!added_menu_groups_.contains(group)) { - added_menu_groups_[group] = QList<QAction *>(); - } - added_menu_groups_[group] << sg_action; - addDynamicMenuGroupItem(group, sg_action); -} - void MainApplication::removeDynamicMenuGroupItem(int group, QAction *sg_action) { if (!removed_menu_groups_.contains(group)) { diff --git a/ui/qt/main_application.h b/ui/qt/main_application.h index f4c70d7b06..786c01dc97 100644 --- a/ui/qt/main_application.h +++ b/ui/qt/main_application.h @@ -92,7 +92,6 @@ public: void emitStatCommandSignal(const QString &menu_path, const char *arg, void *userdata); void emitTapParameterSignal(const QString cfg_abbr, const QString arg, void *userdata); void addDynamicMenuGroupItem(int group, QAction *sg_action); - void appendDynamicMenuGroupItem(int group, QAction *sg_action); void removeDynamicMenuGroupItem(int group, QAction *sg_action); QList<QAction *> dynamicMenuGroupItems(int group); QList<QAction *> addedMenuGroupItems(int group); |