summaryrefslogtreecommitdiff
path: root/ui/qt/main_window.cpp
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-02-07 19:44:19 -0500
committerMichael Mann <mmann78@netscape.net>2017-02-08 14:24:28 +0000
commit243c09fa06bf7646b577e2baf024106432ec1bd9 (patch)
tree7e0385427dd99477b9d8fdc262d2d52c67ee402e /ui/qt/main_window.cpp
parent64a00dc0a81f13d033cc1e7f532a99cdda14cca8 (diff)
downloadwireshark-243c09fa06bf7646b577e2baf024106432ec1bd9.tar.gz
Switch export objects to use wmem_tree_t instead of (sorted) GSList.
Change-Id: Iaaa7b44954337c7857dbb541b727924e2de57c9d Reviewed-on: https://code.wireshark.org/review/20016 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/main_window.cpp')
-rw-r--r--ui/qt/main_window.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 9e33774057..45479df68d 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -1986,10 +1986,10 @@ void MainWindow::initConversationMenus()
connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeActionTriggered()));
}
-void MainWindow::addExportObjectsMenuItem(gpointer data, gpointer user_data)
+gboolean MainWindow::addExportObjectsMenuItem(const void *key _U_, void *value, void *userdata)
{
- register_eo_t *eo = (register_eo_t*)data;
- MainWindow *window = (MainWindow*)user_data;
+ register_eo_t *eo = (register_eo_t*)value;
+ MainWindow *window = (MainWindow*)userdata;
ExportObjectAction *export_action = new ExportObjectAction(window->main_ui_->menuFileExportObjects, eo);
window->main_ui_->menuFileExportObjects->addAction(export_action);
@@ -2000,6 +2000,7 @@ void MainWindow::addExportObjectsMenuItem(gpointer data, gpointer user_data)
connect(&window->capture_file_, SIGNAL(captureFileOpened()), export_action, SLOT(captureFileOpened()));
connect(&window->capture_file_, SIGNAL(captureFileClosed()), export_action, SLOT(captureFileClosed()));
connect(export_action, SIGNAL(triggered()), window, SLOT(applyExportObject()));
+ return FALSE;
}
void MainWindow::initExportObjectsMenus()