Move proto_hier_stats.[ch] to libui.

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

8 files changed, 9 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 163032e1f3..b7f435d1c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1039,7 +1039,6 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
 		fileset.c
 		filters.c
 		iface_monitor.c
-		proto_hier_stats.c
 		summary.c
 		ws80211_utils.c
 		${SHARK_COMMON_CAPTURE_SRC}
diff --git a/Makefile.common b/Makefile.common
index 721a18ba20..fb1d002fc4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -73,7 +73,6 @@ WIRESHARK_COMMON_SRC =	\
 	fileset.c	\
 	filters.c	\
 	iface_monitor.c \
-	proto_hier_stats.c	\
 	summary.c	\
 	ws80211_utils.c
 
@@ -88,7 +87,6 @@ WIRESHARK_COMMON_INCLUDES =	\
 	globals.h	\
 	iface_monitor.h \
 	log.h		\
-	proto_hier_stats.h	\
 	stat_menu.h	\
 	summary.h	\
 	sync_pipe.h	\
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 6d88733f10..1834a43a14 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -32,12 +32,13 @@ set(COMMON_UI_SRC
 	export_object_tftp.c
 	follow.c
 	help_url.c
-	packet_list_utils.c
 	iface_lists.c
 	io_graph_item.c
+	packet_list_utils.c
 	persfilepath_opt.c
 	preference_utils.c
 	profile.c
+	proto_hier_stats.c
 	recent.c
 	software_update.c
 	ssl_key_export.c
diff --git a/ui/Makefile.common b/ui/Makefile.common
index db016a429e..526dd01fd9 100644
--- a/ui/Makefile.common
+++ b/ui/Makefile.common
@@ -59,6 +59,7 @@ WIRESHARK_UI_SRC = \
 	persfilepath_opt.c	\
 	preference_utils.c	\
 	profile.c		\
+	proto_hier_stats.c	\
 	recent.c		\
 	software_update.c	\
 	ssl_key_export.c	\
@@ -91,6 +92,7 @@ noinst_HEADERS = \
 	preference_utils.h	\
 	profile.h		\
 	progress_dlg.h		\
+	proto_hier_stats.h	\
 	recent.h		\
 	recent_utils.h		\
 	rtp_analysis.h		\
diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c
index 0aaec70dc4..06eca2807b 100644
--- a/ui/gtk/proto_hier_stats_dlg.c
+++ b/ui/gtk/proto_hier_stats_dlg.c
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../proto_hier_stats.h"
+#include "ui/proto_hier_stats.h"
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"
 
diff --git a/proto_hier_stats.c b/ui/proto_hier_stats.c
index 4f3ac2c435..fd4adbd333 100644
--- a/proto_hier_stats.c
+++ b/ui/proto_hier_stats.c
@@ -25,8 +25,8 @@
 #include <stdio.h>
 
 #include "globals.h"
-#include "proto_hier_stats.h"
 #include "frame_tvbuff.h"
+#include "ui/proto_hier_stats.h"
 #include "ui/progress_dlg.h"
 #include <epan/epan_dissect.h>
 #include <wtap.h>
diff --git a/proto_hier_stats.h b/ui/proto_hier_stats.h
index a8cd4f28ef..36302d0527 100644
--- a/proto_hier_stats.h
+++ b/ui/proto_hier_stats.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef PROTO_HIER_STATS_H
-#define PROTO_HIER_STATS_H
+#ifndef __UI_PROTO_HIER_STATS_H__
+#define __UI_PROTO_HIER_STATS_H__
 
 #include <epan/proto.h>
 
@@ -46,4 +46,4 @@ ph_stats_t* ph_stats_new(void);
 
 void ph_stats_free(ph_stats_t *ps);
 
-#endif
+#endif /* __UI_PROTO_HIER_STATS_H__ */
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index e852a08a91..b67aac33f7 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -196,7 +196,6 @@ SOURCES_WS_C = \
     ../../fileset.c       \
     ../../filters.c       \
     ../../frame_tvbuff.c   \
-    ../../proto_hier_stats.c      \
     ../../summary.c       \
     ../../sync_pipe_write.c       \
     ../../version_info.c