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>

19 files changed, 19 insertions, 19 deletions

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_