Move utf8_entities.h to wsutil

Change-Id: I6298b3de5f0a1cb988014ff16082eaf8c2a3c3c0
Reviewed-on: https://code.wireshark.org/review/10786
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

36 files changed, 37 insertions, 37 deletions

diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index b02ba99935..6f6b1b036a 100644
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -44,7 +44,7 @@
 #include "ui/last_open_dir.h"
 #include "ui/help_url.h"
 #include "ui/text_import_scanner.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "file.h"
 #include "wsutil/file_util.h"
diff --git a/ui/qt/capture_filter_edit.cpp b/ui/qt/capture_filter_edit.cpp
index 46f67d084a..02ced86f50 100644
--- a/ui/qt/capture_filter_edit.cpp
+++ b/ui/qt/capture_filter_edit.cpp
@@ -29,7 +29,7 @@
 
 #include <ui/capture_globals.h>
 #include <ui/filters.h>
-#include <ui/utf8_entities.h>
+#include <wsutil/utf8_entities.h>
 
 #include "capture_filter_edit.h"
 #include "capture_filter_syntax_worker.h"
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index 03613860c6..71a587e9fd 100644
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -45,7 +45,7 @@
 
 #include "ui/ui_util.h"
 #include "ui/util.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 #include "ui/preference_utils.h"
 
 #include <cstdio>
diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp
index 0170a2a257..d55ac58fa2 100644
--- a/ui/qt/coloring_rules_dialog.cpp
+++ b/ui/qt/coloring_rules_dialog.cpp
@@ -34,7 +34,7 @@
 #include "epan/dfilter/dfilter.h"
 #include "epan/prefs.h"
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "wsutil/filesystem.h"
 
diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp
index aef688f7fe..8cbb29a616 100644
--- a/ui/qt/decode_as_dialog.cpp
+++ b/ui/qt/decode_as_dialog.cpp
@@ -27,7 +27,7 @@
 #include "epan/epan_dissect.h"
 
 #include "ui/decode_as_utils.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "qt_ui_utils.h"
 #include "wireshark_application.h"
diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/display_filter_edit.cpp
index 863729f7e3..f91203a8ea 100644
--- a/ui/qt/display_filter_edit.cpp
+++ b/ui/qt/display_filter_edit.cpp
@@ -27,7 +27,7 @@
 
 #include <ui/filters.h>
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "display_filter_edit.h"
 #include "filter_dialog.h"
@@ -43,7 +43,7 @@
 #include <QPainter>
 #include <QStringListModel>
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 // To do:
 // - Get rid of shortcuts and replace them with "n most recently applied filters"?
diff --git a/ui/qt/display_filter_expression_dialog.cpp b/ui/qt/display_filter_expression_dialog.cpp
index b5fc109550..bee50f322f 100644
--- a/ui/qt/display_filter_expression_dialog.cpp
+++ b/ui/qt/display_filter_expression_dialog.cpp
@@ -27,7 +27,7 @@
 #include <epan/tfs.h>
 #include <epan/value_string.h>
 
-#include <ui/utf8_entities.h>
+#include <wsutil/utf8_entities.h>
 
 #include "qt_ui_utils.h"
 #include "wireshark_application.h"
diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp
index 2da7bd5a03..83aac4b6d0 100644
--- a/ui/qt/export_object_dialog.cpp
+++ b/ui/qt/export_object_dialog.cpp
@@ -23,7 +23,7 @@
 #include <ui_export_object_dialog.h>
 
 #include <ui/alert_box.h>
-#include <ui/utf8_entities.h>
+#include <wsutil/utf8_entities.h>
 
 #include <wsutil/filesystem.h>
 #include <wsutil/str_util.h>
diff --git a/ui/qt/extcap_argument_file.cpp b/ui/qt/extcap_argument_file.cpp
index 227b8c664f..7fec0a5fbc 100644
--- a/ui/qt/extcap_argument_file.cpp
+++ b/ui/qt/extcap_argument_file.cpp
@@ -22,7 +22,7 @@
 #include <extcap_argument.h>
 #include <extcap_argument_file.h>
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include <QObject>
 #include <QWidget>
diff --git a/ui/qt/extcap_options_dialog.cpp b/ui/qt/extcap_options_dialog.cpp
index d13b5fd7de..91b010dee4 100644
--- a/ui/qt/extcap_options_dialog.cpp
+++ b/ui/qt/extcap_options_dialog.cpp
@@ -43,7 +43,7 @@
 
 #include "ui/ui_util.h"
 #include "ui/util.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include <cstdio>
 #include <epan/addr_resolv.h>
diff --git a/ui/qt/filter_action.h b/ui/qt/filter_action.h
index 5fdd09e4e9..0a41a18ddf 100644
--- a/ui/qt/filter_action.h
+++ b/ui/qt/filter_action.h
@@ -24,7 +24,7 @@
 #ifndef FILTER_ACTION_H
 #define FILTER_ACTION_H
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include <QAction>
 
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index 7fa3947a17..e4b8d3a36b 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -36,7 +36,7 @@
 
 #include "ui/alert_box.h"
 #include "ui/simple_dialog.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "wsutil/tempfile.h"
 #include "wsutil/file_util.h"
diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
index aa11736157..cbcdd8bbc3 100644
--- a/ui/qt/iax2_analysis_dialog.cpp
+++ b/ui/qt/iax2_analysis_dialog.cpp
@@ -36,7 +36,7 @@
 #ifdef IAX2_RTP_STREAM_CHECK
 #include "ui/rtp_stream.h"
 #endif
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include <wsutil/g711.h>
 #include <wsutil/pint.h>
diff --git a/ui/qt/interface_tree.cpp b/ui/qt/interface_tree.cpp
index c9d58b8bfa..661304c511 100644
--- a/ui/qt/interface_tree.cpp
+++ b/ui/qt/interface_tree.cpp
@@ -27,7 +27,7 @@
 #include "ui/capture_globals.h"
 #endif
 #include "ui/iface_lists.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 #include "ui/ui_util.h"
 
 #include "qt_ui_utils.h"
diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index 27cebd9110..899dc85763 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -28,7 +28,7 @@
 #include "epan/stats_tree_priv.h"
 #include "epan/uat-int.h"
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "qt_ui_utils.h"
 
diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp
index d28d143037..5d8c35d93c 100644
--- a/ui/qt/lbm_uimflow_dialog.cpp
+++ b/ui/qt/lbm_uimflow_dialog.cpp
@@ -35,7 +35,7 @@
 #include <epan/addr_resolv.h>
 #include <wsutil/nstime.h>
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "qt_ui_utils.h"
 #include "sequence_diagram.h"
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index f3aebe2a75..6e6165d52d 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -31,7 +31,7 @@
 #include "ui/main_statusbar.h"
 #include "ui/profile.h"
 #include "ui/qt/qt_ui_utils.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "capture_file.h"
 #include "main_status_bar.h"
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index 13825e5994..16e1293c5b 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -35,7 +35,7 @@
 #include "ui/iface_lists.h"
 #include "ui/preference_utils.h"
 #include "ui/ui_util.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "qt_ui_utils.h"
 
diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp
index 3144133d4b..c9ac847f07 100644
--- a/ui/qt/module_preferences_scroll_area.cpp
+++ b/ui/qt/module_preferences_scroll_area.cpp
@@ -28,7 +28,7 @@
 
 #include <epan/prefs-int.h>
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include <QAbstractButton>
 #include <QButtonGroup>
diff --git a/ui/qt/packet_dialog.cpp b/ui/qt/packet_dialog.cpp
index 1ecff0370c..8917529d46 100644
--- a/ui/qt/packet_dialog.cpp
+++ b/ui/qt/packet_dialog.cpp
@@ -29,7 +29,7 @@
 
 #include "frame_tvbuff.h"
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "byte_view_tab.h"
 #include "proto_tree.h"
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 5d1676286c..e77b9a3631 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -42,7 +42,7 @@
 #include "ui/recent.h"
 #include "ui/recent_utils.h"
 #include "ui/ui_util.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 #include "ui/util.h"
 
 #include "wsutil/str_util.h"
diff --git a/ui/qt/print_dialog.cpp b/ui/qt/print_dialog.cpp
index 3bed72c91e..12719771dc 100644
--- a/ui/qt/print_dialog.cpp
+++ b/ui/qt/print_dialog.cpp
@@ -22,7 +22,7 @@
 #include "print_dialog.h"
 #include <ui_print_dialog.h>
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include <QPrintDialog>
 #include <QPageSetupDialog>
diff --git a/ui/qt/protocol_hierarchy_dialog.cpp b/ui/qt/protocol_hierarchy_dialog.cpp
index 05a498003d..318d416869 100644
--- a/ui/qt/protocol_hierarchy_dialog.cpp
+++ b/ui/qt/protocol_hierarchy_dialog.cpp
@@ -25,7 +25,7 @@
 #include "cfile.h"
 
 #include "ui/proto_hier_stats.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "qt_ui_utils.h"
 #include "wireshark_application.h"
diff --git a/ui/qt/protocol_preferences_menu.cpp b/ui/qt/protocol_preferences_menu.cpp
index 600f0c4bc9..d64131e15d 100644
--- a/ui/qt/protocol_preferences_menu.cpp
+++ b/ui/qt/protocol_preferences_menu.cpp
@@ -28,7 +28,7 @@
 #include <epan/proto.h>
 
 #include <ui/preference_utils.h>
-#include <ui/utf8_entities.h>
+#include <wsutil/utf8_entities.h>
 
 #include "protocol_preferences_menu.h"
 
diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
index 79eb1dd9e9..10d374628f 100644
--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
@@ -33,7 +33,7 @@
 #include "epan/dissectors/packet-rtp.h"
 
 #include "ui/help_url.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include <wsutil/g711.h>
 #include <wsutil/pint.h>
diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp
index d072b10808..716824f033 100644
--- a/ui/qt/rtp_player_dialog.cpp
+++ b/ui/qt/rtp_player_dialog.cpp
@@ -26,7 +26,7 @@
 
 #include <epan/dissectors/packet-rtp.h>
 
-#include <ui/utf8_entities.h>
+#include <wsutil/utf8_entities.h>
 
 #include "color_utils.h"
 #include "qcustomplot.h"
diff --git a/ui/qt/rtp_stream_dialog.cpp b/ui/qt/rtp_stream_dialog.cpp
index fa77c8e864..930fac4d83 100644
--- a/ui/qt/rtp_stream_dialog.cpp
+++ b/ui/qt/rtp_stream_dialog.cpp
@@ -27,7 +27,7 @@
 #include "epan/addr_resolv.h"
 #include <epan/rtp_pt.h>
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "qt_ui_utils.h"
 #include "wireshark_application.h"
diff --git a/ui/qt/sctp_graph_dialog.cpp b/ui/qt/sctp_graph_dialog.cpp
index 761db06518..27cc4bb0c8 100644
--- a/ui/qt/sctp_graph_dialog.cpp
+++ b/ui/qt/sctp_graph_dialog.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "sctp_graph_dialog.h"
 #include <ui_sctp_graph_dialog.h>
diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp
index c38c3ab4ec..e30fcc6564 100644
--- a/ui/qt/sequence_dialog.cpp
+++ b/ui/qt/sequence_dialog.cpp
@@ -24,7 +24,7 @@
 
 #include "epan/addr_resolv.h"
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "wsutil/nstime.h"
 
diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp
index 2288751df2..78a2adb259 100644
--- a/ui/qt/simple_dialog.cpp
+++ b/ui/qt/simple_dialog.cpp
@@ -23,7 +23,7 @@
 
 #include "epan/strutil.h"
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "qt_ui_utils.h"
 #include "wireshark_application.h"
diff --git a/ui/qt/splash_overlay.cpp b/ui/qt/splash_overlay.cpp
index a38dcf86bb..a38fc1296f 100644
--- a/ui/qt/splash_overlay.cpp
+++ b/ui/qt/splash_overlay.cpp
@@ -26,7 +26,7 @@
 #include <QPainter>
 
 #include "ui/util.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 #include "tango_colors.h"
 
 #ifdef HAVE_LUA
diff --git a/ui/qt/tap_parameter_dialog.cpp b/ui/qt/tap_parameter_dialog.cpp
index ead74acc05..969c8d9996 100644
--- a/ui/qt/tap_parameter_dialog.cpp
+++ b/ui/qt/tap_parameter_dialog.cpp
@@ -41,7 +41,7 @@
 #include "epan/stat_tap_ui.h"
 
 #include "ui/last_open_dir.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "wsutil/file_util.h"
 
diff --git a/ui/qt/tcp_stream_dialog.cpp b/ui/qt/tcp_stream_dialog.cpp
index a76a122ec2..1a2bf5e238 100644
--- a/ui/qt/tcp_stream_dialog.cpp
+++ b/ui/qt/tcp_stream_dialog.cpp
@@ -26,7 +26,7 @@
 
 #include "wsutil/str_util.h"
 
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "tango_colors.h"
 #include "qt_ui_utils.h"
diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp
index b18fd91537..8a49fe07fc 100644
--- a/ui/qt/voip_calls_dialog.cpp
+++ b/ui/qt/voip_calls_dialog.cpp
@@ -28,7 +28,7 @@
 #include "epan/dissectors/packet-h225.h"
 
 #include "ui/rtp_stream.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #include "qt_ui_utils.h"
 #include "rtp_player_dialog.h"
diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
index 344a1627e1..202a246f20 100644
--- a/ui/qt/wireless_frame.cpp
+++ b/ui/qt/wireless_frame.cpp
@@ -32,7 +32,7 @@
 #include <caputils/ws80211_utils.h>
 
 #include <ui/ui_util.h>
-#include <ui/utf8_entities.h>
+#include <wsutil/utf8_entities.h>
 
 #include <QProcess>
 
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 1a206400e8..0439f13fe1 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -57,7 +57,7 @@
 #include "ui/software_update.h"
 #include "ui/last_open_dir.h"
 #include "ui/recent_utils.h"
-#include "ui/utf8_entities.h"
+#include <wsutil/utf8_entities.h>
 
 #ifdef _WIN32
 #  include "ui/win32/console_win32.h"