aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2018-02-07 12:26:45 +0100
committerAnders Broman <a.broman58@gmail.com>2018-02-08 14:57:36 +0000
commit8cd389e16166fa4c075fbddfe69f26653a0169b3 (patch)
tree1bea70a898b41c700cfe8f192dae3ba7e08b3626
parentbfd2dbcf25749d9f1481c479af4aab098069c303 (diff)
replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--capchild/capture_ifinfo.c2
-rw-r--r--capchild/capture_session.h2
-rw-r--r--capchild/capture_sync.c2
-rw-r--r--capchild/capture_sync.h2
-rw-r--r--capinfos.c2
-rw-r--r--capture_info.c2
-rw-r--r--capture_info.h2
-rw-r--r--capture_opts.c2
-rw-r--r--capture_opts.h2
-rw-r--r--capture_stop_conditions.c2
-rw-r--r--capture_stop_conditions.h2
-rw-r--r--captype.c2
-rw-r--r--caputils/airpcap_loader.c2
-rw-r--r--caputils/airpcap_loader.h2
-rw-r--r--caputils/capture-pcap-util-int.h2
-rw-r--r--caputils/capture-pcap-util-unix.c2
-rw-r--r--caputils/capture-pcap-util.c2
-rw-r--r--caputils/capture-pcap-util.h2
-rw-r--r--caputils/capture-wpcap.c2
-rw-r--r--caputils/capture-wpcap.h2
-rw-r--r--caputils/capture_ifinfo.h2
-rw-r--r--caputils/capture_win_ifnames.h2
-rw-r--r--caputils/capture_wpcap_packet.c2
-rw-r--r--caputils/capture_wpcap_packet.h2
-rw-r--r--caputils/iface_monitor.c2
-rw-r--r--caputils/iface_monitor.h2
-rw-r--r--caputils/ws80211_utils.h2
-rw-r--r--cfile.c2
-rw-r--r--cfile.h2
-rw-r--r--codecs/G711a/G711adecode.c2
-rw-r--r--codecs/G711a/G711adecode.h2
-rw-r--r--codecs/G711a/G711atable.h2
-rw-r--r--codecs/G711u/G711udecode.c2
-rw-r--r--codecs/G711u/G711udecode.h2
-rw-r--r--codecs/G711u/G711utable.h2
-rw-r--r--codecs/G722/G722decode.c2
-rw-r--r--codecs/G722/G722decode.h2
-rw-r--r--codecs/G726/G726decode.c2
-rw-r--r--codecs/G726/G726decode.h2
-rw-r--r--codecs/G729/G729decode.c2
-rw-r--r--codecs/G729/G729decode.h2
-rw-r--r--codecs/codecs.c2
-rw-r--r--codecs/codecs.h2
-rw-r--r--codecs/sbc/sbc.c2
-rw-r--r--codecs/sbc/sbc_private.h2
-rw-r--r--conditions.c2
-rw-r--r--conditions.h2
-rw-r--r--dftest.c2
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/README.stats_tree2
-rwxr-xr-xdoc/extcap_example.py2
-rwxr-xr-xdoc/make-authors-format.pl2
-rwxr-xr-xdoc/make-authors-short.pl2
-rw-r--r--doc/packet-PROTOABBREV.c2
-rwxr-xr-xdoc/perlnoutf.pl2
-rw-r--r--doc/plugins.example/Makefile.am2
-rw-r--r--doc/plugins.example/hello.c2
-rw-r--r--docbook/CMakeLists.txt2
-rwxr-xr-xdocbook/make-wsluarm.pl2
-rw-r--r--dumpcap.c2
-rw-r--r--editcap.c2
-rw-r--r--epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c2
-rw-r--r--epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h2
-rw-r--r--epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c2
-rw-r--r--epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h2
-rw-r--r--epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c2
-rw-r--r--epan/dissectors/dissectors.h2
-rw-r--r--epan/dissectors/make-dissectors.c2
-rw-r--r--epan/dissectors/packet-artemis.c2
-rw-r--r--epan/dissectors/packet-bacnet.h2
-rw-r--r--epan/dissectors/packet-btmesh.c2
-rw-r--r--epan/dissectors/packet-caneth.c2
-rw-r--r--epan/dissectors/packet-cvspserver.c2
-rw-r--r--epan/dissectors/packet-ldap.c2
-rw-r--r--epan/dissectors/packet-lnet.c2
-rw-r--r--epan/dissectors/packet-lnet.h2
-rw-r--r--epan/dissectors/packet-lte-rrc.c2
-rw-r--r--epan/dissectors/packet-lte-rrc.h2
-rw-r--r--epan/dissectors/packet-lustre.c2
-rw-r--r--epan/dissectors/packet-nas_eps.c2
-rw-r--r--epan/dissectors/packet-nr-rrc.c2
-rw-r--r--epan/dissectors/packet-nr-rrc.h2
-rw-r--r--epan/dissectors/packet-nxp_802154_sniffer.c2
-rw-r--r--epan/dissectors/packet-sbc-ap.c2
-rw-r--r--epan/dissectors/packet-sip.c2
-rw-r--r--epan/dissectors/packet-smp.c2
-rw-r--r--epan/dissectors/packet-thrift.c2
-rw-r--r--epan/dissectors/packet-thrift.h2
-rw-r--r--epan/epan.c2
-rw-r--r--epan/packet.c2
-rw-r--r--epan/packet.h2
-rw-r--r--epan/prefs.c2
-rw-r--r--epan/print_stream.c2
-rw-r--r--epan/print_stream.h2
-rw-r--r--epan/proto.c2
-rw-r--r--epan/register.c2
-rw-r--r--epan/register.h2
-rw-r--r--epan/wslua/init_wslua.c2
-rw-r--r--epan/wslua/init_wslua.h2
-rw-r--r--extcap.c2
-rw-r--r--extcap.h2
-rw-r--r--extcap/Makefile.am2
-rw-r--r--extcap/androiddump.c2
-rw-r--r--extcap/ciscodump.c2
-rw-r--r--extcap/extcap-base.c2
-rw-r--r--extcap/extcap-base.h2
-rw-r--r--extcap/randpktdump.c2
-rw-r--r--extcap/ssh-base.c2
-rw-r--r--extcap/ssh-base.h2
-rw-r--r--extcap/sshdump.c2
-rw-r--r--extcap/udpdump.c2
-rw-r--r--extcap_parser.c2
-rw-r--r--extcap_parser.h2
-rw-r--r--extcap_spawn.c2
-rw-r--r--extcap_spawn.h2
-rw-r--r--file.c2
-rw-r--r--file.h2
-rw-r--r--file_packet_provider.c2
-rw-r--r--fileset.c2
-rw-r--r--fileset.h2
-rw-r--r--frame_tvbuff.c2
-rw-r--r--frame_tvbuff.h2
-rw-r--r--globals.h2
-rw-r--r--log.h2
-rw-r--r--mergecap.c2
-rw-r--r--packaging/wix/windeployqt-to-wix.ps12
-rw-r--r--plugins/codecs/Makefile.am.inc2
-rw-r--r--plugins/epan/Makefile.am.inc2
-rw-r--r--plugins/wiretap/Makefile.am.inc2
-rw-r--r--plugins/wiretap/usbdump/CMakeLists.txt2
-rw-r--r--plugins/wiretap/usbdump/Makefile.am2
-rw-r--r--plugins/wiretap/usbdump/usbdump.c2
-rw-r--r--randpkt.c2
-rw-r--r--randpkt_core/randpkt_core.c2
-rw-r--r--randpkt_core/randpkt_core.h2
-rw-r--r--rawshark.c2
-rw-r--r--reordercap.c2
-rw-r--r--ringbuffer.c2
-rw-r--r--ringbuffer.h2
-rw-r--r--sharkd.c2
-rw-r--r--sharkd.h2
-rw-r--r--sharkd_daemon.c2
-rw-r--r--sharkd_session.c2
-rw-r--r--sync_pipe.h2
-rw-r--r--sync_pipe_write.c2
-rw-r--r--text2pcap.c2
-rw-r--r--text2pcap.h2
-rw-r--r--tfshark.c2
-rw-r--r--tools/oss-fuzzshark/fuzzshark.c2
-rw-r--r--trigcap.c2
-rw-r--r--tshark.c2
-rw-r--r--ui/alert_box.c2
-rw-r--r--ui/alert_box.h2
-rw-r--r--ui/all_files_wildcard.h2
-rw-r--r--ui/capture.c2
-rw-r--r--ui/capture.h2
-rw-r--r--ui/capture_globals.h2
-rw-r--r--ui/capture_ui_utils.c2
-rw-r--r--ui/capture_ui_utils.h2
-rw-r--r--ui/cli/tap-camelsrt.c2
-rw-r--r--ui/cli/tap-comparestat.c2
-rw-r--r--ui/cli/tap-diameter-avp.c2
-rw-r--r--ui/cli/tap-endpoints.c2
-rw-r--r--ui/cli/tap-expert.c2
-rw-r--r--ui/cli/tap-exportobject.c2
-rw-r--r--ui/cli/tap-exportobject.h2
-rw-r--r--ui/cli/tap-flow.c2
-rw-r--r--ui/cli/tap-follow.c2
-rw-r--r--ui/cli/tap-funnel.c2
-rw-r--r--ui/cli/tap-gsm_astat.c2
-rw-r--r--ui/cli/tap-hosts.c2
-rw-r--r--ui/cli/tap-httpstat.c2
-rw-r--r--ui/cli/tap-icmpstat.c2
-rw-r--r--ui/cli/tap-icmpv6stat.c2
-rw-r--r--ui/cli/tap-iostat.c2
-rw-r--r--ui/cli/tap-iousers.c2
-rw-r--r--ui/cli/tap-macltestat.c2
-rw-r--r--ui/cli/tap-protocolinfo.c2
-rw-r--r--ui/cli/tap-protohierstat.c2
-rw-r--r--ui/cli/tap-rlcltestat.c2
-rw-r--r--ui/cli/tap-rpcprogs.c2
-rw-r--r--ui/cli/tap-rtd.c2
-rw-r--r--ui/cli/tap-rtp.c2
-rw-r--r--ui/cli/tap-rtspstat.c2
-rw-r--r--ui/cli/tap-sctpchunkstat.c2
-rw-r--r--ui/cli/tap-simple_stattable.c2
-rw-r--r--ui/cli/tap-sipstat.c2
-rw-r--r--ui/cli/tap-smbsids.c2
-rw-r--r--ui/cli/tap-srt.c2
-rw-r--r--ui/cli/tap-stats_tree.c2
-rw-r--r--ui/cli/tap-sv.c2
-rw-r--r--ui/cli/tap-wspstat.c2
-rw-r--r--ui/cli/tshark-tap.h2
-rw-r--r--ui/commandline.c2
-rw-r--r--ui/commandline.h2
-rw-r--r--ui/console.c2
-rw-r--r--ui/console.h2
-rw-r--r--ui/decode_as_utils.c2
-rw-r--r--ui/decode_as_utils.h2
-rw-r--r--ui/dissect_opts.c2
-rw-r--r--ui/dissect_opts.h2
-rw-r--r--ui/export_object_ui.c2
-rw-r--r--ui/export_object_ui.h2
-rw-r--r--ui/export_pdu_ui_utils.c2
-rw-r--r--ui/export_pdu_ui_utils.h2
-rw-r--r--ui/failure_message.c2
-rw-r--r--ui/failure_message.h2
-rw-r--r--ui/file_dialog.h2
-rw-r--r--ui/filter_files.c2
-rw-r--r--ui/filter_files.h2
-rw-r--r--ui/firewall_rules.c2
-rw-r--r--ui/firewall_rules.h2
-rw-r--r--ui/gtk/fileset_dlg.c2
-rw-r--r--ui/help_url.c2
-rw-r--r--ui/help_url.h2
-rw-r--r--ui/iface_lists.c2
-rw-r--r--ui/iface_lists.h2
-rw-r--r--ui/iface_toolbar.c2
-rw-r--r--ui/iface_toolbar.h2
-rw-r--r--ui/io_graph_item.c2
-rw-r--r--ui/io_graph_item.h2
-rw-r--r--ui/language.c2
-rw-r--r--ui/language.h2
-rw-r--r--ui/last_open_dir.h2
-rw-r--r--ui/main_statusbar.h2
-rw-r--r--ui/make-taps.c2
-rw-r--r--ui/mcast_stream.c2
-rw-r--r--ui/mcast_stream.h2
-rw-r--r--ui/packet_list_utils.c2
-rw-r--r--ui/packet_list_utils.h2
-rw-r--r--ui/packet_range.c2
-rw-r--r--ui/packet_range.h2
-rw-r--r--ui/persfilepath_opt.c2
-rw-r--r--ui/persfilepath_opt.h2
-rw-r--r--ui/preference_utils.c2
-rw-r--r--ui/preference_utils.h2
-rw-r--r--ui/profile.c2
-rw-r--r--ui/profile.h2
-rw-r--r--ui/progress_dlg.h2
-rw-r--r--ui/proto_hier_stats.c2
-rw-r--r--ui/proto_hier_stats.h2
-rw-r--r--ui/qt/about_dialog.cpp2
-rw-r--r--ui/qt/about_dialog.h2
-rw-r--r--ui/qt/accordion_frame.cpp2
-rw-r--r--ui/qt/accordion_frame.h2
-rw-r--r--ui/qt/address_editor_frame.cpp2
-rw-r--r--ui/qt/address_editor_frame.h2
-rw-r--r--ui/qt/bluetooth_att_server_attributes_dialog.cpp2
-rw-r--r--ui/qt/bluetooth_att_server_attributes_dialog.h2
-rw-r--r--ui/qt/bluetooth_device_dialog.cpp2
-rw-r--r--ui/qt/bluetooth_device_dialog.h2
-rw-r--r--ui/qt/bluetooth_devices_dialog.cpp2
-rw-r--r--ui/qt/bluetooth_devices_dialog.h2
-rw-r--r--ui/qt/bluetooth_hci_summary_dialog.cpp2
-rw-r--r--ui/qt/bluetooth_hci_summary_dialog.h2
-rw-r--r--ui/qt/byte_view_tab.cpp2
-rw-r--r--ui/qt/byte_view_tab.h2
-rw-r--r--ui/qt/capture_file.cpp2
-rw-r--r--ui/qt/capture_file.h2
-rw-r--r--ui/qt/capture_file_dialog.cpp2
-rw-r--r--ui/qt/capture_file_dialog.h2
-rw-r--r--ui/qt/capture_file_properties_dialog.cpp2
-rw-r--r--ui/qt/capture_file_properties_dialog.h2
-rw-r--r--ui/qt/capture_filter_syntax_worker.cpp2
-rw-r--r--ui/qt/capture_filter_syntax_worker.h2
-rw-r--r--ui/qt/capture_info_dialog.cpp2
-rw-r--r--ui/qt/capture_info_dialog.h2
-rw-r--r--ui/qt/capture_interfaces_dialog.cpp2
-rw-r--r--ui/qt/capture_interfaces_dialog.h2
-rw-r--r--ui/qt/capture_preferences_frame.cpp2
-rw-r--r--ui/qt/capture_preferences_frame.h2
-rw-r--r--ui/qt/coloring_rules_dialog.cpp2
-rw-r--r--ui/qt/coloring_rules_dialog.h2
-rw-r--r--ui/qt/column_editor_frame.cpp2
-rw-r--r--ui/qt/column_editor_frame.h2
-rw-r--r--ui/qt/column_preferences_frame.cpp2
-rw-r--r--ui/qt/column_preferences_frame.h2
-rw-r--r--ui/qt/compiled_filter_output.cpp2
-rw-r--r--ui/qt/compiled_filter_output.h2
-rw-r--r--ui/qt/conversation_colorize_action.cpp2
-rw-r--r--ui/qt/conversation_colorize_action.h2
-rw-r--r--ui/qt/conversation_dialog.cpp2
-rw-r--r--ui/qt/conversation_dialog.h2
-rw-r--r--ui/qt/conversation_hash_tables_dialog.cpp2
-rw-r--r--ui/qt/conversation_hash_tables_dialog.h2
-rw-r--r--ui/qt/decode_as_dialog.cpp2
-rw-r--r--ui/qt/decode_as_dialog.h2
-rw-r--r--ui/qt/display_filter_expression_dialog.cpp2
-rw-r--r--ui/qt/display_filter_expression_dialog.h2
-rw-r--r--ui/qt/dissector_tables_dialog.cpp2
-rw-r--r--ui/qt/dissector_tables_dialog.h2
-rw-r--r--ui/qt/enabled_protocols_dialog.cpp2
-rw-r--r--ui/qt/enabled_protocols_dialog.h2
-rw-r--r--ui/qt/endpoint_dialog.cpp2
-rw-r--r--ui/qt/endpoint_dialog.h2
-rw-r--r--ui/qt/expert_info_dialog.cpp2
-rw-r--r--ui/qt/expert_info_dialog.h2
-rw-r--r--ui/qt/export_dissection_dialog.cpp2
-rw-r--r--ui/qt/export_dissection_dialog.h2
-rw-r--r--ui/qt/export_object_action.cpp2
-rw-r--r--ui/qt/export_object_action.h2
-rw-r--r--ui/qt/export_object_dialog.cpp2
-rw-r--r--ui/qt/export_object_dialog.h2
-rw-r--r--ui/qt/export_pdu_dialog.cpp2
-rw-r--r--ui/qt/export_pdu_dialog.h2
-rw-r--r--ui/qt/extcap_argument.cpp2
-rw-r--r--ui/qt/extcap_argument.h2
-rw-r--r--ui/qt/extcap_argument_file.cpp2
-rw-r--r--ui/qt/extcap_argument_file.h2
-rw-r--r--ui/qt/extcap_argument_multiselect.cpp2
-rw-r--r--ui/qt/extcap_argument_multiselect.h2
-rw-r--r--ui/qt/extcap_options_dialog.cpp2
-rw-r--r--ui/qt/extcap_options_dialog.h2
-rw-r--r--ui/qt/file_set_dialog.cpp2
-rw-r--r--ui/qt/file_set_dialog.h2
-rw-r--r--ui/qt/filter_action.cpp2
-rw-r--r--ui/qt/filter_action.h2
-rw-r--r--ui/qt/filter_dialog.cpp2
-rw-r--r--ui/qt/filter_dialog.h2
-rw-r--r--ui/qt/filter_expression_frame.cpp2
-rw-r--r--ui/qt/filter_expression_frame.h2
-rw-r--r--ui/qt/firewall_rules_dialog.cpp2
-rw-r--r--ui/qt/firewall_rules_dialog.h2
-rw-r--r--ui/qt/follow_stream_dialog.cpp2
-rw-r--r--ui/qt/follow_stream_dialog.h2
-rw-r--r--ui/qt/font_color_preferences_frame.cpp2
-rw-r--r--ui/qt/font_color_preferences_frame.h2
-rw-r--r--ui/qt/funnel_statistics.cpp2
-rw-r--r--ui/qt/funnel_statistics.h2
-rw-r--r--ui/qt/funnel_string_dialog.cpp2
-rw-r--r--ui/qt/funnel_string_dialog.h2
-rw-r--r--ui/qt/funnel_text_dialog.cpp2
-rw-r--r--ui/qt/funnel_text_dialog.h2
-rw-r--r--ui/qt/geometry_state_dialog.cpp2
-rw-r--r--ui/qt/geometry_state_dialog.h2
-rw-r--r--ui/qt/gpl-template.txt2
-rw-r--r--ui/qt/gsm_map_summary_dialog.cpp2
-rw-r--r--ui/qt/gsm_map_summary_dialog.h2
-rw-r--r--ui/qt/iax2_analysis_dialog.cpp2
-rw-r--r--ui/qt/iax2_analysis_dialog.h2
-rw-r--r--ui/qt/import_text_dialog.cpp2
-rw-r--r--ui/qt/import_text_dialog.h2
-rw-r--r--ui/qt/interface_frame.cpp2
-rw-r--r--ui/qt/interface_frame.h2
-rw-r--r--ui/qt/interface_toolbar.cpp2
-rw-r--r--ui/qt/interface_toolbar.h2
-rw-r--r--ui/qt/interface_toolbar_reader.cpp2
-rw-r--r--ui/qt/interface_toolbar_reader.h2
-rw-r--r--ui/qt/io_graph_dialog.cpp2
-rw-r--r--ui/qt/io_graph_dialog.h2
-rw-r--r--ui/qt/layout_preferences_frame.cpp2
-rw-r--r--ui/qt/layout_preferences_frame.h2
-rw-r--r--ui/qt/lbm_lbtrm_transport_dialog.cpp2
-rw-r--r--ui/qt/lbm_lbtrm_transport_dialog.h2
-rw-r--r--ui/qt/lbm_lbtru_transport_dialog.cpp2
-rw-r--r--ui/qt/lbm_lbtru_transport_dialog.h2
-rw-r--r--ui/qt/lbm_stream_dialog.cpp2
-rw-r--r--ui/qt/lbm_stream_dialog.h2
-rw-r--r--ui/qt/lte_mac_statistics_dialog.cpp2
-rw-r--r--ui/qt/lte_mac_statistics_dialog.h2
-rw-r--r--ui/qt/lte_rlc_graph_dialog.cpp2
-rw-r--r--ui/qt/lte_rlc_graph_dialog.h2
-rw-r--r--ui/qt/lte_rlc_statistics_dialog.cpp2
-rw-r--r--ui/qt/lte_rlc_statistics_dialog.h2
-rw-r--r--ui/qt/main_status_bar.cpp2
-rw-r--r--ui/qt/main_status_bar.h2
-rw-r--r--ui/qt/main_welcome.cpp2
-rw-r--r--ui/qt/main_welcome.h2
-rw-r--r--ui/qt/main_window.cpp2
-rw-r--r--ui/qt/main_window.h2
-rw-r--r--ui/qt/main_window_preferences_frame.cpp2
-rw-r--r--ui/qt/main_window_preferences_frame.h2
-rw-r--r--ui/qt/main_window_slots.cpp2
-rw-r--r--ui/qt/manage_interfaces_dialog.cpp2
-rw-r--r--ui/qt/manage_interfaces_dialog.h2
-rw-r--r--ui/qt/manager/preference_manager.cpp2
-rw-r--r--ui/qt/manager/preference_manager.h2
-rw-r--r--ui/qt/manager/wireshark_preference.cpp2
-rw-r--r--ui/qt/manager/wireshark_preference.h2
-rw-r--r--ui/qt/models/astringlist_list_model.cpp2
-rw-r--r--ui/qt/models/astringlist_list_model.h2
-rw-r--r--ui/qt/models/cache_proxy_model.cpp2
-rw-r--r--ui/qt/models/cache_proxy_model.h2
-rw-r--r--ui/qt/models/decode_as_delegate.cpp2
-rw-r--r--ui/qt/models/decode_as_delegate.h2
-rw-r--r--ui/qt/models/decode_as_model.cpp2
-rw-r--r--ui/qt/models/decode_as_model.h2
-rw-r--r--ui/qt/models/dissector_tables_model.cpp2
-rw-r--r--ui/qt/models/dissector_tables_model.h2
-rw-r--r--ui/qt/models/enabled_protocols_model.cpp2
-rw-r--r--ui/qt/models/enabled_protocols_model.h2
-rw-r--r--ui/qt/models/expert_info_model.cpp2
-rw-r--r--ui/qt/models/expert_info_model.h2
-rw-r--r--ui/qt/models/expert_info_proxy_model.cpp2
-rw-r--r--ui/qt/models/expert_info_proxy_model.h2
-rw-r--r--ui/qt/models/export_objects_model.cpp2
-rw-r--r--ui/qt/models/export_objects_model.h2
-rw-r--r--ui/qt/models/fileset_entry_model.cpp2
-rw-r--r--ui/qt/models/fileset_entry_model.h2
-rw-r--r--ui/qt/models/info_proxy_model.cpp2
-rw-r--r--ui/qt/models/info_proxy_model.h2
-rw-r--r--ui/qt/models/interface_sort_filter_model.cpp2
-rw-r--r--ui/qt/models/interface_sort_filter_model.h2
-rw-r--r--ui/qt/models/interface_tree_cache_model.cpp2
-rw-r--r--ui/qt/models/interface_tree_cache_model.h2
-rw-r--r--ui/qt/models/interface_tree_model.cpp2
-rw-r--r--ui/qt/models/interface_tree_model.h2
-rw-r--r--ui/qt/models/numeric_value_chooser_delegate.cpp2
-rw-r--r--ui/qt/models/numeric_value_chooser_delegate.h2
-rw-r--r--ui/qt/models/packet_list_model.cpp2
-rw-r--r--ui/qt/models/packet_list_model.h2
-rw-r--r--ui/qt/models/packet_list_record.cpp2
-rw-r--r--ui/qt/models/packet_list_record.h2
-rw-r--r--ui/qt/models/path_chooser_delegate.cpp2
-rw-r--r--ui/qt/models/path_chooser_delegate.h2
-rw-r--r--ui/qt/models/percent_bar_delegate.cpp2
-rw-r--r--ui/qt/models/percent_bar_delegate.h2
-rw-r--r--ui/qt/models/pref_delegate.cpp2
-rw-r--r--ui/qt/models/pref_delegate.h2
-rw-r--r--ui/qt/models/pref_models.cpp2
-rw-r--r--ui/qt/models/pref_models.h2
-rw-r--r--ui/qt/models/proto_tree_model.cpp2
-rw-r--r--ui/qt/models/proto_tree_model.h2
-rw-r--r--ui/qt/models/related_packet_delegate.cpp2
-rw-r--r--ui/qt/models/related_packet_delegate.h2
-rw-r--r--ui/qt/models/sparkline_delegate.cpp2
-rw-r--r--ui/qt/models/sparkline_delegate.h2
-rw-r--r--ui/qt/models/supported_protocols_model.cpp2
-rw-r--r--ui/qt/models/supported_protocols_model.h2
-rw-r--r--ui/qt/models/timeline_delegate.cpp2
-rw-r--r--ui/qt/models/timeline_delegate.h2
-rw-r--r--ui/qt/models/tree_model_helpers.h2
-rw-r--r--ui/qt/models/uat_delegate.cpp2
-rw-r--r--ui/qt/models/uat_delegate.h2
-rw-r--r--ui/qt/models/uat_model.cpp2
-rw-r--r--ui/qt/models/uat_model.h2
-rw-r--r--ui/qt/models/url_link_delegate.cpp2
-rw-r--r--ui/qt/models/url_link_delegate.h2
-rw-r--r--ui/qt/models/voip_calls_info_model.cpp2
-rw-r--r--ui/qt/models/voip_calls_info_model.h2
-rw-r--r--ui/qt/module_preferences_scroll_area.cpp2
-rw-r--r--ui/qt/module_preferences_scroll_area.h2
-rw-r--r--ui/qt/mtp3_summary_dialog.cpp2
-rw-r--r--ui/qt/mtp3_summary_dialog.h2
-rw-r--r--ui/qt/multicast_statistics_dialog.cpp2
-rw-r--r--ui/qt/multicast_statistics_dialog.h2
-rw-r--r--ui/qt/packet_comment_dialog.cpp2
-rw-r--r--ui/qt/packet_comment_dialog.h2
-rw-r--r--ui/qt/packet_dialog.cpp2
-rw-r--r--ui/qt/packet_dialog.h2
-rw-r--r--ui/qt/packet_format_group_box.cpp2
-rw-r--r--ui/qt/packet_format_group_box.h2
-rw-r--r--ui/qt/packet_list.cpp2
-rw-r--r--ui/qt/packet_list.h2
-rw-r--r--ui/qt/packet_range_group_box.cpp2
-rw-r--r--ui/qt/packet_range_group_box.h2
-rw-r--r--ui/qt/preference_editor_frame.cpp2
-rw-r--r--ui/qt/preference_editor_frame.h2
-rw-r--r--ui/qt/preferences_dialog.cpp2
-rw-r--r--ui/qt/preferences_dialog.h2
-rw-r--r--ui/qt/print_dialog.cpp2
-rw-r--r--ui/qt/print_dialog.h2
-rw-r--r--ui/qt/profile_dialog.cpp2
-rw-r--r--ui/qt/profile_dialog.h2
-rw-r--r--ui/qt/progress_frame.cpp2
-rw-r--r--ui/qt/progress_frame.h2
-rw-r--r--ui/qt/proto_tree.cpp2
-rw-r--r--ui/qt/proto_tree.h2
-rw-r--r--ui/qt/protocol_hierarchy_dialog.cpp2
-rw-r--r--ui/qt/protocol_hierarchy_dialog.h2
-rw-r--r--ui/qt/protocol_preferences_menu.cpp2
-rw-r--r--ui/qt/protocol_preferences_menu.h2
-rw-r--r--ui/qt/recent_file_status.cpp2
-rw-r--r--ui/qt/recent_file_status.h2
-rw-r--r--ui/qt/remote_capture_dialog.cpp2
-rw-r--r--ui/qt/remote_capture_dialog.h2
-rw-r--r--ui/qt/remote_settings_dialog.cpp2
-rw-r--r--ui/qt/remote_settings_dialog.h2
-rw-r--r--ui/qt/resolved_addresses_dialog.cpp2
-rw-r--r--ui/qt/resolved_addresses_dialog.h2
-rw-r--r--ui/qt/response_time_delay_dialog.cpp2
-rw-r--r--ui/qt/response_time_delay_dialog.h2
-rw-r--r--ui/qt/rpc_service_response_time_dialog.cpp2
-rw-r--r--ui/qt/rpc_service_response_time_dialog.h2
-rw-r--r--ui/qt/rtp_analysis_dialog.cpp2
-rw-r--r--ui/qt/rtp_analysis_dialog.h2
-rw-r--r--ui/qt/rtp_audio_stream.cpp2
-rw-r--r--ui/qt/rtp_audio_stream.h2
-rw-r--r--ui/qt/rtp_player_dialog.cpp2
-rw-r--r--ui/qt/rtp_player_dialog.h2
-rw-r--r--ui/qt/rtp_stream_dialog.cpp2
-rw-r--r--ui/qt/rtp_stream_dialog.h2
-rw-r--r--ui/qt/scsi_service_response_time_dialog.cpp2
-rw-r--r--ui/qt/scsi_service_response_time_dialog.h2
-rw-r--r--ui/qt/sctp_all_assocs_dialog.cpp2
-rw-r--r--ui/qt/sctp_all_assocs_dialog.h2
-rw-r--r--ui/qt/sctp_assoc_analyse_dialog.cpp2
-rw-r--r--ui/qt/sctp_assoc_analyse_dialog.h2
-rw-r--r--ui/qt/sctp_chunk_statistics_dialog.cpp2
-rw-r--r--ui/qt/sctp_chunk_statistics_dialog.h2
-rw-r--r--ui/qt/sctp_graph_arwnd_dialog.cpp2
-rw-r--r--ui/qt/sctp_graph_arwnd_dialog.h2
-rw-r--r--ui/qt/sctp_graph_byte_dialog.cpp2
-rw-r--r--ui/qt/sctp_graph_byte_dialog.h2
-rw-r--r--ui/qt/sctp_graph_dialog.cpp2
-rw-r--r--ui/qt/sctp_graph_dialog.h2
-rw-r--r--ui/qt/search_frame.cpp2
-rw-r--r--ui/qt/search_frame.h2
-rw-r--r--ui/qt/sequence_diagram.cpp2
-rw-r--r--ui/qt/sequence_diagram.h2
-rw-r--r--ui/qt/sequence_dialog.cpp2
-rw-r--r--ui/qt/sequence_dialog.h2
-rw-r--r--ui/qt/service_response_time_dialog.cpp2
-rw-r--r--ui/qt/service_response_time_dialog.h2
-rw-r--r--ui/qt/show_packet_bytes_dialog.cpp2
-rw-r--r--ui/qt/show_packet_bytes_dialog.h2
-rw-r--r--ui/qt/simple_dialog.cpp2
-rw-r--r--ui/qt/simple_dialog.h2
-rw-r--r--ui/qt/simple_statistics_dialog.cpp2
-rw-r--r--ui/qt/simple_statistics_dialog.h2
-rw-r--r--ui/qt/splash_overlay.cpp2
-rw-r--r--ui/qt/splash_overlay.h2
-rw-r--r--ui/qt/stats_tree_dialog.cpp2
-rw-r--r--ui/qt/stats_tree_dialog.h2
-rw-r--r--ui/qt/supported_protocols_dialog.cpp2
-rw-r--r--ui/qt/supported_protocols_dialog.h2
-rw-r--r--ui/qt/tabnav_tree_widget.cpp2
-rw-r--r--ui/qt/tabnav_tree_widget.h2
-rw-r--r--ui/qt/tap_parameter_dialog.cpp2
-rw-r--r--ui/qt/tap_parameter_dialog.h2
-rw-r--r--ui/qt/tcp_stream_dialog.cpp2
-rw-r--r--ui/qt/tcp_stream_dialog.h2
-rw-r--r--ui/qt/time_shift_dialog.cpp2
-rw-r--r--ui/qt/time_shift_dialog.h2
-rw-r--r--ui/qt/traffic_table_dialog.cpp2
-rw-r--r--ui/qt/traffic_table_dialog.h2
-rw-r--r--ui/qt/uat_dialog.cpp2
-rw-r--r--ui/qt/uat_dialog.h2
-rw-r--r--ui/qt/uat_frame.cpp2
-rw-r--r--ui/qt/uat_frame.h2
-rw-r--r--ui/qt/utils/color_utils.cpp2
-rw-r--r--ui/qt/utils/color_utils.h2
-rw-r--r--ui/qt/utils/data_printer.cpp2
-rw-r--r--ui/qt/utils/data_printer.h2
-rw-r--r--ui/qt/utils/field_information.cpp2
-rw-r--r--ui/qt/utils/field_information.h2
-rw-r--r--ui/qt/utils/frame_information.cpp2
-rw-r--r--ui/qt/utils/frame_information.h2
-rw-r--r--ui/qt/utils/idata_printable.h2
-rw-r--r--ui/qt/utils/proto_node.cpp2
-rw-r--r--ui/qt/utils/proto_node.h2
-rw-r--r--ui/qt/utils/qt_ui_utils.cpp2
-rw-r--r--ui/qt/utils/qt_ui_utils.h2
-rw-r--r--ui/qt/utils/stock_icon.cpp2
-rw-r--r--ui/qt/utils/stock_icon.h2
-rw-r--r--ui/qt/utils/tango_colors.h2
-rw-r--r--ui/qt/utils/variant_pointer.h2
-rw-r--r--ui/qt/utils/wireshark_mime_data.cpp2
-rw-r--r--ui/qt/utils/wireshark_mime_data.h2
-rw-r--r--ui/qt/voip_calls_dialog.cpp2
-rw-r--r--ui/qt/voip_calls_dialog.h2
-rw-r--r--ui/qt/widgets/additional_toolbar.cpp2
-rw-r--r--ui/qt/widgets/additional_toolbar.h2
-rw-r--r--ui/qt/widgets/apply_line_edit.cpp2
-rw-r--r--ui/qt/widgets/apply_line_edit.h2
-rw-r--r--ui/qt/widgets/byte_view_text.cpp2
-rw-r--r--ui/qt/widgets/byte_view_text.h2
-rw-r--r--ui/qt/widgets/capture_filter_combo.cpp2
-rw-r--r--ui/qt/widgets/capture_filter_combo.h2
-rw-r--r--ui/qt/widgets/capture_filter_edit.cpp2
-rw-r--r--ui/qt/widgets/capture_filter_edit.h2
-rw-r--r--ui/qt/widgets/clickable_label.cpp2
-rw-r--r--ui/qt/widgets/clickable_label.h2
-rw-r--r--ui/qt/widgets/display_filter_combo.cpp2
-rw-r--r--ui/qt/widgets/display_filter_combo.h2
-rw-r--r--ui/qt/widgets/display_filter_edit.cpp2
-rw-r--r--ui/qt/widgets/display_filter_edit.h2
-rw-r--r--ui/qt/widgets/dissector_tables_view.cpp2
-rw-r--r--ui/qt/widgets/dissector_tables_view.h2
-rw-r--r--ui/qt/widgets/drag_drop_toolbar.cpp2
-rw-r--r--ui/qt/widgets/drag_drop_toolbar.h2
-rw-r--r--ui/qt/widgets/drag_label.cpp2
-rw-r--r--ui/qt/widgets/drag_label.h2
-rw-r--r--ui/qt/widgets/editor_color_dialog.cpp2
-rw-r--r--ui/qt/widgets/editor_color_dialog.h2
-rw-r--r--ui/qt/widgets/editor_file_dialog.cpp2
-rw-r--r--ui/qt/widgets/editor_file_dialog.h2
-rw-r--r--ui/qt/widgets/elided_label.cpp2
-rw-r--r--ui/qt/widgets/elided_label.h2
-rw-r--r--ui/qt/widgets/expert_info_view.cpp2
-rw-r--r--ui/qt/widgets/expert_info_view.h2
-rw-r--r--ui/qt/widgets/export_objects_view.cpp2
-rw-r--r--ui/qt/widgets/export_objects_view.h2
-rw-r--r--ui/qt/widgets/field_filter_edit.cpp2
-rw-r--r--ui/qt/widgets/field_filter_edit.h2
-rw-r--r--ui/qt/widgets/find_line_edit.cpp2
-rw-r--r--ui/qt/widgets/find_line_edit.h2
-rw-r--r--ui/qt/widgets/follow_stream_text.cpp2
-rw-r--r--ui/qt/widgets/follow_stream_text.h2
-rw-r--r--ui/qt/widgets/interface_toolbar_lineedit.cpp2
-rw-r--r--ui/qt/widgets/interface_toolbar_lineedit.h2
-rw-r--r--ui/qt/widgets/label_stack.cpp2
-rw-r--r--ui/qt/widgets/label_stack.h2
-rw-r--r--ui/qt/widgets/overlay_scroll_bar.cpp2
-rw-r--r--ui/qt/widgets/overlay_scroll_bar.h2
-rw-r--r--ui/qt/widgets/pref_module_view.cpp2
-rw-r--r--ui/qt/widgets/pref_module_view.h2
-rw-r--r--ui/qt/widgets/range_syntax_lineedit.cpp2
-rw-r--r--ui/qt/widgets/range_syntax_lineedit.h2
-rw-r--r--ui/qt/widgets/stock_icon_tool_button.cpp2
-rw-r--r--ui/qt/widgets/stock_icon_tool_button.h2
-rw-r--r--ui/qt/widgets/syntax_line_edit.cpp2
-rw-r--r--ui/qt/widgets/syntax_line_edit.h2
-rw-r--r--ui/qt/widgets/tabnav_tree_view.cpp2
-rw-r--r--ui/qt/widgets/tabnav_tree_view.h2
-rw-r--r--ui/qt/wireless_frame.cpp2
-rw-r--r--ui/qt/wireless_frame.h2
-rw-r--r--ui/qt/wireless_timeline.cpp2
-rw-r--r--ui/qt/wireless_timeline.h2
-rw-r--r--ui/qt/wireshark_application.cpp2
-rw-r--r--ui/qt/wireshark_application.h2
-rw-r--r--ui/qt/wireshark_dialog.cpp2
-rw-r--r--ui/qt/wireshark_dialog.h2
-rw-r--r--ui/qt/wlan_statistics_dialog.cpp2
-rw-r--r--ui/qt/wlan_statistics_dialog.h2
-rw-r--r--ui/recent.c2
-rw-r--r--ui/recent.h2
-rw-r--r--ui/recent_utils.h2
-rw-r--r--ui/rtp_media.c2
-rw-r--r--ui/rtp_media.h2
-rw-r--r--ui/rtp_stream.c2
-rw-r--r--ui/rtp_stream.h2
-rw-r--r--ui/service_response_time.c2
-rw-r--r--ui/service_response_time.h2
-rw-r--r--ui/simple_dialog.h2
-rw-r--r--ui/software_update.c2
-rw-r--r--ui/software_update.h2
-rw-r--r--ui/ssl_key_export.c2
-rw-r--r--ui/ssl_key_export.h2
-rw-r--r--ui/summary.c2
-rw-r--r--ui/summary.h2
-rw-r--r--ui/tap-iax2-analysis.c2
-rw-r--r--ui/tap-iax2-analysis.h2
-rw-r--r--ui/tap-rlc-graph.c2
-rw-r--r--ui/tap-rlc-graph.h2
-rw-r--r--ui/tap-rtp-analysis.h2
-rw-r--r--ui/tap-rtp-common.c2
-rw-r--r--ui/tap-rtp-common.h2
-rw-r--r--ui/tap-sctp-analysis.c2
-rw-r--r--ui/tap-sctp-analysis.h2
-rw-r--r--ui/tap-tcp-stream.c2
-rw-r--r--ui/tap-tcp-stream.h2
-rw-r--r--ui/tap_export_pdu.c2
-rw-r--r--ui/tap_export_pdu.h2
-rw-r--r--ui/taps.h2
-rw-r--r--ui/text_import.c2
-rw-r--r--ui/text_import.h2
-rw-r--r--ui/text_import_scanner.h2
-rw-r--r--ui/time_shift.c2
-rw-r--r--ui/time_shift.h2
-rw-r--r--ui/traffic_table_ui.c2
-rw-r--r--ui/traffic_table_ui.h2
-rw-r--r--ui/util.c2
-rw-r--r--ui/util.h2
-rw-r--r--ui/voip_calls.c2
-rw-r--r--ui/voip_calls.h2
-rw-r--r--ui/win32/console_win32.c2
-rw-r--r--ui/win32/console_win32.h2
-rw-r--r--ui/win32/file_dlg_win32.c2
-rw-r--r--ui/win32/file_dlg_win32.h2
-rw-r--r--ui/win32/print_win32.c2
-rw-r--r--ui/win32/print_win32.h2
-rw-r--r--ui/ws_ui_util.h2
-rw-r--r--version_info.c2
-rw-r--r--version_info.h2
-rw-r--r--wireshark-qt.cpp2
-rw-r--r--wiretap/5views.c2
-rw-r--r--wiretap/5views.h2
-rw-r--r--wiretap/aethra.c2
-rw-r--r--wiretap/aethra.h2
-rw-r--r--wiretap/ascend-int.h2
-rw-r--r--wiretap/ascend.y2
-rw-r--r--wiretap/ascend_scanner.l2
-rw-r--r--wiretap/ascendtext.c2
-rw-r--r--wiretap/ascendtext.h2
-rw-r--r--wiretap/atm.c2
-rw-r--r--wiretap/atm.h2
-rw-r--r--wiretap/ber.c2
-rw-r--r--wiretap/ber.h2
-rw-r--r--wiretap/btsnoop.c2
-rw-r--r--wiretap/btsnoop.h2
-rw-r--r--wiretap/camins.c2
-rw-r--r--wiretap/camins.h2
-rw-r--r--wiretap/capsa.c2
-rw-r--r--wiretap/capsa.h2
-rw-r--r--wiretap/catapult_dct2000.c2
-rw-r--r--wiretap/catapult_dct2000.h2
-rw-r--r--wiretap/commview.c2
-rw-r--r--wiretap/commview.h2
-rw-r--r--wiretap/cosine.c2
-rw-r--r--wiretap/cosine.h2
-rw-r--r--wiretap/csids.c2
-rw-r--r--wiretap/csids.h2
-rw-r--r--wiretap/daintree-sna.c2
-rw-r--r--wiretap/daintree-sna.h2
-rw-r--r--wiretap/dbs-etherwatch.c2
-rw-r--r--wiretap/dbs-etherwatch.h2
-rw-r--r--wiretap/dct3trace.c2
-rw-r--r--wiretap/dct3trace.h2
-rw-r--r--wiretap/eyesdn.c2
-rw-r--r--wiretap/eyesdn.h2
-rw-r--r--wiretap/file_access.c2
-rw-r--r--wiretap/file_wrappers.c2
-rw-r--r--wiretap/file_wrappers.h2
-rw-r--r--wiretap/hcidump.c2
-rw-r--r--wiretap/hcidump.h2
-rw-r--r--wiretap/i4btrace.c2
-rw-r--r--wiretap/i4btrace.h2
-rw-r--r--wiretap/ipfix.c2
-rw-r--r--wiretap/ipfix.h2
-rw-r--r--wiretap/iptrace.c2
-rw-r--r--wiretap/iptrace.h2
-rw-r--r--wiretap/iseries.c2
-rw-r--r--wiretap/iseries.h2
-rw-r--r--wiretap/json.c2
-rw-r--r--wiretap/json.h2
-rw-r--r--wiretap/k12.c2
-rw-r--r--wiretap/k12.h2
-rw-r--r--wiretap/k12text.l2
-rw-r--r--wiretap/lanalyzer.c2
-rw-r--r--wiretap/lanalyzer.h2
-rw-r--r--wiretap/libpcap.c2
-rw-r--r--wiretap/libpcap.h2
-rw-r--r--wiretap/logcat.c2
-rw-r--r--wiretap/logcat.h2
-rw-r--r--wiretap/logcat_text.c2
-rw-r--r--wiretap/logcat_text.h2
-rw-r--r--wiretap/merge.c2
-rw-r--r--wiretap/merge.h2
-rw-r--r--wiretap/mime_file.c2
-rw-r--r--wiretap/mime_file.h2
-rw-r--r--wiretap/mp2t.c2
-rw-r--r--wiretap/mp2t.h2
-rw-r--r--wiretap/mpeg.c2
-rw-r--r--wiretap/mpeg.h2
-rw-r--r--wiretap/mplog.c2
-rw-r--r--wiretap/mplog.h2
-rw-r--r--wiretap/netmon.c2
-rw-r--r--wiretap/netmon.h2
-rw-r--r--wiretap/netscaler.c2
-rw-r--r--wiretap/netscaler.h2
-rw-r--r--wiretap/netscreen.c2
-rw-r--r--wiretap/netscreen.h2
-rw-r--r--wiretap/nettl.c2
-rw-r--r--wiretap/nettl.h2
-rw-r--r--wiretap/nettrace_3gpp_32_423.c2
-rw-r--r--wiretap/nettrace_3gpp_32_423.h2
-rw-r--r--wiretap/netxray.c2
-rw-r--r--wiretap/netxray.h2
-rw-r--r--wiretap/ngsniffer.c2
-rw-r--r--wiretap/ngsniffer.h2
-rw-r--r--wiretap/packetlogger.c2
-rw-r--r--wiretap/packetlogger.h2
-rw-r--r--wiretap/pcap-common.c2
-rw-r--r--wiretap/pcap-common.h2
-rw-r--r--wiretap/pcap-encap.h2
-rw-r--r--wiretap/pcapng.c2
-rw-r--r--wiretap/pcapng.h2
-rw-r--r--wiretap/pcapng_module.h2
-rw-r--r--wiretap/peekclassic.c2
-rw-r--r--wiretap/peekclassic.h2
-rw-r--r--wiretap/peektagged.c2
-rw-r--r--wiretap/peektagged.h2
-rw-r--r--wiretap/pppdump.c2
-rw-r--r--wiretap/pppdump.h2
-rw-r--r--wiretap/radcom.c2
-rw-r--r--wiretap/radcom.h2
-rw-r--r--wiretap/snoop.c2
-rw-r--r--wiretap/snoop.h2
-rw-r--r--wiretap/stanag4607.c2
-rw-r--r--wiretap/stanag4607.h2
-rw-r--r--wiretap/tnef.c2
-rw-r--r--wiretap/tnef.h2
-rw-r--r--wiretap/toshiba.c2
-rw-r--r--wiretap/toshiba.h2
-rw-r--r--wiretap/visual.c2
-rw-r--r--wiretap/visual.h2
-rw-r--r--wiretap/vms.c2
-rw-r--r--wiretap/vms.h2
-rw-r--r--wiretap/vwr.c2
-rw-r--r--wiretap/vwr.h2
-rw-r--r--wiretap/wtap-int.h2
-rw-r--r--wiretap/wtap.c2
-rw-r--r--wiretap/wtap.h2
-rw-r--r--wiretap/wtap_opttypes.c2
-rw-r--r--wiretap/wtap_opttypes.h2
-rw-r--r--ws_attributes.h2
-rw-r--r--ws_compiler_tests.h2
-rw-r--r--ws_diag_control.h2
-rw-r--r--ws_symbol_export.h2
-rw-r--r--wsutil/adler32.c2
-rw-r--r--wsutil/adler32.h2
-rw-r--r--wsutil/base32.c2
-rw-r--r--wsutil/base32.h2
-rw-r--r--wsutil/base64.c2
-rw-r--r--wsutil/base64.h2
-rw-r--r--wsutil/bits_count_ones.h2
-rw-r--r--wsutil/bits_ctz.h2
-rw-r--r--wsutil/bitswap.c2
-rw-r--r--wsutil/bitswap.h2
-rw-r--r--wsutil/buffer.c2
-rw-r--r--wsutil/buffer.h2
-rw-r--r--wsutil/cfutils.c2
-rw-r--r--wsutil/cfutils.h2
-rw-r--r--wsutil/clopts_common.c2
-rw-r--r--wsutil/clopts_common.h2
-rw-r--r--wsutil/cmdarg_err.c2
-rw-r--r--wsutil/cmdarg_err.h2
-rw-r--r--wsutil/color.h2
-rw-r--r--wsutil/copyright_info.c2
-rw-r--r--wsutil/copyright_info.h2
-rw-r--r--wsutil/cpu_info.c2
-rw-r--r--wsutil/cpu_info.h2
-rw-r--r--wsutil/crash_info.c2
-rw-r--r--wsutil/crash_info.h2
-rw-r--r--wsutil/crc10.c2
-rw-r--r--wsutil/crc10.h2
-rw-r--r--wsutil/crc11.c2
-rw-r--r--wsutil/crc11.h2
-rw-r--r--wsutil/crc16-plain.c2
-rw-r--r--wsutil/crc16-plain.h2
-rw-r--r--wsutil/crc16.c2
-rw-r--r--wsutil/crc16.h2
-rw-r--r--wsutil/crc32.c2
-rw-r--r--wsutil/crc32.h2
-rw-r--r--wsutil/crc6.c2
-rw-r--r--wsutil/crc6.h2
-rw-r--r--wsutil/crc7.c2
-rw-r--r--wsutil/crc7.h2
-rw-r--r--wsutil/crc8.c2
-rw-r--r--wsutil/crc8.h2
-rw-r--r--wsutil/eax.c2
-rw-r--r--wsutil/eax.h2
-rw-r--r--wsutil/file_util.c2
-rw-r--r--wsutil/file_util.h2
-rw-r--r--wsutil/filesystem.c2
-rw-r--r--wsutil/filesystem.h2
-rw-r--r--wsutil/frequency-utils.c2
-rw-r--r--wsutil/frequency-utils.h2
-rw-r--r--wsutil/g711.h2
-rw-r--r--wsutil/glib-compat.c2
-rw-r--r--wsutil/glib-compat.h2
-rw-r--r--wsutil/inet_addr.c2
-rw-r--r--wsutil/inet_addr.h2
-rw-r--r--wsutil/inet_ipv4.h2
-rw-r--r--wsutil/inet_ipv6.h2
-rw-r--r--wsutil/interface.c2
-rw-r--r--wsutil/interface.h2
-rw-r--r--wsutil/mpeg-audio.c2
-rw-r--r--wsutil/mpeg-audio.h2
-rw-r--r--wsutil/nstime.c2
-rw-r--r--wsutil/nstime.h2
-rw-r--r--wsutil/os_version_info.c2
-rw-r--r--wsutil/os_version_info.h2
-rw-r--r--wsutil/pint.h2
-rw-r--r--wsutil/plugins.c2
-rw-r--r--wsutil/plugins.h2
-rw-r--r--wsutil/popcount.c2
-rw-r--r--wsutil/popcount.h2
-rw-r--r--wsutil/privileges.c2
-rw-r--r--wsutil/privileges.h2
-rw-r--r--wsutil/processes.h2
-rw-r--r--wsutil/report_message.c2
-rw-r--r--wsutil/report_message.h2
-rw-r--r--wsutil/rsa.c2
-rw-r--r--wsutil/rsa.h2
-rw-r--r--wsutil/sign_ext.h2
-rw-r--r--wsutil/socket.h2
-rw-r--r--wsutil/str_util.c2
-rw-r--r--wsutil/str_util.h2
-rw-r--r--wsutil/strptime.h2
-rw-r--r--wsutil/strtoi.c2
-rw-r--r--wsutil/strtoi.h2
-rw-r--r--wsutil/tempfile.c2
-rw-r--r--wsutil/tempfile.h2
-rw-r--r--wsutil/time_util.c2
-rw-r--r--wsutil/time_util.h2
-rw-r--r--wsutil/type_util.c2
-rw-r--r--wsutil/type_util.h2
-rw-r--r--wsutil/unicode-utils.c2
-rw-r--r--wsutil/unicode-utils.h2
-rw-r--r--wsutil/utf8_entities.h2
-rw-r--r--wsutil/win32-utils.c2
-rw-r--r--wsutil/win32-utils.h2
-rw-r--r--wsutil/ws_cpuid.h2
-rw-r--r--wsutil/ws_mempbrk.c2
-rw-r--r--wsutil/ws_mempbrk.h2
-rw-r--r--wsutil/ws_mempbrk_int.h2
-rw-r--r--wsutil/ws_pipe.c2
-rw-r--r--wsutil/ws_pipe.h2
-rw-r--r--wsutil/ws_printf.h2
-rw-r--r--wsutil/wsgcrypt.c2
-rw-r--r--wsutil/wsgcrypt.h2
-rw-r--r--wsutil/wsjsmn.c2
-rw-r--r--wsutil/wsjsmn.h2
-rw-r--r--wsutil/wspcap.h2
-rw-r--r--wsutil/xtea.c2
-rw-r--r--wsutil/xtea.h2
909 files changed, 909 insertions, 909 deletions
diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c
index ffcaacebee..0236d468be 100644
--- a/capchild/capture_ifinfo.c
+++ b/capchild/capture_ifinfo.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/capchild/capture_session.h b/capchild/capture_session.h
index 3a915ffe54..bdf1af362d 100644
--- a/capchild/capture_session.h
+++ b/capchild/capture_session.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CAPCHILD_CAPTURE_SESSION_H__
#define __CAPCHILD_CAPTURE_SESSION_H__
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index ef5040d67f..a0c194ad6b 100644
--- a/capchild/capture_sync.c
+++ b/capchild/capture_sync.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/capchild/capture_sync.h b/capchild/capture_sync.h
index d51e531eb9..6f419cc9dc 100644
--- a/capchild/capture_sync.h
+++ b/capchild/capture_sync.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/** @file
diff --git a/capinfos.c b/capinfos.c
index c3b0a7e501..58a7514ca9 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/capture_info.c b/capture_info.c
index d0fed6b778..f73b58bbef 100644
--- a/capture_info.c
+++ b/capture_info.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/capture_info.h b/capture_info.h
index c01d1f8a7a..9f2bb4978d 100644
--- a/capture_info.h
+++ b/capture_info.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/capture_opts.c b/capture_opts.c
index a30485a3cf..5d6e84d641 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/capture_opts.h b/capture_opts.h
index 17c049c00a..715a3bee90 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/capture_stop_conditions.c b/capture_stop_conditions.c
index 4765fb8d5b..d1823fa174 100644
--- a/capture_stop_conditions.c
+++ b/capture_stop_conditions.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/capture_stop_conditions.h b/capture_stop_conditions.h
index 2fe3bc6e48..274b4f8a84 100644
--- a/capture_stop_conditions.h
+++ b/capture_stop_conditions.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
void init_capture_stop_conditions(void);
diff --git a/captype.c b/captype.c
index c5e5a93334..b47a66ef2a 100644
--- a/captype.c
+++ b/captype.c
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c
index 916ef60863..e29996a222 100644
--- a/caputils/airpcap_loader.c
+++ b/caputils/airpcap_loader.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/caputils/airpcap_loader.h b/caputils/airpcap_loader.h
index f47965c32f..23199366fa 100644
--- a/caputils/airpcap_loader.h
+++ b/caputils/airpcap_loader.h
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __AIRPCAP_LOADER_H__
#define __AIRPCAP_LOADER_H__
diff --git a/caputils/capture-pcap-util-int.h b/caputils/capture-pcap-util-int.h
index 2993843c13..7d892c5c53 100644
--- a/caputils/capture-pcap-util-int.h
+++ b/caputils/capture-pcap-util-int.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __PCAP_UTIL_INT_H__
#define __PCAP_UTIL_INT_H__
diff --git a/caputils/capture-pcap-util-unix.c b/caputils/capture-pcap-util-unix.c
index a84670746c..f2e494af71 100644
--- a/caputils/capture-pcap-util-unix.c
+++ b/caputils/capture-pcap-util-unix.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c
index 393a8c3e6e..faed73d0fe 100644
--- a/caputils/capture-pcap-util.c
+++ b/caputils/capture-pcap-util.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/caputils/capture-pcap-util.h b/caputils/capture-pcap-util.h
index 2583f9890a..5e5c6568d8 100644
--- a/caputils/capture-pcap-util.h
+++ b/caputils/capture-pcap-util.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CAPTURE_PCAP_UTIL_H__
#define __CAPTURE_PCAP_UTIL_H__
diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c
index 321d645744..2dc75f6ba2 100644
--- a/caputils/capture-wpcap.c
+++ b/caputils/capture-wpcap.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/caputils/capture-wpcap.h b/caputils/capture-wpcap.h
index ccb6bad820..e0bbc44623 100644
--- a/caputils/capture-wpcap.h
+++ b/caputils/capture-wpcap.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_WPCAP_H
#define CAPTURE_WPCAP_H
diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h
index 0318e59074..8e42b64761 100644
--- a/caputils/capture_ifinfo.h
+++ b/caputils/capture_ifinfo.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CAPTURE_IFINFO_H__
#define __CAPTURE_IFINFO_H__
diff --git a/caputils/capture_win_ifnames.h b/caputils/capture_win_ifnames.h
index 79d6f29153..8814258e0a 100644
--- a/caputils/capture_win_ifnames.h
+++ b/caputils/capture_win_ifnames.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_WIN_IFNAMES_H
#define CAPTURE_WIN_IFNAMES_H
diff --git a/caputils/capture_wpcap_packet.c b/caputils/capture_wpcap_packet.c
index d1d4411e9b..9db48e6b0c 100644
--- a/caputils/capture_wpcap_packet.c
+++ b/caputils/capture_wpcap_packet.c
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/caputils/capture_wpcap_packet.h b/caputils/capture_wpcap_packet.h
index 1079d362bc..e486413243 100644
--- a/caputils/capture_wpcap_packet.h
+++ b/caputils/capture_wpcap_packet.h
@@ -5,7 +5,7 @@
* Copyright 2001 Gerald Combs
*
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_WPCAP_PACKET_H
#define CAPTURE_WPCAP_PACKET_H
diff --git a/caputils/iface_monitor.c b/caputils/iface_monitor.c
index 830007b199..672967e08c 100644
--- a/caputils/iface_monitor.c
+++ b/caputils/iface_monitor.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/caputils/iface_monitor.h b/caputils/iface_monitor.h
index c303a623e8..11e80a9205 100644
--- a/caputils/iface_monitor.h
+++ b/caputils/iface_monitor.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef IFACE_MONITOR_H
#define IFACE_MONITOR_H
diff --git a/caputils/ws80211_utils.h b/caputils/ws80211_utils.h
index a1e394fc91..a8b28ccf36 100644
--- a/caputils/ws80211_utils.h
+++ b/caputils/ws80211_utils.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __WS80211_UTILS_H__
#define __WS80211_UTILS_H__
diff --git a/cfile.c b/cfile.c
index 3e257c933f..6de3b3d30c 100644
--- a/cfile.c
+++ b/cfile.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/cfile.h b/cfile.h
index d1c4e379a7..bc6f2bbddb 100644
--- a/cfile.h
+++ b/cfile.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __CFILE_H__
diff --git a/codecs/G711a/G711adecode.c b/codecs/G711a/G711adecode.c
index 1fd122b820..2c4d9727cf 100644
--- a/codecs/G711a/G711adecode.c
+++ b/codecs/G711a/G711adecode.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/codecs/G711a/G711adecode.h b/codecs/G711a/G711adecode.h
index 2d229a6d71..688d85d50d 100644
--- a/codecs/G711a/G711adecode.h
+++ b/codecs/G711a/G711adecode.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CODECS_G711ADECODE_H__
#define __CODECS_G711ADECODE_H__
diff --git a/codecs/G711a/G711atable.h b/codecs/G711a/G711atable.h
index ce74f19937..d4235ded74 100644
--- a/codecs/G711a/G711atable.h
+++ b/codecs/G711a/G711atable.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
gint16 alaw_exp_table[256] = {
-5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736,
diff --git a/codecs/G711u/G711udecode.c b/codecs/G711u/G711udecode.c
index 4344d6399d..d235a3bc10 100644
--- a/codecs/G711u/G711udecode.c
+++ b/codecs/G711u/G711udecode.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/codecs/G711u/G711udecode.h b/codecs/G711u/G711udecode.h
index 988cfa83db..dedf2bf451 100644
--- a/codecs/G711u/G711udecode.h
+++ b/codecs/G711u/G711udecode.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CODECS_G711UDECODE_H__
#define __CODECS_G711UDECODE_H__
diff --git a/codecs/G711u/G711utable.h b/codecs/G711u/G711utable.h
index ceb9df9ca9..548dc3e573 100644
--- a/codecs/G711u/G711utable.h
+++ b/codecs/G711u/G711utable.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
gint16 ulaw_exp_table[256] = {
-32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
diff --git a/codecs/G722/G722decode.c b/codecs/G722/G722decode.c
index b9baa2a3ef..08c6473f2f 100644
--- a/codecs/G722/G722decode.c
+++ b/codecs/G722/G722decode.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/codecs/G722/G722decode.h b/codecs/G722/G722decode.h
index c38e5f197a..1bf603b8ae 100644
--- a/codecs/G722/G722decode.h
+++ b/codecs/G722/G722decode.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CODECS_G722DECODE_H__
#define __CODECS_G722DECODE_H__
diff --git a/codecs/G726/G726decode.c b/codecs/G726/G726decode.c
index 3edfa09237..1ed0066759 100644
--- a/codecs/G726/G726decode.c
+++ b/codecs/G726/G726decode.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/codecs/G726/G726decode.h b/codecs/G726/G726decode.h
index b9bbce346b..4ae50d2c67 100644
--- a/codecs/G726/G726decode.h
+++ b/codecs/G726/G726decode.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CODECS_G726DECODE_H__
#define __CODECS_G726DECODE_H__
diff --git a/codecs/G729/G729decode.c b/codecs/G729/G729decode.c
index b73e783692..082a0704c6 100644
--- a/codecs/G729/G729decode.c
+++ b/codecs/G729/G729decode.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/codecs/G729/G729decode.h b/codecs/G729/G729decode.h
index 36110329f3..d8a0870ca9 100644
--- a/codecs/G729/G729decode.h
+++ b/codecs/G729/G729decode.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CODECS_G729DECODE_H__
#define __CODECS_G729DECODE_H__
diff --git a/codecs/codecs.c b/codecs/codecs.c
index 5188bfd3c9..4e5f542116 100644
--- a/codecs/codecs.c
+++ b/codecs/codecs.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/codecs/codecs.h b/codecs/codecs.h
index 94dc474fb1..7d2715418c 100644
--- a/codecs/codecs.h
+++ b/codecs/codecs.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef _CODECS_H_
#define _CODECS_H_
diff --git a/codecs/sbc/sbc.c b/codecs/sbc/sbc.c
index 809b0300b6..beb614b329 100644
--- a/codecs/sbc/sbc.c
+++ b/codecs/sbc/sbc.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/codecs/sbc/sbc_private.h b/codecs/sbc/sbc_private.h
index 1a23357293..259a4f2acb 100644
--- a/codecs/sbc/sbc_private.h
+++ b/codecs/sbc/sbc_private.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CODECS_SBC_H__
#define __CODECS_SBC_H__
diff --git a/conditions.c b/conditions.c
index a5bf3cdc01..35a24bc6fb 100644
--- a/conditions.c
+++ b/conditions.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/conditions.h b/conditions.h
index f196267457..a0202b5184 100644
--- a/conditions.h
+++ b/conditions.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef CONDITIONS_H
diff --git a/dftest.c b/dftest.c
index 4de107b04c..24e6002c14 100644
--- a/dftest.c
+++ b/dftest.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 333e356e2a..c0cf6c11fc 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -4,7 +4,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
add_custom_command(
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fe517fe4cf..5bcacb26c0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,7 +5,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
# We include dependencies on ../config.h in order to
diff --git a/doc/README.stats_tree b/doc/README.stats_tree
index 811dd754ed..24d4479945 100644
--- a/doc/README.stats_tree
+++ b/doc/README.stats_tree
@@ -47,7 +47,7 @@ A small example of a very basic stats_tree plugin follows.
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/doc/extcap_example.py b/doc/extcap_example.py
index a2ee6fb3b9..6d1d1d32bc 100755
--- a/doc/extcap_example.py
+++ b/doc/extcap_example.py
@@ -6,7 +6,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
"""
diff --git a/doc/make-authors-format.pl b/doc/make-authors-format.pl
index 2c37dca54f..33d4a116a5 100755
--- a/doc/make-authors-format.pl
+++ b/doc/make-authors-format.pl
@@ -9,7 +9,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
use strict;
diff --git a/doc/make-authors-short.pl b/doc/make-authors-short.pl
index 00e23c3132..5500bfd244 100755
--- a/doc/make-authors-short.pl
+++ b/doc/make-authors-short.pl
@@ -9,7 +9,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
use strict;
diff --git a/doc/packet-PROTOABBREV.c b/doc/packet-PROTOABBREV.c
index 8d564e473f..69262e8acc 100644
--- a/doc/packet-PROTOABBREV.c
+++ b/doc/packet-PROTOABBREV.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/doc/perlnoutf.pl b/doc/perlnoutf.pl
index a562f964a5..8a6fea3395 100755
--- a/doc/perlnoutf.pl
+++ b/doc/perlnoutf.pl
@@ -9,7 +9,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
use strict;
diff --git a/doc/plugins.example/Makefile.am b/doc/plugins.example/Makefile.am
index d33e186757..10abf565e8 100644
--- a/doc/plugins.example/Makefile.am
+++ b/doc/plugins.example/Makefile.am
@@ -4,7 +4,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
WARNFLAGS = -Wall -Wextra
diff --git a/doc/plugins.example/hello.c b/doc/plugins.example/hello.c
index 455b4741a6..52c4a50ec6 100644
--- a/doc/plugins.example/hello.c
+++ b/doc/plugins.example/hello.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifdef HAVE_CONFIG_H
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 18f38b3b2c..370c7077ad 100644
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -4,7 +4,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
find_package( LYNX )
diff --git a/docbook/make-wsluarm.pl b/docbook/make-wsluarm.pl
index 0393a16883..fdfd550553 100755
--- a/docbook/make-wsluarm.pl
+++ b/docbook/make-wsluarm.pl
@@ -9,7 +9,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
# (-: I don't even think writing this in Lua :-)
# ...well I wished you had!
diff --git a/dumpcap.c b/dumpcap.c
index eed5abba1b..161219d460 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/editcap.c b/editcap.c
index 37fd3baa55..a5645b5ee8 100644
--- a/editcap.c
+++ b/editcap.c
@@ -12,7 +12,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
index ac30a8512c..88a26ee414 100644
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -9,7 +9,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h
index c2badb021c..3495be91c3 100644
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PACKET_LTE_RRC_H
diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
index 10eea2cd53..ef2bdbaf2e 100644
--- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
+++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h
index 518a57b62d..2d5b819644 100644
--- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h
+++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PACKET_NR_RRC_H
diff --git a/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c b/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c
index 0e3549cbfa..822409d39a 100644
--- a/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c
+++ b/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 29.168
*/
diff --git a/epan/dissectors/dissectors.h b/epan/dissectors/dissectors.h
index 5cf9ed9971..5ff81d2005 100644
--- a/epan/dissectors/dissectors.h
+++ b/epan/dissectors/dissectors.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __DISSECTOR_REGISTER_H__
diff --git a/epan/dissectors/make-dissectors.c b/epan/dissectors/make-dissectors.c
index 514b1efef6..90d41bc55d 100644
--- a/epan/dissectors/make-dissectors.c
+++ b/epan/dissectors/make-dissectors.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <stdlib.h>
diff --git a/epan/dissectors/packet-artemis.c b/epan/dissectors/packet-artemis.c
index 6b14187b09..146b736019 100644
--- a/epan/dissectors/packet-artemis.c
+++ b/epan/dissectors/packet-artemis.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* Protocol information:
* https://github.com/apache/activemq-artemis/blob/master/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java#L309-L326
diff --git a/epan/dissectors/packet-bacnet.h b/epan/dissectors/packet-bacnet.h
index bc4ae68881..11d153dde6 100644
--- a/epan/dissectors/packet-bacnet.h
+++ b/epan/dissectors/packet-bacnet.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __PACKET_BACNET_H__
diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c
index 3e6658e091..14583ee70e 100644
--- a/epan/dissectors/packet-btmesh.c
+++ b/epan/dissectors/packet-btmesh.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref: Mesh Profile v1.0
*/
diff --git a/epan/dissectors/packet-caneth.c b/epan/dissectors/packet-caneth.c
index 04157d7afa..56add4f1df 100644
--- a/epan/dissectors/packet-caneth.c
+++ b/epan/dissectors/packet-caneth.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/epan/dissectors/packet-cvspserver.c b/epan/dissectors/packet-cvspserver.c
index 3954d1bb27..90cbdca796 100644
--- a/epan/dissectors/packet-cvspserver.c
+++ b/epan/dissectors/packet-cvspserver.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 67c3414af0..e55a4deae9 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -15,7 +15,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/epan/dissectors/packet-lnet.c b/epan/dissectors/packet-lnet.c
index 7aa4f07533..1fad311b6e 100644
--- a/epan/dissectors/packet-lnet.c
+++ b/epan/dissectors/packet-lnet.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/epan/dissectors/packet-lnet.h b/epan/dissectors/packet-lnet.h
index f57d2a8131..6093c7e116 100644
--- a/epan/dissectors/packet-lnet.h
+++ b/epan/dissectors/packet-lnet.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __PACKET_LNET_H__
#define __PACKET_LNET_H__
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 0bd2f6c475..71ad21350d 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -17,7 +17,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/dissectors/packet-lte-rrc.h b/epan/dissectors/packet-lte-rrc.h
index 254ce07ea5..cccbc26114 100644
--- a/epan/dissectors/packet-lte-rrc.h
+++ b/epan/dissectors/packet-lte-rrc.h
@@ -13,7 +13,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PACKET_LTE_RRC_H
diff --git a/epan/dissectors/packet-lustre.c b/epan/dissectors/packet-lustre.c
index 4aa999d9f4..60ae5e89e3 100644
--- a/epan/dissectors/packet-lustre.c
+++ b/epan/dissectors/packet-lustre.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index eaeb68b431..980779a421 100644
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* References: 3GPP TS 24.301 V15.1.1 (2017-12)
*/
diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c
index 10c31f8e71..1fff4a5a75 100644
--- a/epan/dissectors/packet-nr-rrc.c
+++ b/epan/dissectors/packet-nr-rrc.c
@@ -16,7 +16,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/dissectors/packet-nr-rrc.h b/epan/dissectors/packet-nr-rrc.h
index 57d4204b14..3f1de1435a 100644
--- a/epan/dissectors/packet-nr-rrc.h
+++ b/epan/dissectors/packet-nr-rrc.h
@@ -13,7 +13,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PACKET_NR_RRC_H
diff --git a/epan/dissectors/packet-nxp_802154_sniffer.c b/epan/dissectors/packet-nxp_802154_sniffer.c
index b21172e7d9..b9ed391bba 100644
--- a/epan/dissectors/packet-nxp_802154_sniffer.c
+++ b/epan/dissectors/packet-nxp_802154_sniffer.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c
index 8757d69a6e..acea7f9863 100644
--- a/epan/dissectors/packet-sbc-ap.c
+++ b/epan/dissectors/packet-sbc-ap.c
@@ -13,7 +13,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 29.168
*/
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index bd9466ee3c..ab379a54fe 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -15,7 +15,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/epan/dissectors/packet-smp.c b/epan/dissectors/packet-smp.c
index bf2ad34d02..63ae6fc8ac 100644
--- a/epan/dissectors/packet-smp.c
+++ b/epan/dissectors/packet-smp.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/epan/dissectors/packet-thrift.c b/epan/dissectors/packet-thrift.c
index 6793a77b22..8ad5d48c9c 100644
--- a/epan/dissectors/packet-thrift.c
+++ b/epan/dissectors/packet-thrift.c
@@ -11,7 +11,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/* Ref https://thrift.apache.org/developers */
diff --git a/epan/dissectors/packet-thrift.h b/epan/dissectors/packet-thrift.h
index ce965ee656..3e4b208783 100644
--- a/epan/dissectors/packet-thrift.h
+++ b/epan/dissectors/packet-thrift.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+
+* SPDX-License-Identifier: GPL-2.0-or-later
*
* Note used by proprietarry dissectors (too).
*/
diff --git a/epan/epan.c b/epan/epan.c
index 0806a23141..3a1d79df33 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -4,7 +4,7 @@
*
* Copyright (c) 2001 by Gerald Combs <gerald@wireshark.org>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/packet.c b/epan/packet.c
index 1e7ae97708..f98b09f884 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/packet.h b/epan/packet.h
index e96375e509..6582d8987d 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __PACKET_H__
diff --git a/epan/prefs.c b/epan/prefs.c
index a2d323c125..1ccf5ac185 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/print_stream.c b/epan/print_stream.c
index a682ebcf85..5d06858277 100644
--- a/epan/print_stream.c
+++ b/epan/print_stream.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/print_stream.h b/epan/print_stream.h
index 32adeaa29a..c9de6c4023 100644
--- a/epan/print_stream.h
+++ b/epan/print_stream.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __PRINT_STREAM_H__
diff --git a/epan/proto.c b/epan/proto.c
index 71bc2ee1c5..7b69ac64c2 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/register.c b/epan/register.c
index 3f0306f56b..8e54c8c76c 100644
--- a/epan/register.c
+++ b/epan/register.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "register.h"
diff --git a/epan/register.h b/epan/register.h
index 17e8133b5e..491badd4af 100644
--- a/epan/register.h
+++ b/epan/register.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __REGISTER_H__
diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c
index 9369972486..d3e8260a5c 100644
--- a/epan/wslua/init_wslua.c
+++ b/epan/wslua/init_wslua.c
@@ -9,7 +9,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/epan/wslua/init_wslua.h b/epan/wslua/init_wslua.h
index 9504379eaa..8edb777029 100644
--- a/epan/wslua/init_wslua.h
+++ b/epan/wslua/init_wslua.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __INIT_WSLUA_H__
diff --git a/extcap.c b/extcap.c
index 392e2b6689..ac1de60ffc 100644
--- a/extcap.c
+++ b/extcap.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/extcap.h b/extcap.h
index 49e23ffb70..d7728006e3 100644
--- a/extcap.h
+++ b/extcap.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __EXTCAP_H__
diff --git a/extcap/Makefile.am b/extcap/Makefile.am
index 7784e414cb..6a4d7f39c7 100644
--- a/extcap/Makefile.am
+++ b/extcap/Makefile.am
@@ -5,7 +5,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
include ../Makefile.am.inc
diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 2969a33cf7..ff163b1f83 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c
index 1c8f40f33b..83e54a9b4f 100644
--- a/extcap/ciscodump.c
+++ b/extcap/ciscodump.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/extcap/extcap-base.c b/extcap/extcap-base.c
index e2ba0015a1..6ec654c790 100644
--- a/extcap/extcap-base.c
+++ b/extcap/extcap-base.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/extcap/extcap-base.h b/extcap/extcap-base.h
index 5bb4f26217..264281577c 100644
--- a/extcap/extcap-base.h
+++ b/extcap/extcap-base.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __EXTCAP_BASE_H__
#define __EXTCAP_BASE_H__
diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index b45ea75645..754ffc4bb9 100644
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/extcap/ssh-base.c b/extcap/ssh-base.c
index 1799887d90..ac39134b20 100644
--- a/extcap/ssh-base.c
+++ b/extcap/ssh-base.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/extcap/ssh-base.h b/extcap/ssh-base.h
index 76790e8791..8c81ac5c50 100644
--- a/extcap/ssh-base.h
+++ b/extcap/ssh-base.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __SSHBASE_H__
diff --git a/extcap/sshdump.c b/extcap/sshdump.c
index 1872cce392..2217d6f3c7 100644
--- a/extcap/sshdump.c
+++ b/extcap/sshdump.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/extcap/udpdump.c b/extcap/udpdump.c
index 44cc24e1db..5ea0addcc3 100644
--- a/extcap/udpdump.c
+++ b/extcap/udpdump.c
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/extcap_parser.c b/extcap_parser.c
index 561b2eaefd..db326a9ef6 100644
--- a/extcap_parser.c
+++ b/extcap_parser.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/extcap_parser.h b/extcap_parser.h
index 512f4ba8b4..924318144c 100644
--- a/extcap_parser.h
+++ b/extcap_parser.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __EXTCAP_PARSER_H__
diff --git a/extcap_spawn.c b/extcap_spawn.c
index c5659181ad..816e0e3a5f 100644
--- a/extcap_spawn.c
+++ b/extcap_spawn.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/extcap_spawn.h b/extcap_spawn.h
index fafce74268..0557a6f352 100644
--- a/extcap_spawn.h
+++ b/extcap_spawn.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __EXTCAP_SPAWN_H__
diff --git a/file.c b/file.c
index e154b71752..ceb1a8b971 100644
--- a/file.c
+++ b/file.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/file.h b/file.h
index 198e20a230..4804f08c84 100644
--- a/file.h
+++ b/file.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __FILE_H__
diff --git a/file_packet_provider.c b/file_packet_provider.c
index c08d216819..3a0531388a 100644
--- a/file_packet_provider.c
+++ b/file_packet_provider.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <glib.h>
diff --git a/fileset.c b/fileset.c
index 6e8ea01575..bf10ca56be 100644
--- a/fileset.c
+++ b/fileset.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/fileset.h b/fileset.h
index 776df31952..ca02e97b46 100644
--- a/fileset.h
+++ b/fileset.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __FILESET_H__
diff --git a/frame_tvbuff.c b/frame_tvbuff.c
index e5309bd134..513aefb8d3 100644
--- a/frame_tvbuff.c
+++ b/frame_tvbuff.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/frame_tvbuff.h b/frame_tvbuff.h
index 5b8edb4dd4..6122eccaa8 100644
--- a/frame_tvbuff.h
+++ b/frame_tvbuff.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __FRAME_TVBUFF_H__
diff --git a/globals.h b/globals.h
index 246c829c1a..8e6d333f0e 100644
--- a/globals.h
+++ b/globals.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __GLOBALS_H__
diff --git a/log.h b/log.h
index fd9f1b58e2..ba38897bb8 100644
--- a/log.h
+++ b/log.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __LOG_H__
diff --git a/mergecap.c b/mergecap.c
index 98a32b8b2d..73cb8439a5 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* Mergecap written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
diff --git a/packaging/wix/windeployqt-to-wix.ps1 b/packaging/wix/windeployqt-to-wix.ps1
index 809ceacaf2..b621e55e63 100644
--- a/packaging/wix/windeployqt-to-wix.ps1
+++ b/packaging/wix/windeployqt-to-wix.ps1
@@ -9,7 +9,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#requires -version 2
diff --git a/plugins/codecs/Makefile.am.inc b/plugins/codecs/Makefile.am.inc
index 14ac941b08..fb1b6d7770 100644
--- a/plugins/codecs/Makefile.am.inc
+++ b/plugins/codecs/Makefile.am.inc
@@ -5,7 +5,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
include $(top_srcdir)/plugins/Makefile.am.inc
diff --git a/plugins/epan/Makefile.am.inc b/plugins/epan/Makefile.am.inc
index 5c7f5256ec..4d3f145225 100644
--- a/plugins/epan/Makefile.am.inc
+++ b/plugins/epan/Makefile.am.inc
@@ -5,7 +5,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
include $(top_srcdir)/plugins/Makefile.am.inc
diff --git a/plugins/wiretap/Makefile.am.inc b/plugins/wiretap/Makefile.am.inc
index eab1328465..384ea2e170 100644
--- a/plugins/wiretap/Makefile.am.inc
+++ b/plugins/wiretap/Makefile.am.inc
@@ -5,7 +5,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
include $(top_srcdir)/plugins/Makefile.am.inc
diff --git a/plugins/wiretap/usbdump/CMakeLists.txt b/plugins/wiretap/usbdump/CMakeLists.txt
index 5093353ff3..2c6b22af8e 100644
--- a/plugins/wiretap/usbdump/CMakeLists.txt
+++ b/plugins/wiretap/usbdump/CMakeLists.txt
@@ -4,7 +4,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
include(WiresharkPlugin)
diff --git a/plugins/wiretap/usbdump/Makefile.am b/plugins/wiretap/usbdump/Makefile.am
index b090b19e27..dd12ad96ac 100644
--- a/plugins/wiretap/usbdump/Makefile.am
+++ b/plugins/wiretap/usbdump/Makefile.am
@@ -4,7 +4,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
#
include $(top_srcdir)/Makefile.am.inc
diff --git a/plugins/wiretap/usbdump/usbdump.c b/plugins/wiretap/usbdump/usbdump.c
index b52c94be09..99b88a2f1a 100644
--- a/plugins/wiretap/usbdump/usbdump.c
+++ b/plugins/wiretap/usbdump/usbdump.c
@@ -6,7 +6,7 @@
* File format support for usbdump file format
* Copyright (c) 2017 by Jaap Keuter <jaap.keuter@xs4all.nl>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/randpkt.c b/randpkt.c
index 7fe34c6e91..fe3cc9d43f 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -6,7 +6,7 @@
*
* Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/randpkt_core/randpkt_core.c b/randpkt_core/randpkt_core.c
index 70769a4551..7e73c7678b 100644
--- a/randpkt_core/randpkt_core.c
+++ b/randpkt_core/randpkt_core.c
@@ -6,7 +6,7 @@
*
* Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/randpkt_core/randpkt_core.h b/randpkt_core/randpkt_core.h
index c977b66996..dd1ff49860 100644
--- a/randpkt_core/randpkt_core.h
+++ b/randpkt_core/randpkt_core.h
@@ -6,7 +6,7 @@
*
* Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __RANDPKT_CORE_H__
#define __RANDPKT_CORE_H__
diff --git a/rawshark.c b/rawshark.c
index d8a1d1917c..3b5fc64caa 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -9,7 +9,7 @@
* Based on TShark, by Gilbert Ramirez <gram@alumni.rice.edu> and Guy Harris
* <guy@alum.mit.edu>.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/reordercap.c b/reordercap.c
index 8570726cfc..c4b9dfd02b 100644
--- a/reordercap.c
+++ b/reordercap.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/ringbuffer.c b/ringbuffer.c
index 4b215cfe17..31eb9bdd33 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/ringbuffer.h b/ringbuffer.h
index f1c99fa68c..b56fa056fa 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __RINGBUFFER_H__
diff --git a/sharkd.c b/sharkd.c
index 6597171862..a3219d3a35 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/sharkd.h b/sharkd.h
index 134917e500..80cd8d9edf 100644
--- a/sharkd.h
+++ b/sharkd.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __SHARKD_H
diff --git a/sharkd_daemon.c b/sharkd_daemon.c
index 230534914f..4f98ef48cb 100644
--- a/sharkd_daemon.c
+++ b/sharkd_daemon.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/sharkd_session.c b/sharkd_session.c
index 08b3e44696..087f2f6589 100644
--- a/sharkd_session.c
+++ b/sharkd_session.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/sync_pipe.h b/sync_pipe.h
index 05f9ff15e4..04407389ae 100644
--- a/sync_pipe.h
+++ b/sync_pipe.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/sync_pipe_write.c b/sync_pipe_write.c
index 3a6155513d..ea1a7927d0 100644
--- a/sync_pipe_write.c
+++ b/sync_pipe_write.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/text2pcap.c b/text2pcap.c
index aae921aad0..ffa3c0fc84 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -10,7 +10,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*******************************************************************************/
diff --git a/text2pcap.h b/text2pcap.h
index 42d97a10b1..d9cd7f9d28 100644
--- a/text2pcap.h
+++ b/text2pcap.h
@@ -10,7 +10,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/tfshark.c b/tfshark.c
index bb522b04b8..fee411c0a2 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/tools/oss-fuzzshark/fuzzshark.c b/tools/oss-fuzzshark/fuzzshark.c
index 5d0ceae0b6..79caada80d 100644
--- a/tools/oss-fuzzshark/fuzzshark.c
+++ b/tools/oss-fuzzshark/fuzzshark.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/trigcap.c b/trigcap.c
index ef09a8fc09..9086b5897f 100644
--- a/trigcap.c
+++ b/trigcap.c
@@ -4,7 +4,7 @@
*
* (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <stdio.h>
diff --git a/tshark.c b/tshark.c
index bfccd59aa6..c3d30776f2 100644
--- a/tshark.c
+++ b/tshark.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/ui/alert_box.c b/ui/alert_box.c
index b7aa64e354..b3000e8944 100644
--- a/ui/alert_box.c
+++ b/ui/alert_box.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/alert_box.h b/ui/alert_box.h
index 6070208b35..afa99c08f8 100644
--- a/ui/alert_box.h
+++ b/ui/alert_box.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __ALERT_BOX_H__
#define __ALERT_BOX_H__
diff --git a/ui/all_files_wildcard.h b/ui/all_files_wildcard.h
index 82aa6a0789..dd18381637 100644
--- a/ui/all_files_wildcard.h
+++ b/ui/all_files_wildcard.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __ALL_FILES_WILDCARD_H__
#define __ALL_FILES_WILDCARD_H__
diff --git a/ui/capture.c b/ui/capture.c
index cc4b09127e..5b7c68cda1 100644
--- a/ui/capture.c
+++ b/ui/capture.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/capture.h b/ui/capture.h
index 219767c40f..f30f76ef80 100644
--- a/ui/capture.h
+++ b/ui/capture.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/* This file should only be included if libpcap is present */
diff --git a/ui/capture_globals.h b/ui/capture_globals.h
index 38c1acdd75..2394427bad 100644
--- a/ui/capture_globals.h
+++ b/ui/capture_globals.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CAPTURE_GLOBALS_H__
#define __CAPTURE_GLOBALS_H__
diff --git a/ui/capture_ui_utils.c b/ui/capture_ui_utils.c
index 84b1f7782e..e6d4099fd4 100644
--- a/ui/capture_ui_utils.c
+++ b/ui/capture_ui_utils.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/capture_ui_utils.h b/ui/capture_ui_utils.h
index dfedebd9c1..da5bc9a5d9 100644
--- a/ui/capture_ui_utils.h
+++ b/ui/capture_ui_utils.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __CAPTURE_UI_UTILS_H__
diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index ba85055b65..a8c9942e1b 100644
--- a/ui/cli/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index f9f795765a..6b205ad75d 100644
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* This module provides statistics about two merged capture files, to find packet loss,
* time delay, ip header checksum errors and order check to tshark.
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index 232fbe26ab..37d3092164 100644
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/*
* This TAP enables extraction of most important diameter fields in text format.
diff --git a/ui/cli/tap-endpoints.c b/ui/cli/tap-endpoints.c
index f87ce95b43..539668f1b0 100644
--- a/ui/cli/tap-endpoints.c
+++ b/ui/cli/tap-endpoints.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c
index 224f6d4dfc..b7eaf5e479 100644
--- a/ui/cli/tap-expert.c
+++ b/ui/cli/tap-expert.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/ui/cli/tap-exportobject.c b/ui/cli/tap-exportobject.c
index aae061c996..b1f08e1abe 100644
--- a/ui/cli/tap-exportobject.c
+++ b/ui/cli/tap-exportobject.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-exportobject.h b/ui/cli/tap-exportobject.h
index ca4ca67de3..182fd1af18 100644
--- a/ui/cli/tap-exportobject.h
+++ b/ui/cli/tap-exportobject.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __TAP_EXPORT_OBJECT_H__
#define __TAP_EXPORT_OBJECT_H__
diff --git a/ui/cli/tap-flow.c b/ui/cli/tap-flow.c
index ba80b856a7..55178fa61f 100644
--- a/ui/cli/tap-flow.c
+++ b/ui/cli/tap-flow.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* This module provides udp and tcp follow stream capabilities to tshark.
* It is only used by tshark and not wireshark.
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index a96dd5f9de..a22d4590b5 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* This module provides udp and tcp follow stream capabilities to tshark.
* It is only used by tshark and not wireshark.
diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c
index e30a9ff69d..d769c82c4f 100644
--- a/ui/cli/tap-funnel.c
+++ b/ui/cli/tap-funnel.c
@@ -9,7 +9,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c
index b934314a07..a3d13ee75e 100644
--- a/ui/cli/tap-gsm_astat.c
+++ b/ui/cli/tap-gsm_astat.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/*
* This TAP provides statistics for the GSM A Interface:
diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c
index 39b1017dfc..69b7ccb9f7 100644
--- a/ui/cli/tap-hosts.c
+++ b/ui/cli/tap-hosts.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* Dump our collected IPv4- and IPv6-to-hostname mappings */
diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index af70d2416a..93cfbab64d 100644
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index 840988f2f9..c2d14336df 100644
--- a/ui/cli/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* This module provides icmp echo request/reply SRT statistics to tshark.
* It is only used by tshark and not wireshark
diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index 0d067bbe7f..88a462fbb3 100644
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* This module provides icmpv6 echo request/reply SRT statistics to tshark.
* It is only used by tshark and not wireshark
diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c
index e0f0c54e69..c4186aaa83 100644
--- a/ui/cli/tap-iostat.c
+++ b/ui/cli/tap-iostat.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c
index 3ca7fa68b9..fa2df3cf26 100644
--- a/ui/cli/tap-iousers.c
+++ b/ui/cli/tap-iousers.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c
index 9738bef977..de35425d2d 100644
--- a/ui/cli/tap-macltestat.c
+++ b/ui/cli/tap-macltestat.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
index d4c7b8b855..9bed7fb656 100644
--- a/ui/cli/tap-protocolinfo.c
+++ b/ui/cli/tap-protocolinfo.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* This module provides Protocol Column Info tap for tshark */
diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c
index cab2ce4f7a..1defd98423 100644
--- a/ui/cli/tap-protohierstat.c
+++ b/ui/cli/tap-protohierstat.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* This module provides ProtocolHierarchyStatistics for tshark */
diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c
index d7fce85f9c..02967dc4e0 100644
--- a/ui/cli/tap-rlcltestat.c
+++ b/ui/cli/tap-rlcltestat.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
index 6650491075..c0602839d1 100644
--- a/ui/cli/tap-rpcprogs.c
+++ b/ui/cli/tap-rpcprogs.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* This module provides rpc call/reply SRT statistics to tshark.
* It is only used by tshark and not wireshark
diff --git a/ui/cli/tap-rtd.c b/ui/cli/tap-rtd.c
index cbaef97fab..480b239f75 100644
--- a/ui/cli/tap-rtd.c
+++ b/ui/cli/tap-rtd.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c
index f8d598dc30..f6569d463b 100644
--- a/ui/cli/tap-rtp.c
+++ b/ui/cli/tap-rtp.c
@@ -12,7 +12,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/*
* This TAP provides statistics for RTP streams
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index 276cc6a1f4..ec2de3edd5 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
index b27da53755..b471301cca 100644
--- a/ui/cli/tap-sctpchunkstat.c
+++ b/ui/cli/tap-sctpchunkstat.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-simple_stattable.c b/ui/cli/tap-simple_stattable.c
index e28b5648a3..4390d2e98e 100644
--- a/ui/cli/tap-simple_stattable.c
+++ b/ui/cli/tap-simple_stattable.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c
index c2e106dd98..090605b01a 100644
--- a/ui/cli/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c
index c428e9fc70..5874b3dee7 100644
--- a/ui/cli/tap-smbsids.c
+++ b/ui/cli/tap-smbsids.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-srt.c b/ui/cli/tap-srt.c
index 6fc1743a6d..fd881015b6 100644
--- a/ui/cli/tap-srt.c
+++ b/ui/cli/tap-srt.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-stats_tree.c b/ui/cli/tap-stats_tree.c
index 4107bbf55d..8062a6ac83 100644
--- a/ui/cli/tap-stats_tree.c
+++ b/ui/cli/tap-stats_tree.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c
index 6ec6ee4f0a..6f5c4f0063 100644
--- a/ui/cli/tap-sv.c
+++ b/ui/cli/tap-sv.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index 55c4f123e0..15e9afd4aa 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* This module provides WSP statistics to tshark.
* It is only used by tshark and not wireshark
diff --git a/ui/cli/tshark-tap.h b/ui/cli/tshark-tap.h
index 56fe981bda..76bc9823ff 100644
--- a/ui/cli/tshark-tap.h
+++ b/ui/cli/tshark-tap.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __TSHARK_TAP_H__
#define __TSHARK_TAP_H__
diff --git a/ui/commandline.c b/ui/commandline.c
index e29a64ebb2..2c249dad91 100644
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/commandline.h b/ui/commandline.h
index ef2b204b37..981aaadf6e 100644
--- a/ui/commandline.h
+++ b/ui/commandline.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __COMMANDLINE_H__
#define __COMMANDLINE_H__
diff --git a/ui/console.c b/ui/console.c
index 2a791288bc..d0b7f74e55 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/console.h b/ui/console.h
index 48c775c7c4..18cf0288da 100644
--- a/ui/console.h
+++ b/ui/console.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CONSOLE_H__
#define __CONSOLE_H__
diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index e52bb67d87..9634112bda 100644
--- a/ui/decode_as_utils.c
+++ b/ui/decode_as_utils.c
@@ -5,7 +5,7 @@
* By David Hampton <dhampton@mac.com>
* Copyright 2001 David Hampton
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
#include <stdlib.h>
diff --git a/ui/decode_as_utils.h b/ui/decode_as_utils.h
index 9b2d9e8b67..1c121d4f84 100644
--- a/ui/decode_as_utils.h
+++ b/ui/decode_as_utils.h
@@ -5,7 +5,7 @@
* By David Hampton <dhampton@mac.com>
* Copyright 2001 David Hampton
*
- * SPDX-License-Identifier: GPL-2.0+*
+ * SPDX-License-Identifier: GPL-2.0-or-later*
*/
#ifndef __DECODE_AS_UTILS_H__
diff --git a/ui/dissect_opts.c b/ui/dissect_opts.c
index 18ccf552f7..33f284b1e7 100644
--- a/ui/dissect_opts.c
+++ b/ui/dissect_opts.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/ui/dissect_opts.h b/ui/dissect_opts.h
index fb7cd02121..71bb5ef4d4 100644
--- a/ui/dissect_opts.h
+++ b/ui/dissect_opts.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/** @file
diff --git a/ui/export_object_ui.c b/ui/export_object_ui.c
index c24e5bf9a2..71e464336b 100644
--- a/ui/export_object_ui.c
+++ b/ui/export_object_ui.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
diff --git a/ui/export_object_ui.h b/ui/export_object_ui.h
index e58083ec76..20b1390005 100644
--- a/ui/export_object_ui.h
+++ b/ui/export_object_ui.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __EXPORT_OBJECT_UI_H__
#define __EXPORT_OBJECT_UI_H__
diff --git a/ui/export_pdu_ui_utils.c b/ui/export_pdu_ui_utils.c
index b9216aa594..869ec334db 100644
--- a/ui/export_pdu_ui_utils.c
+++ b/ui/export_pdu_ui_utils.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+*/
+* SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/export_pdu_ui_utils.h b/ui/export_pdu_ui_utils.h
index 80556600ee..43b43f956a 100644
--- a/ui/export_pdu_ui_utils.h
+++ b/ui/export_pdu_ui_utils.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+*/
+* SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef EXPORT_PDU_UI_UTILS_H
#define EXPORT_PDU_UI_UTILS_H
diff --git a/ui/failure_message.c b/ui/failure_message.c
index 9c200d08cd..49dc05a4a7 100644
--- a/ui/failure_message.c
+++ b/ui/failure_message.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/failure_message.h b/ui/failure_message.h
index ae37f63cf7..2801442414 100644
--- a/ui/failure_message.h
+++ b/ui/failure_message.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __FAILURE_MESSAGE_H__
#define __FAILURE_MESSAGE_H__
diff --git a/ui/file_dialog.h b/ui/file_dialog.h
index 15aed533b5..f931fa8f9e 100644
--- a/ui/file_dialog.h
+++ b/ui/file_dialog.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2006 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __FILE_DIALOG_H__
#define __FILE_DIALOG_H__
diff --git a/ui/filter_files.c b/ui/filter_files.c
index 3748eec98c..1a30f2fffe 100644
--- a/ui/filter_files.c
+++ b/ui/filter_files.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/ui/filter_files.h b/ui/filter_files.h
index e0d4551a10..f293f4e691 100644
--- a/ui/filter_files.h
+++ b/ui/filter_files.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __UI_FILTERS_H__
#define __UI_FILTERS_H__
diff --git a/ui/firewall_rules.c b/ui/firewall_rules.c
index 55dbcc8881..566dd83b01 100644
--- a/ui/firewall_rules.c
+++ b/ui/firewall_rules.c
@@ -1,6 +1,6 @@
/* firewall_rules_dlg.c
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/*
* Generate firewall ACL rules based on packet addresses and ports.
diff --git a/ui/firewall_rules.h b/ui/firewall_rules.h
index aa7174833f..a1833ec48f 100644
--- a/ui/firewall_rules.h
+++ b/ui/firewall_rules.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2006 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __UI_FIREWALL_RULES_H__
#define __UI_FIREWALL_RULES_H__
diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
index e684583309..027d945afa 100644
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/help_url.c b/ui/help_url.c
index fd4d7f6fde..1d48935129 100644
--- a/ui/help_url.c
+++ b/ui/help_url.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/help_url.h b/ui/help_url.h
index 672c9f183a..bf2cfdc86c 100644
--- a/ui/help_url.h
+++ b/ui/help_url.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*
+ * SPDX-License-Identifier: GPL-2.0-or-later*
*/
#ifndef __HELP_URL_H__
diff --git a/ui/iface_lists.c b/ui/iface_lists.c
index d4d394d4b1..a495b1b6fd 100644
--- a/ui/iface_lists.c
+++ b/ui/iface_lists.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/iface_lists.h b/ui/iface_lists.h
index ad80010a46..f749f453b6 100644
--- a/ui/iface_lists.h
+++ b/ui/iface_lists.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __IFACE_LISTS_H__
#define __IFACE_LISTS_H__
diff --git a/ui/iface_toolbar.c b/ui/iface_toolbar.c
index f84851867e..64cb22ddac 100644
--- a/ui/iface_toolbar.c
+++ b/ui/iface_toolbar.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/iface_toolbar.h b/ui/iface_toolbar.h
index 13d8acf6cb..9e10e622db 100644
--- a/ui/iface_toolbar.h
+++ b/ui/iface_toolbar.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __IFACE_TOOLBAR_H__
#define __IFACE_TOOLBAR_H__
diff --git a/ui/io_graph_item.c b/ui/io_graph_item.c
index 6608f103f2..a40ac027ee 100644
--- a/ui/io_graph_item.c
+++ b/ui/io_graph_item.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/io_graph_item.h b/ui/io_graph_item.h
index f7dded0db4..9ef92d76f1 100644
--- a/ui/io_graph_item.h
+++ b/ui/io_graph_item.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __IO_GRAPH_ITEM_H__
#define __IO_GRAPH_ITEM_H__
diff --git a/ui/language.c b/ui/language.c
index f9eedad83b..7c41622f17 100644
--- a/ui/language.c
+++ b/ui/language.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/language.h b/ui/language.h
index ee277c98f7..4be1deeca0 100644
--- a/ui/language.h
+++ b/ui/language.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __LANGUAGE_H__
#define __LANGUAGE_H__
diff --git a/ui/last_open_dir.h b/ui/last_open_dir.h
index ede7378f1b..62709b38f3 100644
--- a/ui/last_open_dir.h
+++ b/ui/last_open_dir.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __UI_LAST_OPEN_DIR_H__
#define __UI_LAST_OPEN_DIR_H__
diff --git a/ui/main_statusbar.h b/ui/main_statusbar.h
index ea4788edfe..64874db053 100644
--- a/ui/main_statusbar.h
+++ b/ui/main_statusbar.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __MAIN_STATUSBAR_H__
#define __MAIN_STATUSBAR_H__
diff --git a/ui/make-taps.c b/ui/make-taps.c
index 6c48ac0974..e1ad4431c6 100644
--- a/ui/make-taps.c
+++ b/ui/make-taps.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <stdlib.h>
diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c
index fbaf0ac1d0..32f3df701d 100644
--- a/ui/mcast_stream.c
+++ b/ui/mcast_stream.c
@@ -12,7 +12,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/mcast_stream.h b/ui/mcast_stream.h
index 78278bef8f..943fba14ca 100644
--- a/ui/mcast_stream.h
+++ b/ui/mcast_stream.h
@@ -12,7 +12,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __MCAST_STREAM_H__
#define __MCAST_STREAM_H__
diff --git a/ui/packet_list_utils.c b/ui/packet_list_utils.c
index 3c13c2dfdf..5599cdad14 100644
--- a/ui/packet_list_utils.c
+++ b/ui/packet_list_utils.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
diff --git a/ui/packet_list_utils.h b/ui/packet_list_utils.h
index d8cbad72f5..d0b7bcd40f 100644
--- a/ui/packet_list_utils.h
+++ b/ui/packet_list_utils.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __PACKET_LIST_UTILS_H__
#define __PACKET_LIST_UTILS_H__
diff --git a/ui/packet_range.c b/ui/packet_range.c
index abd791a5a5..6edd391f38 100644
--- a/ui/packet_range.c
+++ b/ui/packet_range.c
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/packet_range.h b/ui/packet_range.h
index fce2884181..dec0e61813 100644
--- a/ui/packet_range.h
+++ b/ui/packet_range.h
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __PACKET_RANGE_H__
#define __PACKET_RANGE_H__
diff --git a/ui/persfilepath_opt.c b/ui/persfilepath_opt.c
index 04d7c13cb5..3b5dcba35e 100644
--- a/ui/persfilepath_opt.c
+++ b/ui/persfilepath_opt.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/persfilepath_opt.h b/ui/persfilepath_opt.h
index 7229d3e4db..356ee9733c 100644
--- a/ui/persfilepath_opt.h
+++ b/ui/persfilepath_opt.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PERSFILEPATH_OPT_H
#define PERSFILEPATH_OPT_H
diff --git a/ui/preference_utils.c b/ui/preference_utils.c
index a4bf7b06da..4914b9192b 100644
--- a/ui/preference_utils.c
+++ b/ui/preference_utils.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/preference_utils.h b/ui/preference_utils.h
index 9364eeeb73..aaed9b6ab9 100644
--- a/ui/preference_utils.h
+++ b/ui/preference_utils.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __PREFRENCE_UTILS_H__
diff --git a/ui/profile.c b/ui/profile.c
index b8b51fda2e..16fba49857 100644
--- a/ui/profile.c
+++ b/ui/profile.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/profile.h b/ui/profile.h
index 00e579f4d5..0aa279bd72 100644
--- a/ui/profile.h
+++ b/ui/profile.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __PROFILE_H__
#define __PROFILE_H__
diff --git a/ui/progress_dlg.h b/ui/progress_dlg.h
index 8cfc30ac46..22eac9b7b6 100644
--- a/ui/progress_dlg.h
+++ b/ui/progress_dlg.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __PROGRESS_DLG_H__
#define __PROGRESS_DLG_H__
diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c
index 66a550b491..91d93941ac 100644
--- a/ui/proto_hier_stats.c
+++ b/ui/proto_hier_stats.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/proto_hier_stats.h b/ui/proto_hier_stats.h
index 0b8cea60df..e3b42594aa 100644
--- a/ui/proto_hier_stats.h
+++ b/ui/proto_hier_stats.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __UI_PROTO_HIER_STATS_H__
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index 187793dfa8..21449b9698 100644
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/qt/about_dialog.h b/ui/qt/about_dialog.h
index ec1f2450cd..79d00c318f 100644
--- a/ui/qt/about_dialog.h
+++ b/ui/qt/about_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef ABOUT_DIALOG_H
diff --git a/ui/qt/accordion_frame.cpp b/ui/qt/accordion_frame.cpp
index 22a132da20..ec1d0be741 100644
--- a/ui/qt/accordion_frame.cpp
+++ b/ui/qt/accordion_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
#include <glib.h>
diff --git a/ui/qt/accordion_frame.h b/ui/qt/accordion_frame.h
index 6306af07d8..2be96ce5f2 100644
--- a/ui/qt/accordion_frame.h
+++ b/ui/qt/accordion_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef ACCORDION_FRAME_H
#define ACCORDION_FRAME_H
diff --git a/ui/qt/address_editor_frame.cpp b/ui/qt/address_editor_frame.cpp
index ea7f92a365..3c2087a7d1 100644
--- a/ui/qt/address_editor_frame.cpp
+++ b/ui/qt/address_editor_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/address_editor_frame.h b/ui/qt/address_editor_frame.h
index cc7e81a13e..15d745f535 100644
--- a/ui/qt/address_editor_frame.h
+++ b/ui/qt/address_editor_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef ADDRESS_EDITOR_FRAME_H
#define ADDRESS_EDITOR_FRAME_H
diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
index 68808d2d5e..4da92d8b3f 100644
--- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp
+++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "bluetooth_att_server_attributes_dialog.h"
#include <ui_bluetooth_att_server_attributes_dialog.h>
diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.h b/ui/qt/bluetooth_att_server_attributes_dialog.h
index d0d1bb636d..6ddbc7ce69 100644
--- a/ui/qt/bluetooth_att_server_attributes_dialog.h
+++ b/ui/qt/bluetooth_att_server_attributes_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef BLUETOOTH_ATT_SERVER_ATTRIBUTES_DIALOG_H
#define BLUETOOTH_ATT_SERVER_ATTRIBUTES_DIALOG_H
diff --git a/ui/qt/bluetooth_device_dialog.cpp b/ui/qt/bluetooth_device_dialog.cpp
index c606677c31..8ff5067b5b 100644
--- a/ui/qt/bluetooth_device_dialog.cpp
+++ b/ui/qt/bluetooth_device_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "bluetooth_device_dialog.h"
#include <ui_bluetooth_device_dialog.h>
diff --git a/ui/qt/bluetooth_device_dialog.h b/ui/qt/bluetooth_device_dialog.h
index d4c21b6d0a..0ab306d718 100644
--- a/ui/qt/bluetooth_device_dialog.h
+++ b/ui/qt/bluetooth_device_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef BLUETOOTH_DEVICE_DIALOG_H
#define BLUETOOTH_DEVICE_DIALOG_H
diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp
index b5e3451861..a0b6c1d76c 100644
--- a/ui/qt/bluetooth_devices_dialog.cpp
+++ b/ui/qt/bluetooth_devices_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "bluetooth_devices_dialog.h"
#include <ui_bluetooth_devices_dialog.h>
diff --git a/ui/qt/bluetooth_devices_dialog.h b/ui/qt/bluetooth_devices_dialog.h
index 0c9acd4cfd..e2bfc84181 100644
--- a/ui/qt/bluetooth_devices_dialog.h
+++ b/ui/qt/bluetooth_devices_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef BLUETOOTH_DEVICES_DIALOG_H
#define BLUETOOTH_DEVICES_DIALOG_H
diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp
index a6cacb84c1..baf76ee777 100644
--- a/ui/qt/bluetooth_hci_summary_dialog.cpp
+++ b/ui/qt/bluetooth_hci_summary_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "bluetooth_hci_summary_dialog.h"
#include <ui_bluetooth_hci_summary_dialog.h>
diff --git a/ui/qt/bluetooth_hci_summary_dialog.h b/ui/qt/bluetooth_hci_summary_dialog.h
index a878dd074a..6149044452 100644
--- a/ui/qt/bluetooth_hci_summary_dialog.h
+++ b/ui/qt/bluetooth_hci_summary_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef BLUETOOTH_HCI_SUMMARY_DIALOG_H
#define BLUETOOTH_HCI_SUMMARY_DIALOG_H
diff --git a/ui/qt/byte_view_tab.cpp b/ui/qt/byte_view_tab.cpp
index 0a60475cc4..9b945c649e 100644
--- a/ui/qt/byte_view_tab.cpp
+++ b/ui/qt/byte_view_tab.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "byte_view_tab.h"
diff --git a/ui/qt/byte_view_tab.h b/ui/qt/byte_view_tab.h
index 87e5f73d37..b3144f2886 100644
--- a/ui/qt/byte_view_tab.h
+++ b/ui/qt/byte_view_tab.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef BYTE_VIEW_TAB_H
#define BYTE_VIEW_TAB_H
diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp
index 594ae87563..49975352df 100644
--- a/ui/qt/capture_file.cpp
+++ b/ui/qt/capture_file.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "capture_file.h"
diff --git a/ui/qt/capture_file.h b/ui/qt/capture_file.h
index 5601cf602b..a6a75f69c8 100644
--- a/ui/qt/capture_file.h
+++ b/ui/qt/capture_file.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_FILE_H
#define CAPTURE_FILE_H
diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp
index cb95ffd4d1..4d94260118 100644
--- a/ui/qt/capture_file_dialog.cpp
+++ b/ui/qt/capture_file_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <wiretap/wtap.h>
diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h
index 234f6c6240..f235d5dc11 100644
--- a/ui/qt/capture_file_dialog.h
+++ b/ui/qt/capture_file_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_FILE_DIALOG_H
#define CAPTURE_FILE_DIALOG_H
diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp
index d97b4beaa1..0c4a72e1ad 100644
--- a/ui/qt/capture_file_properties_dialog.cpp
+++ b/ui/qt/capture_file_properties_dialog.cpp
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "capture_file_properties_dialog.h"
#include <ui_capture_file_properties_dialog.h>
diff --git a/ui/qt/capture_file_properties_dialog.h b/ui/qt/capture_file_properties_dialog.h
index 6298b122a0..8f683125b6 100644
--- a/ui/qt/capture_file_properties_dialog.h
+++ b/ui/qt/capture_file_properties_dialog.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_FILE_PROPERTIES_DIALOG_H
#define CAPTURE_FILE_PROPERTIES_DIALOG_H
diff --git a/ui/qt/capture_filter_syntax_worker.cpp b/ui/qt/capture_filter_syntax_worker.cpp
index 7064d13f41..8a118e3142 100644
--- a/ui/qt/capture_filter_syntax_worker.cpp
+++ b/ui/qt/capture_filter_syntax_worker.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/capture_filter_syntax_worker.h b/ui/qt/capture_filter_syntax_worker.h
index 34ccc74f64..8dcb2cba65 100644
--- a/ui/qt/capture_filter_syntax_worker.h
+++ b/ui/qt/capture_filter_syntax_worker.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_FILTER_SYNTAX_WORKER_H
#define CAPTURE_FILTER_SYNTAX_WORKER_H
diff --git a/ui/qt/capture_info_dialog.cpp b/ui/qt/capture_info_dialog.cpp
index 7427dc71d0..25532d7a12 100644
--- a/ui/qt/capture_info_dialog.cpp
+++ b/ui/qt/capture_info_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/capture_info_dialog.h b/ui/qt/capture_info_dialog.h
index 37a12e8634..c8b0013613 100644
--- a/ui/qt/capture_info_dialog.h
+++ b/ui/qt/capture_info_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_INFO_DIALOG_H
#define CAPTURE_INFO_DIALOG_H
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index ecfe201829..6874ff14f1 100644
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/capture_interfaces_dialog.h b/ui/qt/capture_interfaces_dialog.h
index 789331082b..7deb13f311 100644
--- a/ui/qt/capture_interfaces_dialog.h
+++ b/ui/qt/capture_interfaces_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_INTERFACES_DIALOG_H
diff --git a/ui/qt/capture_preferences_frame.cpp b/ui/qt/capture_preferences_frame.cpp
index aa0d4149f2..b315814612 100644
--- a/ui/qt/capture_preferences_frame.cpp
+++ b/ui/qt/capture_preferences_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/capture_preferences_frame.h b/ui/qt/capture_preferences_frame.h
index 0f3759aca5..e8af0a50ff 100644
--- a/ui/qt/capture_preferences_frame.h
+++ b/ui/qt/capture_preferences_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_PREFERENCES_FRAME_H
#define CAPTURE_PREFERENCES_FRAME_H
diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp
index 9b0ffca047..ab19bb5613 100644
--- a/ui/qt/coloring_rules_dialog.cpp
+++ b/ui/qt/coloring_rules_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/coloring_rules_dialog.h b/ui/qt/coloring_rules_dialog.h
index 6051759dda..c1c5e6d5fc 100644
--- a/ui/qt/coloring_rules_dialog.h
+++ b/ui/qt/coloring_rules_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef COLORING_RULES_DIALOG_H
#define COLORING_RULES_DIALOG_H
diff --git a/ui/qt/column_editor_frame.cpp b/ui/qt/column_editor_frame.cpp
index f82a7a2c38..dba4ecc4b5 100644
--- a/ui/qt/column_editor_frame.cpp
+++ b/ui/qt/column_editor_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/column_editor_frame.h b/ui/qt/column_editor_frame.h
index 2ef6277a7d..1e9ce64f55 100644
--- a/ui/qt/column_editor_frame.h
+++ b/ui/qt/column_editor_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef COLUMN_EDITOR_FRAME_H
#define COLUMN_EDITOR_FRAME_H
diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp
index 5d93ff3375..394588a18c 100644
--- a/ui/qt/column_preferences_frame.cpp
+++ b/ui/qt/column_preferences_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/column_preferences_frame.h b/ui/qt/column_preferences_frame.h
index a9e2c08c8c..59b63ca51b 100644
--- a/ui/qt/column_preferences_frame.h
+++ b/ui/qt/column_preferences_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef COLUMN_PREFERENCES_FRAME_H
#define COLUMN_PREFERENCES_FRAME_H
diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp
index c82f3dd7a3..1e6661b8ca 100644
--- a/ui/qt/compiled_filter_output.cpp
+++ b/ui/qt/compiled_filter_output.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/compiled_filter_output.h b/ui/qt/compiled_filter_output.h
index 3310eeeb8c..d7af289af7 100644
--- a/ui/qt/compiled_filter_output.h
+++ b/ui/qt/compiled_filter_output.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef COMPILEDFILTEROUTPUT_H
#define COMPILEDFILTEROUTPUT_H
diff --git a/ui/qt/conversation_colorize_action.cpp b/ui/qt/conversation_colorize_action.cpp
index d41139b8bb..da3720fde3 100644
--- a/ui/qt/conversation_colorize_action.cpp
+++ b/ui/qt/conversation_colorize_action.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "conversation_colorize_action.h"
diff --git a/ui/qt/conversation_colorize_action.h b/ui/qt/conversation_colorize_action.h
index 59c7c77b93..f78cdc0428 100644
--- a/ui/qt/conversation_colorize_action.h
+++ b/ui/qt/conversation_colorize_action.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CONVERSATIONCOLORIZEACTION_H
#define CONVERSATIONCOLORIZEACTION_H
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp
index 2d23e15ed7..1687628e1f 100644
--- a/ui/qt/conversation_dialog.cpp
+++ b/ui/qt/conversation_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "conversation_dialog.h"
diff --git a/ui/qt/conversation_dialog.h b/ui/qt/conversation_dialog.h
index 4954135bcc..94a5e776f6 100644
--- a/ui/qt/conversation_dialog.h
+++ b/ui/qt/conversation_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CONVERSATION_DIALOG_H
#define CONVERSATION_DIALOG_H
diff --git a/ui/qt/conversation_hash_tables_dialog.cpp b/ui/qt/conversation_hash_tables_dialog.cpp
index e60b9346ce..3aa3e85ec7 100644
--- a/ui/qt/conversation_hash_tables_dialog.cpp
+++ b/ui/qt/conversation_hash_tables_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "conversation_hash_tables_dialog.h"
#include <ui_conversation_hash_tables_dialog.h>
diff --git a/ui/qt/conversation_hash_tables_dialog.h b/ui/qt/conversation_hash_tables_dialog.h
index 1f20a0b345..00c4bfa60a 100644
--- a/ui/qt/conversation_hash_tables_dialog.h
+++ b/ui/qt/conversation_hash_tables_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CONVERSATION_HASH_TABLES_DIALOG_H
#define CONVERSATION_HASH_TABLES_DIALOG_H
diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp
index 23d9719d0d..22168a4496 100644
--- a/ui/qt/decode_as_dialog.cpp
+++ b/ui/qt/decode_as_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "decode_as_dialog.h"
#include <ui_decode_as_dialog.h>
diff --git a/ui/qt/decode_as_dialog.h b/ui/qt/decode_as_dialog.h
index 6e0df067c3..19be96d861 100644
--- a/ui/qt/decode_as_dialog.h
+++ b/ui/qt/decode_as_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef DECODE_AS_DIALOG_H
#define DECODE_AS_DIALOG_H
diff --git a/ui/qt/display_filter_expression_dialog.cpp b/ui/qt/display_filter_expression_dialog.cpp
index 629a39fa54..8c19d69c13 100644
--- a/ui/qt/display_filter_expression_dialog.cpp
+++ b/ui/qt/display_filter_expression_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <algorithm>
diff --git a/ui/qt/display_filter_expression_dialog.h b/ui/qt/display_filter_expression_dialog.h
index 808c341dfa..4715f7307f 100644
--- a/ui/qt/display_filter_expression_dialog.h
+++ b/ui/qt/display_filter_expression_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef DISPLAY_FILTER_EXPRESSION_DIALOG_H
#define DISPLAY_FILTER_EXPRESSION_DIALOG_H
diff --git a/ui/qt/dissector_tables_dialog.cpp b/ui/qt/dissector_tables_dialog.cpp
index 91d55dc8a6..e3f4fcab85 100644
--- a/ui/qt/dissector_tables_dialog.cpp
+++ b/ui/qt/dissector_tables_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/qt/dissector_tables_dialog.h b/ui/qt/dissector_tables_dialog.h
index 6f3f3d5728..85386fb76c 100644
--- a/ui/qt/dissector_tables_dialog.h
+++ b/ui/qt/dissector_tables_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef DISSECTOR_TABLES_DIALOG_H
diff --git a/ui/qt/enabled_protocols_dialog.cpp b/ui/qt/enabled_protocols_dialog.cpp
index 32bd27b64e..3c796b21be 100644
--- a/ui/qt/enabled_protocols_dialog.cpp
+++ b/ui/qt/enabled_protocols_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "enabled_protocols_dialog.h"
#include <ui_enabled_protocols_dialog.h>
diff --git a/ui/qt/enabled_protocols_dialog.h b/ui/qt/enabled_protocols_dialog.h
index 412b2387c7..f7642bb841 100644
--- a/ui/qt/enabled_protocols_dialog.h
+++ b/ui/qt/enabled_protocols_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef ENABLED_PROTOCOLS_DIALOG_H
#define ENABLED_PROTOCOLS_DIALOG_H
diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp
index 5a71c9f69c..20b79e8881 100644
--- a/ui/qt/endpoint_dialog.cpp
+++ b/ui/qt/endpoint_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "endpoint_dialog.h"
diff --git a/ui/qt/endpoint_dialog.h b/ui/qt/endpoint_dialog.h
index c55d31034c..5ca6084e54 100644
--- a/ui/qt/endpoint_dialog.h
+++ b/ui/qt/endpoint_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef ENDPOINT_DIALOG_H
#define ENDPOINT_DIALOG_H
diff --git a/ui/qt/expert_info_dialog.cpp b/ui/qt/expert_info_dialog.cpp
index 64df4ddf12..c6aa2c7223 100644
--- a/ui/qt/expert_info_dialog.cpp
+++ b/ui/qt/expert_info_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "expert_info_dialog.h"
#include <ui_expert_info_dialog.h>
diff --git a/ui/qt/expert_info_dialog.h b/ui/qt/expert_info_dialog.h
index 69603bdbd6..0840a57757 100644
--- a/ui/qt/expert_info_dialog.h
+++ b/ui/qt/expert_info_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef EXPERT_INFO_DIALOG_H
#define EXPERT_INFO_DIALOG_H
diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp
index 81e0e32644..447638fc1e 100644
--- a/ui/qt/export_dissection_dialog.cpp
+++ b/ui/qt/export_dissection_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "export_dissection_dialog.h"
diff --git a/ui/qt/export_dissection_dialog.h b/ui/qt/export_dissection_dialog.h
index c4992eb0d7..b6ac1072be 100644
--- a/ui/qt/export_dissection_dialog.h
+++ b/ui/qt/export_dissection_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef EXPORT_DISSECTION_DIALOG_H
#define EXPORT_DISSECTION_DIALOG_H
diff --git a/ui/qt/export_object_action.cpp b/ui/qt/export_object_action.cpp
index 188b7bb5c1..0ed8fe6af5 100644
--- a/ui/qt/export_object_action.cpp
+++ b/ui/qt/export_object_action.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/ui/qt/export_object_action.h b/ui/qt/export_object_action.h
index 759ebfc5c8..077d979ad1 100644
--- a/ui/qt/export_object_action.h
+++ b/ui/qt/export_object_action.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef EXPORTOBJECTACTION_H
#define EXPORTOBJECTACTION_H
diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp
index d0ebc69cc4..f0057998dd 100644
--- a/ui/qt/export_object_dialog.cpp
+++ b/ui/qt/export_object_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "export_object_dialog.h"
diff --git a/ui/qt/export_object_dialog.h b/ui/qt/export_object_dialog.h
index c28c965e67..5fa8735166 100644
--- a/ui/qt/export_object_dialog.h
+++ b/ui/qt/export_object_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef EXPORT_OBJECT_DIALOG_H
diff --git a/ui/qt/export_pdu_dialog.cpp b/ui/qt/export_pdu_dialog.cpp
index 6386848611..a30fd523d7 100644
--- a/ui/qt/export_pdu_dialog.cpp
+++ b/ui/qt/export_pdu_dialog.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/export_pdu_dialog.h b/ui/qt/export_pdu_dialog.h
index 0139ff6477..a6afbce030 100644
--- a/ui/qt/export_pdu_dialog.h
+++ b/ui/qt/export_pdu_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef EXPORT_PDU_DIALOG_H
#define EXPORT_PDU_DIALOG_H
diff --git a/ui/qt/extcap_argument.cpp b/ui/qt/extcap_argument.cpp
index 76fc060409..1d97d47930 100644
--- a/ui/qt/extcap_argument.cpp
+++ b/ui/qt/extcap_argument.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <extcap_argument.h>
diff --git a/ui/qt/extcap_argument.h b/ui/qt/extcap_argument.h
index 23cc4b42f4..f7fd27ce37 100644
--- a/ui/qt/extcap_argument.h
+++ b/ui/qt/extcap_argument.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UI_QT_EXTCAP_ARGUMENT_H_
#define UI_QT_EXTCAP_ARGUMENT_H_
diff --git a/ui/qt/extcap_argument_file.cpp b/ui/qt/extcap_argument_file.cpp
index ebda3d2807..9a708cc347 100644
--- a/ui/qt/extcap_argument_file.cpp
+++ b/ui/qt/extcap_argument_file.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <extcap_argument.h>
#include <extcap_argument_file.h>
diff --git a/ui/qt/extcap_argument_file.h b/ui/qt/extcap_argument_file.h
index a1e1c9e706..5e8eeeedca 100644
--- a/ui/qt/extcap_argument_file.h
+++ b/ui/qt/extcap_argument_file.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UI_QT_EXTCAP_ARGUMENT_FILE_H_
#define UI_QT_EXTCAP_ARGUMENT_FILE_H_
diff --git a/ui/qt/extcap_argument_multiselect.cpp b/ui/qt/extcap_argument_multiselect.cpp
index 91db637803..92c44eab45 100644
--- a/ui/qt/extcap_argument_multiselect.cpp
+++ b/ui/qt/extcap_argument_multiselect.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <extcap_argument.h>
#include <extcap_argument_file.h>
diff --git a/ui/qt/extcap_argument_multiselect.h b/ui/qt/extcap_argument_multiselect.h
index 86b0671b26..ef89445581 100644
--- a/ui/qt/extcap_argument_multiselect.h
+++ b/ui/qt/extcap_argument_multiselect.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UI_QT_EXTCAP_ARGUMENT_MULTISELECT_H_
#define UI_QT_EXTCAP_ARGUMENT_MULTISELECT_H_
diff --git a/ui/qt/extcap_options_dialog.cpp b/ui/qt/extcap_options_dialog.cpp
index 35f1d7637a..cd7e386e48 100644
--- a/ui/qt/extcap_options_dialog.cpp
+++ b/ui/qt/extcap_options_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/ui/qt/extcap_options_dialog.h b/ui/qt/extcap_options_dialog.h
index ce89c52917..a578528412 100644
--- a/ui/qt/extcap_options_dialog.h
+++ b/ui/qt/extcap_options_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef EXTCAP_OPTIONS_DIALOG_H
diff --git a/ui/qt/file_set_dialog.cpp b/ui/qt/file_set_dialog.cpp
index a8e792f407..7f21892700 100644
--- a/ui/qt/file_set_dialog.cpp
+++ b/ui/qt/file_set_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/qt/file_set_dialog.h b/ui/qt/file_set_dialog.h
index 49c994c7c6..3d976e7771 100644
--- a/ui/qt/file_set_dialog.h
+++ b/ui/qt/file_set_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef FILE_SET_DIALOG_H
diff --git a/ui/qt/filter_action.cpp b/ui/qt/filter_action.cpp
index dcff4312dc..2991343352 100644
--- a/ui/qt/filter_action.cpp
+++ b/ui/qt/filter_action.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "filter_action.h"
diff --git a/ui/qt/filter_action.h b/ui/qt/filter_action.h
index e43d7f4f04..8b6b99c6eb 100644
--- a/ui/qt/filter_action.h
+++ b/ui/qt/filter_action.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/* Derived from gtk/filter_utils.h */
diff --git a/ui/qt/filter_dialog.cpp b/ui/qt/filter_dialog.cpp
index 518a7aca43..7e51d2f345 100644
--- a/ui/qt/filter_dialog.cpp
+++ b/ui/qt/filter_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/ui/qt/filter_dialog.h b/ui/qt/filter_dialog.h
index 22ca87e4cb..743ccb6830 100644
--- a/ui/qt/filter_dialog.h
+++ b/ui/qt/filter_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FILTER_DIALOG_H
#define FILTER_DIALOG_H
diff --git a/ui/qt/filter_expression_frame.cpp b/ui/qt/filter_expression_frame.cpp
index 8c938c9e86..08fdd0922d 100644
--- a/ui/qt/filter_expression_frame.cpp
+++ b/ui/qt/filter_expression_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "filter_expression_frame.h"
diff --git a/ui/qt/filter_expression_frame.h b/ui/qt/filter_expression_frame.h
index dc2013301c..23494dafa2 100644
--- a/ui/qt/filter_expression_frame.h
+++ b/ui/qt/filter_expression_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef FILTER_EXPRESSION_FRAME_H
diff --git a/ui/qt/firewall_rules_dialog.cpp b/ui/qt/firewall_rules_dialog.cpp
index ef7b4310ae..a7a49229f5 100644
--- a/ui/qt/firewall_rules_dialog.cpp
+++ b/ui/qt/firewall_rules_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/ui/qt/firewall_rules_dialog.h b/ui/qt/firewall_rules_dialog.h
index a0d3037880..761e890df2 100644
--- a/ui/qt/firewall_rules_dialog.h
+++ b/ui/qt/firewall_rules_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FIREWALL_RULES_DIALOG_H
#define FIREWALL_RULES_DIALOG_H
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index a04608bc62..6ffdc2c967 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "follow_stream_dialog.h"
#include <ui_follow_stream_dialog.h>
diff --git a/ui/qt/follow_stream_dialog.h b/ui/qt/follow_stream_dialog.h
index c2c22f1520..070c376877 100644
--- a/ui/qt/follow_stream_dialog.h
+++ b/ui/qt/follow_stream_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FOLLOW_STREAM_DIALOG_H
#define FOLLOW_STREAM_DIALOG_H
diff --git a/ui/qt/font_color_preferences_frame.cpp b/ui/qt/font_color_preferences_frame.cpp
index 908d3b25fc..76873459e6 100644
--- a/ui/qt/font_color_preferences_frame.cpp
+++ b/ui/qt/font_color_preferences_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/ui/qt/font_color_preferences_frame.h b/ui/qt/font_color_preferences_frame.h
index 55c02ede75..6bac996231 100644
--- a/ui/qt/font_color_preferences_frame.h
+++ b/ui/qt/font_color_preferences_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FONT_COLOR_PREFERENCES_FRAME_H
#define FONT_COLOR_PREFERENCES_FRAME_H
diff --git a/ui/qt/funnel_statistics.cpp b/ui/qt/funnel_statistics.cpp
index 51c7d3b111..1eac12ca2b 100644
--- a/ui/qt/funnel_statistics.cpp
+++ b/ui/qt/funnel_statistics.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/funnel_statistics.h b/ui/qt/funnel_statistics.h
index 41a12e63a3..7db3c20313 100644
--- a/ui/qt/funnel_statistics.h
+++ b/ui/qt/funnel_statistics.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FUNNELSTATISTICS_H
#define FUNNELSTATISTICS_H
diff --git a/ui/qt/funnel_string_dialog.cpp b/ui/qt/funnel_string_dialog.cpp
index 20d40fb9ff..401172ac5f 100644
--- a/ui/qt/funnel_string_dialog.cpp
+++ b/ui/qt/funnel_string_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "funnel_string_dialog.h"
#include <ui_funnel_string_dialog.h>
diff --git a/ui/qt/funnel_string_dialog.h b/ui/qt/funnel_string_dialog.h
index 3eb3674ba3..608e8b7114 100644
--- a/ui/qt/funnel_string_dialog.h
+++ b/ui/qt/funnel_string_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FUNNEL_STRING_DIALOG_H
#define FUNNEL_STRING_DIALOG_H
diff --git a/ui/qt/funnel_text_dialog.cpp b/ui/qt/funnel_text_dialog.cpp
index d9c10a24ae..faa426e504 100644
--- a/ui/qt/funnel_text_dialog.cpp
+++ b/ui/qt/funnel_text_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "funnel_text_dialog.h"
#include <ui_funnel_text_dialog.h>
diff --git a/ui/qt/funnel_text_dialog.h b/ui/qt/funnel_text_dialog.h
index 16cbb130d5..16031c6af2 100644
--- a/ui/qt/funnel_text_dialog.h
+++ b/ui/qt/funnel_text_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FUNNEL_TEXT_DIALOG_H
#define FUNNEL_TEXT_DIALOG_H
diff --git a/ui/qt/geometry_state_dialog.cpp b/ui/qt/geometry_state_dialog.cpp
index 9f7e3ec3e3..4ef86a72da 100644
--- a/ui/qt/geometry_state_dialog.cpp
+++ b/ui/qt/geometry_state_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "geometry_state_dialog.h"
#include <ui/qt/utils/qt_ui_utils.h>
diff --git a/ui/qt/geometry_state_dialog.h b/ui/qt/geometry_state_dialog.h
index 22698ab65c..277851cc02 100644
--- a/ui/qt/geometry_state_dialog.h
+++ b/ui/qt/geometry_state_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef GEOMETRY_STATE_DIALOG_H
#define GEOMETRY_STATE_DIALOG_H
diff --git a/ui/qt/gpl-template.txt b/ui/qt/gpl-template.txt
index c8a976deae..7db6500c06 100644
--- a/ui/qt/gpl-template.txt
+++ b/ui/qt/gpl-template.txt
@@ -4,4 +4,4 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp
index 585f7c36c2..2dacb48b06 100644
--- a/ui/qt/gsm_map_summary_dialog.cpp
+++ b/ui/qt/gsm_map_summary_dialog.cpp
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "gsm_map_summary_dialog.h"
#include <ui_gsm_map_summary_dialog.h>
diff --git a/ui/qt/gsm_map_summary_dialog.h b/ui/qt/gsm_map_summary_dialog.h
index efe6c4c317..8e1cfae2f2 100644
--- a/ui/qt/gsm_map_summary_dialog.h
+++ b/ui/qt/gsm_map_summary_dialog.h
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef GSM_MAP_SUMMARY_DIALOG_H
#define GSM_MAP_SUMMARY_DIALOG_H
diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
index f67f317659..d5411a6016 100644
--- a/ui/qt/iax2_analysis_dialog.cpp
+++ b/ui/qt/iax2_analysis_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "iax2_analysis_dialog.h"
#include <ui_iax2_analysis_dialog.h>
diff --git a/ui/qt/iax2_analysis_dialog.h b/ui/qt/iax2_analysis_dialog.h
index c1a86417d3..a29207f845 100644
--- a/ui/qt/iax2_analysis_dialog.h
+++ b/ui/qt/iax2_analysis_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef IAX2_ANALYSIS_DIALOG_H
#define IAX2_ANALYSIS_DIALOG_H
diff --git a/ui/qt/import_text_dialog.cpp b/ui/qt/import_text_dialog.cpp
index 3f07e15410..0bcff538a9 100644
--- a/ui/qt/import_text_dialog.cpp
+++ b/ui/qt/import_text_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/import_text_dialog.h b/ui/qt/import_text_dialog.h
index acc3911aad..261dea68cd 100644
--- a/ui/qt/import_text_dialog.h
+++ b/ui/qt/import_text_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef IMPORT_TEXT_DIALOG_H
#define IMPORT_TEXT_DIALOG_H
diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp
index d20e04bf25..756812865f 100644
--- a/ui/qt/interface_frame.cpp
+++ b/ui/qt/interface_frame.cpp
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
#include <ui_interface_frame.h>
diff --git a/ui/qt/interface_frame.h b/ui/qt/interface_frame.h
index 1d3036d74c..5879db4f24 100644
--- a/ui/qt/interface_frame.h
+++ b/ui/qt/interface_frame.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef INTERFACE_FRAME_H
#define INTERFACE_FRAME_H
diff --git a/ui/qt/interface_toolbar.cpp b/ui/qt/interface_toolbar.cpp
index aebb5d8871..6262dd0803 100644
--- a/ui/qt/interface_toolbar.cpp
+++ b/ui/qt/interface_toolbar.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/interface_toolbar.h b/ui/qt/interface_toolbar.h
index 4141211729..4806ce7d01 100644
--- a/ui/qt/interface_toolbar.h
+++ b/ui/qt/interface_toolbar.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef INTERFACE_TOOLBAR_H
#define INTERFACE_TOOLBAR_H
diff --git a/ui/qt/interface_toolbar_reader.cpp b/ui/qt/interface_toolbar_reader.cpp
index 8fc5d67556..1e3ee907fb 100644
--- a/ui/qt/interface_toolbar_reader.cpp
+++ b/ui/qt/interface_toolbar_reader.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/interface_toolbar_reader.h b/ui/qt/interface_toolbar_reader.h
index d412e0d2cd..7e27402cd5 100644
--- a/ui/qt/interface_toolbar_reader.h
+++ b/ui/qt/interface_toolbar_reader.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef INTERFACE_TOOLBAR_READER_H
#define INTERFACE_TOOLBAR_READER_H
diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index 0822638009..0ee85cbdcc 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "io_graph_dialog.h"
#include <ui_io_graph_dialog.h>
diff --git a/ui/qt/io_graph_dialog.h b/ui/qt/io_graph_dialog.h
index b84014f96f..9f85c7ece3 100644
--- a/ui/qt/io_graph_dialog.h
+++ b/ui/qt/io_graph_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef IO_GRAPH_DIALOG_H
#define IO_GRAPH_DIALOG_H
diff --git a/ui/qt/layout_preferences_frame.cpp b/ui/qt/layout_preferences_frame.cpp
index f003eccb1e..7ce625b9a9 100644
--- a/ui/qt/layout_preferences_frame.cpp
+++ b/ui/qt/layout_preferences_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/ui/qt/layout_preferences_frame.h b/ui/qt/layout_preferences_frame.h
index cad718c95b..6062d1139d 100644
--- a/ui/qt/layout_preferences_frame.h
+++ b/ui/qt/layout_preferences_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef LAYOUT_PREFERENCES_FRAME_H
#define LAYOUT_PREFERENCES_FRAME_H
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp
index 606c8ab08c..71863b3104 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "lbm_lbtrm_transport_dialog.h"
#include <ui_lbm_lbtrm_transport_dialog.h>
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.h b/ui/qt/lbm_lbtrm_transport_dialog.h
index 9b176c21b4..514fda2d1b 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.h
+++ b/ui/qt/lbm_lbtrm_transport_dialog.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef LBM_LBTRM_TRANSPORT_DIALOG_H
#define LBM_LBTRM_TRANSPORT_DIALOG_H
diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp
index b8376043e1..636d3a151e 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtru_transport_dialog.cpp
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "lbm_lbtru_transport_dialog.h"
#include <ui_lbm_lbtru_transport_dialog.h>
diff --git a/ui/qt/lbm_lbtru_transport_dialog.h b/ui/qt/lbm_lbtru_transport_dialog.h
index 6364840153..42cfca5acc 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.h
+++ b/ui/qt/lbm_lbtru_transport_dialog.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef LBM_LBTRU_TRANSPORT_DIALOG_H
#define LBM_LBTRU_TRANSPORT_DIALOG_H
diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp
index 78e27caa27..a7ddb42e10 100644
--- a/ui/qt/lbm_stream_dialog.cpp
+++ b/ui/qt/lbm_stream_dialog.cpp
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
// Adapted from stats_tree_packet.cpp
diff --git a/ui/qt/lbm_stream_dialog.h b/ui/qt/lbm_stream_dialog.h
index 1698e4143f..5ea776a376 100644
--- a/ui/qt/lbm_stream_dialog.h
+++ b/ui/qt/lbm_stream_dialog.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef LBM_STREAM_DIALOG_H
#define LBM_STREAM_DIALOG_H
diff --git a/ui/qt/lte_mac_statistics_dialog.cpp b/ui/qt/lte_mac_statistics_dialog.cpp
index 2f2780b104..7cb3966b13 100644
--- a/ui/qt/lte_mac_statistics_dialog.cpp
+++ b/ui/qt/lte_mac_statistics_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "lte_mac_statistics_dialog.h"
diff --git a/ui/qt/lte_mac_statistics_dialog.h b/ui/qt/lte_mac_statistics_dialog.h
index 99a98a55a7..3a8bdf004e 100644
--- a/ui/qt/lte_mac_statistics_dialog.h
+++ b/ui/qt/lte_mac_statistics_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __LTE_MAC_STATISTICS_DIALOG_H__
#define __LTE_MAC_STATISTICS_DIALOG_H__
diff --git a/ui/qt/lte_rlc_graph_dialog.cpp b/ui/qt/lte_rlc_graph_dialog.cpp
index e456e34abd..9020dd9982 100644
--- a/ui/qt/lte_rlc_graph_dialog.cpp
+++ b/ui/qt/lte_rlc_graph_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "lte_rlc_graph_dialog.h"
#include <ui_lte_rlc_graph_dialog.h>
diff --git a/ui/qt/lte_rlc_graph_dialog.h b/ui/qt/lte_rlc_graph_dialog.h
index b731d5e6f9..6da4dd39fe 100644
--- a/ui/qt/lte_rlc_graph_dialog.h
+++ b/ui/qt/lte_rlc_graph_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef LTE_RLC_GRAPH_DIALOG_H
#define LTE_RLC_GRAPH_DIALOG_H
diff --git a/ui/qt/lte_rlc_statistics_dialog.cpp b/ui/qt/lte_rlc_statistics_dialog.cpp
index 71d0d80fbc..a9c2ed6c4f 100644
--- a/ui/qt/lte_rlc_statistics_dialog.cpp
+++ b/ui/qt/lte_rlc_statistics_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "lte_rlc_statistics_dialog.h"
diff --git a/ui/qt/lte_rlc_statistics_dialog.h b/ui/qt/lte_rlc_statistics_dialog.h
index 4250a9b41f..cefe9f186c 100644
--- a/ui/qt/lte_rlc_statistics_dialog.h
+++ b/ui/qt/lte_rlc_statistics_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __LTE_RLC_STATISTICS_DIALOG_H__
#define __LTE_RLC_STATISTICS_DIALOG_H__
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index 3e2767f0f9..54ec5bab15 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h
index 0f6a1429da..c0674d7dc3 100644
--- a/ui/qt/main_status_bar.h
+++ b/ui/qt/main_status_bar.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef MAIN_STATUS_BAR_H
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index f0874ede6f..42de3776c7 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/main_welcome.h b/ui/qt/main_welcome.h
index 6f56904d90..eb6fc55ca4 100644
--- a/ui/qt/main_welcome.h
+++ b/ui/qt/main_welcome.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef MAIN_WELCOME_H
#define MAIN_WELCOME_H
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index bb24456955..a93eb5d329 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "main_window.h"
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 043309c68a..20dad06006 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef MAINWINDOW_H
diff --git a/ui/qt/main_window_preferences_frame.cpp b/ui/qt/main_window_preferences_frame.cpp
index 182c13d151..f83b86e0e6 100644
--- a/ui/qt/main_window_preferences_frame.cpp
+++ b/ui/qt/main_window_preferences_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "wireshark_application.h"
diff --git a/ui/qt/main_window_preferences_frame.h b/ui/qt/main_window_preferences_frame.h
index 230bc5c6c0..0ae4fb7353 100644
--- a/ui/qt/main_window_preferences_frame.h
+++ b/ui/qt/main_window_preferences_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef MAIN_WINDOW_PREFERENCES_FRAME_H
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 5b5dbc4ead..26abffd4ff 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index 37533b0104..7142e976a2 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <glib.h>
#include "manage_interfaces_dialog.h"
diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h
index bbd91c0bee..a43dd9d5fd 100644
--- a/ui/qt/manage_interfaces_dialog.h
+++ b/ui/qt/manage_interfaces_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef MANAGE_INTERFACES_DIALOG_H
#define MANAGE_INTERFACES_DIALOG_H
diff --git a/ui/qt/manager/preference_manager.cpp b/ui/qt/manager/preference_manager.cpp
index 26e64e040c..54c2cfb7b0 100644
--- a/ui/qt/manager/preference_manager.cpp
+++ b/ui/qt/manager/preference_manager.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/qt/manager/preference_manager.h b/ui/qt/manager/preference_manager.h
index 99dc16d0be..f6b995d943 100644
--- a/ui/qt/manager/preference_manager.h
+++ b/ui/qt/manager/preference_manager.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PREFERENCE_MANAGER_H
diff --git a/ui/qt/manager/wireshark_preference.cpp b/ui/qt/manager/wireshark_preference.cpp
index b83a98306f..9774d7d0ed 100644
--- a/ui/qt/manager/wireshark_preference.cpp
+++ b/ui/qt/manager/wireshark_preference.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/qt/manager/wireshark_preference.h b/ui/qt/manager/wireshark_preference.h
index d8f124190d..11cba31415 100644
--- a/ui/qt/manager/wireshark_preference.h
+++ b/ui/qt/manager/wireshark_preference.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef WIRESHARK_PREFERENCE_H
diff --git a/ui/qt/models/astringlist_list_model.cpp b/ui/qt/models/astringlist_list_model.cpp
index 6156b44966..0110633486 100644
--- a/ui/qt/models/astringlist_list_model.cpp
+++ b/ui/qt/models/astringlist_list_model.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <QSortFilterProxyModel>
diff --git a/ui/qt/models/astringlist_list_model.h b/ui/qt/models/astringlist_list_model.h
index ddefe4d8dd..516540b36b 100644
--- a/ui/qt/models/astringlist_list_model.h
+++ b/ui/qt/models/astringlist_list_model.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef ASTRINGLIST_LIST_MODEL_H
diff --git a/ui/qt/models/cache_proxy_model.cpp b/ui/qt/models/cache_proxy_model.cpp
index 3ce250cedc..48909352b2 100644
--- a/ui/qt/models/cache_proxy_model.cpp
+++ b/ui/qt/models/cache_proxy_model.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/models/cache_proxy_model.h>
diff --git a/ui/qt/models/cache_proxy_model.h b/ui/qt/models/cache_proxy_model.h
index b31cb1a5e3..f3628039ad 100644
--- a/ui/qt/models/cache_proxy_model.h
+++ b/ui/qt/models/cache_proxy_model.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CACHE_PROXY_MODEL_H
#define CACHE_PROXY_MODEL_H
diff --git a/ui/qt/models/decode_as_delegate.cpp b/ui/qt/models/decode_as_delegate.cpp
index f9bbc789b4..16d6665c6a 100644
--- a/ui/qt/models/decode_as_delegate.cpp
+++ b/ui/qt/models/decode_as_delegate.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "decode_as_delegate.h"
diff --git a/ui/qt/models/decode_as_delegate.h b/ui/qt/models/decode_as_delegate.h
index 43db595a9c..3e3a6b5906 100644
--- a/ui/qt/models/decode_as_delegate.h
+++ b/ui/qt/models/decode_as_delegate.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef DECODE_AS_DELEGATE_H
#define DECODE_AS_DELEGATE_H
diff --git a/ui/qt/models/decode_as_model.cpp b/ui/qt/models/decode_as_model.cpp
index ea08effbf2..59e077c80e 100644
--- a/ui/qt/models/decode_as_model.cpp
+++ b/ui/qt/models/decode_as_model.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "decode_as_model.h"
#include <epan/to_str.h>
diff --git a/ui/qt/models/decode_as_model.h b/ui/qt/models/decode_as_model.h
index 5638a232ce..1c37cfddb5 100644
--- a/ui/qt/models/decode_as_model.h
+++ b/ui/qt/models/decode_as_model.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef DECODE_AS_MODEL_H
#define DECODE_AS_MODEL_H
diff --git a/ui/qt/models/dissector_tables_model.cpp b/ui/qt/models/dissector_tables_model.cpp
index 327098eb68..9b7ac681bc 100644
--- a/ui/qt/models/dissector_tables_model.cpp
+++ b/ui/qt/models/dissector_tables_model.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/models/dissector_tables_model.h>
diff --git a/ui/qt/models/dissector_tables_model.h b/ui/qt/models/dissector_tables_model.h
index 824cc51b28..c36648cc6a 100644
--- a/ui/qt/models/dissector_tables_model.h
+++ b/ui/qt/models/dissector_tables_model.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef DISSECTOR_TABLES_MODEL_H
diff --git a/ui/qt/models/enabled_protocols_model.cpp b/ui/qt/models/enabled_protocols_model.cpp
index 3693a62efb..46ae46d685 100644
--- a/ui/qt/models/enabled_protocols_model.cpp
+++ b/ui/qt/models/enabled_protocols_model.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <QSortFilterProxyModel>
diff --git a/ui/qt/models/enabled_protocols_model.h b/ui/qt/models/enabled_protocols_model.h
index 98b95c9630..a7d6339ca6 100644
--- a/ui/qt/models/enabled_protocols_model.h
+++ b/ui/qt/models/enabled_protocols_model.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef ENABLED_PROTOCOLS_MODEL_H
diff --git a/ui/qt/models/expert_info_model.cpp b/ui/qt/models/expert_info_model.cpp
index 5b34fbed5e..6f16fec56d 100644
--- a/ui/qt/models/expert_info_model.cpp
+++ b/ui/qt/models/expert_info_model.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "expert_info_model.h"
diff --git a/ui/qt/models/expert_info_model.h b/ui/qt/models/expert_info_model.h
index 32aabd3fee..50c9c61dae 100644
--- a/ui/qt/models/expert_info_model.h
+++ b/ui/qt/models/expert_info_model.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef EXPERT_INFO_MODEL_H
diff --git a/ui/qt/models/expert_info_proxy_model.cpp b/ui/qt/models/expert_info_proxy_model.cpp
index 797b6043ec..8417ab0f39 100644
--- a/ui/qt/models/expert_info_proxy_model.cpp
+++ b/ui/qt/models/expert_info_proxy_model.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/models/expert_info_model.h>
diff --git a/ui/qt/models/expert_info_proxy_model.h b/ui/qt/models/expert_info_proxy_model.h
index 3926e0e9e5..9295141d64 100644
--- a/ui/qt/models/expert_info_proxy_model.h
+++ b/ui/qt/models/expert_info_proxy_model.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef EXPERT_INFO_PROXY_MODEL_H
diff --git a/ui/qt/models/export_objects_model.cpp b/ui/qt/models/export_objects_model.cpp
index 2b18a07542..cade148a24 100644
--- a/ui/qt/models/export_objects_model.cpp
+++ b/ui/qt/models/export_objects_model.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "export_objects_model.h"
diff --git a/ui/qt/models/export_objects_model.h b/ui/qt/models/export_objects_model.h
index 35eeac78b5..8e0bac21b5 100644
--- a/ui/qt/models/export_objects_model.h
+++ b/ui/qt/models/export_objects_model.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef EXPORT_OBJECTS_MODEL_H
diff --git a/ui/qt/models/fileset_entry_model.cpp b/ui/qt/models/fileset_entry_model.cpp
index d3ce1dba67..2c91179e84 100644
--- a/ui/qt/models/fileset_entry_model.cpp
+++ b/ui/qt/models/fileset_entry_model.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/models/fileset_entry_model.h>
diff --git a/ui/qt/models/fileset_entry_model.h b/ui/qt/models/fileset_entry_model.h
index 1a4b97a15e..e528033dca 100644
--- a/ui/qt/models/fileset_entry_model.h
+++ b/ui/qt/models/fileset_entry_model.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef FILESET_ENTRY_MODEL_H
diff --git a/ui/qt/models/info_proxy_model.cpp b/ui/qt/models/info_proxy_model.cpp
index 197cc9e0d8..de8fecded6 100644
--- a/ui/qt/models/info_proxy_model.cpp
+++ b/ui/qt/models/info_proxy_model.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/ui/qt/models/info_proxy_model.h b/ui/qt/models/info_proxy_model.h
index 9574882f5a..63c762b3fa 100644
--- a/ui/qt/models/info_proxy_model.h
+++ b/ui/qt/models/info_proxy_model.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef INFO_PROXY_MODEL_H
diff --git a/ui/qt/models/interface_sort_filter_model.cpp b/ui/qt/models/interface_sort_filter_model.cpp
index ac189f923f..2ab5b9656b 100644
--- a/ui/qt/models/interface_sort_filter_model.cpp
+++ b/ui/qt/models/interface_sort_filter_model.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/models/interface_tree_model.h>
#include <ui/qt/models/interface_tree_cache_model.h>
diff --git a/ui/qt/models/interface_sort_filter_model.h b/ui/qt/models/interface_sort_filter_model.h
index 45e0ea72df..6d24f3d9e6 100644
--- a/ui/qt/models/interface_sort_filter_model.h
+++ b/ui/qt/models/interface_sort_filter_model.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef INTERFACE_SORT_FILTER_MODEL_H
#define INTERFACE_SORT_FILTER_MODEL_H
diff --git a/ui/qt/models/interface_tree_cache_model.cpp b/ui/qt/models/interface_tree_cache_model.cpp
index 4d8a416c9f..9d718977b0 100644
--- a/ui/qt/models/interface_tree_cache_model.cpp
+++ b/ui/qt/models/interface_tree_cache_model.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/models/interface_tree_cache_model.h>
diff --git a/ui/qt/models/interface_tree_cache_model.h b/ui/qt/models/interface_tree_cache_model.h
index 6af031c1f1..f7d3bac98a 100644
--- a/ui/qt/models/interface_tree_cache_model.h
+++ b/ui/qt/models/interface_tree_cache_model.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef INTERFACE_TREE_CACHE_MODEL_H_
#define INTERFACE_TREE_CACHE_MODEL_H_
diff --git a/ui/qt/models/interface_tree_model.cpp b/ui/qt/models/interface_tree_model.cpp
index ef0483b524..91a2926623 100644
--- a/ui/qt/models/interface_tree_model.cpp
+++ b/ui/qt/models/interface_tree_model.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/models/interface_tree_model.h b/ui/qt/models/interface_tree_model.h
index c8154197d5..67a9eb7c5e 100644
--- a/ui/qt/models/interface_tree_model.h
+++ b/ui/qt/models/interface_tree_model.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef INTERFACE_TREE_MODEL_H
#define INTERFACE_TREE_MODEL_H
diff --git a/ui/qt/models/numeric_value_chooser_delegate.cpp b/ui/qt/models/numeric_value_chooser_delegate.cpp
index d4a10cf8f8..fc7e9eb5d5 100644
--- a/ui/qt/models/numeric_value_chooser_delegate.cpp
+++ b/ui/qt/models/numeric_value_chooser_delegate.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/models/numeric_value_chooser_delegate.h b/ui/qt/models/numeric_value_chooser_delegate.h
index 08292ad263..2b9627023c 100644
--- a/ui/qt/models/numeric_value_chooser_delegate.h
+++ b/ui/qt/models/numeric_value_chooser_delegate.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef NUMERIC_VALUE_CHOOSER_DELEGATE_H_
#define NUMERIC_VALUE_CHOOSER_DELEGATE_H_
diff --git a/ui/qt/models/packet_list_model.cpp b/ui/qt/models/packet_list_model.cpp
index f3ba380890..3601427e2e 100644
--- a/ui/qt/models/packet_list_model.cpp
+++ b/ui/qt/models/packet_list_model.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <algorithm>
diff --git a/ui/qt/models/packet_list_model.h b/ui/qt/models/packet_list_model.h
index d65718609e..9cd64df433 100644
--- a/ui/qt/models/packet_list_model.h
+++ b/ui/qt/models/packet_list_model.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PACKET_LIST_MODEL_H
#define PACKET_LIST_MODEL_H
diff --git a/ui/qt/models/packet_list_record.cpp b/ui/qt/models/packet_list_record.cpp
index 0b8d84e574..6e9c6c3316 100644
--- a/ui/qt/models/packet_list_record.cpp
+++ b/ui/qt/models/packet_list_record.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "packet_list_record.h"
diff --git a/ui/qt/models/packet_list_record.h b/ui/qt/models/packet_list_record.h
index 3df8d0db9b..a5a623d8ab 100644
--- a/ui/qt/models/packet_list_record.h
+++ b/ui/qt/models/packet_list_record.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PACKET_LIST_RECORD_H
#define PACKET_LIST_RECORD_H
diff --git a/ui/qt/models/path_chooser_delegate.cpp b/ui/qt/models/path_chooser_delegate.cpp
index 8943b7f986..72ba840650 100644
--- a/ui/qt/models/path_chooser_delegate.cpp
+++ b/ui/qt/models/path_chooser_delegate.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/models/path_chooser_delegate.h b/ui/qt/models/path_chooser_delegate.h
index 395e1a9af7..8777e2500b 100644
--- a/ui/qt/models/path_chooser_delegate.h
+++ b/ui/qt/models/path_chooser_delegate.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PATH_CHOOSER_DELEGATE_H_
#define PATH_CHOOSER_DELEGATE_H_
diff --git a/ui/qt/models/percent_bar_delegate.cpp b/ui/qt/models/percent_bar_delegate.cpp
index e4d7edc285..81573c0bdc 100644
--- a/ui/qt/models/percent_bar_delegate.cpp
+++ b/ui/qt/models/percent_bar_delegate.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/models/percent_bar_delegate.h>
diff --git a/ui/qt/models/percent_bar_delegate.h b/ui/qt/models/percent_bar_delegate.h
index a9ebb86919..345826d8a6 100644
--- a/ui/qt/models/percent_bar_delegate.h
+++ b/ui/qt/models/percent_bar_delegate.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PERCENTBARDELEGATE_H
#define PERCENTBARDELEGATE_H
diff --git a/ui/qt/models/pref_delegate.cpp b/ui/qt/models/pref_delegate.cpp
index ab25b6ceaa..2d0669564e 100644
--- a/ui/qt/models/pref_delegate.cpp
+++ b/ui/qt/models/pref_delegate.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/models/pref_delegate.h>
diff --git a/ui/qt/models/pref_delegate.h b/ui/qt/models/pref_delegate.h
index 23e8744bb0..c7495443c6 100644
--- a/ui/qt/models/pref_delegate.h
+++ b/ui/qt/models/pref_delegate.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PREF_DELEGATE_H
diff --git a/ui/qt/models/pref_models.cpp b/ui/qt/models/pref_models.cpp
index 9d199e7f60..2db3865498 100644
--- a/ui/qt/models/pref_models.cpp
+++ b/ui/qt/models/pref_models.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/models/pref_models.h>
diff --git a/ui/qt/models/pref_models.h b/ui/qt/models/pref_models.h
index b34959ca99..09e8e14ac6 100644
--- a/ui/qt/models/pref_models.h
+++ b/ui/qt/models/pref_models.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PREF_MODELS_H
diff --git a/ui/qt/models/proto_tree_model.cpp b/ui/qt/models/proto_tree_model.cpp
index 276b5a8f26..637d0d0072 100644
--- a/ui/qt/models/proto_tree_model.cpp
+++ b/ui/qt/models/proto_tree_model.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/models/proto_tree_model.h>
diff --git a/ui/qt/models/proto_tree_model.h b/ui/qt/models/proto_tree_model.h
index dce8060b9d..41a95941d7 100644
--- a/ui/qt/models/proto_tree_model.h
+++ b/ui/qt/models/proto_tree_model.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PROTO_TREE_MODEL_H
diff --git a/ui/qt/models/related_packet_delegate.cpp b/ui/qt/models/related_packet_delegate.cpp
index 1519ffda59..23d9152744 100644
--- a/ui/qt/models/related_packet_delegate.cpp
+++ b/ui/qt/models/related_packet_delegate.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/models/related_packet_delegate.h>
#include "packet_list_record.h"
diff --git a/ui/qt/models/related_packet_delegate.h b/ui/qt/models/related_packet_delegate.h
index 29dc0ad086..db9da84fdb 100644
--- a/ui/qt/models/related_packet_delegate.h
+++ b/ui/qt/models/related_packet_delegate.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef RELATED_PACKET_DELEGATE_H
#define RELATED_PACKET_DELEGATE_H
diff --git a/ui/qt/models/sparkline_delegate.cpp b/ui/qt/models/sparkline_delegate.cpp
index df44903544..a99245c190 100644
--- a/ui/qt/models/sparkline_delegate.cpp
+++ b/ui/qt/models/sparkline_delegate.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/models/sparkline_delegate.h>
diff --git a/ui/qt/models/sparkline_delegate.h b/ui/qt/models/sparkline_delegate.h
index 5d6b11e1ff..48c9f52201 100644
--- a/ui/qt/models/sparkline_delegate.h
+++ b/ui/qt/models/sparkline_delegate.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SPARKLINE_DELEGATE_H
#define SPARKLINE_DELEGATE_H
diff --git a/ui/qt/models/supported_protocols_model.cpp b/ui/qt/models/supported_protocols_model.cpp
index 335e615c40..8f5b54e195 100644
--- a/ui/qt/models/supported_protocols_model.cpp
+++ b/ui/qt/models/supported_protocols_model.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <QSortFilterProxyModel>
diff --git a/ui/qt/models/supported_protocols_model.h b/ui/qt/models/supported_protocols_model.h
index 77359c3091..75fee84ba7 100644
--- a/ui/qt/models/supported_protocols_model.h
+++ b/ui/qt/models/supported_protocols_model.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef SUPPORTED_PROTOCOLS_MODEL_H
diff --git a/ui/qt/models/timeline_delegate.cpp b/ui/qt/models/timeline_delegate.cpp
index 453927b895..721c5d2e17 100644
--- a/ui/qt/models/timeline_delegate.cpp
+++ b/ui/qt/models/timeline_delegate.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/models/timeline_delegate.h>
diff --git a/ui/qt/models/timeline_delegate.h b/ui/qt/models/timeline_delegate.h
index 4c9ca6fb24..5597d7dfda 100644
--- a/ui/qt/models/timeline_delegate.h
+++ b/ui/qt/models/timeline_delegate.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef TIMELINE_DELEGATE_H
#define TIMELINE_DELEGATE_H
diff --git a/ui/qt/models/tree_model_helpers.h b/ui/qt/models/tree_model_helpers.h
index 440f7d5fa1..6585ef6e4e 100644
--- a/ui/qt/models/tree_model_helpers.h
+++ b/ui/qt/models/tree_model_helpers.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef TREE_MODEL_HELPERS_H
diff --git a/ui/qt/models/uat_delegate.cpp b/ui/qt/models/uat_delegate.cpp
index 49cd56b96b..afe5771d14 100644
--- a/ui/qt/models/uat_delegate.cpp
+++ b/ui/qt/models/uat_delegate.cpp
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/models/uat_delegate.h>
#include "epan/value_string.h"
diff --git a/ui/qt/models/uat_delegate.h b/ui/qt/models/uat_delegate.h
index 932d56be09..0f1c7455ee 100644
--- a/ui/qt/models/uat_delegate.h
+++ b/ui/qt/models/uat_delegate.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UAT_DELEGATE_H
#define UAT_DELEGATE_H
diff --git a/ui/qt/models/uat_model.cpp b/ui/qt/models/uat_model.cpp
index 3174da89b1..5ae86e9c91 100644
--- a/ui/qt/models/uat_model.cpp
+++ b/ui/qt/models/uat_model.cpp
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "uat_model.h"
#include <epan/to_str.h>
diff --git a/ui/qt/models/uat_model.h b/ui/qt/models/uat_model.h
index bd847e115d..299f04c102 100644
--- a/ui/qt/models/uat_model.h
+++ b/ui/qt/models/uat_model.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UAT_MODEL_H
#define UAT_MODEL_H
diff --git a/ui/qt/models/url_link_delegate.cpp b/ui/qt/models/url_link_delegate.cpp
index 205a35921a..a00eb4833b 100644
--- a/ui/qt/models/url_link_delegate.cpp
+++ b/ui/qt/models/url_link_delegate.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/models/url_link_delegate.h>
diff --git a/ui/qt/models/url_link_delegate.h b/ui/qt/models/url_link_delegate.h
index c35a611d18..4167704f52 100644
--- a/ui/qt/models/url_link_delegate.h
+++ b/ui/qt/models/url_link_delegate.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef URL_LINK_DELEGATE_H
diff --git a/ui/qt/models/voip_calls_info_model.cpp b/ui/qt/models/voip_calls_info_model.cpp
index 4a066d8d00..be15e6c728 100644
--- a/ui/qt/models/voip_calls_info_model.cpp
+++ b/ui/qt/models/voip_calls_info_model.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "voip_calls_info_model.h"
#include <wsutil/utf8_entities.h>
diff --git a/ui/qt/models/voip_calls_info_model.h b/ui/qt/models/voip_calls_info_model.h
index b50d4dbbb4..7c00f3166a 100644
--- a/ui/qt/models/voip_calls_info_model.h
+++ b/ui/qt/models/voip_calls_info_model.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef VOIP_CALLS_INFO_MODEL_H
#define VOIP_CALLS_INFO_MODEL_H
diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp
index 68b0fa392f..2cb5330080 100644
--- a/ui/qt/module_preferences_scroll_area.cpp
+++ b/ui/qt/module_preferences_scroll_area.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "module_preferences_scroll_area.h"
#include <ui_module_preferences_scroll_area.h>
diff --git a/ui/qt/module_preferences_scroll_area.h b/ui/qt/module_preferences_scroll_area.h
index 67de217cd6..103b17fd60 100644
--- a/ui/qt/module_preferences_scroll_area.h
+++ b/ui/qt/module_preferences_scroll_area.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef MODULE_PREFERENCES_SCROLL_AREA_H
#define MODULE_PREFERENCES_SCROLL_AREA_H
diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp
index 31d6fdcfdd..466eafe2ef 100644
--- a/ui/qt/mtp3_summary_dialog.cpp
+++ b/ui/qt/mtp3_summary_dialog.cpp
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "mtp3_summary_dialog.h"
#include <ui_mtp3_summary_dialog.h>
diff --git a/ui/qt/mtp3_summary_dialog.h b/ui/qt/mtp3_summary_dialog.h
index 79fed44532..f75c36f420 100644
--- a/ui/qt/mtp3_summary_dialog.h
+++ b/ui/qt/mtp3_summary_dialog.h
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef MTP3_SUMMARY_DIALOG_H
#define MTP3_SUMMARY_DIALOG_H
diff --git a/ui/qt/multicast_statistics_dialog.cpp b/ui/qt/multicast_statistics_dialog.cpp
index a5e7778651..04578bd23a 100644
--- a/ui/qt/multicast_statistics_dialog.cpp
+++ b/ui/qt/multicast_statistics_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "multicast_statistics_dialog.h"
diff --git a/ui/qt/multicast_statistics_dialog.h b/ui/qt/multicast_statistics_dialog.h
index a23bedda95..9bbcb398b4 100644
--- a/ui/qt/multicast_statistics_dialog.h
+++ b/ui/qt/multicast_statistics_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef MULTICASTSTATISTICSDIALOG_H
#define MULTICASTSTATISTICSDIALOG_H
diff --git a/ui/qt/packet_comment_dialog.cpp b/ui/qt/packet_comment_dialog.cpp
index 5f1af825f1..fa111a9c57 100644
--- a/ui/qt/packet_comment_dialog.cpp
+++ b/ui/qt/packet_comment_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "packet_comment_dialog.h"
#include <ui_packet_comment_dialog.h>
diff --git a/ui/qt/packet_comment_dialog.h b/ui/qt/packet_comment_dialog.h
index 88dd5e7d30..b19b719166 100644
--- a/ui/qt/packet_comment_dialog.h
+++ b/ui/qt/packet_comment_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PACKET_COMMENT_DIALOG_H
#define PACKET_COMMENT_DIALOG_H
diff --git a/ui/qt/packet_dialog.cpp b/ui/qt/packet_dialog.cpp
index 4539a828d1..326fd71aa9 100644
--- a/ui/qt/packet_dialog.cpp
+++ b/ui/qt/packet_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "packet_dialog.h"
diff --git a/ui/qt/packet_dialog.h b/ui/qt/packet_dialog.h
index b9ba62e90e..4779dd6f64 100644
--- a/ui/qt/packet_dialog.h
+++ b/ui/qt/packet_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PACKET_DIALOG_H
#define PACKET_DIALOG_H
diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
index e8c8608fd0..a80a71aaad 100644
--- a/ui/qt/packet_format_group_box.cpp
+++ b/ui/qt/packet_format_group_box.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "packet_format_group_box.h"
#include <ui_packet_format_group_box.h>
diff --git a/ui/qt/packet_format_group_box.h b/ui/qt/packet_format_group_box.h
index a194d1ece5..2171f2fd25 100644
--- a/ui/qt/packet_format_group_box.h
+++ b/ui/qt/packet_format_group_box.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PACKET_FORMAT_GROUP_BOX_H
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index e3ede1a325..9ddf6cec8e 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/packet_list.h>
diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h
index 3f4d339288..db1556f976 100644
--- a/ui/qt/packet_list.h
+++ b/ui/qt/packet_list.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PACKET_LIST_H
diff --git a/ui/qt/packet_range_group_box.cpp b/ui/qt/packet_range_group_box.cpp
index 2411bafd33..0981c1e44e 100644
--- a/ui/qt/packet_range_group_box.cpp
+++ b/ui/qt/packet_range_group_box.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "packet_range_group_box.h"
#include <ui_packet_range_group_box.h>
diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h
index 05fbeec441..8629d806c4 100644
--- a/ui/qt/packet_range_group_box.h
+++ b/ui/qt/packet_range_group_box.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PACKET_RANGE_GROUP_BOX_H
#define PACKET_RANGE_GROUP_BOX_H
diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp
index 5be2635c3c..e2b9e8605e 100644
--- a/ui/qt/preference_editor_frame.cpp
+++ b/ui/qt/preference_editor_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/preference_editor_frame.h b/ui/qt/preference_editor_frame.h
index 0863c39839..6cef560970 100644
--- a/ui/qt/preference_editor_frame.h
+++ b/ui/qt/preference_editor_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PREFERENCE_EDITOR_FRAME_H
#define PREFERENCE_EDITOR_FRAME_H
diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp
index c15c6ceb26..2b14ef42b0 100644
--- a/ui/qt/preferences_dialog.cpp
+++ b/ui/qt/preferences_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "preferences_dialog.h"
diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h
index 04925bcd7f..5bc95ade5a 100644
--- a/ui/qt/preferences_dialog.h
+++ b/ui/qt/preferences_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PREFERENCES_DIALOG_H
diff --git a/ui/qt/print_dialog.cpp b/ui/qt/print_dialog.cpp
index ba9fa4a855..59f1915803 100644
--- a/ui/qt/print_dialog.cpp
+++ b/ui/qt/print_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "print_dialog.h"
#include <ui_print_dialog.h>
diff --git a/ui/qt/print_dialog.h b/ui/qt/print_dialog.h
index 6c4ef68bd5..9900d10b95 100644
--- a/ui/qt/print_dialog.h
+++ b/ui/qt/print_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PRINT_DIALOG_H
#define PRINT_DIALOG_H
diff --git a/ui/qt/profile_dialog.cpp b/ui/qt/profile_dialog.cpp
index 102156433f..81ca9ba5f7 100644
--- a/ui/qt/profile_dialog.cpp
+++ b/ui/qt/profile_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
#include <glib.h>
diff --git a/ui/qt/profile_dialog.h b/ui/qt/profile_dialog.h
index 1263113c45..aca0ff8db2 100644
--- a/ui/qt/profile_dialog.h
+++ b/ui/qt/profile_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PROFILE_DIALOG_H
#define PROFILE_DIALOG_H
diff --git a/ui/qt/progress_frame.cpp b/ui/qt/progress_frame.cpp
index 846bb7fa99..d3dfb9ef4a 100644
--- a/ui/qt/progress_frame.cpp
+++ b/ui/qt/progress_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/progress_frame.h b/ui/qt/progress_frame.h
index 2d9dfe7574..ff5c6dc59b 100644
--- a/ui/qt/progress_frame.h
+++ b/ui/qt/progress_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PROGRESS_FRAME_H
#define PROGRESS_FRAME_H
diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp
index ed9da842f6..6b25f7156d 100644
--- a/ui/qt/proto_tree.cpp
+++ b/ui/qt/proto_tree.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <stdio.h>
diff --git a/ui/qt/proto_tree.h b/ui/qt/proto_tree.h
index 8394b69815..9dada379eb 100644
--- a/ui/qt/proto_tree.h
+++ b/ui/qt/proto_tree.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PROTO_TREE_H
diff --git a/ui/qt/protocol_hierarchy_dialog.cpp b/ui/qt/protocol_hierarchy_dialog.cpp
index 2d9b36cf03..d6688ddd62 100644
--- a/ui/qt/protocol_hierarchy_dialog.cpp
+++ b/ui/qt/protocol_hierarchy_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "protocol_hierarchy_dialog.h"
#include <ui_protocol_hierarchy_dialog.h>
diff --git a/ui/qt/protocol_hierarchy_dialog.h b/ui/qt/protocol_hierarchy_dialog.h
index 0a24179af6..40f8125cee 100644
--- a/ui/qt/protocol_hierarchy_dialog.h
+++ b/ui/qt/protocol_hierarchy_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef PROTOCOL_HIERARCHY_DIALOG_H
#define PROTOCOL_HIERARCHY_DIALOG_H
diff --git a/ui/qt/protocol_preferences_menu.cpp b/ui/qt/protocol_preferences_menu.cpp
index 31d4154271..1ad2fd6759 100644
--- a/ui/qt/protocol_preferences_menu.cpp
+++ b/ui/qt/protocol_preferences_menu.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/qt/protocol_preferences_menu.h b/ui/qt/protocol_preferences_menu.h
index 4672aba7d0..4dfcda12e6 100644
--- a/ui/qt/protocol_preferences_menu.h
+++ b/ui/qt/protocol_preferences_menu.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __PROTOCOL_PREFERENCES_MENU_H__
diff --git a/ui/qt/recent_file_status.cpp b/ui/qt/recent_file_status.cpp
index 4829de40b5..3cf9333f4d 100644
--- a/ui/qt/recent_file_status.cpp
+++ b/ui/qt/recent_file_status.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "recent_file_status.h"
diff --git a/ui/qt/recent_file_status.h b/ui/qt/recent_file_status.h
index c012d35195..098c953ae5 100644
--- a/ui/qt/recent_file_status.h
+++ b/ui/qt/recent_file_status.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef RECENT_FILE_STATUS_H
diff --git a/ui/qt/remote_capture_dialog.cpp b/ui/qt/remote_capture_dialog.cpp
index ecc2675b08..d205f9f6ef 100644
--- a/ui/qt/remote_capture_dialog.cpp
+++ b/ui/qt/remote_capture_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
// XXX This shouldn't exist. These controls should be in ManageInterfacesDialog instead.
diff --git a/ui/qt/remote_capture_dialog.h b/ui/qt/remote_capture_dialog.h
index ab6b7a58a9..8cc70be73b 100644
--- a/ui/qt/remote_capture_dialog.h
+++ b/ui/qt/remote_capture_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef REMOTE_CAPTURE_DIALOG_H
#define REMOTE_CAPTURE_DIALOG_H
diff --git a/ui/qt/remote_settings_dialog.cpp b/ui/qt/remote_settings_dialog.cpp
index 4575c481f3..272a2aa074 100644
--- a/ui/qt/remote_settings_dialog.cpp
+++ b/ui/qt/remote_settings_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
// XXX This shouldn't exist. These controls should be in ManageInterfacesDialog instead.
diff --git a/ui/qt/remote_settings_dialog.h b/ui/qt/remote_settings_dialog.h
index eab8dd0dd6..948582de0e 100644
--- a/ui/qt/remote_settings_dialog.h
+++ b/ui/qt/remote_settings_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef REMOTE_SETTINGS_DIALOG_H
#define REMOTE_SETTINGS_DIALOG_H
diff --git a/ui/qt/resolved_addresses_dialog.cpp b/ui/qt/resolved_addresses_dialog.cpp
index a7091339f3..ece27bb294 100644
--- a/ui/qt/resolved_addresses_dialog.cpp
+++ b/ui/qt/resolved_addresses_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "resolved_addresses_dialog.h"
#include <ui_resolved_addresses_dialog.h>
diff --git a/ui/qt/resolved_addresses_dialog.h b/ui/qt/resolved_addresses_dialog.h
index 54ed0e139d..ff87a33467 100644
--- a/ui/qt/resolved_addresses_dialog.h
+++ b/ui/qt/resolved_addresses_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef RESOLVED_ADDRESSES_DIALOG_H
#define RESOLVED_ADDRESSES_DIALOG_H
diff --git a/ui/qt/response_time_delay_dialog.cpp b/ui/qt/response_time_delay_dialog.cpp
index b2dbedd507..fe22a2893a 100644
--- a/ui/qt/response_time_delay_dialog.cpp
+++ b/ui/qt/response_time_delay_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "response_time_delay_dialog.h"
diff --git a/ui/qt/response_time_delay_dialog.h b/ui/qt/response_time_delay_dialog.h
index 41f70b21c7..99413060a2 100644
--- a/ui/qt/response_time_delay_dialog.h
+++ b/ui/qt/response_time_delay_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __RESPONSE_TIME_DELAY_DIALOG_H__
#define __RESPONSE_TIME_DELAY_DIALOG_H__
diff --git a/ui/qt/rpc_service_response_time_dialog.cpp b/ui/qt/rpc_service_response_time_dialog.cpp
index ab2d5c9e87..30db4c5e06 100644
--- a/ui/qt/rpc_service_response_time_dialog.cpp
+++ b/ui/qt/rpc_service_response_time_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
// warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
#ifdef _MSC_VER
diff --git a/ui/qt/rpc_service_response_time_dialog.h b/ui/qt/rpc_service_response_time_dialog.h
index 064d89ff66..a474914e6e 100644
--- a/ui/qt/rpc_service_response_time_dialog.h
+++ b/ui/qt/rpc_service_response_time_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __RPC_SERVICE_RESPONSE_TIME_DIALOG_H__
#define __RPC_SERVICE_RESPONSE_TIME_DIALOG_H__
diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
index 76eda663b2..b8a950344d 100644
--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "rtp_analysis_dialog.h"
#include <ui_rtp_analysis_dialog.h>
diff --git a/ui/qt/rtp_analysis_dialog.h b/ui/qt/rtp_analysis_dialog.h
index 26cabdad4b..227b99e0e0 100644
--- a/ui/qt/rtp_analysis_dialog.h
+++ b/ui/qt/rtp_analysis_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef RTP_ANALYSIS_DIALOG_H
#define RTP_ANALYSIS_DIALOG_H
diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp
index 1e4a8404dc..10a5bed40c 100644
--- a/ui/qt/rtp_audio_stream.cpp
+++ b/ui/qt/rtp_audio_stream.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "rtp_audio_stream.h"
diff --git a/ui/qt/rtp_audio_stream.h b/ui/qt/rtp_audio_stream.h
index ff13d3037d..4d57e50714 100644
--- a/ui/qt/rtp_audio_stream.h
+++ b/ui/qt/rtp_audio_stream.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef RTPAUDIOSTREAM_H
#define RTPAUDIOSTREAM_H
diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp
index 5de3299e17..b42cb55231 100644
--- a/ui/qt/rtp_player_dialog.cpp
+++ b/ui/qt/rtp_player_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "rtp_player_dialog.h"
#include <ui_rtp_player_dialog.h>
diff --git a/ui/qt/rtp_player_dialog.h b/ui/qt/rtp_player_dialog.h
index d999616cf9..fa82911f4a 100644
--- a/ui/qt/rtp_player_dialog.h
+++ b/ui/qt/rtp_player_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef RTP_PLAYER_DIALOG_H
#define RTP_PLAYER_DIALOG_H
diff --git a/ui/qt/rtp_stream_dialog.cpp b/ui/qt/rtp_stream_dialog.cpp
index 52e4841a66..48228305f1 100644
--- a/ui/qt/rtp_stream_dialog.cpp
+++ b/ui/qt/rtp_stream_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "rtp_stream_dialog.h"
#include <ui_rtp_stream_dialog.h>
diff --git a/ui/qt/rtp_stream_dialog.h b/ui/qt/rtp_stream_dialog.h
index 28e87324e1..5f79c853bf 100644
--- a/ui/qt/rtp_stream_dialog.h
+++ b/ui/qt/rtp_stream_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef RTP_STREAM_DIALOG_H
#define RTP_STREAM_DIALOG_H
diff --git a/ui/qt/scsi_service_response_time_dialog.cpp b/ui/qt/scsi_service_response_time_dialog.cpp
index eb2870f092..d08eefeaf2 100644
--- a/ui/qt/scsi_service_response_time_dialog.cpp
+++ b/ui/qt/scsi_service_response_time_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "scsi_service_response_time_dialog.h"
diff --git a/ui/qt/scsi_service_response_time_dialog.h b/ui/qt/scsi_service_response_time_dialog.h
index 1313dfc805..8eb50fd3f9 100644
--- a/ui/qt/scsi_service_response_time_dialog.h
+++ b/ui/qt/scsi_service_response_time_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __SCSI_SERVICE_RESPONSE_TIME_DIALOG_H__
#define __SCSI_SERVICE_RESPONSE_TIME_DIALOG_H__
diff --git a/ui/qt/sctp_all_assocs_dialog.cpp b/ui/qt/sctp_all_assocs_dialog.cpp
index 96a7a5e816..ebe97d6163 100644
--- a/ui/qt/sctp_all_assocs_dialog.cpp
+++ b/ui/qt/sctp_all_assocs_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "sctp_all_assocs_dialog.h"
#include <ui_sctp_all_assocs_dialog.h>
diff --git a/ui/qt/sctp_all_assocs_dialog.h b/ui/qt/sctp_all_assocs_dialog.h
index 6d0e75d308..12ea73e101 100644
--- a/ui/qt/sctp_all_assocs_dialog.h
+++ b/ui/qt/sctp_all_assocs_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SCTP_ALL_ASSOCS_DIALOG_H
#define SCTP_ALL_ASSOCS_DIALOG_H
diff --git a/ui/qt/sctp_assoc_analyse_dialog.cpp b/ui/qt/sctp_assoc_analyse_dialog.cpp
index dabb2ae23c..02c4e1bd0b 100644
--- a/ui/qt/sctp_assoc_analyse_dialog.cpp
+++ b/ui/qt/sctp_assoc_analyse_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "epan/to_str.h"
diff --git a/ui/qt/sctp_assoc_analyse_dialog.h b/ui/qt/sctp_assoc_analyse_dialog.h
index ddcb3969f8..71b6ce42fa 100644
--- a/ui/qt/sctp_assoc_analyse_dialog.h
+++ b/ui/qt/sctp_assoc_analyse_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SCTP_ASSOC_ANALYSE_DIALOG_H
#define SCTP_ASSOC_ANALYSE_DIALOG_H
diff --git a/ui/qt/sctp_chunk_statistics_dialog.cpp b/ui/qt/sctp_chunk_statistics_dialog.cpp
index 8d57fbada7..af9ccee020 100644
--- a/ui/qt/sctp_chunk_statistics_dialog.cpp
+++ b/ui/qt/sctp_chunk_statistics_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "sctp_chunk_statistics_dialog.h"
#include <ui_sctp_chunk_statistics_dialog.h>
diff --git a/ui/qt/sctp_chunk_statistics_dialog.h b/ui/qt/sctp_chunk_statistics_dialog.h
index c1355a8c82..9c288cf03a 100644
--- a/ui/qt/sctp_chunk_statistics_dialog.h
+++ b/ui/qt/sctp_chunk_statistics_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SCTP_CHUNK_STATISTICS_DIALOG_H
#define SCTP_CHUNK_STATISTICS_DIALOG_H
diff --git a/ui/qt/sctp_graph_arwnd_dialog.cpp b/ui/qt/sctp_graph_arwnd_dialog.cpp
index 872b023a0d..891e51e852 100644
--- a/ui/qt/sctp_graph_arwnd_dialog.cpp
+++ b/ui/qt/sctp_graph_arwnd_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "sctp_graph_arwnd_dialog.h"
#include <ui_sctp_graph_arwnd_dialog.h>
diff --git a/ui/qt/sctp_graph_arwnd_dialog.h b/ui/qt/sctp_graph_arwnd_dialog.h
index 5a6ac1bd0b..5785cefb64 100644
--- a/ui/qt/sctp_graph_arwnd_dialog.h
+++ b/ui/qt/sctp_graph_arwnd_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SCTP_GRAPH_ARWND_DIALOG_H
#define SCTP_GRAPH_ARWND_DIALOG_H
diff --git a/ui/qt/sctp_graph_byte_dialog.cpp b/ui/qt/sctp_graph_byte_dialog.cpp
index 45a4345a89..afe227136e 100644
--- a/ui/qt/sctp_graph_byte_dialog.cpp
+++ b/ui/qt/sctp_graph_byte_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "sctp_graph_byte_dialog.h"
#include <ui_sctp_graph_byte_dialog.h>
diff --git a/ui/qt/sctp_graph_byte_dialog.h b/ui/qt/sctp_graph_byte_dialog.h
index 4b8f3a85ed..df4353fc56 100644
--- a/ui/qt/sctp_graph_byte_dialog.h
+++ b/ui/qt/sctp_graph_byte_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SCTP_GRAPH_BYTE_DIALOG_H
#define SCTP_GRAPH_BYTE_DIALOG_H
diff --git a/ui/qt/sctp_graph_dialog.cpp b/ui/qt/sctp_graph_dialog.cpp
index 47d38f58e5..a5afe34738 100644
--- a/ui/qt/sctp_graph_dialog.cpp
+++ b/ui/qt/sctp_graph_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <wsutil/utf8_entities.h>
diff --git a/ui/qt/sctp_graph_dialog.h b/ui/qt/sctp_graph_dialog.h
index 94839f37d5..22b6527e4c 100644
--- a/ui/qt/sctp_graph_dialog.h
+++ b/ui/qt/sctp_graph_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SCTP_GRAPH_DIALOG_H
#define SCTP_GRAPH_DIALOG_H
diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp
index 9bd5f9bf4e..a5e704cb3d 100644
--- a/ui/qt/search_frame.cpp
+++ b/ui/qt/search_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "search_frame.h"
#include <ui_search_frame.h>
diff --git a/ui/qt/search_frame.h b/ui/qt/search_frame.h
index f943dad7fb..0917dbfa6c 100644
--- a/ui/qt/search_frame.h
+++ b/ui/qt/search_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SEARCH_FRAME_H
#define SEARCH_FRAME_H
diff --git a/ui/qt/sequence_diagram.cpp b/ui/qt/sequence_diagram.cpp
index cf33d7dfbe..e826f3a459 100644
--- a/ui/qt/sequence_diagram.cpp
+++ b/ui/qt/sequence_diagram.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "sequence_diagram.h"
diff --git a/ui/qt/sequence_diagram.h b/ui/qt/sequence_diagram.h
index 1a3ad327e0..4167699e22 100644
--- a/ui/qt/sequence_diagram.h
+++ b/ui/qt/sequence_diagram.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SEQUENCE_DIAGRAM_H
#define SEQUENCE_DIAGRAM_H
diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp
index 6f747ea91b..be255e57e3 100644
--- a/ui/qt/sequence_dialog.cpp
+++ b/ui/qt/sequence_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "sequence_dialog.h"
#include <ui_sequence_dialog.h>
diff --git a/ui/qt/sequence_dialog.h b/ui/qt/sequence_dialog.h
index 7087ac357a..84c297dce8 100644
--- a/ui/qt/sequence_dialog.h
+++ b/ui/qt/sequence_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SEQUENCE_DIALOG_H
#define SEQUENCE_DIALOG_H
diff --git a/ui/qt/service_response_time_dialog.cpp b/ui/qt/service_response_time_dialog.cpp
index 3f9f10dfb2..5dc6e736a2 100644
--- a/ui/qt/service_response_time_dialog.cpp
+++ b/ui/qt/service_response_time_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "service_response_time_dialog.h"
diff --git a/ui/qt/service_response_time_dialog.h b/ui/qt/service_response_time_dialog.h
index 329df609ed..8dd5938552 100644
--- a/ui/qt/service_response_time_dialog.h
+++ b/ui/qt/service_response_time_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __SERVICE_RESPONSE_TIME_DIALOG_H__
#define __SERVICE_RESPONSE_TIME_DIALOG_H__
diff --git a/ui/qt/show_packet_bytes_dialog.cpp b/ui/qt/show_packet_bytes_dialog.cpp
index 0051ba1ea8..87de6a5425 100644
--- a/ui/qt/show_packet_bytes_dialog.cpp
+++ b/ui/qt/show_packet_bytes_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "show_packet_bytes_dialog.h"
#include <ui_show_packet_bytes_dialog.h>
diff --git a/ui/qt/show_packet_bytes_dialog.h b/ui/qt/show_packet_bytes_dialog.h
index 21294236ef..8382b945e5 100644
--- a/ui/qt/show_packet_bytes_dialog.h
+++ b/ui/qt/show_packet_bytes_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SHOW_PACKET_BYTES_DIALOG_H
#define SHOW_PACKET_BYTES_DIALOG_H
diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp
index 6b58dc4bf4..636333c292 100644
--- a/ui/qt/simple_dialog.cpp
+++ b/ui/qt/simple_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "simple_dialog.h"
diff --git a/ui/qt/simple_dialog.h b/ui/qt/simple_dialog.h
index 06404190cf..4bfd3f1465 100644
--- a/ui/qt/simple_dialog.h
+++ b/ui/qt/simple_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SIMPLE_DIALOG_H
#define SIMPLE_DIALOG_H
diff --git a/ui/qt/simple_statistics_dialog.cpp b/ui/qt/simple_statistics_dialog.cpp
index f1e4f5c42a..3bdcc29723 100644
--- a/ui/qt/simple_statistics_dialog.cpp
+++ b/ui/qt/simple_statistics_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "simple_statistics_dialog.h"
diff --git a/ui/qt/simple_statistics_dialog.h b/ui/qt/simple_statistics_dialog.h
index 6892bcd561..a1fe6929d5 100644
--- a/ui/qt/simple_statistics_dialog.h
+++ b/ui/qt/simple_statistics_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __SIMPLE_STATISTICS_DIALOG_H__
#define __SIMPLE_STATISTICS_DIALOG_H__
diff --git a/ui/qt/splash_overlay.cpp b/ui/qt/splash_overlay.cpp
index a34c7d156b..0131f58e2a 100644
--- a/ui/qt/splash_overlay.cpp
+++ b/ui/qt/splash_overlay.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "splash_overlay.h"
#include <ui_splash_overlay.h>
diff --git a/ui/qt/splash_overlay.h b/ui/qt/splash_overlay.h
index a8a501fe7f..32d5fa1fd9 100644
--- a/ui/qt/splash_overlay.h
+++ b/ui/qt/splash_overlay.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SPLASH_OVERLAY_H
#define SPLASH_OVERLAY_H
diff --git a/ui/qt/stats_tree_dialog.cpp b/ui/qt/stats_tree_dialog.cpp
index ca8feb06db..83654d1ff3 100644
--- a/ui/qt/stats_tree_dialog.cpp
+++ b/ui/qt/stats_tree_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "stats_tree_dialog.h"
diff --git a/ui/qt/stats_tree_dialog.h b/ui/qt/stats_tree_dialog.h
index 2a895d5abc..c17a50f48c 100644
--- a/ui/qt/stats_tree_dialog.h
+++ b/ui/qt/stats_tree_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef STATS_TREE_DIALOG_H
#define STATS_TREE_DIALOG_H
diff --git a/ui/qt/supported_protocols_dialog.cpp b/ui/qt/supported_protocols_dialog.cpp
index 726f713c16..a680db5382 100644
--- a/ui/qt/supported_protocols_dialog.cpp
+++ b/ui/qt/supported_protocols_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/qt/supported_protocols_dialog.h b/ui/qt/supported_protocols_dialog.h
index 585da1898f..f65e17a415 100644
--- a/ui/qt/supported_protocols_dialog.h
+++ b/ui/qt/supported_protocols_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef SUPPORTED_PROTOCOLS_DIALOG_H
diff --git a/ui/qt/tabnav_tree_widget.cpp b/ui/qt/tabnav_tree_widget.cpp
index ab2aa4f276..b80f77a97f 100644
--- a/ui/qt/tabnav_tree_widget.cpp
+++ b/ui/qt/tabnav_tree_widget.cpp
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "tabnav_tree_widget.h"
diff --git a/ui/qt/tabnav_tree_widget.h b/ui/qt/tabnav_tree_widget.h
index 83e234d31f..c10074cfc6 100644
--- a/ui/qt/tabnav_tree_widget.h
+++ b/ui/qt/tabnav_tree_widget.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef TABNAV_TREE_WIDGET_H
#define TABNAV_TREE_WIDGET_H
diff --git a/ui/qt/tap_parameter_dialog.cpp b/ui/qt/tap_parameter_dialog.cpp
index c2e42c891e..4072117b74 100644
--- a/ui/qt/tap_parameter_dialog.cpp
+++ b/ui/qt/tap_parameter_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/*
* @file Tap parameter dialog class
diff --git a/ui/qt/tap_parameter_dialog.h b/ui/qt/tap_parameter_dialog.h
index 71268f82cb..0d701acf35 100644
--- a/ui/qt/tap_parameter_dialog.h
+++ b/ui/qt/tap_parameter_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef TAP_PARAMETER_DIALOG_H
#define TAP_PARAMETER_DIALOG_H
diff --git a/ui/qt/tcp_stream_dialog.cpp b/ui/qt/tcp_stream_dialog.cpp
index 33be836eee..64143d4731 100644
--- a/ui/qt/tcp_stream_dialog.cpp
+++ b/ui/qt/tcp_stream_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "tcp_stream_dialog.h"
#include <ui_tcp_stream_dialog.h>
diff --git a/ui/qt/tcp_stream_dialog.h b/ui/qt/tcp_stream_dialog.h
index 7f17fc4457..a422cd9abe 100644
--- a/ui/qt/tcp_stream_dialog.h
+++ b/ui/qt/tcp_stream_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef TCP_STREAM_DIALOG_H
#define TCP_STREAM_DIALOG_H
diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
index f18b6d5ceb..93882c09a3 100644
--- a/ui/qt/time_shift_dialog.cpp
+++ b/ui/qt/time_shift_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "time_shift_dialog.h"
#include <ui_time_shift_dialog.h>
diff --git a/ui/qt/time_shift_dialog.h b/ui/qt/time_shift_dialog.h
index 0a9f85f305..10f87f05a0 100644
--- a/ui/qt/time_shift_dialog.h
+++ b/ui/qt/time_shift_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef TIME_SHIFT_DIALOG_H
#define TIME_SHIFT_DIALOG_H
diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp
index 9cb6fffe64..8cbe863dfe 100644
--- a/ui/qt/traffic_table_dialog.cpp
+++ b/ui/qt/traffic_table_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "log.h"
#include "traffic_table_dialog.h"
diff --git a/ui/qt/traffic_table_dialog.h b/ui/qt/traffic_table_dialog.h
index ed7317f7c1..681b41e5b3 100644
--- a/ui/qt/traffic_table_dialog.h
+++ b/ui/qt/traffic_table_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef TRAFFIC_TABLE_DIALOG_H
#define TRAFFIC_TABLE_DIALOG_H
diff --git a/ui/qt/uat_dialog.cpp b/ui/qt/uat_dialog.cpp
index 203590f00a..deef940beb 100644
--- a/ui/qt/uat_dialog.cpp
+++ b/ui/qt/uat_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "uat_dialog.h"
#include <ui_uat_dialog.h>
diff --git a/ui/qt/uat_dialog.h b/ui/qt/uat_dialog.h
index 42e64c19df..ce5d4601c6 100644
--- a/ui/qt/uat_dialog.h
+++ b/ui/qt/uat_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UAT_DIALOG_H
#define UAT_DIALOG_H
diff --git a/ui/qt/uat_frame.cpp b/ui/qt/uat_frame.cpp
index a12a8a53ad..ed3d286207 100644
--- a/ui/qt/uat_frame.cpp
+++ b/ui/qt/uat_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/uat_frame.h b/ui/qt/uat_frame.h
index 0056c93f50..1c1124e194 100644
--- a/ui/qt/uat_frame.h
+++ b/ui/qt/uat_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UAT_FRAME_H
#define UAT_FRAME_H
diff --git a/ui/qt/utils/color_utils.cpp b/ui/qt/utils/color_utils.cpp
index 14b11e34d2..e5e44afd6f 100644
--- a/ui/qt/utils/color_utils.cpp
+++ b/ui/qt/utils/color_utils.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/utils/tango_colors.h>
diff --git a/ui/qt/utils/color_utils.h b/ui/qt/utils/color_utils.h
index 2d60cdc688..0afff4f6c2 100644
--- a/ui/qt/utils/color_utils.h
+++ b/ui/qt/utils/color_utils.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef COLOR_UTILS_H
#define COLOR_UTILS_H
diff --git a/ui/qt/utils/data_printer.cpp b/ui/qt/utils/data_printer.cpp
index 2eceb9e22c..7ff5e3dd78 100644
--- a/ui/qt/utils/data_printer.cpp
+++ b/ui/qt/utils/data_printer.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/utils/data_printer.h>
diff --git a/ui/qt/utils/data_printer.h b/ui/qt/utils/data_printer.h
index 31fc690279..ce43477486 100644
--- a/ui/qt/utils/data_printer.h
+++ b/ui/qt/utils/data_printer.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef DATA_PRINTER_H
diff --git a/ui/qt/utils/field_information.cpp b/ui/qt/utils/field_information.cpp
index 5a919627b0..d671106cf7 100644
--- a/ui/qt/utils/field_information.cpp
+++ b/ui/qt/utils/field_information.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <stdint.h>
diff --git a/ui/qt/utils/field_information.h b/ui/qt/utils/field_information.h
index a9284966b9..e021b4ad1b 100644
--- a/ui/qt/utils/field_information.h
+++ b/ui/qt/utils/field_information.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef FIELD_INFORMATION_H_
diff --git a/ui/qt/utils/frame_information.cpp b/ui/qt/utils/frame_information.cpp
index a9f6786ca3..b3e6b12dfe 100644
--- a/ui/qt/utils/frame_information.cpp
+++ b/ui/qt/utils/frame_information.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <epan/epan_dissect.h>
#include "epan/epan.h"
diff --git a/ui/qt/utils/frame_information.h b/ui/qt/utils/frame_information.h
index 36b05aa55e..58ebebe221 100644
--- a/ui/qt/utils/frame_information.h
+++ b/ui/qt/utils/frame_information.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FRAME_INFORMATION_H_
#define FRAME_INFORMATION_H_
diff --git a/ui/qt/utils/idata_printable.h b/ui/qt/utils/idata_printable.h
index 369847f7c1..0e2e6181f2 100644
--- a/ui/qt/utils/idata_printable.h
+++ b/ui/qt/utils/idata_printable.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef IDATA_PRINTABLE_H
diff --git a/ui/qt/utils/proto_node.cpp b/ui/qt/utils/proto_node.cpp
index 03a9b91162..dd15a41846 100644
--- a/ui/qt/utils/proto_node.cpp
+++ b/ui/qt/utils/proto_node.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/utils/proto_node.h>
diff --git a/ui/qt/utils/proto_node.h b/ui/qt/utils/proto_node.h
index 044dbf7e07..b76d9ee3d9 100644
--- a/ui/qt/utils/proto_node.h
+++ b/ui/qt/utils/proto_node.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PROTO_NODE_H_
diff --git a/ui/qt/utils/qt_ui_utils.cpp b/ui/qt/utils/qt_ui_utils.cpp
index 84a33eaf74..13553e96c5 100644
--- a/ui/qt/utils/qt_ui_utils.cpp
+++ b/ui/qt/utils/qt_ui_utils.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/ui/qt/utils/qt_ui_utils.h b/ui/qt/utils/qt_ui_utils.h
index e0cbd22342..650e08558f 100644
--- a/ui/qt/utils/qt_ui_utils.h
+++ b/ui/qt/utils/qt_ui_utils.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __QT_UI_UTILS_H__
#define __QT_UI_UTILS_H__
diff --git a/ui/qt/utils/stock_icon.cpp b/ui/qt/utils/stock_icon.cpp
index 82545f9f9b..ced54b23cd 100644
--- a/ui/qt/utils/stock_icon.cpp
+++ b/ui/qt/utils/stock_icon.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/utils/stock_icon.h>
diff --git a/ui/qt/utils/stock_icon.h b/ui/qt/utils/stock_icon.h
index 7b8b827ed1..df8b936675 100644
--- a/ui/qt/utils/stock_icon.h
+++ b/ui/qt/utils/stock_icon.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef STOCK_ICON_H
#define STOCK_ICON_H
diff --git a/ui/qt/utils/tango_colors.h b/ui/qt/utils/tango_colors.h
index 954acd93d5..c73861d2f6 100644
--- a/ui/qt/utils/tango_colors.h
+++ b/ui/qt/utils/tango_colors.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __TANGO_COLORS_H__
#define __TANGO_COLORS_H__
diff --git a/ui/qt/utils/variant_pointer.h b/ui/qt/utils/variant_pointer.h
index 9458398c93..4edd65beba 100644
--- a/ui/qt/utils/variant_pointer.h
+++ b/ui/qt/utils/variant_pointer.h
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UI_QT_VARIANT_POINTER_H_
#define UI_QT_VARIANT_POINTER_H_
diff --git a/ui/qt/utils/wireshark_mime_data.cpp b/ui/qt/utils/wireshark_mime_data.cpp
index 6d53ab402b..bde1f32318 100644
--- a/ui/qt/utils/wireshark_mime_data.cpp
+++ b/ui/qt/utils/wireshark_mime_data.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <utils/wireshark_mime_data.h>
diff --git a/ui/qt/utils/wireshark_mime_data.h b/ui/qt/utils/wireshark_mime_data.h
index 6ee6c56b84..3f798c2c5b 100644
--- a/ui/qt/utils/wireshark_mime_data.h
+++ b/ui/qt/utils/wireshark_mime_data.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UI_QT_UTILS_WIRESHARK_MIME_DATA_H_
#define UI_QT_UTILS_WIRESHARK_MIME_DATA_H_
diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp
index d96bad45ae..e3d7f427e8 100644
--- a/ui/qt/voip_calls_dialog.cpp
+++ b/ui/qt/voip_calls_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "voip_calls_dialog.h"
#include <ui_voip_calls_dialog.h>
diff --git a/ui/qt/voip_calls_dialog.h b/ui/qt/voip_calls_dialog.h
index 03e515940e..9a2c8a96f9 100644
--- a/ui/qt/voip_calls_dialog.h
+++ b/ui/qt/voip_calls_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef VOIP_CALLS_DIALOG_H
#define VOIP_CALLS_DIALOG_H
diff --git a/ui/qt/widgets/additional_toolbar.cpp b/ui/qt/widgets/additional_toolbar.cpp
index c77edeb71a..20f3891059 100644
--- a/ui/qt/widgets/additional_toolbar.cpp
+++ b/ui/qt/widgets/additional_toolbar.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <config.h>
diff --git a/ui/qt/widgets/additional_toolbar.h b/ui/qt/widgets/additional_toolbar.h
index ab1fed8dc2..48ed51870b 100644
--- a/ui/qt/widgets/additional_toolbar.h
+++ b/ui/qt/widgets/additional_toolbar.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UI_QT_ADDITIONAL_TOOLBAR_H_
#define UI_QT_ADDITIONAL_TOOLBAR_H_
diff --git a/ui/qt/widgets/apply_line_edit.cpp b/ui/qt/widgets/apply_line_edit.cpp
index 847eac77a3..d28bf85e46 100644
--- a/ui/qt/widgets/apply_line_edit.cpp
+++ b/ui/qt/widgets/apply_line_edit.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/apply_line_edit.h>
diff --git a/ui/qt/widgets/apply_line_edit.h b/ui/qt/widgets/apply_line_edit.h
index 44ed90368a..17275d098a 100644
--- a/ui/qt/widgets/apply_line_edit.h
+++ b/ui/qt/widgets/apply_line_edit.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UI_QT_APPLY_LINE_EDIT_H_
#define UI_QT_APPLY_LINE_EDIT_H_
diff --git a/ui/qt/widgets/byte_view_text.cpp b/ui/qt/widgets/byte_view_text.cpp
index cd6eada7f2..2a758d14e2 100644
--- a/ui/qt/widgets/byte_view_text.cpp
+++ b/ui/qt/widgets/byte_view_text.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "byte_view_text.h"
diff --git a/ui/qt/widgets/byte_view_text.h b/ui/qt/widgets/byte_view_text.h
index 7b9d5e2a42..071601996e 100644
--- a/ui/qt/widgets/byte_view_text.h
+++ b/ui/qt/widgets/byte_view_text.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef BYTE_VIEW_TEXT_H
diff --git a/ui/qt/widgets/capture_filter_combo.cpp b/ui/qt/widgets/capture_filter_combo.cpp
index 39610fb205..f62652604c 100644
--- a/ui/qt/widgets/capture_filter_combo.cpp
+++ b/ui/qt/widgets/capture_filter_combo.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <stdio.h>
diff --git a/ui/qt/widgets/capture_filter_combo.h b/ui/qt/widgets/capture_filter_combo.h
index 7d0a585d79..930c8e8de9 100644
--- a/ui/qt/widgets/capture_filter_combo.h
+++ b/ui/qt/widgets/capture_filter_combo.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_FILTER_COMBO_H
#define CAPTURE_FILTER_COMBO_H
diff --git a/ui/qt/widgets/capture_filter_edit.cpp b/ui/qt/widgets/capture_filter_edit.cpp
index 279bb66d42..7ad7d5d300 100644
--- a/ui/qt/widgets/capture_filter_edit.cpp
+++ b/ui/qt/widgets/capture_filter_edit.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/widgets/capture_filter_edit.h b/ui/qt/widgets/capture_filter_edit.h
index 3849002247..8b142e1101 100644
--- a/ui/qt/widgets/capture_filter_edit.h
+++ b/ui/qt/widgets/capture_filter_edit.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef CAPTURE_FILTER_EDIT_H
#define CAPTURE_FILTER_EDIT_H
diff --git a/ui/qt/widgets/clickable_label.cpp b/ui/qt/widgets/clickable_label.cpp
index 4ddaf498b0..1b7ca02537 100644
--- a/ui/qt/widgets/clickable_label.cpp
+++ b/ui/qt/widgets/clickable_label.cpp
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/widgets/clickable_label.h>
diff --git a/ui/qt/widgets/clickable_label.h b/ui/qt/widgets/clickable_label.h
index dec5ebfec1..1e2445ba06 100644
--- a/ui/qt/widgets/clickable_label.h
+++ b/ui/qt/widgets/clickable_label.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef CLICKABLE_LABEL_H_
diff --git a/ui/qt/widgets/display_filter_combo.cpp b/ui/qt/widgets/display_filter_combo.cpp
index bc07bb11d9..f973b586f4 100644
--- a/ui/qt/widgets/display_filter_combo.cpp
+++ b/ui/qt/widgets/display_filter_combo.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <stdio.h>
diff --git a/ui/qt/widgets/display_filter_combo.h b/ui/qt/widgets/display_filter_combo.h
index 691fb6f569..3c3fad2fa9 100644
--- a/ui/qt/widgets/display_filter_combo.h
+++ b/ui/qt/widgets/display_filter_combo.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef DISPLAY_FILTER_COMBO_H
#define DISPLAY_FILTER_COMBO_H
diff --git a/ui/qt/widgets/display_filter_edit.cpp b/ui/qt/widgets/display_filter_edit.cpp
index 46f832d8dc..e1cd6237f3 100644
--- a/ui/qt/widgets/display_filter_edit.cpp
+++ b/ui/qt/widgets/display_filter_edit.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/qt/widgets/display_filter_edit.h b/ui/qt/widgets/display_filter_edit.h
index 447d969671..72eb8cfeca 100644
--- a/ui/qt/widgets/display_filter_edit.h
+++ b/ui/qt/widgets/display_filter_edit.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef DISPLAYFILTEREDIT_H
diff --git a/ui/qt/widgets/dissector_tables_view.cpp b/ui/qt/widgets/dissector_tables_view.cpp
index c3b383b0f0..1586efe60b 100644
--- a/ui/qt/widgets/dissector_tables_view.cpp
+++ b/ui/qt/widgets/dissector_tables_view.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "dissector_tables_view.h"
diff --git a/ui/qt/widgets/dissector_tables_view.h b/ui/qt/widgets/dissector_tables_view.h
index 446268a0c2..46d4dd2e1d 100644
--- a/ui/qt/widgets/dissector_tables_view.h
+++ b/ui/qt/widgets/dissector_tables_view.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef DISSECTOR_TABLES_VIEW_H
diff --git a/ui/qt/widgets/drag_drop_toolbar.cpp b/ui/qt/widgets/drag_drop_toolbar.cpp
index 726c38a931..5916be4a9e 100644
--- a/ui/qt/widgets/drag_drop_toolbar.cpp
+++ b/ui/qt/widgets/drag_drop_toolbar.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/drag_drop_toolbar.h>
#include <ui/qt/widgets/drag_label.h>
diff --git a/ui/qt/widgets/drag_drop_toolbar.h b/ui/qt/widgets/drag_drop_toolbar.h
index fca6c72765..bddf8c4bdc 100644
--- a/ui/qt/widgets/drag_drop_toolbar.h
+++ b/ui/qt/widgets/drag_drop_toolbar.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef DRAG_DROP_TOOLBAR_H
#define DRAG_DROP_TOOLBAR_H
diff --git a/ui/qt/widgets/drag_label.cpp b/ui/qt/widgets/drag_label.cpp
index 2469462ae2..40a3d2d5cc 100644
--- a/ui/qt/widgets/drag_label.cpp
+++ b/ui/qt/widgets/drag_label.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/drag_label.h>
diff --git a/ui/qt/widgets/drag_label.h b/ui/qt/widgets/drag_label.h
index 18ec0e6654..6c7f8f0d5d 100644
--- a/ui/qt/widgets/drag_label.h
+++ b/ui/qt/widgets/drag_label.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef UI_QT_WIDGETS_DRAG_LABEL_H_
#define UI_QT_WIDGETS_DRAG_LABEL_H_
diff --git a/ui/qt/widgets/editor_color_dialog.cpp b/ui/qt/widgets/editor_color_dialog.cpp
index e324d56faa..a85fb9c5fc 100644
--- a/ui/qt/widgets/editor_color_dialog.cpp
+++ b/ui/qt/widgets/editor_color_dialog.cpp
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/editor_color_dialog.h>
diff --git a/ui/qt/widgets/editor_color_dialog.h b/ui/qt/widgets/editor_color_dialog.h
index 29c143aca6..5bc42955ca 100644
--- a/ui/qt/widgets/editor_color_dialog.h
+++ b/ui/qt/widgets/editor_color_dialog.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef EDITOR_COLOR_DIALOG_H_
#define EDITOR_COLOR_DIALOG_H_
diff --git a/ui/qt/widgets/editor_file_dialog.cpp b/ui/qt/widgets/editor_file_dialog.cpp
index 89bb040c35..486dcc419c 100644
--- a/ui/qt/widgets/editor_file_dialog.cpp
+++ b/ui/qt/widgets/editor_file_dialog.cpp
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/editor_file_dialog.h>
diff --git a/ui/qt/widgets/editor_file_dialog.h b/ui/qt/widgets/editor_file_dialog.h
index 15356b236e..20ad4bba23 100644
--- a/ui/qt/widgets/editor_file_dialog.h
+++ b/ui/qt/widgets/editor_file_dialog.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef EDITOR_FILE_DIALOG_H_
#define EDITOR_FILE_DIALOG_H_
diff --git a/ui/qt/widgets/elided_label.cpp b/ui/qt/widgets/elided_label.cpp
index 2319b24e47..286d5a5e45 100644
--- a/ui/qt/widgets/elided_label.cpp
+++ b/ui/qt/widgets/elided_label.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/elided_label.h>
diff --git a/ui/qt/widgets/elided_label.h b/ui/qt/widgets/elided_label.h
index 1ff8ad7a67..c076cd9785 100644
--- a/ui/qt/widgets/elided_label.h
+++ b/ui/qt/widgets/elided_label.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef ELIDED_LABEL_H
#define ELIDED_LABEL_H
diff --git a/ui/qt/widgets/expert_info_view.cpp b/ui/qt/widgets/expert_info_view.cpp
index 1436ee23a4..fc0ab7587f 100644
--- a/ui/qt/widgets/expert_info_view.cpp
+++ b/ui/qt/widgets/expert_info_view.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "expert_info_view.h"
diff --git a/ui/qt/widgets/expert_info_view.h b/ui/qt/widgets/expert_info_view.h
index 7662cf330d..5f796ab438 100644
--- a/ui/qt/widgets/expert_info_view.h
+++ b/ui/qt/widgets/expert_info_view.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef EXPERT_INFO_VIEW_H
diff --git a/ui/qt/widgets/export_objects_view.cpp b/ui/qt/widgets/export_objects_view.cpp
index 4fa350f318..d426755228 100644
--- a/ui/qt/widgets/export_objects_view.cpp
+++ b/ui/qt/widgets/export_objects_view.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "export_objects_view.h"
diff --git a/ui/qt/widgets/export_objects_view.h b/ui/qt/widgets/export_objects_view.h
index 6caa1bf4f2..711321bfde 100644
--- a/ui/qt/widgets/export_objects_view.h
+++ b/ui/qt/widgets/export_objects_view.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef EXPORT_OBJECTS_VIEW_H
diff --git a/ui/qt/widgets/field_filter_edit.cpp b/ui/qt/widgets/field_filter_edit.cpp
index 797b2f4745..d378289f43 100644
--- a/ui/qt/widgets/field_filter_edit.cpp
+++ b/ui/qt/widgets/field_filter_edit.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/widgets/field_filter_edit.h b/ui/qt/widgets/field_filter_edit.h
index e669c3043c..b5787a909e 100644
--- a/ui/qt/widgets/field_filter_edit.h
+++ b/ui/qt/widgets/field_filter_edit.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FIELDFILTEREDIT_H
#define FIELDFILTEREDIT_H
diff --git a/ui/qt/widgets/find_line_edit.cpp b/ui/qt/widgets/find_line_edit.cpp
index 8788fa5bd5..74acb930c8 100644
--- a/ui/qt/widgets/find_line_edit.cpp
+++ b/ui/qt/widgets/find_line_edit.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/find_line_edit.h>
#include <ui/qt/utils/color_utils.h>
diff --git a/ui/qt/widgets/find_line_edit.h b/ui/qt/widgets/find_line_edit.h
index c9edc7e367..269a1dbb23 100644
--- a/ui/qt/widgets/find_line_edit.h
+++ b/ui/qt/widgets/find_line_edit.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FIND_LINE_EDIT_H
#define FIND_LINE_EDIT_H
diff --git a/ui/qt/widgets/follow_stream_text.cpp b/ui/qt/widgets/follow_stream_text.cpp
index 2fd782d91c..515a535c92 100644
--- a/ui/qt/widgets/follow_stream_text.cpp
+++ b/ui/qt/widgets/follow_stream_text.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/follow_stream_text.h>
diff --git a/ui/qt/widgets/follow_stream_text.h b/ui/qt/widgets/follow_stream_text.h
index eee211f703..9cfaae7de7 100644
--- a/ui/qt/widgets/follow_stream_text.h
+++ b/ui/qt/widgets/follow_stream_text.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef FOLLOW_STREAM_TEXT_H
#define FOLLOW_STREAM_TEXT_H
diff --git a/ui/qt/widgets/interface_toolbar_lineedit.cpp b/ui/qt/widgets/interface_toolbar_lineedit.cpp
index 02f541ea11..26be826ae8 100644
--- a/ui/qt/widgets/interface_toolbar_lineedit.cpp
+++ b/ui/qt/widgets/interface_toolbar_lineedit.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/widgets/interface_toolbar_lineedit.h b/ui/qt/widgets/interface_toolbar_lineedit.h
index 462dcd5620..2d5f75cdb5 100644
--- a/ui/qt/widgets/interface_toolbar_lineedit.h
+++ b/ui/qt/widgets/interface_toolbar_lineedit.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef INTERFACE_TOOLBAR_LINEEDIT_H
#define INTERFACE_TOOLBAR_LINEEDIT_H
diff --git a/ui/qt/widgets/label_stack.cpp b/ui/qt/widgets/label_stack.cpp
index 19d4a73725..212bed4825 100644
--- a/ui/qt/widgets/label_stack.cpp
+++ b/ui/qt/widgets/label_stack.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/label_stack.h>
diff --git a/ui/qt/widgets/label_stack.h b/ui/qt/widgets/label_stack.h
index c6d57d83e1..3b16d9ba57 100644
--- a/ui/qt/widgets/label_stack.h
+++ b/ui/qt/widgets/label_stack.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef LABEL_STACK_H
#define LABEL_STACK_H
diff --git a/ui/qt/widgets/overlay_scroll_bar.cpp b/ui/qt/widgets/overlay_scroll_bar.cpp
index e7b880be3b..95b9e2de69 100644
--- a/ui/qt/widgets/overlay_scroll_bar.cpp
+++ b/ui/qt/widgets/overlay_scroll_bar.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/overlay_scroll_bar.h>
diff --git a/ui/qt/widgets/overlay_scroll_bar.h b/ui/qt/widgets/overlay_scroll_bar.h
index d31fe3b45e..a358d9f958 100644
--- a/ui/qt/widgets/overlay_scroll_bar.h
+++ b/ui/qt/widgets/overlay_scroll_bar.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __OVERLAY_SCROLL_BAR_H__
#define __OVERLAY_SCROLL_BAR_H__
diff --git a/ui/qt/widgets/pref_module_view.cpp b/ui/qt/widgets/pref_module_view.cpp
index dd0b04bbd4..bd86590f88 100644
--- a/ui/qt/widgets/pref_module_view.cpp
+++ b/ui/qt/widgets/pref_module_view.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "pref_module_view.h"
diff --git a/ui/qt/widgets/pref_module_view.h b/ui/qt/widgets/pref_module_view.h
index f88581117d..a769dc3f5a 100644
--- a/ui/qt/widgets/pref_module_view.h
+++ b/ui/qt/widgets/pref_module_view.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PREFERENCE_MODULE_VIEW_H
diff --git a/ui/qt/widgets/range_syntax_lineedit.cpp b/ui/qt/widgets/range_syntax_lineedit.cpp
index 1175f592d1..22f5106239 100644
--- a/ui/qt/widgets/range_syntax_lineedit.cpp
+++ b/ui/qt/widgets/range_syntax_lineedit.cpp
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <ui/qt/widgets/range_syntax_lineedit.h>
diff --git a/ui/qt/widgets/range_syntax_lineedit.h b/ui/qt/widgets/range_syntax_lineedit.h
index 5b069d55d8..a2bd49927e 100644
--- a/ui/qt/widgets/range_syntax_lineedit.h
+++ b/ui/qt/widgets/range_syntax_lineedit.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef RANGE_SYNTAX_LINEEDIT_H
diff --git a/ui/qt/widgets/stock_icon_tool_button.cpp b/ui/qt/widgets/stock_icon_tool_button.cpp
index 0ecf990269..1c06bd3593 100644
--- a/ui/qt/widgets/stock_icon_tool_button.cpp
+++ b/ui/qt/widgets/stock_icon_tool_button.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <ui/qt/widgets/stock_icon_tool_button.h>
diff --git a/ui/qt/widgets/stock_icon_tool_button.h b/ui/qt/widgets/stock_icon_tool_button.h
index 1b8eef0fe2..15cbe51b28 100644
--- a/ui/qt/widgets/stock_icon_tool_button.h
+++ b/ui/qt/widgets/stock_icon_tool_button.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef STOCKICONTOOLBUTTON_H
#define STOCKICONTOOLBUTTON_H
diff --git a/ui/qt/widgets/syntax_line_edit.cpp b/ui/qt/widgets/syntax_line_edit.cpp
index a86a3035e3..c233d58c05 100644
--- a/ui/qt/widgets/syntax_line_edit.cpp
+++ b/ui/qt/widgets/syntax_line_edit.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/widgets/syntax_line_edit.h b/ui/qt/widgets/syntax_line_edit.h
index 8b27e06d17..9bce7508a9 100644
--- a/ui/qt/widgets/syntax_line_edit.h
+++ b/ui/qt/widgets/syntax_line_edit.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef SYNTAX_LINE_EDIT_H
#define SYNTAX_LINE_EDIT_H
diff --git a/ui/qt/widgets/tabnav_tree_view.cpp b/ui/qt/widgets/tabnav_tree_view.cpp
index f8e6cf3a68..3b54426ab7 100644
--- a/ui/qt/widgets/tabnav_tree_view.cpp
+++ b/ui/qt/widgets/tabnav_tree_view.cpp
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "tabnav_tree_view.h"
diff --git a/ui/qt/widgets/tabnav_tree_view.h b/ui/qt/widgets/tabnav_tree_view.h
index 6ba75a5245..ca92778be3 100644
--- a/ui/qt/widgets/tabnav_tree_view.h
+++ b/ui/qt/widgets/tabnav_tree_view.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef TABNAV_TREE_VIEW_H
#define TABNAV_TREE_VIEW_H
diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
index 75f3cc6e81..bd9076abcf 100644
--- a/ui/qt/wireless_frame.cpp
+++ b/ui/qt/wireless_frame.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "wireless_frame.h"
#include <ui_wireless_frame.h>
diff --git a/ui/qt/wireless_frame.h b/ui/qt/wireless_frame.h
index 243f45acf9..67057a335e 100644
--- a/ui/qt/wireless_frame.h
+++ b/ui/qt/wireless_frame.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef WIRELESS_FRAME_H
#define WIRELESS_FRAME_H
diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp
index 61843338f3..6ab1691db9 100644
--- a/ui/qt/wireless_timeline.cpp
+++ b/ui/qt/wireless_timeline.cpp
@@ -8,7 +8,7 @@
* Copyright 2012 Parc Inc and Samsung Electronics
* Copyright 2015, 2016 & 2017 Cisco Inc
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "wireless_timeline.h"
diff --git a/ui/qt/wireless_timeline.h b/ui/qt/wireless_timeline.h
index 0003fd0537..d5499d1501 100644
--- a/ui/qt/wireless_timeline.h
+++ b/ui/qt/wireless_timeline.h
@@ -8,7 +8,7 @@
* Copyright 2012 Parc Inc and Samsung Electronics
* Copyright 2015, 2016 & 2017 Cisco Inc
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include <QScrollArea>
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index e6ad3f4732..be905ea19b 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
// warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index c043edc00c..fa359b441e 100644
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef WIRESHARK_APPLICATION_H
diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp
index a0e82c8ffc..5ea9246824 100644
--- a/ui/qt/wireshark_dialog.cpp
+++ b/ui/qt/wireshark_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/qt/wireshark_dialog.h b/ui/qt/wireshark_dialog.h
index be5a784281..2e4a750a74 100644
--- a/ui/qt/wireshark_dialog.h
+++ b/ui/qt/wireshark_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef WIRESHARK_DIALOG_H
#define WIRESHARK_DIALOG_H
diff --git a/ui/qt/wlan_statistics_dialog.cpp b/ui/qt/wlan_statistics_dialog.cpp
index df0e38b7c4..327d631974 100644
--- a/ui/qt/wlan_statistics_dialog.cpp
+++ b/ui/qt/wlan_statistics_dialog.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "wlan_statistics_dialog.h"
diff --git a/ui/qt/wlan_statistics_dialog.h b/ui/qt/wlan_statistics_dialog.h
index f1d8079bed..80f968ea11 100644
--- a/ui/qt/wlan_statistics_dialog.h
+++ b/ui/qt/wlan_statistics_dialog.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef WLANSTATISTICSDIALOG_H
#define WLANSTATISTICSDIALOG_H
diff --git a/ui/recent.c b/ui/recent.c
index 11a6f96008..9417d4e922 100644
--- a/ui/recent.c
+++ b/ui/recent.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/recent.h b/ui/recent.h
index 05cfd9077b..cfafcc6350 100644
--- a/ui/recent.h
+++ b/ui/recent.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __RECENT_H__
diff --git a/ui/recent_utils.h b/ui/recent_utils.h
index 01c939b16d..8a943be14c 100644
--- a/ui/recent_utils.h
+++ b/ui/recent_utils.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __UI_RECENT_UTILS_H__
#define __UI_RECENT_UTILS_H__
diff --git a/ui/rtp_media.c b/ui/rtp_media.c
index d16d50bca3..3a8c3a02be 100644
--- a/ui/rtp_media.c
+++ b/ui/rtp_media.c
@@ -9,7 +9,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/rtp_media.h b/ui/rtp_media.h
index dc18632505..3842582336 100644
--- a/ui/rtp_media.h
+++ b/ui/rtp_media.h
@@ -9,7 +9,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __RTP_MEDIA_H__
#define __RTP_MEDIA_H__
diff --git a/ui/rtp_stream.c b/ui/rtp_stream.c
index f17a77474f..8da569229b 100644
--- a/ui/rtp_stream.c
+++ b/ui/rtp_stream.c
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h
index bad4fbd0db..28342a510f 100644
--- a/ui/rtp_stream.h
+++ b/ui/rtp_stream.h
@@ -8,7 +8,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __RTP_STREAM_H__
#define __RTP_STREAM_H__
diff --git a/ui/service_response_time.c b/ui/service_response_time.c
index 100fc34674..80329e9de7 100644
--- a/ui/service_response_time.c
+++ b/ui/service_response_time.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "service_response_time.h"
diff --git a/ui/service_response_time.h b/ui/service_response_time.h
index 230c5a02b5..c041e501a3 100644
--- a/ui/service_response_time.h
+++ b/ui/service_response_time.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
/** @file
* Helper routines common to all service response time statistics taps.
diff --git a/ui/simple_dialog.h b/ui/simple_dialog.h
index 218c2c34a6..53c1c52975 100644
--- a/ui/simple_dialog.h
+++ b/ui/simple_dialog.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __SIMPLE_DIALOG_UI_H__
#define __SIMPLE_DIALOG_UI_H__
diff --git a/ui/software_update.c b/ui/software_update.c
index 2cc90c3ee1..9253a0d6b4 100644
--- a/ui/software_update.c
+++ b/ui/software_update.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/software_update.h b/ui/software_update.h
index cb817f6282..0902e6cae0 100644
--- a/ui/software_update.h
+++ b/ui/software_update.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __SOFTWARE_UPDATE_H__
#define __SOFTWARE_UPDATE_H__
diff --git a/ui/ssl_key_export.c b/ui/ssl_key_export.c
index 54883ba47e..d253eee128 100644
--- a/ui/ssl_key_export.c
+++ b/ui/ssl_key_export.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/ssl_key_export.h b/ui/ssl_key_export.h
index 54a17a51ef..3d7369e47b 100644
--- a/ui/ssl_key_export.h
+++ b/ui/ssl_key_export.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __SSL_KEY_EXPORT_H__
#define __SSL_KEY_EXPORT_H__
diff --git a/ui/summary.c b/ui/summary.c
index 039f4ff870..6725a2d608 100644
--- a/ui/summary.c
+++ b/ui/summary.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/ui/summary.h b/ui/summary.h
index e4cbbcdc82..c2af42b182 100644
--- a/ui/summary.h
+++ b/ui/summary.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __SUMMARY_H__
diff --git a/ui/tap-iax2-analysis.c b/ui/tap-iax2-analysis.c
index ec1e93695b..1eab3790a1 100644
--- a/ui/tap-iax2-analysis.c
+++ b/ui/tap-iax2-analysis.c
@@ -13,7 +13,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
diff --git a/ui/tap-iax2-analysis.h b/ui/tap-iax2-analysis.h
index 2246a47aef..04ab172afa 100644
--- a/ui/tap-iax2-analysis.h
+++ b/ui/tap-iax2-analysis.h
@@ -13,7 +13,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __TAP_IAX2_ANALYSIS_H__
#define __TAP_IAX2_ANALYSIS_H__
diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c
index 93a494a897..5be215d318 100644
--- a/ui/tap-rlc-graph.c
+++ b/ui/tap-rlc-graph.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/tap-rlc-graph.h b/ui/tap-rlc-graph.h
index 1dcf49274d..8dfdc247db 100644
--- a/ui/tap-rlc-graph.h
+++ b/ui/tap-rlc-graph.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __TAP_RLC_GRAPH_H__
#define __TAP_RLC_GRAPH_H__
diff --git a/ui/tap-rtp-analysis.h b/ui/tap-rtp-analysis.h
index 937ab9e1db..23f68e824a 100644
--- a/ui/tap-rtp-analysis.h
+++ b/ui/tap-rtp-analysis.h
@@ -12,7 +12,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __TAP_RTP_ANALYSIS_H__
#define __TAP_RTP_ANALYSIS_H__
diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c
index 2fd78d70b9..b8d7c4e335 100644
--- a/ui/tap-rtp-common.c
+++ b/ui/tap-rtp-common.c
@@ -12,7 +12,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/tap-rtp-common.h b/ui/tap-rtp-common.h
index 5fbcbd9dce..1f559bf739 100644
--- a/ui/tap-rtp-common.h
+++ b/ui/tap-rtp-common.h
@@ -12,7 +12,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __TAP_RTP_COMMON_H__
diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c
index 41f78139df..4b799ecfba 100644
--- a/ui/tap-sctp-analysis.c
+++ b/ui/tap-sctp-analysis.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/tap-sctp-analysis.h b/ui/tap-sctp-analysis.h
index d9f04a3982..5d2f37a296 100644
--- a/ui/tap-sctp-analysis.h
+++ b/ui/tap-sctp-analysis.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __TAP_SCTP_ANALYSIS_H__
diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c
index e87f64872b..a91ad14836 100644
--- a/ui/tap-tcp-stream.c
+++ b/ui/tap-tcp-stream.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/tap-tcp-stream.h b/ui/tap-tcp-stream.h
index 69e584fca5..a0320175c0 100644
--- a/ui/tap-tcp-stream.h
+++ b/ui/tap-tcp-stream.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __TAP_TCP_STREAM_H__
#define __TAP_TCP_STREAM_H__
diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c
index 53b1e7de65..b58747c24f 100644
--- a/ui/tap_export_pdu.c
+++ b/ui/tap_export_pdu.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/tap_export_pdu.h b/ui/tap_export_pdu.h
index d5adb25887..883ed479ca 100644
--- a/ui/tap_export_pdu.h
+++ b/ui/tap_export_pdu.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __TAP_EXPORT_PDU_H__
#define __TAP_EXPORT_PDU_H__
diff --git a/ui/taps.h b/ui/taps.h
index 9faf44c61e..771835443c 100644
--- a/ui/taps.h
+++ b/ui/taps.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __TAP_REGISTER_H__
diff --git a/ui/text_import.c b/ui/text_import.c
index 4b5b7b002d..6a4c2e998d 100644
--- a/ui/text_import.c
+++ b/ui/text_import.c
@@ -8,7 +8,7 @@
*
* Based on text2pcap.c by Ashok Narayanan <ashokn@cisco.com>
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
/*******************************************************************************
*
diff --git a/ui/text_import.h b/ui/text_import.h
index f516f9c382..a0a77fea7f 100644
--- a/ui/text_import.h
+++ b/ui/text_import.h
@@ -9,7 +9,7 @@
*
* Based on text2pcap.h by Ashok Narayanan <ashokn@cisco.com>
*
- * SPDX-License-Identifier: GPL-2.0+*
+ * SPDX-License-Identifier: GPL-2.0-or-later*
*******************************************************************************/
diff --git a/ui/text_import_scanner.h b/ui/text_import_scanner.h
index 6d1d48c73d..f762ef3040 100644
--- a/ui/text_import_scanner.h
+++ b/ui/text_import_scanner.h
@@ -9,7 +9,7 @@
*
* Based on text2pcap.h by Ashok Narayanan <ashokn@cisco.com>
*
- * SPDX-License-Identifier: GPL-2.0+*
+ * SPDX-License-Identifier: GPL-2.0-or-later*
*******************************************************************************/
diff --git a/ui/time_shift.c b/ui/time_shift.c
index 446e7b6dcc..e8edc978aa 100644
--- a/ui/time_shift.c
+++ b/ui/time_shift.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/time_shift.h b/ui/time_shift.h
index ac8ff26796..b335d261c1 100644
--- a/ui/time_shift.h
+++ b/ui/time_shift.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __TIME_SHIFT_H__
#define __TIME_SHIFT_H__
diff --git a/ui/traffic_table_ui.c b/ui/traffic_table_ui.c
index 8baba47127..106f30dd85 100644
--- a/ui/traffic_table_ui.c
+++ b/ui/traffic_table_ui.c
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
#include <glib.h>
diff --git a/ui/traffic_table_ui.h b/ui/traffic_table_ui.h
index eefa29fee4..4baab403bb 100644
--- a/ui/traffic_table_ui.h
+++ b/ui/traffic_table_ui.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __CONVERSATION_UI_H__
#define __CONVERSATION_UI_H__
diff --git a/ui/util.c b/ui/util.c
index 2008bfa9bb..9fe353a6b0 100644
--- a/ui/util.c
+++ b/ui/util.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/ui/util.h b/ui/util.h
index f73344edcc..0940cacff0 100644
--- a/ui/util.h
+++ b/ui/util.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __UTIL_H__
#define __UTIL_H__
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index f95f62bd1b..1eed2034b8 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -16,7 +16,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
diff --git a/ui/voip_calls.h b/ui/voip_calls.h
index f0ab9ac7bd..15d7284f76 100644
--- a/ui/voip_calls.h
+++ b/ui/voip_calls.h
@@ -16,7 +16,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __VOIP_CALLS_H__
#define __VOIP_CALLS_H__
diff --git a/ui/win32/console_win32.c b/ui/win32/console_win32.c
index 9392989d7e..609b5abfe3 100644
--- a/ui/win32/console_win32.c
+++ b/ui/win32/console_win32.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifdef _WIN32
diff --git a/ui/win32/console_win32.h b/ui/win32/console_win32.h
index de2a6fcd6c..7add4095c7 100644
--- a/ui/win32/console_win32.h
+++ b/ui/win32/console_win32.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __CONSOLE_WIN32_H__
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index 36dc90f249..0e9803936b 100644
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2004 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/ui/win32/file_dlg_win32.h b/ui/win32/file_dlg_win32.h
index 57381e6677..10ced0e4be 100644
--- a/ui/win32/file_dlg_win32.h
+++ b/ui/win32/file_dlg_win32.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2006 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __FILE_DLG_WIN32_H__
diff --git a/ui/win32/print_win32.c b/ui/win32/print_win32.c
index 7a495eaa52..3f889455f1 100644
--- a/ui/win32/print_win32.c
+++ b/ui/win32/print_win32.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* This original code was from the Technet Article Q139652 :
* HOWTO: Print a Document
diff --git a/ui/win32/print_win32.h b/ui/win32/print_win32.h
index 4005ce47e1..cb14ca03f6 100644
--- a/ui/win32/print_win32.h
+++ b/ui/win32/print_win32.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2002, Jeffrey C. Foster <jfoste@woodward.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __PRINT_MSWIN_H__
diff --git a/ui/ws_ui_util.h b/ui/ws_ui_util.h
index b0bc885234..571c53c265 100644
--- a/ui/ws_ui_util.h
+++ b/ui/ws_ui_util.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __UI_UTIL_H__
#define __UI_UTIL_H__
diff --git a/version_info.c b/version_info.c
index bf6122f6c4..37601cf7e7 100644
--- a/version_info.c
+++ b/version_info.c
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/version_info.h b/version_info.h
index 9305256cda..e581b67c19 100644
--- a/version_info.h
+++ b/version_info.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __WS_VERSION_INFO_H__
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index b78f7de5a0..c7c6e389bd 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/wiretap/5views.c b/wiretap/5views.c
index f47105977d..61e7bd78d3 100644
--- a/wiretap/5views.c
+++ b/wiretap/5views.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/5views.h b/wiretap/5views.h
index 6fe3fe28fe..395680f4ce 100644
--- a/wiretap/5views.h
+++ b/wiretap/5views.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __5VIEWS_H__
diff --git a/wiretap/aethra.c b/wiretap/aethra.c
index 1d08ab4ff7..bfe02042a2 100644
--- a/wiretap/aethra.c
+++ b/wiretap/aethra.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/aethra.h b/wiretap/aethra.h
index 73e8211999..26e8809600 100644
--- a/wiretap/aethra.h
+++ b/wiretap/aethra.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_AETHRA_H__
diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h
index ea7d47cc9f..0b7af0e679 100644
--- a/wiretap/ascend-int.h
+++ b/wiretap/ascend-int.h
@@ -6,7 +6,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __ASCEND_INT_H__
diff --git a/wiretap/ascend.y b/wiretap/ascend.y
index 56f88b58de..0b527157b3 100644
--- a/wiretap/ascend.y
+++ b/wiretap/ascend.y
@@ -29,7 +29,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0+ *
+* SPDX-License-Identifier: GPL-2.0-or-later *
*/
/*
diff --git a/wiretap/ascend_scanner.l b/wiretap/ascend_scanner.l
index cba58e779e..0fb90184da 100644
--- a/wiretap/ascend_scanner.l
+++ b/wiretap/ascend_scanner.l
@@ -54,7 +54,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#include <stdlib.h>
#include <string.h>
diff --git a/wiretap/ascendtext.c b/wiretap/ascendtext.c
index 6792f87b0c..94d905e57c 100644
--- a/wiretap/ascendtext.c
+++ b/wiretap/ascendtext.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/ascendtext.h b/wiretap/ascendtext.h
index ad4b0866ee..607e87c678 100644
--- a/wiretap/ascendtext.h
+++ b/wiretap/ascendtext.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/atm.c b/wiretap/atm.c
index c6fc13ee22..cd7d2955e8 100644
--- a/wiretap/atm.c
+++ b/wiretap/atm.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/atm.h b/wiretap/atm.h
index e84b08f341..287fb2fbf1 100644
--- a/wiretap/atm.h
+++ b/wiretap/atm.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __ATM_H__
diff --git a/wiretap/ber.c b/wiretap/ber.c
index 75525a1b7e..1d0e87abf5 100644
--- a/wiretap/ber.c
+++ b/wiretap/ber.c
@@ -2,7 +2,7 @@
*
* Basic Encoding Rules (BER) file reading
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/ber.h b/wiretap/ber.h
index 9945a8fdbb..2c9ca05f19 100644
--- a/wiretap/ber.h
+++ b/wiretap/ber.h
@@ -2,7 +2,7 @@
*
* Basic Encoding Rules (BER) file reading
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c
index 2c7fd89da7..8bfb750e6c 100644
--- a/wiretap/btsnoop.c
+++ b/wiretap/btsnoop.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/btsnoop.h b/wiretap/btsnoop.h
index cd1c2e2cd1..e255d9b823 100644
--- a/wiretap/btsnoop.h
+++ b/wiretap/btsnoop.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_BTSNOOP_H__
diff --git a/wiretap/camins.c b/wiretap/camins.c
index 0d1ce001f7..1b3df7b48b 100644
--- a/wiretap/camins.c
+++ b/wiretap/camins.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
/* CAM Inspector is a commercial log tool for DVB-CI
diff --git a/wiretap/camins.h b/wiretap/camins.h
index f4423c658c..d8b53b23e8 100644
--- a/wiretap/camins.h
+++ b/wiretap/camins.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef _CAMINS_H
#define _CAMINS_H
diff --git a/wiretap/capsa.c b/wiretap/capsa.c
index e69303229f..0ba9dc233f 100644
--- a/wiretap/capsa.c
+++ b/wiretap/capsa.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/capsa.h b/wiretap/capsa.h
index fcb64c63c2..30906868ac 100644
--- a/wiretap/capsa.h
+++ b/wiretap/capsa.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_CAPSA_H__
diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c
index 3e609daf25..81fdd908b3 100644
--- a/wiretap/catapult_dct2000.c
+++ b/wiretap/catapult_dct2000.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/catapult_dct2000.h b/wiretap/catapult_dct2000.h
index 9b3748311d..b30002224f 100644
--- a/wiretap/catapult_dct2000.h
+++ b/wiretap/catapult_dct2000.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0+*/
+* SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __W_CAT_DCT2K_H__
#define __W_CAT_DCT2K_H__
diff --git a/wiretap/commview.c b/wiretap/commview.c
index e0b360e310..595b889793 100644
--- a/wiretap/commview.c
+++ b/wiretap/commview.c
@@ -8,7 +8,7 @@
*
* Based on csids.c and nettl.c
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
/* A brief description of this file format is available at:
* http://www.tamos.com/htmlhelp/commview/logformat.htm
diff --git a/wiretap/commview.h b/wiretap/commview.h
index a7e4e1eceb..c38df64971 100644
--- a/wiretap/commview.h
+++ b/wiretap/commview.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __COMMVIEW_H__
#define __COMMVIEW_H__
diff --git a/wiretap/cosine.c b/wiretap/cosine.c
index 4ff91f06b3..49bcb3a6db 100644
--- a/wiretap/cosine.c
+++ b/wiretap/cosine.c
@@ -6,7 +6,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/cosine.h b/wiretap/cosine.h
index 6e50e7b659..80fca64402 100644
--- a/wiretap/cosine.h
+++ b/wiretap/cosine.h
@@ -6,7 +6,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/csids.c b/wiretap/csids.c
index 80702cf74d..e864161572 100644
--- a/wiretap/csids.c
+++ b/wiretap/csids.c
@@ -3,7 +3,7 @@
* Copyright (c) 2000 by Mike Hall <mlh@io.com>
* Copyright (c) 2000 by Cisco Systems
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/csids.h b/wiretap/csids.h
index 6d06d2c401..365884ab63 100644
--- a/wiretap/csids.h
+++ b/wiretap/csids.h
@@ -3,7 +3,7 @@
* Copyright (c) 2000 by Mike Hall <mlh@io.com>
* Copyright (c) Cisco Systems
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c
index 26cf289bd9..853e3e4134 100644
--- a/wiretap/daintree-sna.c
+++ b/wiretap/daintree-sna.c
@@ -11,7 +11,7 @@
* remains. Borrowed many snippets from dbs-etherwatch.c, the
* daintree_sna_process_hex_data function having the largest chunk.
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
/* This module reads capture files saved by Daintree's Sensor Network Analyzer.
* Daintree captures are plain text files with a two line header,
diff --git a/wiretap/daintree-sna.h b/wiretap/daintree-sna.h
index 278e4acbd2..1e2621b1b1 100644
--- a/wiretap/daintree-sna.h
+++ b/wiretap/daintree-sna.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+ *
+* SPDX-License-Identifier: GPL-2.0-or-later *
*/
#ifndef __DAINTREE_SNA_H__
diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c
index 37ed2d7979..8e33b7cf43 100644
--- a/wiretap/dbs-etherwatch.c
+++ b/wiretap/dbs-etherwatch.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/dbs-etherwatch.h b/wiretap/dbs-etherwatch.h
index 7497d74f8f..fcfd419a35 100644
--- a/wiretap/dbs-etherwatch.h
+++ b/wiretap/dbs-etherwatch.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c
index 478bb9a92d..4996d15327 100644
--- a/wiretap/dct3trace.c
+++ b/wiretap/dct3trace.c
@@ -9,7 +9,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0+*/
+* SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
#include "wtap-int.h"
diff --git a/wiretap/dct3trace.h b/wiretap/dct3trace.h
index c0a26636e7..1c2b0c67ef 100644
--- a/wiretap/dct3trace.h
+++ b/wiretap/dct3trace.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_DCT3TRACE_H__
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c
index 9457061047..e2e92b596c 100644
--- a/wiretap/eyesdn.c
+++ b/wiretap/eyesdn.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/eyesdn.h b/wiretap/eyesdn.h
index ef89d72071..98c6b32a0f 100644
--- a/wiretap/eyesdn.h
+++ b/wiretap/eyesdn.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index d96e0d4ba2..c45270b971 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
index 2aff050826..4f426a20ec 100644
--- a/wiretap/file_wrappers.c
+++ b/wiretap/file_wrappers.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/* file_access interface based heavily on zlib gzread.c and gzlib.c from zlib
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h
index 869b174386..64e0b6b166 100644
--- a/wiretap/file_wrappers.h
+++ b/wiretap/file_wrappers.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __WTAP_FILE_WRAPPERS_H__
diff --git a/wiretap/hcidump.c b/wiretap/hcidump.c
index 5813a89b9a..d0aad8f9f1 100644
--- a/wiretap/hcidump.c
+++ b/wiretap/hcidump.c
@@ -2,7 +2,7 @@
*
* Copyright (c) 2003 by Marcel Holtmann <marcel@holtmann.org>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/hcidump.h b/wiretap/hcidump.h
index f24cb8c78c..6d497303bb 100644
--- a/wiretap/hcidump.h
+++ b/wiretap/hcidump.h
@@ -2,7 +2,7 @@
*
* Copyright (c) 2003 by Marcel Holtmann <marcel@holtmann.org>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c
index 893991351c..52d4faa8c3 100644
--- a/wiretap/i4btrace.c
+++ b/wiretap/i4btrace.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/i4btrace.h b/wiretap/i4btrace.h
index fdd728dd09..450e227941 100644
--- a/wiretap/i4btrace.h
+++ b/wiretap/i4btrace.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c
index ff61cd2cf5..ffb7e86613 100644
--- a/wiretap/ipfix.c
+++ b/wiretap/ipfix.c
@@ -7,7 +7,7 @@
* Copyright (c) 2010 by Hadriel Kaplan <hadrielk@yahoo.com>
* with generous copying from other wiretaps, such as pcapng
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/* File format reference:
diff --git a/wiretap/ipfix.h b/wiretap/ipfix.h
index c9fb9326c8..55ecff76ba 100644
--- a/wiretap/ipfix.h
+++ b/wiretap/ipfix.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 2010 by Hadriel Kaplan <hadrielk@yahoo.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_IPFIX_H__
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c
index efbb014013..b8d9105b98 100644
--- a/wiretap/iptrace.c
+++ b/wiretap/iptrace.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
#include "config.h"
diff --git a/wiretap/iptrace.h b/wiretap/iptrace.h
index 0abcd8a0bf..32d012060a 100644
--- a/wiretap/iptrace.h
+++ b/wiretap/iptrace.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/iseries.c b/wiretap/iseries.c
index c07d4ed8e1..1e26400b92 100644
--- a/wiretap/iseries.c
+++ b/wiretap/iseries.c
@@ -5,7 +5,7 @@
*
* Based on toshiba.c and vms.c
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
diff --git a/wiretap/iseries.h b/wiretap/iseries.h
index b69b298118..4812e406fe 100644
--- a/wiretap/iseries.h
+++ b/wiretap/iseries.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 2005 by Martin Warnes <martin@warnes.homeip.net>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_ISERIES_H__
diff --git a/wiretap/json.c b/wiretap/json.c
index a84fdea9c6..a61ef121a3 100644
--- a/wiretap/json.c
+++ b/wiretap/json.c
@@ -2,7 +2,7 @@
*
* Copyright 2015, Dario Lombardo <lomato@gmail.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/json.h b/wiretap/json.h
index b757ab454f..0803ef0b73 100644
--- a/wiretap/json.h
+++ b/wiretap/json.h
@@ -2,7 +2,7 @@
*
* Copyright 2015, Dario Lombardo <lomato@gmail.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/k12.c b/wiretap/k12.c
index 07d4d458a5..784bb6734c 100644
--- a/wiretap/k12.c
+++ b/wiretap/k12.c
@@ -8,7 +8,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/k12.h b/wiretap/k12.h
index 8f3c1f2bc2..7b4f06ff64 100644
--- a/wiretap/k12.h
+++ b/wiretap/k12.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0+*/
+* SPDX-License-Identifier: GPL-2.0-or-later*/
#ifndef __W_K12_H__
#define __W_K12_H__
diff --git a/wiretap/k12text.l b/wiretap/k12text.l
index 2b41ac7f02..4ffc849ba9 100644
--- a/wiretap/k12text.l
+++ b/wiretap/k12text.l
@@ -79,7 +79,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* TODO:
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index 042dfd5dd7..12fd85f4bc 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/lanalyzer.h b/wiretap/lanalyzer.h
index 013139ee57..8be6e2b2b5 100644
--- a/wiretap/lanalyzer.h
+++ b/wiretap/lanalyzer.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __LANALYZER_H__
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 5ddd37ff4f..77af997c19 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h
index 48a647ea6d..643e611f73 100644
--- a/wiretap/libpcap.h
+++ b/wiretap/libpcap.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_LIBPCAP_H__
diff --git a/wiretap/logcat.c b/wiretap/logcat.c
index 7af15942ba..9e7e88a959 100644
--- a/wiretap/logcat.c
+++ b/wiretap/logcat.c
@@ -2,7 +2,7 @@
*
* Copyright 2014, Michal Labedzki for Tieto Corporation
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/logcat.h b/wiretap/logcat.h
index 5ad283c332..cf79e18f4f 100644
--- a/wiretap/logcat.h
+++ b/wiretap/logcat.h
@@ -2,7 +2,7 @@
*
* Copyright 2014, Michal Labedzki for Tieto Corporation
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c
index 12925ef554..c4a5022987 100644
--- a/wiretap/logcat_text.c
+++ b/wiretap/logcat_text.c
@@ -3,7 +3,7 @@
* Copyright 2014, Michal Orynicz for Tieto Corporation
* Copyright 2014, Michal Labedzki for Tieto Corporation
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/logcat_text.h b/wiretap/logcat_text.h
index bd85b7965a..b7d9e53cdd 100644
--- a/wiretap/logcat_text.h
+++ b/wiretap/logcat_text.h
@@ -2,7 +2,7 @@
*
* Copyright 2014, Michal Orynicz for Tieto Corporation
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/merge.c b/wiretap/merge.c
index d6cf7be615..7d12ff4bbf 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -9,7 +9,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
diff --git a/wiretap/merge.h b/wiretap/merge.h
index 2059500619..aafbd81104 100644
--- a/wiretap/merge.h
+++ b/wiretap/merge.h
@@ -5,7 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __MERGE_H__
diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c
index 502bd1a91a..d5133d9214 100644
--- a/wiretap/mime_file.c
+++ b/wiretap/mime_file.c
@@ -12,7 +12,7 @@
* off to heuristic dissectors to try to identify the file's contents.
*
* Wiretap Library
-* SPDX-License-Identifier: GPL-2.0+*/
+* SPDX-License-Identifier: GPL-2.0-or-later*/
#include "config.h"
diff --git a/wiretap/mime_file.h b/wiretap/mime_file.h
index 6641fce073..ddc36f8dc9 100644
--- a/wiretap/mime_file.h
+++ b/wiretap/mime_file.h
@@ -3,7 +3,7 @@
* MIME file format decoder for the Wiretap library.
*
* Wiretap Library
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_JPEG_JFIF_H__
diff --git a/wiretap/mp2t.c b/wiretap/mp2t.c
index c6bf4e9a09..840fe34283 100644
--- a/wiretap/mp2t.c
+++ b/wiretap/mp2t.c
@@ -5,7 +5,7 @@
* Copyright 2012 Weston Schmidt
*
* Wiretap Library
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/mp2t.h b/wiretap/mp2t.h
index a7d6869249..39f625282a 100644
--- a/wiretap/mp2t.h
+++ b/wiretap/mp2t.h
@@ -5,7 +5,7 @@
* Copyright 2012 Weston Schmidt
*
* Wiretap Library
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_MP2T_H__
diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c
index da7ccc509c..a00e0fbab2 100644
--- a/wiretap/mpeg.c
+++ b/wiretap/mpeg.c
@@ -5,7 +5,7 @@
* Copyright 2007 Shaun Jackman
*
* Wiretap Library
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/mpeg.h b/wiretap/mpeg.h
index fe107e7687..76b7f1d000 100644
--- a/wiretap/mpeg.h
+++ b/wiretap/mpeg.h
@@ -5,7 +5,7 @@
* Copyright 2007 Shaun Jackman
*
* Wiretap Library
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_MPEG_H__
diff --git a/wiretap/mplog.c b/wiretap/mplog.c
index 8ca5e3fc9c..0f63963332 100644
--- a/wiretap/mplog.c
+++ b/wiretap/mplog.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
/*
diff --git a/wiretap/mplog.h b/wiretap/mplog.h
index e4c7743b81..13a57da37b 100644
--- a/wiretap/mplog.h
+++ b/wiretap/mplog.h
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef _MPLOG_H
#define _MPLOG_H
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index d9b258bd58..0359fcd12f 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/netmon.h b/wiretap/netmon.h
index d179dcb41b..0f92909866 100644
--- a/wiretap/netmon.h
+++ b/wiretap/netmon.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __NETMON_H__
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index 7f9a497018..bf10ab6ce8 100644
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 2006 by Ravi Kondamuru <Ravi.Kondamuru@citrix.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/netscaler.h b/wiretap/netscaler.h
index fb1d71db62..112457f19c 100644
--- a/wiretap/netscaler.h
+++ b/wiretap/netscaler.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 2006 by Ravi Kondamuru <Ravi.Kondamuru@citrix.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef _NETSCALER_H
diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c
index 2bbd1258a7..e66297d2e9 100644
--- a/wiretap/netscreen.c
+++ b/wiretap/netscreen.c
@@ -7,7 +7,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/netscreen.h b/wiretap/netscreen.h
index 1d815f6e19..51c02ee0ce 100644
--- a/wiretap/netscreen.h
+++ b/wiretap/netscreen.h
@@ -7,7 +7,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index e46c4c0198..d8ba4be23b 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -6,7 +6,7 @@
* Enhancements by Mark C. Brown <mbrown@hp.com>
* Copyright (C) 2003, 2005 Hewlett-Packard Development Company, L.P.
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
diff --git a/wiretap/nettl.h b/wiretap/nettl.h
index 0142e98de8..a48a5bc0e1 100644
--- a/wiretap/nettl.h
+++ b/wiretap/nettl.h
@@ -6,7 +6,7 @@
* Enhancements by Mark C. Brown <mbrown@hp.com>
* Copyright (C) 2003, 2005 Hewlett-Packard Development Company, L.P.
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __NETTL_H__
#define __NETTL_H__
diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c
index 2775ad9771..e923475800 100644
--- a/wiretap/nettrace_3gpp_32_423.c
+++ b/wiretap/nettrace_3gpp_32_423.c
@@ -3,7 +3,7 @@
* Decoder for 3GPP TS 32.423 file format for the Wiretap library.
* The main purpose is to have Wireshark decode raw message content (<rawMsg> tag).
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref: http://www.3gpp.org/DynaReport/32423.htm
*/
diff --git a/wiretap/nettrace_3gpp_32_423.h b/wiretap/nettrace_3gpp_32_423.h
index 8e86ad8554..bd07fbf38a 100644
--- a/wiretap/nettrace_3gpp_32_423.h
+++ b/wiretap/nettrace_3gpp_32_423.h
@@ -3,7 +3,7 @@
* MIME file format decoder for the Wiretap library.
*
* Wiretap Library
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __NETTRACE_3GPP_32_423__
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index 0bc0994c1e..baaf7533ea 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/netxray.h b/wiretap/netxray.h
index 0d48a34910..7163a88f0f 100644
--- a/wiretap/netxray.h
+++ b/wiretap/netxray.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __NETXRAY_H__
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index d732f54eb0..fa28d13dce 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/* The code in ngsniffer.c that decodes the time fields for each packet in the
diff --git a/wiretap/ngsniffer.h b/wiretap/ngsniffer.h
index d70030b430..9b5ad7dd1f 100644
--- a/wiretap/ngsniffer.h
+++ b/wiretap/ngsniffer.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __NGSNIFFER_H__
diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c
index c8d8b80e3c..e262f3ae0c 100644
--- a/wiretap/packetlogger.c
+++ b/wiretap/packetlogger.c
@@ -9,7 +9,7 @@
* Based on commview.c, Linux's BlueZ-Gnome Analyzer program and hexdumps of
* the output files from Apple's PacketLogger tool.
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
diff --git a/wiretap/packetlogger.h b/wiretap/packetlogger.h
index 19cf0b8476..5d11fb0564 100644
--- a/wiretap/packetlogger.h
+++ b/wiretap/packetlogger.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
-* SPDX-License-Identifier: GPL-2.0+ *
+* SPDX-License-Identifier: GPL-2.0-or-later *
*/
#ifndef __PACKETLOGGER_H__
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index d99bdaf514..894c33fb4e 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -7,7 +7,7 @@
* File format support for pcapng file format
* Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/pcap-common.h b/wiretap/pcap-common.h
index ca4e3027ac..c376d435bb 100644
--- a/wiretap/pcap-common.h
+++ b/wiretap/pcap-common.h
@@ -7,7 +7,7 @@
* File format support for pcapng file format
* Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_PCAP_COMMON_H__
diff --git a/wiretap/pcap-encap.h b/wiretap/pcap-encap.h
index 03ecc3054f..d72ede2928 100644
--- a/wiretap/pcap-encap.h
+++ b/wiretap/pcap-encap.h
@@ -7,7 +7,7 @@
* File format support for pcapng file format
* Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_PCAP_ENCAP_H__
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index 8933e96fe3..72398e8db3 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -6,7 +6,7 @@
* File format support for pcapng file format
* Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/* File format specification:
diff --git a/wiretap/pcapng.h b/wiretap/pcapng.h
index 3c0ca7d4be..d065131981 100644
--- a/wiretap/pcapng.h
+++ b/wiretap/pcapng.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_PCAPNG_H__
diff --git a/wiretap/pcapng_module.h b/wiretap/pcapng_module.h
index 918f2189e8..9a869b8b67 100644
--- a/wiretap/pcapng_module.h
+++ b/wiretap/pcapng_module.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __PCAP_MODULE_H__
diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c
index e929089fca..ba6836fe0f 100644
--- a/wiretap/peekclassic.c
+++ b/wiretap/peekclassic.c
@@ -18,7 +18,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
#include <errno.h>
diff --git a/wiretap/peekclassic.h b/wiretap/peekclassic.h
index 49eab0a675..d7e9290da5 100644
--- a/wiretap/peekclassic.h
+++ b/wiretap/peekclassic.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c
index 798bf8e0b6..4368a90988 100644
--- a/wiretap/peektagged.c
+++ b/wiretap/peektagged.c
@@ -15,7 +15,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#include "config.h"
#include <errno.h>
diff --git a/wiretap/peektagged.h b/wiretap/peektagged.h
index 8dd12cff16..628a8bf501 100644
--- a/wiretap/peektagged.h
+++ b/wiretap/peektagged.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_PEEKTAGGED_H__
diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c
index 3b1bc7a5dc..b6ad43f1fa 100644
--- a/wiretap/pppdump.c
+++ b/wiretap/pppdump.c
@@ -2,7 +2,7 @@
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/pppdump.h b/wiretap/pppdump.h
index 782fdc7b80..d9c37fa41d 100644
--- a/wiretap/pppdump.h
+++ b/wiretap/pppdump.h
@@ -2,7 +2,7 @@
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/radcom.c b/wiretap/radcom.c
index 71ee72210d..8583ef55a6 100644
--- a/wiretap/radcom.c
+++ b/wiretap/radcom.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/radcom.h b/wiretap/radcom.h
index b566127792..5d2194fd78 100644
--- a/wiretap/radcom.h
+++ b/wiretap/radcom.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index 825d2399d5..dee9cc8b88 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/snoop.h b/wiretap/snoop.h
index 4bf949fc1b..249257b995 100644
--- a/wiretap/snoop.h
+++ b/wiretap/snoop.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_SNOOP_H__
diff --git a/wiretap/stanag4607.c b/wiretap/stanag4607.c
index 743665032b..a89cd7daed 100644
--- a/wiretap/stanag4607.c
+++ b/wiretap/stanag4607.c
@@ -8,7 +8,7 @@
*
* https://nso.nato.int/nso/zPublic/ap/aedp-7(2).pdf
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/stanag4607.h b/wiretap/stanag4607.h
index 9092c25ac3..4b185aa190 100644
--- a/wiretap/stanag4607.h
+++ b/wiretap/stanag4607.h
@@ -2,7 +2,7 @@
*
* STANAG 4607 file reading
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/tnef.c b/wiretap/tnef.c
index 95cf6928d8..03720773b8 100644
--- a/wiretap/tnef.c
+++ b/wiretap/tnef.c
@@ -2,7 +2,7 @@
*
* Transport-Neutral Encapsulation Format (TNEF) file reading
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/tnef.h b/wiretap/tnef.h
index 3c324af226..3126727c11 100644
--- a/wiretap/tnef.h
+++ b/wiretap/tnef.h
@@ -2,7 +2,7 @@
*
* Transport-Neutral Encapsulation Format (TNEF) file reading
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c
index 2472577009..8f824ec51c 100644
--- a/wiretap/toshiba.c
+++ b/wiretap/toshiba.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/toshiba.h b/wiretap/toshiba.h
index 0fbadc35c3..5bf95a8f9a 100644
--- a/wiretap/toshiba.h
+++ b/wiretap/toshiba.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __W_TOSHIBA_H__
diff --git a/wiretap/visual.c b/wiretap/visual.c
index fb4a502829..58f714240f 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -5,7 +5,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/visual.h b/wiretap/visual.h
index befe8e9b7f..1af4c37738 100644
--- a/wiretap/visual.h
+++ b/wiretap/visual.h
@@ -8,7 +8,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __VISUAL_H__
diff --git a/wiretap/vms.c b/wiretap/vms.c
index a9c9011202..6242d0cfbd 100644
--- a/wiretap/vms.c
+++ b/wiretap/vms.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/* Notes:
diff --git a/wiretap/vms.h b/wiretap/vms.h
index e8a126925d..c061b43594 100644
--- a/wiretap/vms.h
+++ b/wiretap/vms.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/vwr.c b/wiretap/vwr.c
index 209c3e798b..180a01418f 100644
--- a/wiretap/vwr.c
+++ b/wiretap/vwr.c
@@ -4,7 +4,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
#include "config.h"
diff --git a/wiretap/vwr.h b/wiretap/vwr.h
index 4df3c33d17..63c652f969 100644
--- a/wiretap/vwr.h
+++ b/wiretap/vwr.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998-2010 by Tom Alexander <talexander@ixiacom.com>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index ed277ee58f..0bf6279f0d 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __WTAP_INT_H__
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 422c8c56e7..addc800095 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 9dbe6fc4f0..ea33b1d42b 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* SPDX-License-Identifier: GPL-2.0+ */
+* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __WTAP_H__
#define __WTAP_H__
diff --git a/wiretap/wtap_opttypes.c b/wiretap/wtap_opttypes.c
index 11fbdadec9..34b779a470 100644
--- a/wiretap/wtap_opttypes.c
+++ b/wiretap/wtap_opttypes.c
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
diff --git a/wiretap/wtap_opttypes.h b/wiretap/wtap_opttypes.h
index addcda3fc5..ade7079ad2 100644
--- a/wiretap/wtap_opttypes.h
+++ b/wiretap/wtap_opttypes.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef WTAP_OPT_TYPES_H
diff --git a/ws_attributes.h b/ws_attributes.h
index 1efcaafe6a..7e2245b9c3 100644
--- a/ws_attributes.h
+++ b/ws_attributes.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __WS_ATTRIBUTES_H__
diff --git a/ws_compiler_tests.h b/ws_compiler_tests.h
index d4e35a68f1..46a4ab6099 100644
--- a/ws_compiler_tests.h
+++ b/ws_compiler_tests.h
@@ -4,7 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __WS_COMPILER_TESTS_H__
diff --git a/ws_diag_control.h b/ws_diag_control.h
index f65340abb3..459a18a9af 100644
--- a/ws_diag_control.h
+++ b/ws_diag_control.h
@@ -7,7 +7,7 @@
*
* That project is covered by the GPLv2, so:
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __WS_DIAG_CONTROL_H__
diff --git a/ws_symbol_export.h b/ws_symbol_export.h
index 01f230e345..4c7a2f710a 100644
--- a/ws_symbol_export.h
+++ b/ws_symbol_export.h
@@ -5,7 +5,7 @@
* By Balint Reczey <balint@balintreczey.hu>
* Copyright 2013 Balint Reczey
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "ws_compiler_tests.h"
diff --git a/wsutil/adler32.c b/wsutil/adler32.c
index eb68c0280e..21e6ee3d41 100644
--- a/wsutil/adler32.c
+++ b/wsutil/adler32.c
@@ -7,7 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <string.h>
diff --git a/wsutil/adler32