diff options
64 files changed, 68 insertions, 81 deletions
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 70c655c25b..c1265ca352 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -38,6 +38,7 @@ #include <epan/prefs.h> #include <epan/decode_as.h> #include <epan/tap.h> +#include <wsutil/utf8_entities.h> #include "packet-bluetooth.h" #include "packet-bthci_cmd.h" @@ -1245,9 +1246,6 @@ static const value_string cmd_authentication_enable_values[] = { {0, NULL } }; -/* XXX - Should be pulled from utf8_entities.h */ -#define UTF8_MICRO_SIGN "\xc2\xb5" /* 181 / 0xb5 */ - static const value_string cmd_input_coding_values[] = { {0x0, "Linear" }, {0x1, UTF8_MICRO_SIGN "-law" }, diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 9754a55810..701bb83c8a 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -38,6 +38,7 @@ #include <epan/prefs.h> #include <epan/decode_as.h> #include <epan/tap.h> +#include <wsutil/utf8_entities.h> #include "packet-bluetooth.h" #include "packet-bthci_sco.h" @@ -715,9 +716,6 @@ static const value_string evt_master_clock_accuray[] = { { 0, NULL } }; -/* XXX - Should be pulled from utf8_entities.h */ -#define UTF8_MICRO_SIGN "\xc2\xb5" /* 181 / 0xb5 */ - static const value_string evt_air_mode_vals[] = { { 0x00, UTF8_MICRO_SIGN "-law log" }, { 0x01, "A-law log" }, diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 54813dd13b..0a500b2be9 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -66,6 +66,7 @@ #include <epan/decode_as.h> #include <wsutil/crc32.h> #include <wsutil/adler32.h> +#include <wsutil/utf8_entities.h> #include "packet-sctp.h" @@ -719,11 +720,6 @@ find_assoc_index(assoc_info_t* tmpinfo) return inf; } -/* XXX - redefined here to not create UI dependencies */ -#define UTF8_LEFTWARDS_ARROW "\xe2\x86\x90" /* 8592 / 0x2190 */ -#define UTF8_RIGHTWARDS_ARROW "\xe2\x86\x92" /* 8594 / 0x2192 */ -#define UTF8_LEFT_RIGHT_ARROW "\xe2\x86\x94" /* 8596 / 0x2194 */ - static void sctp_src_prompt(packet_info *pinfo, gchar *result) { diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index ef939b2c25..21011f470c 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -37,6 +37,7 @@ #include <epan/reassemble.h> #include <epan/decode_as.h> #include <epan/in_cksum.h> +#include <wsutil/utf8_entities.h> #include "packet-tcp.h" #include "packet-ip.h" @@ -501,11 +502,6 @@ static dissector_handle_t data_handle; static dissector_handle_t sport_handle; static guint32 tcp_stream_count; -/* XXX - redefined here to not create UI dependencies */ -#define UTF8_LEFTWARDS_ARROW "\xe2\x86\x90" /* 8592 / 0x2190 */ -#define UTF8_RIGHTWARDS_ARROW "\xe2\x86\x92" /* 8594 / 0x2192 */ -#define UTF8_LEFT_RIGHT_ARROW "\xe2\x86\x94" /* 8596 / 0x2194 */ - static const int *tcp_option_mptcp_capable_flags[] = { &hf_tcp_option_mptcp_checksum_flag, &hf_tcp_option_mptcp_B_flag, @@ -4375,7 +4371,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dst_port_str = tcp_port_to_display(wmem_packet_scope(), tcph->th_dport); col_add_lstr(pinfo->cinfo, COL_INFO, src_port_str, - " \xe2\x86\x92 ", /* UTF8_RIGHTWARDS_ARROW */ + " "UTF8_RIGHTWARDS_ARROW" ", dst_port_str, COL_ADD_LSTR_TERMINATOR); diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index e7d26e30ea..d0acf286ad 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -36,6 +36,7 @@ #include <epan/expert.h> #include <epan/exceptions.h> #include <epan/show_exception.h> +#include <wsutil/utf8_entities.h> #include "packet-udp.h" @@ -187,11 +188,6 @@ typedef struct heur_dtbl_entry_t *heur_dtbl_entry; } udp_p_info_t; -/* XXX - redefined here to not create UI dependencies */ -#define UTF8_LEFTWARDS_ARROW "\xe2\x86\x90" /* 8592 / 0x2190 */ -#define UTF8_RIGHTWARDS_ARROW "\xe2\x86\x92" /* 8594 / 0x2192 */ -#define UTF8_LEFT_RIGHT_ARROW "\xe2\x86\x94" /* 8596 / 0x2194 */ - static void udp_src_prompt(packet_info *pinfo, gchar *result) { @@ -716,7 +712,7 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) dst_port_str = udp_port_to_display(wmem_packet_scope(), udph->uh_dport); col_add_lstr(pinfo->cinfo, COL_INFO, src_port_str, - " \xe2\x86\x92 ", /* UTF8_RIGHTWARDS_ARROW */ + " "UTF8_RIGHTWARDS_ARROW" ", dst_port_str, COL_ADD_LSTR_TERMINATOR); diff --git a/ui/Makefile.common b/ui/Makefile.common index 15ce1010c1..2e24319d42 100644 --- a/ui/Makefile.common +++ b/ui/Makefile.common @@ -126,6 +126,5 @@ noinst_HEADERS = \ time_shift.h \ traffic_table_ui.h \ ui_util.h \ - utf8_entities.h \ util.h \ voip_calls.h diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index ee51e4dddc..0c3950a38e 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -33,7 +33,7 @@ #include <epan/stat_groups.h> #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/conversations_table.h" #include "ui/gtk/filter_utils.h" diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index b752c4bb95..8c8cf64c12 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -34,7 +34,7 @@ #include "ui/decode_as_utils.h" #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/main.h" #include "ui/gtk/decode_as_dlg.h" diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index 5296fa8ffc..3766b5513f 100644 --- a/ui/gtk/expert_comp_table.c +++ b/ui/gtk/expert_comp_table.c @@ -35,7 +35,7 @@ #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/expert_comp_table.h" #include "ui/gtk/filter_utils.h" diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c index d1c2dbc616..a8d41d6da2 100644 --- a/ui/gtk/follow_ssl.c +++ b/ui/gtk/follow_ssl.c @@ -40,7 +40,7 @@ #include <ui/alert_box.h> #include <ui/simple_dialog.h> -#include <ui/utf8_entities.h> +#include <wsutil/utf8_entities.h> #include <ui/util.h> #include "gtkglobals.h" diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c index a7f501c8c9..1fa5f30ba8 100644 --- a/ui/gtk/follow_tcp.c +++ b/ui/gtk/follow_tcp.c @@ -42,7 +42,7 @@ #include "../file.h" #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/gtk/follow_udp.c b/ui/gtk/follow_udp.c index e945036f95..85a2778cc3 100644 --- a/ui/gtk/follow_udp.c +++ b/ui/gtk/follow_udp.c @@ -32,7 +32,7 @@ #include <epan/tap.h> #include <ui/simple_dialog.h> -#include <ui/utf8_entities.h> +#include <wsutil/utf8_entities.h> #include "gtkglobals.h" #include "ui/gtk/follow_stream.h" diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 39845fa44c..34f43a11ef 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -39,7 +39,7 @@ #include "ui/simple_dialog.h" #include "ui/alert_box.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/hostlist_table.h" #include "ui/gtk/filter_utils.h" diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 9819304e20..1627b831a7 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -70,7 +70,7 @@ #include "ui/last_open_dir.h" #include "ui/progress_dlg.h" #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/gtkglobals.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 05fc29cbef..e01e4fbb05 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -47,7 +47,7 @@ #include "ui/recent_utils.h" #include "ui/simple_dialog.h" #include "ui/software_update.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/about_dlg.h" diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index f8bfd9432f..9930fcfa29 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -46,7 +46,7 @@ #include "ui/main_statusbar.h" #include "ui/recent.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #ifdef HAVE_LIBPCAP #include "ui/capture_ui_utils.h" #endif diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index fddb9b6d81..d5fcae42fd 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -42,7 +42,7 @@ #endif #include "ui/recent.h" #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/ui_util.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c index 4842d1f337..041e9aac25 100644 --- a/ui/gtk/proto_hier_stats_dlg.c +++ b/ui/gtk/proto_hier_stats_dlg.c @@ -29,7 +29,7 @@ #include "ui/proto_hier_stats.h" #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/proto_hier_stats_dlg.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/response_time_delay_table.c b/ui/gtk/response_time_delay_table.c index 26dc47d9f8..fb110fe018 100644 --- a/ui/gtk/response_time_delay_table.c +++ b/ui/gtk/response_time_delay_table.c @@ -30,7 +30,7 @@ #include <epan/stat_tap_ui.h> #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/filter_utils.h" #include "ui/gtk/gui_stat_util.h" diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 4cef14e97e..c8fa4a7356 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -68,7 +68,7 @@ #include "ui/last_open_dir.h" #include "ui/progress_dlg.h" #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/gtkglobals.h" diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c index 3284c06b2c..c1f615849a 100644 --- a/ui/gtk/service_response_time_table.c +++ b/ui/gtk/service_response_time_table.c @@ -30,7 +30,7 @@ #include "epan/proto.h" #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/filter_utils.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/simple_stattable.c b/ui/gtk/simple_stattable.c index e366b75776..3372c21c7d 100644 --- a/ui/gtk/simple_stattable.c +++ b/ui/gtk/simple_stattable.c @@ -30,7 +30,7 @@ #include <epan/stat_tap_ui.h> #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/filter_utils.h" #include "ui/gtk/gui_stat_util.h" diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c index a76b2caf67..397f0f0ce4 100644 --- a/ui/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.c @@ -31,7 +31,7 @@ #include "ui/gtk/toolbar_icons.h" #include "ui/gtk/wsicon.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> /* these icons are derived from the original stock icons */ #include "../../image/toolbar/capture_filter_24.xpm" diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 416d7a01e9..b4b55fe4ec 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -47,7 +47,7 @@ #include <epan/stat_groups.h> #include "ui/tap-tcp-stream.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index c6e16451e5..743406304c 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -36,7 +36,7 @@ #include "ui/recent.h" #include "ui/simple_dialog.h" -#include "ui/utf8_entities.h" +#include <wsutil/utf8_entities.h> #include <epan/stat_groups.h> 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" diff --git a/ui/traffic_table_ui.c b/ui/traffic_table_ui.c index 5ee28f510c..0a98a98de9 100644 --- a/ui/traffic_table_ui.c +++ b/ui/traffic_table_ui.c @@ -25,7 +25,7 @@ #include <glib.h> #include "traffic_table_ui.h" -#include "utf8_entities.h" +#include <wsutil/utf8_entities.h> #ifdef HAVE_GEOIP #include <GeoIP.h> diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index 19626aef34..e24f015b72 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -123,6 +123,7 @@ libwsutil_nonrepl_INCLUDES = \ type_util.h \ u3.h \ unicode-utils.h \ + utf8_entities.h \ ws_cpuid.h \ ws_diag_control.h \ ws_mempbrk.h \ diff --git a/ui/utf8_entities.h b/wsutil/utf8_entities.h index 05285d5517..50132e742e 100644 --- a/ui/utf8_entities.h +++ b/wsutil/utf8_entities.h @@ -44,6 +44,9 @@ #define UTF8_CHECK_MARK "\xe2\x9c\x93" /* 10003 / 0x2713 */ #define UTF8_BALLOT_X "\xe2\x9c\x97" /* 10007 / 0x2717 */ + +#define UTF8_MICRO_SIGN "\xc2\xb5" /* 181 / 0xb5 */ + #endif /* __UTF8_ENTITIES_H__ */ /* |