Move filters.[ch] to libui.

Change-Id: I32f04016498dfe8f54b0480f30a84ffe5ef7868f
Reviewed-on: https://code.wireshark.org/review/2727
Reviewed-by: Guy Harris <guy@alum.mit.edu>

8 files changed, 11 insertions, 13 deletions

diff --git a/Makefile.common b/Makefile.common
index e3ee92ff4c..5ed647f5d6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -71,7 +71,6 @@ WIRESHARK_COMMON_SRC =	\
 	color_filters.c	\
 	file.c		\
 	fileset.c	\
-	filters.c	\
 	iface_monitor.c \
 	summary.c	\
 	ws80211_utils.c
@@ -83,7 +82,6 @@ WIRESHARK_COMMON_INCLUDES =	\
 	capture_info.h	\
 	capture_opts.h	\
 	color_filters.h	\
-	filters.h	\
 	globals.h	\
 	iface_monitor.h \
 	log.h		\
diff --git a/ui/Makefile.common b/ui/Makefile.common
index f5bce78538..5022898063 100644
--- a/ui/Makefile.common
+++ b/ui/Makefile.common
@@ -51,6 +51,7 @@ WIRESHARK_UI_SRC = \
 	export_object_http.c	\
 	export_object_smb.c	\
 	export_object_tftp.c	\
+	filters.c		\
 	follow.c		\
 	iface_lists.c		\
 	io_graph_item.c		\
@@ -82,6 +83,7 @@ noinst_HEADERS = \
 	export_object.h		\
 	last_open_dir.h		\
 	file_dialog.h		\
+	filters.h		\
 	follow.h		\
 	help_url.h		\
 	packet_list_utils.h	\
diff --git a/filters.c b/ui/filters.c
index d7fa43d379..bb1aad6d13 100644
--- a/filters.c
+++ b/ui/filters.c
@@ -36,7 +36,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
 
-#include "filters.h"
+#include "ui/filters.h"
 
 /*
  * Old filter file name.
diff --git a/filters.h b/ui/filters.h
index 5f41b3bbd7..bc8e797258 100644
--- a/filters.h
+++ b/ui/filters.h
@@ -5,7 +5,6 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -21,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef FILTERS_H
-#define FILTERS_H
+#ifndef __UI_FILTERS_H__
+#define __UI_FILTERS_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -94,4 +93,4 @@ void copy_filter_list(filter_list_type_t dest_type, filter_list_type_t src_type)
 }
 #endif /* __cplusplus */
 
-#endif /* FILTERS_H */
+#endif /* __UI_FILTERS_H__ */
diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c
index 9fb4cc5e18..ac08e6a240 100644
--- a/ui/gtk/filter_dlg.c
+++ b/ui/gtk/filter_dlg.c
@@ -30,7 +30,7 @@
 #include <epan/prefs.h>
 #include <epan/proto.h>
 
-#include "../filters.h"
+#include "ui/filters.h"
 #include "ui/simple_dialog.h"
 #include "ui/main_statusbar.h"
 
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index eea7a13b26..bf42840afe 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -100,12 +100,10 @@
 #include "../file.h"
 #include "../frame_tvbuff.h"
 #include "../summary.h"
-#include "../filters.h"
 #include "../color.h"
 #include "../color_filters.h"
 #include "../register.h"
 #include "../ringbuffer.h"
-#include "ui/util.h"
 #include "../version_info.h"
 #include "../log.h"
 
@@ -113,6 +111,7 @@
 
 #include "ui/alert_box.h"
 #include "ui/decode_as_utils.h"
+#include "ui/filters.h"
 #include "ui/main_statusbar.h"
 #include "ui/persfilepath_opt.h"
 #include "ui/preference_utils.h"
@@ -121,6 +120,7 @@
 #include "ui/software_update.h"
 #include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
+#include "ui/util.h"
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture_ui_utils.h"
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index b67aac33f7..b853217117 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -194,7 +194,6 @@ SOURCES_WS_C = \
     ../../color_filters.c \
     ../../file.c  \
     ../../fileset.c       \
-    ../../filters.c       \
     ../../frame_tvbuff.c   \
     ../../summary.c       \
     ../../sync_pipe_write.c       \
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 8d8c493f26..b6cbeb62f8 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -35,12 +35,12 @@
 
 #include "qt_ui_utils.h"
 
-#include "ui/capture.h"
 #include "color_filters.h"
-#include "filters.h"
 #include "log.h"
 #include "recent_file_status.h"
 
+#include "ui/capture.h"
+#include "ui/filters.h"
 #include "ui/capture_globals.h"
 #include "ui/software_update.h"
 #include "ui/last_open_dir.h"