Remove "pkg" prefix from display filters.

Also rename base protocol filter name to match prefix of all other fields

Change-Id: Iff234c1443252b9f8e6d87fd7a76925746b5e513
Reviewed-on: https://code.wireshark.org/review/2449
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 31 insertions, 31 deletions

diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index 21198224d9..c404443127 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -464,137 +464,137 @@ void proto_register_q1950(void) {
 	static hf_register_info hf[] = {
 		/* A.3 Bearer characteristics package */
 		{ &hf_h248_pkg_BCP,
-			{ "BCP (Bearer characteristics package)", "h248.pkg.BCP",
+			{ "BCP (Bearer characteristics package)", "h248.BCP",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_BCP_BNCChar,
-			{ "BNCChar (BNC Characteristics)", "h248.pkg.bcp.bncchar",
+			{ "BNCChar (BNC Characteristics)", "h248.bcp.bncchar",
 			FT_UINT32, BASE_HEX|BASE_EXT_STRING, &bearer_network_connection_characteristics_vals_ext, 0, "BNC Characteristics", HFILL }
 		},
 
 		/* A.4 Bearer Network connection cut-through package */
 		{ &hf_h248_pkg_BNCCT,
-			{ "BNCCT (Bearer network connection cut-through package)", "h248.pkg.BNCCT",
+			{ "BNCCT (Bearer network connection cut-through package)", "h248.BNCCT",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_BNCCT_prop,
-			{ "Bearer network connection cut-through capability", "h248.pkg.bcp.bncct",
+			{ "Bearer network connection cut-through capability", "h248.bcp.bncct",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_BNCCT_prop_vals), 0, "This property allows the MGC to ask the MG when the cut through of a bearer will occur, early or late.", HFILL }
 		},
 
 		{ &hf_h248_pkg_GB,
-			{ "GB (Generic bearer connection)", "h248.pkg.GB",
+			{ "GB (Generic bearer connection)", "h248.GB",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_GB_BNCChange,
-			{ "BNCChange", "h248.pkg.GB.BNCChang",
+			{ "BNCChange", "h248.GB.BNCChang",
 			FT_BYTES, BASE_NONE, NULL, 0, "This event occurs whenever a change to a Bearer Network connection occurs", HFILL }
 		},
 		{ &hf_h248_pkg_GB_BNCChange_type,
-			{ "Type", "h248.pkg.GB.BNCChang.Type",
+			{ "Type", "h248.GB.BNCChang.Type",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_BNCChange_type_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_GB_EstBNC,
-			{ "Type", "h248.pkg.GB.BNCChang.EstBNC",
+			{ "Type", "h248.GB.BNCChang.EstBNC",
 			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer establishment signalling", HFILL }
 		},
 		{ &hf_h248_pkg_GB_ModBNC,
-			{ "Type", "h248.pkg.GB.BNCChang.Type",
+			{ "Type", "h248.GB.BNCChang.Type",
 			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer modification", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC,
-			{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC",
+			{ "RelBNC", "h248.GB.BNCChang.RelBNC",
 			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer release", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Generalcause,
-			{ "Generalcause", "h248.pkg.GB.BNCChang.RelBNC.Generalcause",
+			{ "Generalcause", "h248.GB.BNCChang.RelBNC.Generalcause",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_RelBNC_Generalcause_vals), 0, "This indicates the general reason for the Release", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Failurecause,
-			{ "Failurecause", "h248.pkg.GB.BNCChang.RelBNC.Failurecause",
+			{ "Failurecause", "h248.GB.BNCChang.RelBNC.Failurecause",
 			FT_BYTES, BASE_NONE, NULL, 0, "The Release Cause is the value generated by the Released equipment", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Reset,
-			{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC",
+			{ "RelBNC", "h248.GB.BNCChang.RelBNC",
 			FT_BOOLEAN, BASE_NONE, NULL, 0x0, "This signal triggers the bearer control function to send bearer release", HFILL }
 		},
 
 		/* A.5 Bearer Network connection cut-through package */
 		{ &hf_h248_pkg_RI,
-			{ "RI (Reuse idle package)", "h248.pkg.RI",
+			{ "RI (Reuse idle package)", "h248.RI",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_RII,
-			{ "Reuse Idle Indication", "h248.pkg.bcp.rii",
+			{ "Reuse Idle Indication", "h248.bcp.rii",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_RII_vals), 0, "This property indicates that the provided bearer network connection relates to an Idle Bearer.", HFILL }
 		},
 
 		/* A.7 Bearer control tunnelling package */
 		{ &hf_h248_pkg_bt,
-			{ "BT (Bearer control Tunneling)", "h248.pkg.BT",
+			{ "BT (Bearer control Tunneling)", "h248.BT",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_tunopt,
-			{ "Tunnelling Options", "h248.pkg.BT.TunOpt",
+			{ "Tunnelling Options", "h248.BT.TunOpt",
 				FT_UINT32, BASE_DEC, VALS(h248_pkg_bt_tunopt_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_tind,
-			{ "tind (Tunnel INDication)", "h248.pkg.BT.TIND",
+			{ "tind (Tunnel INDication)", "h248.BT.TIND",
 				FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_bit,
-			{ "Bearer Information Transport", "h248.pkg.BT.BIT",
+			{ "Bearer Information Transport", "h248.BT.BIT",
 				FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 
 
 		/* A.8 Basic call progress tones generator with directionality */
 		{ &hf_h248_pkg_bcg,
-			{ "bcg (Basic call progress tones generator with directionality)", "h248.pkg.bcg",
+			{ "bcg (Basic call progress tones generator with directionality)", "h248.bcg",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bdt_par_btd,
-			{ "btd (Tone Direction)", "h248.pkg.bcp.btd",
+			{ "btd (Tone Direction)", "h248.bcp.btd",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_bcg_sig_bdt_par_btd_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bdt,
-			{ "bdt (Dial Tone)", "h248.pkg.bcg.bdt",
+			{ "bdt (Dial Tone)", "h248.bcg.bdt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_brt,
-			{ "brt (Ringing tone)", "h248.pkg.bcg.brt",
+			{ "brt (Ringing tone)", "h248.bcg.brt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bbt,
-			{ "bbt (Busy tone)", "h248.pkg.bcg.bbt",
+			{ "bbt (Busy tone)", "h248.bcg.bbt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bct,
-			{ "bct (Congestion tone)", "h248.pkg.bcg.bct",
+			{ "bct (Congestion tone)", "h248.bcg.bct",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bsit,
-			{ "bsit (Special information tone)", "h248.pkg.bcg.bsit",
+			{ "bsit (Special information tone)", "h248.bcg.bsit",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bwt,
-			{ "bwt (Warning tone)", "h248.pkg.bcg.bwt",
+			{ "bwt (Warning tone)", "h248.bcg.bwt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bpt,
-			{ "bpt (Payphone recognition tone)", "h248.pkg.bcg.bpt",
+			{ "bpt (Payphone recognition tone)", "h248.bcg.bpt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bcw,
-			{ "bcw (Call waiting tone)", "h248.pkg.bcg.bcw",
+			{ "bcw (Call waiting tone)", "h248.bcg.bcw",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bcr,
-			{ "bcr (Call ringing tone)", "h248.pkg.bcg.bcr",
+			{ "bcr (Call ringing tone)", "h248.bcg.bcr",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bpy,
-			{ "bpy (Pay tone)", "h248.pkg.bcg.bpy",
+			{ "bpy (Pay tone)", "h248.bcg.bpy",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 	};