diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /ui/qt/widgets/traffic_tab.h | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ui/qt/widgets/traffic_tab.h')
| -rw-r--r-- | ui/qt/widgets/traffic_tab.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ui/qt/widgets/traffic_tab.h b/ui/qt/widgets/traffic_tab.h index 71c48ae5..ff0bacc5 100644 --- a/ui/qt/widgets/traffic_tab.h +++ b/ui/qt/widgets/traffic_tab.h @@ -12,10 +12,9 @@ #include "config.h" -#include <glib.h> - #include <ui/qt/models/atap_data_model.h> #include <ui/qt/filter_action.h> +#include <ui/qt/widgets/traffic_tree.h> #include <ui/qt/widgets/detachable_tabwidget.h> #include <ui/qt/widgets/traffic_types_list.h> @@ -94,7 +93,7 @@ public: * * @see ATapModelCallback */ - void setProtocolInfo(QString tableName, TrafficTypesList * trafficList, GList ** recentColumnList, ATapModelCallback createModel); + void setProtocolInfo(QString tableName, TrafficTypesList * trafficList, GList ** recentList, GList ** recentColumnList, ATapModelCallback createModel); /** * @brief Set the Delegate object for the tab. It will apply for all @@ -221,20 +220,23 @@ private: QMap<int, int> _tabs; ATapModelCallback _createModel; ATapCreateDelegate _createDelegate; + GList ** _recentList; GList ** _recentColumnList; bool _disableTaps; bool _nameResolution; QTreeView * createTree(int protoId); - ATapDataModel * modelForTabIndex(int tabIdx = -1); - ATapDataModel * modelForWidget(QWidget * widget); + TrafficDataFilterProxy * modelForTabIndex(int tabIdx = -1); + TrafficDataFilterProxy * modelForWidget(QWidget * widget); + ATapDataModel * dataModelForTabIndex(int tabIdx = -1); + ATapDataModel * dataModelForWidget(QWidget * widget); void insertProtoTab(int protoId, bool emitSignals = true); void removeProtoTab(int protoId, bool emitSignals = true); #ifdef HAVE_MAXMINDDB - bool writeGeoIPMapFile(QFile * fp, bool json_only, ATapDataModel * dataModel); + bool writeGeoIPMapFile(QFile * fp, bool json_only, TrafficDataFilterProxy * model); #endif private slots: |