diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-07-25 19:07:04 -0400 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2017-07-26 10:09:34 +0000 |
| commit | 07d8fad852babaf9d1b02e7f13eb188f34ff58f5 (patch) | |
| tree | 8e5fda5f9d8472733748217d99ec2333c0fe0abb /ui | |
| parent | b376aa05eaa47bf679691a5031b00255712807f4 (diff) | |
WirelessTimeline: move signals out of setPacketList().
Start to remove the dependency on PacketList by moving the signals
out of setPacketList and into MainWindow.
Change-Id: Ibbe5a5619e06809eb71aee5145c4b0f7d54382a2
Reviewed-on: https://code.wireshark.org/review/22798
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/main_window.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/wireless_timeline.cpp | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index cc7f0de3d7..6cc63fe44b 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -536,6 +536,10 @@ MainWindow::MainWindow(QWidget *parent) : packet_list_ = new PacketList(&master_split_); main_ui_->wirelessTimelineWidget->setPacketList(packet_list_); + connect(packet_list_, SIGNAL(packetSelectionChanged()), + main_ui_->wirelessTimelineWidget, SLOT(packetSelectionChanged())); + connect(packet_list_->packetListModel(), SIGNAL(bgColorizationProgress(int,int)), + main_ui_->wirelessTimelineWidget, SLOT(bgColorizationProgress(int,int))); proto_tree_ = new ProtoTree(&master_split_); proto_tree_->installEventFilter(this); diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp index d4845bae96..67b40f2be8 100644 --- a/ui/qt/wireless_timeline.cpp +++ b/ui/qt/wireless_timeline.cpp @@ -317,17 +317,12 @@ WirelessTimeline::WirelessTimeline(QWidget *parent) : QWidget(parent) setMouseTracking(true); radio_packet_list = NULL; + connect(wsApp, SIGNAL(appInitialized()), this, SLOT(appInitialized())); } void WirelessTimeline::setPacketList(PacketList *packet_list) { this->packet_list = packet_list; - connect(packet_list->packetListModel(), SIGNAL(bgColorizationProgress(int,int)), - this, SLOT(bgColorizationProgress(int,int))); - connect(packet_list, SIGNAL(packetSelectionChanged()), - this, SLOT(packetSelectionChanged())); - connect(wsApp, SIGNAL(appInitialized()), - this, SLOT(appInitialized())); } void WirelessTimeline::tap_timeline_reset(void* tapdata) |