aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2018-04-17 16:23:31 +0200
committerPeter Wu <peter@lekensteyn.nl>2018-04-17 16:40:13 +0000
commitf2aa1cbdec5f5534cdbc1c4b6cb4ffd7da368eae (patch)
treeab0541529110daf518f01b781778cd2d1d708ef5
parent41d41c2e9b298291d398144b189f1c97a4684ad2 (diff)
Qt: fix remaining CaptureEvent signal connections
Converted all remaining "CaptureEvent *" to "CaptureEvent" using: sed -e 's/CaptureEvent *\*/CaptureEvent/g' $(git grep -le 'CaptureEvent *\*') -i Change-Id: I328d2890ec3b5e6672fa3fab22e85063e8309574 Fixes: v2.9.0rc0-186-g57bf7e4347 ("Qt: Fix memory leak for CaptureEvent") Reviewed-on: https://code.wireshark.org/review/26985 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-rw-r--r--ui/qt/export_object_dialog.cpp4
-rw-r--r--ui/qt/follow_stream_dialog.cpp4
-rw-r--r--ui/qt/iax2_analysis_dialog.cpp4
-rw-r--r--ui/qt/io_graph_dialog.cpp4
-rw-r--r--ui/qt/main_window.cpp2
-rw-r--r--ui/qt/multicast_statistics_dialog.cpp4
-rw-r--r--ui/qt/traffic_table_dialog.cpp4
-rw-r--r--ui/qt/wireshark_dialog.cpp4
8 files changed, 15 insertions, 15 deletions
diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp
index da0b05f..872bd95 100644
--- a/ui/qt/export_object_dialog.cpp
+++ b/ui/qt/export_object_dialog.cpp
@@ -56,8 +56,8 @@ ExportObjectDialog::ExportObjectDialog(QWidget &parent, CaptureFile &cf, registe
if (save_all_bt_) save_all_bt_->setEnabled(false);
if (close_bt) close_bt->setDefault(true);
- connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent *)),
- this, SLOT(captureEvent(CaptureEvent *)));
+ connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent)),
+ this, SLOT(captureEvent(CaptureEvent)));
show();
raise();
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index a9da39e..8fd0c2a 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -132,8 +132,8 @@ FollowStreamDialog::FollowStreamDialog(QWidget &parent, CaptureFile &cf, follow_
this, SLOT(fillHintLabel(int)));
connect(ui->teStreamContent, SIGNAL(mouseClickedOnTextCursorPosition(int)),
this, SLOT(goToPacketForTextPos(int)));
- connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent *)),
- this, SLOT(captureEvent(CaptureEvent *)));
+ connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent)),
+ this, SLOT(captureEvent(CaptureEvent)));
fillHintLabel(-1);
}
diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
index ea206cb..aed1be2 100644
--- a/ui/qt/iax2_analysis_dialog.cpp
+++ b/ui/qt/iax2_analysis_dialog.cpp
@@ -396,8 +396,8 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) :
this, SLOT(updateWidgets()));
connect(ui->reverseTreeWidget, SIGNAL(itemSelectionChanged()),
this, SLOT(updateWidgets()));
- connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent *)),
- this, SLOT(captureEvent(CaptureEvent *)));
+ connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent)),
+ this, SLOT(captureEvent(CaptureEvent)));
updateWidgets();
registerTapListener("IAX2", this, NULL, 0, tapReset, tapPacket, tapDraw);
diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index 6106e7c..ecd2c16 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -465,8 +465,8 @@ void IOGraphDialog::createIOGraph(int currentRow)
connect(this, SIGNAL(recalcGraphData(capture_file *, bool)), iog, SLOT(recalcGraphData(capture_file *, bool)));
connect(this, SIGNAL(reloadValueUnitFields()), iog, SLOT(reloadValueUnitField()));
- connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent *)),
- iog, SLOT(captureEvent(CaptureEvent *)));
+ connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent)),
+ iog, SLOT(captureEvent(CaptureEvent)));
connect(iog, SIGNAL(requestRetap()), this, SLOT(scheduleRetap()));
connect(iog, SIGNAL(requestRecalc()), this, SLOT(scheduleRecalc()));
connect(iog, SIGNAL(requestReplot()), this, SLOT(scheduleReplot()));
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index afbcb2a..93ba8ca 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -2142,7 +2142,7 @@ gboolean MainWindow::addExportObjectsMenuItem(const void *, void *value, void *u
//initially disable until a file is loaded (then file signals will take over)
export_action->setEnabled(false);
- connect(&window->capture_file_, SIGNAL(captureEvent(CaptureEvent *)), export_action, SLOT(captureFileEvent(CaptureEvent *)));
+ connect(&window->capture_file_, SIGNAL(captureEvent(CaptureEvent)), export_action, SLOT(captureFileEvent(CaptureEvent)));
connect(export_action, SIGNAL(triggered()), window, SLOT(applyExportObject()));
return FALSE;
}
diff --git a/ui/qt/multicast_statistics_dialog.cpp b/ui/qt/multicast_statistics_dialog.cpp
index 63bdceb..3d90ada 100644
--- a/ui/qt/multicast_statistics_dialog.cpp
+++ b/ui/qt/multicast_statistics_dialog.cpp
@@ -242,8 +242,8 @@ MulticastStatisticsDialog::MulticastStatisticsDialog(QWidget &parent, CaptureFil
connect(this, SIGNAL(updateFilter(QString)),
this, SLOT(updateMulticastParameters()));
- connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent *)),
- this, SLOT(captureEvent(CaptureEvent *)));
+ connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent)),
+ this, SLOT(captureEvent(CaptureEvent)));
/* Register the tap listener */
register_tap_listener_mcast_stream(tapinfo_);
diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp
index 7219c6d..a5081e6 100644
--- a/ui/qt/traffic_table_dialog.cpp
+++ b/ui/qt/traffic_table_dialog.cpp
@@ -76,8 +76,8 @@ TrafficTableDialog::TrafficTableDialog(QWidget &parent, CaptureFile &cf, const c
connect(wsApp, SIGNAL(addressResolutionChanged()), this, SLOT(updateWidgets()));
connect(ui->trafficTableTabWidget, SIGNAL(currentChanged(int)),
this, SLOT(currentTabChanged()));
- connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent *)),
- this, SLOT(captureEvent(CaptureEvent *)));
+ connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent)),
+ this, SLOT(captureEvent(CaptureEvent)));
}
TrafficTableDialog::~TrafficTableDialog()
diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp
index 9130c59..56d1b2e 100644
--- a/ui/qt/wireshark_dialog.cpp
+++ b/ui/qt/wireshark_dialog.cpp
@@ -38,8 +38,8 @@ WiresharkDialog::WiresharkDialog(QWidget &parent, CaptureFile &capture_file) :
setWindowIcon(wsApp->normalIcon());
setWindowTitleFromSubtitle();
- connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent *)),
- this, SLOT(captureEvent(CaptureEvent *)));
+ connect(&cap_file_, SIGNAL(captureEvent(CaptureEvent)),
+ this, SLOT(captureEvent(CaptureEvent)));
}
void WiresharkDialog::accept()