diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-12-29 11:23:07 -0500 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2018-01-04 21:20:59 +0000 |
| commit | d239da264c5d0ca2ecfd609ae3eccced939a4c46 (patch) | |
| tree | aa5b490fa2d9c1b4b6899a411bbcca03ccc0659d /ui/qt/packet_list.h | |
| parent | a79b7986cddf40a8ade57638916951323fff581e (diff) | |
Convert preference dialog to use more models.
Convert Advanced view and Modules view to use a single base model,
loading the preferences once and then filter and display what they
need with QSortFilterProxyModel derived classes.
Convert the PreferencePane "types" to just strings. This allows
a more straightforward relationship between the "special" modules
that need custom widgets for preference manipulation and it also
removes dependency on preferences_dialog.h for many files.
Change-Id: I091deb3061564aa4d1564e9ca1c792715961b083
Reviewed-on: https://code.wireshark.org/review/25134
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt/packet_list.h')
| -rw-r--r-- | ui/qt/packet_list.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h index 2ee97fe338..6d2eed23cc 100644 --- a/ui/qt/packet_list.h +++ b/ui/qt/packet_list.h @@ -4,19 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef PACKET_LIST_H @@ -24,7 +12,6 @@ #include "byte_view_tab.h" #include <ui/qt/models/packet_list_model.h> -#include "preferences_dialog.h" #include "proto_tree.h" #include "protocol_preferences_menu.h" #include <ui/qt/models/related_packet_delegate.h> @@ -150,7 +137,7 @@ private: signals: void packetDissectionChanged(); - void showColumnPreferences(PreferencesDialog::PreferencesPane start_pane); + void showColumnPreferences(QString pane_name); void editColumn(int column); void packetListScrolled(bool at_end); void showProtocolPreferences(const QString module_name); |