epan: Rename dissector_filters.c to conversation_filter.c

For the same reason as in g89c9d909.

Change-Id: I5e344ebdf8ba05d169484aa32b409d84edc6124f
Reviewed-on: https://code.wireshark.org/review/34943
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

18 files changed, 21 insertions, 21 deletions

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index b08a1a7167..354a23d4e0 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -93,7 +93,7 @@ set(LIBWIRESHARK_PUBLIC_HEADERS
 	decode_as.h
 	diam_dict.h
 	disabled_protos.h
-	dissector_filters.h
+	conversation_filter.h
 	dtd.h
 	dtd_parse.h
 	dvb_chartbl.h
@@ -210,7 +210,7 @@ set(LIBWIRESHARK_NONGENERATED_FILES
 	crc8-tvb.c
 	decode_as.c
 	disabled_protos.c
-	dissector_filters.c
+	conversation_filter.c
 	dvb_chartbl.c
 	epan.c
 	ex-opt.c
diff --git a/epan/dissector_filters.c b/epan/conversation_filter.c
index 9aa4de5984..982b93d823 100644
--- a/epan/dissector_filters.c
+++ b/epan/conversation_filter.c
@@ -1,4 +1,4 @@
-/* dissector_filters.c
+/* conversation_filter.c
  * Routines for dissector-generated conversation filters for use as
  * display and color filters
  *
@@ -14,7 +14,7 @@
 #include <glib.h>
 #include "packet.h"
 
-#include "dissector_filters.h"
+#include "conversation_filter.h"
 
 
 GList *conv_filter_list = NULL;
diff --git a/epan/dissector_filters.h b/epan/conversation_filter.h
index 7f142b4f09..a43c0b49a6 100644
--- a/epan/dissector_filters.h
+++ b/epan/conversation_filter.h
@@ -1,4 +1,4 @@
-/* dissector_filters.h
+/* conversation_filter.h
  * Routines for dissector-generated conversation filters for use as
  * display and color filters
  *
@@ -61,4 +61,4 @@ WS_DLL_PUBLIC GList *conv_filter_list;
 }
 #endif /* __cplusplus */
 
-#endif /* dissector_filters.h */
+#endif /* conversation_filter.h */
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index 4a129d2946..2005ff4178 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -29,7 +29,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/prefs.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index fdd8496c85..4d28923df2 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -17,7 +17,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/expert.h>
 #include <epan/conversation_table.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/capture_dissectors.h>
 #include <wsutil/pint.h>
 #include "packet-eth.h"
diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c
index e1e0f7da80..f90842b585 100644
--- a/epan/dissectors/packet-f5ethtrailer.c
+++ b/epan/dissectors/packet-f5ethtrailer.c
@@ -223,7 +223,7 @@ Notes:
 #include <epan/expert.h>
 #include <epan/proto.h>
 #include <epan/proto_data.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/dissectors/packet-ip.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 782aa18308..de9c3ccb09 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -91,7 +91,7 @@
 #include <epan/address_types.h>
 #include <epan/conversation.h>
 #include <epan/conversation_table.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/prefs.h>
 #include <epan/uat.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 5a5c4d0c59..c5a36bded1 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -24,7 +24,7 @@
 #include <epan/ip_opts.h>
 #include <epan/prefs.h>
 #include <epan/conversation_table.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/reassemble.h>
 #include <epan/etypes.h>
 #include <epan/ppptypes.h>
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 917c9276c4..4371e30c3a 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -25,7 +25,7 @@
 #include <epan/maxmind_db.h>
 #include <epan/prefs.h>
 #include <epan/conversation_table.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/reassemble.h>
 #include <epan/ipproto.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 8b74680b7d..74e9b6b10c 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -22,7 +22,7 @@
 #include <epan/prefs.h>
 #include <epan/show_exception.h>
 #include <epan/conversation_table.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/sequence_analysis.h>
 #include <epan/reassemble.h>
 #include <epan/decode_as.h>
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c
index 99def2fa6e..bbe5fb4127 100644
--- a/epan/dissectors/packet-udp.c
+++ b/epan/dissectors/packet-udp.c
@@ -35,7 +35,7 @@
 
 #include <epan/conversation.h>
 #include <epan/conversation_table.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/exported_pdu.h>
 #include <epan/decode_as.h>
 
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index c425839073..7a369306f2 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -22,7 +22,7 @@
 #include <epan/expert.h>
 #include <epan/proto_data.h>
 #include <epan/conversation_table.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/tap.h>
 #include <wsutil/bits_ctz.h>    /* for ws_ctz */
 #include <wsutil/pint.h>
diff --git a/epan/epan.c b/epan/epan.c
index f06d4c0ea6..2c0d1d58a1 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -50,7 +50,7 @@
 #include "follow.h"
 #include "disabled_protos.h"
 #include "decode_as.h"
-#include "dissector_filters.h"
+#include "conversation_filter.h"
 #include "conversation_table.h"
 #include "reassemble.h"
 #include "srt_table.h"
diff --git a/plugins/epan/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c
index 175d5623cb..f3111127ca 100644
--- a/plugins/epan/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c
@@ -62,7 +62,7 @@
 #include <epan/wmem/wmem.h>
 #include <epan/dissectors/packet-dcerpc.h>
 #include <epan/expert.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/proto_data.h>
 
 #include <wsutil/file_util.h>
diff --git a/plugins/epan/profinet/packet-dcom-cba-acco.c b/plugins/epan/profinet/packet-dcom-cba-acco.c
index 6bcf536f2f..e05f6f9914 100644
--- a/plugins/epan/profinet/packet-dcom-cba-acco.c
+++ b/plugins/epan/profinet/packet-dcom-cba-acco.c
@@ -15,7 +15,7 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/addr_resolv.h>
-#include <epan/dissector_filters.h>
+#include <epan/conversation_filter.h>
 #include <epan/proto_data.h>
 #include <epan/dissectors/packet-dcerpc.h>
 #include <epan/dissectors/packet-dcom.h>
diff --git a/ui/qt/conversation_colorize_action.cpp b/ui/qt/conversation_colorize_action.cpp
index 4da5a58bc8..c7fd13030f 100644
--- a/ui/qt/conversation_colorize_action.cpp
+++ b/ui/qt/conversation_colorize_action.cpp
@@ -13,7 +13,7 @@
 
 #include <glib.h>
 
-#include "epan/dissector_filters.h"
+#include "epan/conversation_filter.h"
 
 #include <QMenu>
 
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 0e824044c7..3461b65a7c 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -18,7 +18,7 @@ DIAG_OFF(frame-larger-than=)
 DIAG_ON(frame-larger-than=)
 
 #include <epan/addr_resolv.h>
-#include "epan/dissector_filters.h"
+#include "epan/conversation_filter.h"
 #include <epan/epan_dissect.h>
 #include <wsutil/filesystem.h>
 #include <version_info.h>
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index f481c6c00a..5590509d59 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -46,7 +46,7 @@ DIAG_ON(frame-larger-than=)
 #include "epan/addr_resolv.h"
 #include "epan/column.h"
 #include "epan/dfilter/dfilter-macro.h"
-#include "epan/dissector_filters.h"
+#include "epan/conversation_filter.h"
 #include "epan/epan_dissect.h"
 #include "epan/filter_expressions.h"
 #include "epan/prefs.h"