diff options
93 files changed, 93 insertions, 93 deletions
diff --git a/Makefile.common b/Makefile.common index fb1d002fc4..e3ee92ff4c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -87,7 +87,6 @@ WIRESHARK_COMMON_INCLUDES = \ globals.h \ iface_monitor.h \ log.h \ - stat_menu.h \ summary.h \ sync_pipe.h \ ws80211_utils.h diff --git a/epan/funnel.h b/epan/funnel.h index f4f4adeab6..b2878427fa 100644 --- a/epan/funnel.h +++ b/epan/funnel.h @@ -27,7 +27,7 @@ #define _FUNNEL_H #include <glib.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ws_symbol_export.h" typedef struct _funnel_progress_window_t funnel_progress_window_t ; diff --git a/epan/stats_tree.h b/epan/stats_tree.h index 27056fe5f3..8f98ed2ce6 100644 --- a/epan/stats_tree.h +++ b/epan/stats_tree.h @@ -27,7 +27,7 @@ #include <epan/epan.h> #include <epan/packet_info.h> #include <epan/tap.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "../register.h" #include "ws_symbol_export.h" diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt index 8707eaa67b..ca919b8572 100644 --- a/epan/wslua/CMakeLists.txt +++ b/epan/wslua/CMakeLists.txt @@ -33,10 +33,10 @@ set(WSLUA_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_pinfo.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_listener.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_gui.c - ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dir.c + ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dir.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_util.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_field.c - ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_file.c + ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_file.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_struct.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dumper.c ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_internals.c @@ -106,7 +106,7 @@ ADD_CUSTOM_COMMAND( ${CMAKE_SOURCE_DIR}/epan/ftypes/ftypes.h ${CMAKE_SOURCE_DIR}/wiretap/wtap.h ${CMAKE_SOURCE_DIR}/epan/epan.h - ${CMAKE_SOURCE_DIR}/stat_menu.h + ${CMAKE_SOURCE_DIR}/ui/stat_menu.h ) add_custom_target( diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index 29d0f71b75..7e677dbec1 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -122,7 +122,7 @@ declare_wslua.h: make-reg.pl $(wslua_modules) taps_wslua.c dummy: touch dummy -init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h ../proto.h ../../stat_menu.h +init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h ../proto.h ../../ui/stat_menu.h $(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua checkapi: diff --git a/epan/wslua/make-init-lua.pl b/epan/wslua/make-init-lua.pl index 29df74019f..336d6670bd 100755 --- a/epan/wslua/make-init-lua.pl +++ b/epan/wslua/make-init-lua.pl @@ -212,7 +212,7 @@ close PROTO_H; $menu_groups .= "-- menu groups for register_menu\n"; my $menu_i = 0; -open STAT_MENU, "< $WSROOT/stat_menu.h" or die "cannot open '$WSROOT/stat_menu.h': $!"; +open STAT_MENU, "< $WSROOT/ui/stat_menu.h" or die "cannot open '$WSROOT/ui/stat_menu.h': $!"; my $foundit = 0; while(<STAT_MENU>) { # need to skip matching words in comments, and get to the enum diff --git a/ui/Makefile.common b/ui/Makefile.common index 526dd01fd9..f5bce78538 100644 --- a/ui/Makefile.common +++ b/ui/Makefile.common @@ -100,6 +100,7 @@ noinst_HEADERS = \ simple_dialog.h \ software_update.h \ ssl_key_export.h \ + stat_menu.h \ tap_export_pdu.h \ tap-megaco-common.h \ tap-rtp-common.h \ diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c index cae7dc334a..30ac9441b0 100644 --- a/ui/gtk/afp_stat.c +++ b/ui/gtk/afp_stat.c @@ -34,7 +34,7 @@ #include <epan/dissectors/packet-afp.h> #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c index dfc55eff45..4ed87f2361 100644 --- a/ui/gtk/ansi_a_stat.c +++ b/ui/gtk/ansi_a_stat.c @@ -43,7 +43,7 @@ #include <epan/dissectors/packet-bssap.h> #include <epan/dissectors/packet-ansi_a.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c index c02377070c..aecfba0faf 100644 --- a/ui/gtk/ansi_map_stat.c +++ b/ui/gtk/ansi_map_stat.c @@ -42,7 +42,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ansi_map.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c index 303c39d01f..d85bc05601 100644 --- a/ui/gtk/bootp_stat.c +++ b/ui/gtk/bootp_stat.c @@ -30,7 +30,7 @@ #include <epan/epan.h> #include <epan/tap.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c index 2105ff571e..34943ff155 100644 --- a/ui/gtk/camel_counter.c +++ b/ui/gtk/camel_counter.c @@ -35,7 +35,7 @@ #include <epan/asn1.h> #include <epan/dissectors/packet-camel.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c index e30d416647..12b3d84173 100644 --- a/ui/gtk/camel_srt.c +++ b/ui/gtk/camel_srt.c @@ -35,7 +35,7 @@ #include <epan/dissectors/packet-camel.h> #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index 3b70075b3a..945d75bbc7 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -53,7 +53,7 @@ #include <epan/dissectors/packet-ip.h> #include <epan/in_cksum.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "epan/timestats.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/conversations_eth.c b/ui/gtk/conversations_eth.c index 98f0de7396..1e5a1679d5 100644 --- a/ui/gtk/conversations_eth.c +++ b/ui/gtk/conversations_eth.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-eth.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_fc.c b/ui/gtk/conversations_fc.c index f455379913..de004b62db 100644 --- a/ui/gtk/conversations_fc.c +++ b/ui/gtk/conversations_fc.c @@ -32,7 +32,7 @@ #include <epan/conversation.h> #include <epan/dissectors/packet-fc.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_fddi.c b/ui/gtk/conversations_fddi.c index 5718b158b7..eb544a3f05 100644 --- a/ui/gtk/conversations_fddi.c +++ b/ui/gtk/conversations_fddi.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-fddi.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_ip.c b/ui/gtk/conversations_ip.c index 9c32aaa7ae..495a02abaf 100644 --- a/ui/gtk/conversations_ip.c +++ b/ui/gtk/conversations_ip.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ip.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_ipv6.c b/ui/gtk/conversations_ipv6.c index 013719b577..706a5d5763 100644 --- a/ui/gtk/conversations_ipv6.c +++ b/ui/gtk/conversations_ipv6.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ipv6.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_ipx.c b/ui/gtk/conversations_ipx.c index a2ac556152..49d6b0c398 100644 --- a/ui/gtk/conversations_ipx.c +++ b/ui/gtk/conversations_ipx.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ipx.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_jxta.c b/ui/gtk/conversations_jxta.c index 9890f9aad6..2eac226dac 100644 --- a/ui/gtk/conversations_jxta.c +++ b/ui/gtk/conversations_jxta.c @@ -32,7 +32,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-jxta.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_ncp.c b/ui/gtk/conversations_ncp.c index af83cbe9d3..bb80560961 100644 --- a/ui/gtk/conversations_ncp.c +++ b/ui/gtk/conversations_ncp.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ncp-int.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_rsvp.c b/ui/gtk/conversations_rsvp.c index d4a27e8b0c..9301b5c7f8 100644 --- a/ui/gtk/conversations_rsvp.c +++ b/ui/gtk/conversations_rsvp.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-rsvp.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_sctp.c b/ui/gtk/conversations_sctp.c index 6d3b05df8f..d672bf1cee 100644 --- a/ui/gtk/conversations_sctp.c +++ b/ui/gtk/conversations_sctp.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-sctp.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index 4aa56e3628..faf034ad23 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -36,7 +36,7 @@ #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" #include "ui/utf8_entities.h" diff --git a/ui/gtk/conversations_tcpip.c b/ui/gtk/conversations_tcpip.c index 18eddfaa5a..c719057c9f 100644 --- a/ui/gtk/conversations_tcpip.c +++ b/ui/gtk/conversations_tcpip.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-tcp.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_tr.c b/ui/gtk/conversations_tr.c index 57b68710c3..4443252d0a 100644 --- a/ui/gtk/conversations_tr.c +++ b/ui/gtk/conversations_tr.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-tr.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_udpip.c b/ui/gtk/conversations_udpip.c index 8ee46f9eac..3921cc1d58 100644 --- a/ui/gtk/conversations_udpip.c +++ b/ui/gtk/conversations_udpip.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-udp.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_usb.c b/ui/gtk/conversations_usb.c index bb47a59fa3..acb8a4cfa7 100644 --- a/ui/gtk/conversations_usb.c +++ b/ui/gtk/conversations_usb.c @@ -30,7 +30,7 @@ #include <epan/stat_cmd_args.h> #include <epan/tap.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/conversations_wlan.c b/ui/gtk/conversations_wlan.c index e87bf13aac..ce2c9941af 100644 --- a/ui/gtk/conversations_wlan.c +++ b/ui/gtk/conversations_wlan.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ieee80211.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/conversations_table.h" diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index 0fb8ee4464..6ca7bda5fa 100644 --- a/ui/gtk/dcerpc_stat.c +++ b/ui/gtk/dcerpc_stat.c @@ -41,7 +41,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-dcerpc.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c index 82210df20f..0e7bf85077 100644 --- a/ui/gtk/diameter_stat.c +++ b/ui/gtk/diameter_stat.c @@ -35,7 +35,7 @@ #include <epan/dissectors/packet-diameter.h> #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index c604709a53..ba1e8c252a 100644 --- a/ui/gtk/expert_comp_dlg.c +++ b/ui/gtk/expert_comp_dlg.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c index bc964e9daa..ad9e16316c 100644 --- a/ui/gtk/fc_stat.c +++ b/ui/gtk/fc_stat.c @@ -35,7 +35,7 @@ #include "ui/simple_dialog.h" #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c index aadf624d69..e0671700a5 100644 --- a/ui/gtk/flow_graph.c +++ b/ui/gtk/flow_graph.c @@ -35,7 +35,7 @@ #include <epan/to_str.h> #include <epan/strutil.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/graph_analysis.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index 5d03fefbde..dbaf1bb2af 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -45,7 +45,7 @@ #include <epan/funnel.h> #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/progress_dlg.h" #include "../color_filters.h" diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c index 6906a5ae0a..daebf0adcb 100644 --- a/ui/gtk/gsm_a_stat.c +++ b/ui/gtk/gsm_a_stat.c @@ -43,7 +43,7 @@ #include <epan/dissectors/packet-bssap.h> #include <epan/dissectors/packet-gsm_a_common.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c index 3add9e0f57..19ae29bc03 100644 --- a/ui/gtk/gsm_map_stat.c +++ b/ui/gtk/gsm_map_stat.c @@ -44,7 +44,7 @@ #include <epan/asn1.h> #include <epan/dissectors/packet-gsm_map.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c index 0e903583fe..c055ee4ba2 100644 --- a/ui/gtk/gsm_map_summary.c +++ b/ui/gtk/gsm_map_summary.c @@ -39,7 +39,7 @@ #include <epan/asn1.h> #include <epan/dissectors/packet-gsm_map.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "../globals.h" #include "../file.h" #include "../summary.h" diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c index ad680e4397..d79787e716 100644 --- a/ui/gtk/gtp_stat.c +++ b/ui/gtk/gtp_stat.c @@ -35,7 +35,7 @@ #include "ui/simple_dialog.h" #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/h225_counter.c b/ui/gtk/h225_counter.c index de9368ab1b..8a8b28822d 100644 --- a/ui/gtk/h225_counter.c +++ b/ui/gtk/h225_counter.c @@ -36,7 +36,7 @@ #include "ui/simple_dialog.h" #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_util.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c index 316788f0fe..72eaf26ed0 100644 --- a/ui/gtk/h225_ras_srt.c +++ b/ui/gtk/h225_ras_srt.c @@ -37,7 +37,7 @@ #include "epan/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_util.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/hostlist_eth.c b/ui/gtk/hostlist_eth.c index cd1ad44f8d..1de198a045 100644 --- a/ui/gtk/hostlist_eth.c +++ b/ui/gtk/hostlist_eth.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-eth.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_fc.c b/ui/gtk/hostlist_fc.c index f9636e00da..ee11dd906a 100644 --- a/ui/gtk/hostlist_fc.c +++ b/ui/gtk/hostlist_fc.c @@ -32,7 +32,7 @@ #include <epan/conversation.h> #include <epan/dissectors/packet-fc.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_fddi.c b/ui/gtk/hostlist_fddi.c index a08f33040f..c7de4313de 100644 --- a/ui/gtk/hostlist_fddi.c +++ b/ui/gtk/hostlist_fddi.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-fddi.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_ip.c b/ui/gtk/hostlist_ip.c index 459fac396d..b304b80e8a 100644 --- a/ui/gtk/hostlist_ip.c +++ b/ui/gtk/hostlist_ip.c @@ -33,7 +33,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ip.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_ipv6.c b/ui/gtk/hostlist_ipv6.c index c379235889..4fae34283f 100644 --- a/ui/gtk/hostlist_ipv6.c +++ b/ui/gtk/hostlist_ipv6.c @@ -34,7 +34,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ipv6.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_ipx.c b/ui/gtk/hostlist_ipx.c index baa54f286e..218c8c794f 100644 --- a/ui/gtk/hostlist_ipx.c +++ b/ui/gtk/hostlist_ipx.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ipx.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_jxta.c b/ui/gtk/hostlist_jxta.c index 02642f4de3..a44eaff860 100644 --- a/ui/gtk/hostlist_jxta.c +++ b/ui/gtk/hostlist_jxta.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-jxta.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_ncp.c b/ui/gtk/hostlist_ncp.c index 8b29c6fd60..20c8a51731 100644 --- a/ui/gtk/hostlist_ncp.c +++ b/ui/gtk/hostlist_ncp.c @@ -31,7 +31,7 @@ #include <epan/tap.h> /*#include <epan/dissectors/packet-ncp-int.h>*/ -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_rsvp.c b/ui/gtk/hostlist_rsvp.c index fdc75a2f2a..402bd8423d 100644 --- a/ui/gtk/hostlist_rsvp.c +++ b/ui/gtk/hostlist_rsvp.c @@ -32,7 +32,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-rsvp.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_sctp.c b/ui/gtk/hostlist_sctp.c index 0c1a8bbd97..0cc9cd3efa 100644 --- a/ui/gtk/hostlist_sctp.c +++ b/ui/gtk/hostlist_sctp.c @@ -30,7 +30,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-sctp.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_tcpip.c b/ui/gtk/hostlist_tcpip.c index 28d5b981dd..23c4734386 100644 --- a/ui/gtk/hostlist_tcpip.c +++ b/ui/gtk/hostlist_tcpip.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-tcp.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_tr.c b/ui/gtk/hostlist_tr.c index e2a443b6ff..e0269cc586 100644 --- a/ui/gtk/hostlist_tr.c +++ b/ui/gtk/hostlist_tr.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-tr.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_udpip.c b/ui/gtk/hostlist_udpip.c index ff2b064f83..f10922cda8 100644 --- a/ui/gtk/hostlist_udpip.c +++ b/ui/gtk/hostlist_udpip.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-udp.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_usb.c b/ui/gtk/hostlist_usb.c index abf476e23a..0c240bda92 100644 --- a/ui/gtk/hostlist_usb.c +++ b/ui/gtk/hostlist_usb.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-usb.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/hostlist_wlan.c b/ui/gtk/hostlist_wlan.c index 0c0b8b2d81..d928914d4d 100644 --- a/ui/gtk/hostlist_wlan.c +++ b/ui/gtk/hostlist_wlan.c @@ -31,7 +31,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ieee80211.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/hostlist_table.h" diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 1aa58564ad..3c72ad039b 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -64,7 +64,7 @@ #include <epan/stat_cmd_args.h> #include <epan/strutil.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/util.h" #include "ui/alert_box.h" diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index 053ccc8924..eafff9084a 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -35,7 +35,7 @@ #include <epan/tap.h> #include <epan/strutil.h> -#include "../../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/alert_box.h" #include "ui/io_graph_item.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/lbm_stream_dlg.c b/ui/gtk/lbm_stream_dlg.c index ab765ba6c9..4295ed4449 100644 --- a/ui/gtk/lbm_stream_dlg.c +++ b/ui/gtk/lbm_stream_dlg.c @@ -25,12 +25,12 @@ #include "config.h" #include <glib.h> #include <epan/to_str.h> -#include <stat_menu.h> #include <epan/funnel.h> #include <epan/packet.h> #include <epan/tap.h> #include <epan/wmem/wmem.h> #include <gtk/gtk.h> +#include <ui/stat_menu.h> #include <ui/gtk/gui_utils.h> #include <ui/gtk/dlg_utils.h> #include <cfile.h> diff --git a/ui/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c index 6de90a2b2b..1f05ec614b 100644 --- a/ui/gtk/lbm_uimflow_dlg.c +++ b/ui/gtk/lbm_uimflow_dlg.c @@ -25,11 +25,11 @@ #include "config.h" #include <glib.h> #include <epan/to_str.h> -#include <stat_menu.h> #include <epan/funnel.h> #include <epan/packet.h> #include <epan/tap.h> #include <gtk/gtk.h> +#include <ui/stat_menu.h> #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include <cfile.h> diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c index 6d5d6ab7c7..4c90ffb452 100644 --- a/ui/gtk/ldap_stat.c +++ b/ui/gtk/ldap_stat.c @@ -34,7 +34,7 @@ #include "ui/simple_dialog.h" #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index 0e9afd504a..eba41e5a75 100644 --- a/ui/gtk/mac_lte_stat_dlg.c +++ b/ui/gtk/mac_lte_stat_dlg.c @@ -35,7 +35,7 @@ #include <epan/dissectors/packet-mac-lte.h> #include "ui/simple_dialog.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 1ab235250e..1b6af6f505 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -47,8 +47,8 @@ #include "cfile.h" #include "globals.h" #include "color_filters.h" -#include "stat_menu.h" +#include "ui/stat_menu.h" #include "ui/iface_lists.h" #include "ui/main_statusbar.h" #include "ui/preference_utils.h" diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index dcd6928724..c1f54d6809 100644 --- a/ui/gtk/mcast_stream_dlg.c +++ b/ui/gtk/mcast_stream_dlg.c @@ -41,7 +41,7 @@ #include <epan/strutil.h> #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" #include "ui/gtk/mcast_stream_dlg.h" diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index a4ffaab2f8..8692002337 100644 --- a/ui/gtk/megaco_stat.c +++ b/ui/gtk/megaco_stat.c @@ -39,7 +39,7 @@ #include "epan/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_util.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c index 5a54c95c99..25a0e2f047 100644 --- a/ui/gtk/mgcp_stat.c +++ b/ui/gtk/mgcp_stat.c @@ -36,7 +36,7 @@ #include "epan/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_util.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index 0594c9199e..cb1f61c9d8 100644 --- a/ui/gtk/mtp3_stat.c +++ b/ui/gtk/mtp3_stat.c @@ -43,7 +43,7 @@ #include <epan/emem.h> #include <epan/dissectors/packet-mtp3.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c index 2d2efbb776..52ec983cbe 100644 --- a/ui/gtk/mtp3_summary.c +++ b/ui/gtk/mtp3_summary.c @@ -37,7 +37,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-mtp3.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "../globals.h" #include "../file.h" #include "../summary.h" diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c index 25c2ad0bee..94f0bc857b 100644 --- a/ui/gtk/ncp_stat.c +++ b/ui/gtk/ncp_stat.c @@ -34,7 +34,7 @@ #include "ui/simple_dialog.h" #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c index 2c7a6c0552..5d2c1aa6c8 100644 --- a/ui/gtk/radius_stat.c +++ b/ui/gtk/radius_stat.c @@ -36,7 +36,7 @@ #include "epan/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_util.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c index de51c7533e..764ce34d4a 100644 --- a/ui/gtk/rlc_lte_graph.c +++ b/ui/gtk/rlc_lte_graph.c @@ -40,7 +40,7 @@ #include "../globals.h" #include "../frame_tvbuff.h" #include "ui/simple_dialog.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c index 87716a6e56..92fbe8268b 100644 --- a/ui/gtk/rlc_lte_stat_dlg.c +++ b/ui/gtk/rlc_lte_stat_dlg.c @@ -40,7 +40,7 @@ #include <epan/dissectors/packet-rlc-lte.h> #include "ui/simple_dialog.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c index 742b8fde37..fbc4adff27 100644 --- a/ui/gtk/rpc_progs.c +++ b/ui/gtk/rpc_progs.c @@ -39,7 +39,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-rpc.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "../globals.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c index 84065bf4a7..d635d9fdea 100644 --- a/ui/gtk/rpc_stat.c +++ b/ui/gtk/rpc_stat.c @@ -39,7 +39,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-rpc.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/simple_dialog.h" #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index f4e999dc03..aaf7e97b15 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -63,7 +63,7 @@ #include <epan/stat_cmd_args.h> #include <epan/strutil.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/util.h" #include "ui/alert_box.h" diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index 86191f66bf..0378466bcf 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -36,7 +36,7 @@ #include "wsutil/filesystem.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/last_open_dir.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c index d3e4f6ea93..6e2abfd217 100644 --- a/ui/gtk/scsi_stat.c +++ b/ui/gtk/scsi_stat.c @@ -45,7 +45,7 @@ #include "ui/simple_dialog.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index c5fc946e42..979c8761b4 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -31,7 +31,7 @@ #include "../globals.h" #include "ui/simple_dialog.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c index 7a0a51b854..008a54fd25 100644 --- a/ui/gtk/sctp_chunk_stat.c +++ b/ui/gtk/sctp_chunk_stat.c @@ -39,7 +39,7 @@ #include "ui/simple_dialog.h" #include "../file.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_util.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c index 0f1cb533f2..c754e50c30 100644 --- a/ui/gtk/sctp_stat_dlg.c +++ b/ui/gtk/sctp_stat_dlg.c @@ -29,7 +29,7 @@ #include "epan/to_str.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c index 7cd1621f11..a1cbc3a705 100644 --- a/ui/gtk/sip_stat.c +++ b/ui/gtk/sip_stat.c @@ -34,7 +34,7 @@ #include "ui/simple_dialog.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index 3e7c6596fe..7b549c1b11 100644 --- a/ui/gtk/smb2_stat.c +++ b/ui/gtk/smb2_stat.c @@ -35,7 +35,7 @@ #include "ui/simple_dialog.h" #include "../file.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c index d73d4b48c0..891c186e2d 100644 --- a/ui/gtk/smb_stat.c +++ b/ui/gtk/smb_stat.c @@ -35,7 +35,7 @@ #include "ui/simple_dialog.h" #include "../file.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index 73e1afdb98..406bc5da3a 100644 --- a/ui/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.c @@ -41,7 +41,7 @@ #include "ui/simple_dialog.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index dc07ac6abc..28a9d85e3a 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -32,7 +32,7 @@ #include "../file.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/stock_icons.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index a1f13de72f..af00f8c48a 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -45,8 +45,8 @@ #include <epan/conv_id.h> #include "../../globals.h" -#include "../../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/tap-tcp-stream.h" #include "ui/utf8_entities.h" diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index c0bca303b8..63c903b7e2 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -56,7 +56,7 @@ #include <epan/value_string.h> #include <wsutil/filesystem.h> -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/help_url.h" #include "ui/gtk/gtkglobals.h" diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index 155d4ea182..660bf6672a 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -50,7 +50,7 @@ #include <epan/dissectors/packet-h248.h> #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/graph_analysis.h" #include "ui/gtk/voip_calls_dlg.h" diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index 65b969e0da..e94e1d9f2d 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -37,7 +37,7 @@ #include "ui/simple_dialog.h" #include "ui/utf8_entities.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c index 99a05fb382..7cda88733b 100644 --- a/ui/gtk/wsp_stat.c +++ b/ui/gtk/wsp_stat.c @@ -32,7 +32,7 @@ #include "ui/simple_dialog.h" #include "../globals.h" -#include "../stat_menu.h" +#include "ui/stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/stat_menu.h b/ui/stat_menu.h index 35ef533ac0..35ef533ac0 100644 --- a/stat_menu.h +++ b/ui/stat_menu.h diff --git a/ui/tap-megaco-common.c b/ui/tap-megaco-common.c index 0cf63b0ab2..7b639df542 100644 --- a/ui/tap-megaco-common.c +++ b/ui/tap-megaco-common.c @@ -36,7 +36,7 @@ #include "epan/timestats.h" #include "file.h" #include "globals.h" -#include "stat_menu.h" +#include "ui/stat_menu.h" #include "tap-megaco-common.h" |