aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/widgets
diff options
context:
space:
mode:
authorRoland Knall <rknall@gmail.com>2019-11-21 10:50:41 +0100
committerRoland Knall <rknall@gmail.com>2019-11-21 10:59:05 +0000
commitcfee0f8082578810cbc88213edde3562f2a7bf73 (patch)
treea7faa696f466c3fc004709a602474af79361910d /ui/qt/widgets
parentecb90a4e25ac9aad866c76a9d65839dc27c77519 (diff)
Qt: Remove frameSelect signal
As all frameSelect signals now transport a QList<int> of selected frames, use this instead Change-Id: I1888e45a4df997920aebde9706ca0ae803bdba03 Reviewed-on: https://code.wireshark.org/review/35176 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt/widgets')
-rw-r--r--ui/qt/widgets/wireless_timeline.cpp6
-rw-r--r--ui/qt/widgets/wireless_timeline.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/ui/qt/widgets/wireless_timeline.cpp b/ui/qt/widgets/wireless_timeline.cpp
index 3f31e6351a..b57ff672d4 100644
--- a/ui/qt/widgets/wireless_timeline.cpp
+++ b/ui/qt/widgets/wireless_timeline.cpp
@@ -175,7 +175,7 @@ void WirelessTimeline::clip_tsf()
}
-void WirelessTimeline::selectedFrameChanged(int)
+void WirelessTimeline::selectedFrameChanged(QList<int>)
{
if (isHidden())
return;
@@ -278,13 +278,15 @@ void WirelessTimeline::captureFileReadFinished()
zoom_level = 0;
show();
- selectedFrameChanged(0);
+ selectedFrameChanged(QList<int>());
// TODO: show or ungrey the toolbar controls
update();
}
void WirelessTimeline::appInitialized()
{
+ connect(wsApp->mainWindow(), SIGNAL(framesSelected(QList<int>)), this, SLOT(selectedFrameChanged(QList<int>)));
+
GString *error_string;
error_string = register_tap_listener("wlan_radio_timeline", this, NULL, TL_REQUIRES_NOTHING, tap_timeline_reset, tap_timeline_packet, NULL/*tap_draw_cb tap_draw*/, NULL);
if (error_string) {
diff --git a/ui/qt/widgets/wireless_timeline.h b/ui/qt/widgets/wireless_timeline.h
index 9a2972f067..00af02db99 100644
--- a/ui/qt/widgets/wireless_timeline.h
+++ b/ui/qt/widgets/wireless_timeline.h
@@ -67,7 +67,6 @@ protected:
public slots:
void bgColorizationProgress(int first, int last);
- void selectedFrameChanged(int frameNum);
void appInitialized();
protected:
@@ -94,6 +93,9 @@ protected:
capture_file *capfile;
GHashTable* radio_packet_list;
+
+protected slots:
+ void selectedFrameChanged(QList<int>);
};
#endif // WIRELESS_TIMELINE_H