diff options
Diffstat (limited to 'ui')
34 files changed, 18 insertions, 36 deletions
diff --git a/ui/cli/tap-afpstat.c b/ui/cli/tap-afpstat.c index 088030574e..8c5929d5c0 100644 --- a/ui/cli/tap-afpstat.c +++ b/ui/cli/tap-afpstat.c @@ -33,7 +33,7 @@ #include <epan/stat_cmd_args.h> #include <epan/value_string.h> #include <epan/dissectors/packet-afp.h> -#include "timestats.h" +#include "wsutil/timestats.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _afpstat_t { diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c index f241a72960..df27e857e0 100644 --- a/ui/cli/tap-camelsrt.c +++ b/ui/cli/tap-camelsrt.c @@ -35,7 +35,7 @@ #include "epan/asn1.h" #include "epan/dissectors/packet-camel.h" #include "epan/camel-persistentdata.h" -#include "timestats.h" +#include "wsutil/timestats.h" #include "epan/stat_cmd_args.h" diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index 6f55926e6c..de5e2ecbe0 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -45,7 +45,7 @@ #include <epan/timestamp.h> #include <epan/stat_cmd_args.h> #include <epan/dissectors/packet-ip.h> -#include "timestats.h" +#include "wsutil/timestats.h" /* For checksum */ diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index f3b5777bdc..ce773bfccb 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -46,7 +46,6 @@ #include <epan/epan_dissect.h> #include <epan/stat_cmd_args.h> #include "epan/value_string.h" -#include "epan/nstime.h" #include "epan/ftypes/ftypes.h" #include "epan/to_str.h" #include "epan/dissectors/packet-diameter.h" diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c index 38d26a5f16..acbc89cbd4 100644 --- a/ui/cli/tap-funnel.c +++ b/ui/cli/tap-funnel.c @@ -30,7 +30,6 @@ #include <glib.h> #include <wiretap/wtap.h> -#include <epan/nstime.h> #include <epan/proto.h> #include <epan/funnel.h> diff --git a/ui/cli/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c index 5bb62e97f4..155b368dea 100644 --- a/ui/cli/tap-h225rassrt.c +++ b/ui/cli/tap-h225rassrt.c @@ -34,7 +34,7 @@ #include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include <epan/dissectors/packet-h225.h> -#include "timestats.h" +#include "wsutil/timestats.h" /* following values represent the size of their valuestring arrays */ #define NUM_RAS_STATS 7 diff --git a/ui/cli/tap-megacostat.c b/ui/cli/tap-megacostat.c index b15f5673e2..9570b1b7b7 100644 --- a/ui/cli/tap-megacostat.c +++ b/ui/cli/tap-megacostat.c @@ -34,7 +34,7 @@ #include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include "epan/gcp.h" -#include "timestats.h" +#include "wsutil/timestats.h" #include <epan/prefs-int.h> #include "tap-megaco-common.h" diff --git a/ui/cli/tap-mgcpstat.c b/ui/cli/tap-mgcpstat.c index 4858142721..9ea2129fa9 100644 --- a/ui/cli/tap-mgcpstat.c +++ b/ui/cli/tap-mgcpstat.c @@ -32,7 +32,7 @@ #include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include "epan/dissectors/packet-mgcp.h" -#include "timestats.h" +#include "wsutil/timestats.h" #define NUM_TIMESTATS 11 diff --git a/ui/cli/tap-radiusstat.c b/ui/cli/tap-radiusstat.c index 852c89d0c8..67522b8b46 100644 --- a/ui/cli/tap-radiusstat.c +++ b/ui/cli/tap-radiusstat.c @@ -32,7 +32,7 @@ #include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include <epan/dissectors/packet-radius.h> -#include "timestats.h" +#include "wsutil/timestats.h" typedef enum _radius_category { RADIUS_CAT_OVERALL = 0, diff --git a/ui/cli/tap-smbstat.c b/ui/cli/tap-smbstat.c index 99d65ddc23..153a086208 100644 --- a/ui/cli/tap-smbstat.c +++ b/ui/cli/tap-smbstat.c @@ -32,7 +32,7 @@ #include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include <epan/dissectors/packet-smb.h> -#include "timestats.h" +#include "wsutil/timestats.h" #define MICROSECS_PER_SEC 1000000 #define NANOSECS_PER_SEC 1000000000 diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c index 8ef6acb0ff..ccd705a445 100644 --- a/ui/cli/tap-sv.c +++ b/ui/cli/tap-sv.c @@ -32,7 +32,6 @@ #include <epan/packet_info.h> #include <epan/tap.h> #include <epan/stat_cmd_args.h> -#include <epan/nstime.h> #include <epan/dissectors/packet-sv.h> static int diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c index 56af2e4b11..61258ea2d4 100644 --- a/ui/gtk/afp_stat.c +++ b/ui/gtk/afp_stat.c @@ -35,7 +35,6 @@ #include <epan/tap.h> #include <epan/dissectors/packet-afp.h> -#include "../timestats.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c index f2f2621283..53e334abfd 100644 --- a/ui/gtk/camel_counter.c +++ b/ui/gtk/camel_counter.c @@ -38,7 +38,6 @@ #include <epan/camel-persistentdata.h> #include "../stat_menu.h" -#include "../timestats.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c index b52cc2c904..d9d396d8de 100644 --- a/ui/gtk/camel_srt.c +++ b/ui/gtk/camel_srt.c @@ -36,7 +36,6 @@ #include <epan/asn1.h> #include <epan/camel-persistentdata.h> -#include "../timestats.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index e07ee96eaa..c6f483e5c6 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -51,11 +51,10 @@ #include <epan/packet.h> #include <epan/report_err.h> #include <epan/dissectors/packet-ip.h> -#include <epan/nstime.h> #include <epan/in_cksum.h> #include "../stat_menu.h" -#include "../timestats.h" +#include "wsutil/timestats.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index e17d62e7f8..4cb5ef57f6 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -35,7 +35,6 @@ #include <epan/address.h> #include <epan/addr_resolv.h> #include <epan/tap.h> -#include <epan/nstime.h> #include "../globals.h" diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c index a5887c3577..c0cd20f452 100644 --- a/ui/gtk/diameter_stat.c +++ b/ui/gtk/diameter_stat.c @@ -36,7 +36,6 @@ #include <epan/tap.h> #include <epan/dissectors/packet-diameter.h> -#include "../timestats.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c index 85d64227db..45d5443886 100644 --- a/ui/gtk/fc_stat.c +++ b/ui/gtk/fc_stat.c @@ -36,7 +36,6 @@ #include <epan/dissectors/packet-scsi.h> #include <epan/dissectors/packet-fc.h> -#include "../timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index adc4aed15d..f9525835f9 100644 --- a/ui/gtk/filter_expression_save_dlg.c +++ b/ui/gtk/filter_expression_save_dlg.c @@ -33,7 +33,6 @@ #include <epan/proto.h> #include <epan/dfilter/dfilter.h> -#include <epan/nstime.h> #include <epan/strutil.h> #include <epan/prefs.h> #include <epan/filter_expressions.h> diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index 4af421486b..11583fa0a2 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -46,7 +46,6 @@ #include <epan/prefs.h> #include <epan/funnel.h> -#include "../timestats.h" #include "../file.h" #include "../stat_menu.h" #include "ui/progress_dlg.h" diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c index 908a8a95f8..17e6a15cc9 100644 --- a/ui/gtk/gtp_stat.c +++ b/ui/gtk/gtp_stat.c @@ -35,7 +35,6 @@ #include <epan/tap.h> #include <epan/dissectors/packet-gtp.h> -#include "../timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c index bd12ac71d2..9b4b8b551c 100644 --- a/ui/gtk/h225_ras_srt.c +++ b/ui/gtk/h225_ras_srt.c @@ -36,7 +36,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-h225.h> -#include "../timestats.h" +#include "wsutil/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c index e34255211e..c2f9a6f0ce 100644 --- a/ui/gtk/ldap_stat.c +++ b/ui/gtk/ldap_stat.c @@ -34,7 +34,6 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ldap.h> -#include "../timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index 5f0b0bab7d..55cc7ead6f 100644 --- a/ui/gtk/megaco_stat.c +++ b/ui/gtk/megaco_stat.c @@ -38,7 +38,7 @@ #include "epan/gcp.h" #include <epan/prefs-int.h> -#include "../timestats.h" +#include "wsutil/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c index aea8739278..80d20ec958 100644 --- a/ui/gtk/mgcp_stat.c +++ b/ui/gtk/mgcp_stat.c @@ -35,7 +35,7 @@ #include <epan/tap.h> #include "epan/dissectors/packet-mgcp.h" -#include "../timestats.h" +#include "wsutil/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c index 6ab3b91242..3a8a9f2b53 100644 --- a/ui/gtk/ncp_stat.c +++ b/ui/gtk/ncp_stat.c @@ -34,7 +34,6 @@ #include <epan/tap.h> #include <epan/dissectors/packet-ncp-int.h> -#include "../timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index d91fdd6033..c1e9a4c29c 100644 --- a/ui/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c @@ -45,7 +45,6 @@ #include <epan/epan_dissect.h> #include <epan/column_info.h> #include <epan/column.h> -#include <epan/nstime.h> #include "color.h" #include "color_filters.h" diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c index cd73e76795..595a027f72 100644 --- a/ui/gtk/radius_stat.c +++ b/ui/gtk/radius_stat.c @@ -35,7 +35,7 @@ #include <epan/tap.h> #include <epan/dissectors/packet-radius.h> -#include "../timestats.h" +#include "wsutil/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/service_response_time_table.h b/ui/gtk/service_response_time_table.h index 3907ac5de1..761ebd813a 100644 --- a/ui/gtk/service_response_time_table.h +++ b/ui/gtk/service_response_time_table.h @@ -28,8 +28,8 @@ #define __SERVICE_RESPONSE_TIME_TABLE_H__ #include <gtk/gtk.h> -#include "epan/nstime.h" -#include "../timestats.h" +#include "wsutil/nstime.h" +#include "wsutil/timestats.h" /** @file * Helper routines common to all service response time statistics tap. diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index b875bd57d7..c3b0a5108e 100644 --- a/ui/gtk/smb2_stat.c +++ b/ui/gtk/smb2_stat.c @@ -34,7 +34,6 @@ #include <epan/tap.h> #include <epan/dissectors/packet-smb2.h> -#include "../timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../globals.h" diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c index 8d81688727..33c730bc68 100644 --- a/ui/gtk/smb_stat.c +++ b/ui/gtk/smb_stat.c @@ -34,7 +34,6 @@ #include <epan/tap.h> #include <epan/dissectors/packet-smb.h> -#include "../timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../globals.h" diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp index 63f986e2a8..1136b62991 100644 --- a/ui/qt/capture_file_dialog.cpp +++ b/ui/qt/capture_file_dialog.cpp @@ -37,7 +37,7 @@ #include "../../epan/addr_resolv.h" #include "../../epan/prefs.h" #include "../../epan/filesystem.h" -#include "../../epan/nstime.h" +#include "../../wsutil/nstime.h" #include <wireshark_application.h> diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp index 96953f2938..d34a35bb37 100644 --- a/ui/qt/packet_list_model.cpp +++ b/ui/qt/packet_list_model.cpp @@ -26,7 +26,7 @@ #include <epan/epan_dissect.h> #include <epan/column_info.h> #include <epan/column.h> -#include <epan/nstime.h> +#include <wsutil/nstime.h> #include <epan/prefs.h> #include "color.h" diff --git a/ui/time_shift.h b/ui/time_shift.h index bedc353bf4..d1bbebde92 100644 --- a/ui/time_shift.h +++ b/ui/time_shift.h @@ -26,7 +26,7 @@ #define __TIME_SHIFT_H__ #include "cfile.h" -#include <epan/nstime.h> +#include <wsutil/nstime.h> #ifdef __cplusplus extern "C" { |