diff options
author | Roland Knall <rknall@gmail.com> | 2022-04-22 11:34:55 +0200 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2022-04-22 09:37:10 +0000 |
commit | 374c5997da94d46f47873b9ee2c8e84b62ad12b4 (patch) | |
tree | 176f28850ad51ca52128aa9c22711be970fb9340 | |
parent | 3407992cb4205ff24c713797a938302405570619 (diff) |
Qt: Remove unnecessary signal/slot
getPoints never worked in the new system therefore it is removed. SparkLineDelegate uses the underlying model to ensure the correct data being transmitted
-rw-r--r-- | ui/logwolf/logwolf_main_window_slots.cpp | 2 | ||||
-rw-r--r-- | ui/qt/capture_options_dialog.h | 1 | ||||
-rw-r--r-- | ui/qt/interface_frame.cpp | 6 | ||||
-rw-r--r-- | ui/qt/interface_frame.h | 1 | ||||
-rw-r--r-- | ui/qt/models/interface_tree_model.cpp | 15 | ||||
-rw-r--r-- | ui/qt/models/interface_tree_model.h | 1 | ||||
-rw-r--r-- | ui/qt/wireshark_main_window_slots.cpp | 2 |
7 files changed, 0 insertions, 28 deletions
diff --git a/ui/logwolf/logwolf_main_window_slots.cpp b/ui/logwolf/logwolf_main_window_slots.cpp index 09271f0adf..438474103c 100644 --- a/ui/logwolf/logwolf_main_window_slots.cpp +++ b/ui/logwolf/logwolf_main_window_slots.cpp @@ -3292,8 +3292,6 @@ void LogwolfMainWindow::on_actionCaptureOptions_triggered() connect(capture_options_dialog_, SIGNAL(startCapture()), this, SLOT(startCapture())); connect(capture_options_dialog_, SIGNAL(stopCapture()), this, SLOT(stopCapture())); - connect(capture_options_dialog_, SIGNAL(getPoints(int, PointList*)), - this->welcome_page_->getInterfaceFrame(), SLOT(getPoints(int, PointList*))); connect(capture_options_dialog_, SIGNAL(interfacesChanged()), this->welcome_page_, SLOT(interfaceSelected())); connect(capture_options_dialog_, SIGNAL(interfacesChanged()), diff --git a/ui/qt/capture_options_dialog.h b/ui/qt/capture_options_dialog.h index c61d08f70b..80b4aca8e7 100644 --- a/ui/qt/capture_options_dialog.h +++ b/ui/qt/capture_options_dialog.h @@ -97,7 +97,6 @@ private slots: signals: void startCapture(); void stopCapture(); - void getPoints(int row, PointList *pts); void setSelectedInterfaces(); void setFilterValid(bool valid, const QString capture_filter); void interfacesChanged(); diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp index 9402de6124..22437155b5 100644 --- a/ui/qt/interface_frame.cpp +++ b/ui/qt/interface_frame.cpp @@ -482,12 +482,6 @@ void InterfaceFrame::updateStatistics(void) #endif } -/* Proxy Method so we do not need to expose the source model */ -void InterfaceFrame::getPoints(int idx, PointList * pts) -{ - source_model_.getPoints(idx, pts); -} - void InterfaceFrame::showRunOnFile(void) { ui->warningLabel->setText("Interfaces not loaded on startup (run on capture file). Go to Capture -> Refresh Interfaces to load."); diff --git a/ui/qt/interface_frame.h b/ui/qt/interface_frame.h index 14871d34ef..f36ce945fa 100644 --- a/ui/qt/interface_frame.h +++ b/ui/qt/interface_frame.h @@ -58,7 +58,6 @@ public slots: #ifdef HAVE_PCAP_REMOTE void toggleRemoteInterfaces(); #endif - void getPoints(int idx, PointList *pts); void showRunOnFile(); void showContextMenu(QPoint pos); diff --git a/ui/qt/models/interface_tree_model.cpp b/ui/qt/models/interface_tree_model.cpp index f17a7088d2..69ffc12d18 100644 --- a/ui/qt/models/interface_tree_model.cpp +++ b/ui/qt/models/interface_tree_model.cpp @@ -476,21 +476,6 @@ void InterfaceTreeModel::updateStatistic(unsigned int idx) #endif } -void InterfaceTreeModel::getPoints(int idx, PointList *pts) -{ -#ifdef HAVE_LIBPCAP - if (! global_capture_opts.all_ifaces || global_capture_opts.all_ifaces->len <= (guint) idx) - return; - - interface_t *device = &g_array_index(global_capture_opts.all_ifaces, interface_t, idx); - if (points.contains(device->name)) - pts->append(points[device->name]); -#else - Q_UNUSED(idx) - Q_UNUSED(pts) -#endif -} - QItemSelection InterfaceTreeModel::selectedDevices() { QItemSelection mySelection; diff --git a/ui/qt/models/interface_tree_model.h b/ui/qt/models/interface_tree_model.h index a897df5e04..f2755b950d 100644 --- a/ui/qt/models/interface_tree_model.h +++ b/ui/qt/models/interface_tree_model.h @@ -85,7 +85,6 @@ public: static const QString DefaultNumericValue; public slots: - void getPoints(int idx, PointList *pts); void interfaceListChanged(); private: diff --git a/ui/qt/wireshark_main_window_slots.cpp b/ui/qt/wireshark_main_window_slots.cpp index 8962a266b1..789b7f2d0a 100644 --- a/ui/qt/wireshark_main_window_slots.cpp +++ b/ui/qt/wireshark_main_window_slots.cpp @@ -4054,8 +4054,6 @@ void WiresharkMainWindow::on_actionCaptureOptions_triggered() connect(capture_options_dialog_, SIGNAL(startCapture()), this, SLOT(startCapture())); connect(capture_options_dialog_, SIGNAL(stopCapture()), this, SLOT(stopCapture())); - connect(capture_options_dialog_, SIGNAL(getPoints(int, PointList*)), - this->welcome_page_->getInterfaceFrame(), SLOT(getPoints(int, PointList*))); connect(capture_options_dialog_, SIGNAL(interfacesChanged()), this->welcome_page_, SLOT(interfaceSelected())); connect(capture_options_dialog_, SIGNAL(interfacesChanged()), |