diff options
author | Roland Knall <roland.knall@br-automation.com> | 2016-10-06 17:04:45 +0200 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2016-10-07 14:31:30 +0000 |
commit | d58da8ec9098f249abd3fd0dfb3e00dee6ff47b4 (patch) | |
tree | 5e9b532e5d6b77f2c6654ca53e98a4084536a59e /ui/qt/interface_tree_model.cpp | |
parent | a239472f303b1b482b5ec91e631a16d3ae3c90ce (diff) | |
download | wireshark-d58da8ec9098f249abd3fd0dfb3e00dee6ff47b4.tar.gz |
Interface View/Model: Correct column ordering
This orders the columns correctly in the sequence the developer
has intended when adding them with setColumns. Also it allows for
disabling and inverting the filtering by type, as well as query
additional roles instead of only Qt::DisplayRole from the tree model.
Change-Id: I90469e8e3f3caa50debb3c839590d42719a6fb10
Reviewed-on: https://code.wireshark.org/review/18096
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'ui/qt/interface_tree_model.cpp')
-rw-r--r-- | ui/qt/interface_tree_model.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/interface_tree_model.cpp b/ui/qt/interface_tree_model.cpp index 9fa3910d7f..4eb20f9472 100644 --- a/ui/qt/interface_tree_model.cpp +++ b/ui/qt/interface_tree_model.cpp @@ -194,9 +194,9 @@ QVariant InterfaceTreeModel::data(const QModelIndex &index, int role) const return QVariant(); } -QVariant InterfaceTreeModel::getColumnContent(int idx, int col) +QVariant InterfaceTreeModel::getColumnContent(int idx, int col, int role) { - return InterfaceTreeModel::data(index(idx, col), Qt::DisplayRole); + return InterfaceTreeModel::data(index(idx, col), role); } /** |