diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2017-01-11 13:55:23 +0100 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2017-01-12 16:04:00 +0000 |
| commit | 3df81a055064e2e2c8c9548f1c6837ddef5e5034 (patch) | |
| tree | 484d3a1e56679668e657ddb29fe6aa6a9d964cdf /ui/qt/protocol_hierarchy_dialog.cpp | |
| parent | d6d516888122a26d477dcaa39a52fc9cd8b24479 (diff) | |
Qt: Remove unneccessary Q_DECLARE_METATYPE
Remove unnecessary Q_DECLARE_METATYPE macros and replace calls
to QVariant conversions with VariantPointer where necessary
Change-Id: Ia4690590095f930bf94644197de7fa30b00ee7ec
Reviewed-on: https://code.wireshark.org/review/19611
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt/protocol_hierarchy_dialog.cpp')
| -rw-r--r-- | ui/qt/protocol_hierarchy_dialog.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/qt/protocol_hierarchy_dialog.cpp b/ui/qt/protocol_hierarchy_dialog.cpp index 6e3cd927c5..2570508eb7 100644 --- a/ui/qt/protocol_hierarchy_dialog.cpp +++ b/ui/qt/protocol_hierarchy_dialog.cpp @@ -25,6 +25,9 @@ #include "cfile.h" #include "ui/proto_hier_stats.h" + +#include <ui/qt/variant_pointer.h> + #include <wsutil/utf8_entities.h> #include "qt_ui_utils.h" @@ -56,8 +59,6 @@ const int end_packets_col_ = 6; const int end_bytes_col_ = 7; const int end_bandwidth_col_ = 8; -Q_DECLARE_METATYPE(ph_stats_t*) - class ProtocolHierarchyTreeWidgetItem : public QTreeWidgetItem { public: @@ -75,7 +76,7 @@ public: filter_name_ = ph_stats_node.hfinfo->abbrev; if (!parent) return; - ph_stats_t *ph_stats = parent->treeWidget()->invisibleRootItem()->data(0, Qt::UserRole).value<ph_stats_t*>(); + ph_stats_t *ph_stats = VariantPointer<ph_stats_t>::asPtr(parent->treeWidget()->invisibleRootItem()->data(0, Qt::UserRole)); if (!ph_stats || ph_stats->tot_packets < 1) return; percent_packets_ = total_packets_ * 100.0 / ph_stats->tot_packets; @@ -182,7 +183,7 @@ ProtocolHierarchyDialog::ProtocolHierarchyDialog(QWidget &parent, CaptureFile &c ui->hierStatsTreeWidget->setItemDelegateForColumn(pct_bytes_col_, &percent_bar_delegate_); ph_stats_t *ph_stats = ph_stats_new(cap_file_.capFile()); if (ph_stats) { - ui->hierStatsTreeWidget->invisibleRootItem()->setData(0, Qt::UserRole, qVariantFromValue(ph_stats)); + ui->hierStatsTreeWidget->invisibleRootItem()->setData(0, Qt::UserRole, VariantPointer<ph_stats_t>::asQVariant(ph_stats)); g_node_children_foreach(ph_stats->stats_tree, G_TRAVERSE_ALL, addTreeNode, ui->hierStatsTreeWidget->invisibleRootItem()); ph_stats_free(ph_stats); } |