Start moving files to ui/ and ui/cli/

svn path=/trunk/; revision=41047

48 files changed, 91 insertions, 91 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bb54e46dd..60486204dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -567,52 +567,52 @@ set(WIRESHARK_COMMON_SRC
 	svnversion.h
 	sync_pipe_write.c
 	timestats.c
-	util.c
+	ui/util.c
 	tap-megaco-common.c
 	tap-rtp-common.c
 	version_info.c
 )
 
 set(TSHARK_TAP_SRC
-	tap-afpstat.c
-	tap-ansi_astat.c
-	tap-bootpstat.c
-	tap-camelcounter.c
-	tap-camelsrt.c
-	tap-comparestat.c
-	tap-dcerpcstat.c
-	tap-diameter-avp.c
-	tap-expert.c
-	tap-follow.c
-	tap-funnel.c
-	tap-gsm_astat.c
-	tap-h225counter.c
-	tap-h225rassrt.c
-	tap-hosts.c
-	tap-httpstat.c
-	tap-icmpstat.c
-	tap-icmpv6stat.c
-	tap-iostat.c
-	tap-iousers.c
-	tap-macltestat.c
-	tap-mgcpstat.c
-	tap-megacostat.c
-	tap-protocolinfo.c
-	tap-protohierstat.c
-	tap-radiusstat.c
-	tap-rlcltestat.c
-	tap-rpcstat.c
-	tap-rpcprogs.c
-	tap-rtp.c
-	tap-rtspstat.c
-	tap-scsistat.c
-	tap-sctpchunkstat.c
-	tap-sipstat.c
-	tap-smbsids.c
-	tap-smbstat.c
-	tap-stats_tree.c
-	tap-sv.c
-	tap-wspstat.c
+	ui/cli/tap-afpstat.c
+	ui/cli/tap-ansi_astat.c
+	ui/cli/tap-bootpstat.c
+	ui/cli/tap-camelcounter.c
+	ui/cli/tap-camelsrt.c
+	ui/cli/tap-comparestat.c
+	ui/cli/tap-dcerpcstat.c
+	ui/cli/tap-diameter-avp.c
+	ui/cli/tap-expert.c
+	ui/cli/tap-follow.c
+	ui/cli/tap-funnel.c
+	ui/cli/tap-gsm_astat.c
+	ui/cli/tap-h225counter.c
+	ui/cli/tap-h225rassrt.c
+	ui/cli/tap-hosts.c
+	ui/cli/tap-httpstat.c
+	ui/cli/tap-icmpstat.c
+	ui/cli/tap-icmpv6stat.c
+	ui/cli/tap-iostat.c
+	ui/cli/tap-iousers.c
+	ui/cli/tap-macltestat.c
+	ui/cli/tap-mgcpstat.c
+	ui/cli/tap-megacostat.c
+	ui/cli/tap-protocolinfo.c
+	ui/cli/tap-protohierstat.c
+	ui/cli/tap-radiusstat.c
+	ui/cli/tap-rlcltestat.c
+	ui/cli/tap-rpcstat.c
+	ui/cli/tap-rpcprogs.c
+	ui/cli/tap-rtp.c
+	ui/cli/tap-rtspstat.c
+	ui/cli/tap-scsistat.c
+	ui/cli/tap-sctpchunkstat.c
+	ui/cli/tap-sipstat.c
+	ui/cli/tap-smbsids.c
+	ui/cli/tap-smbstat.c
+	ui/cli/tap-stats_tree.c
+	ui/cli/tap-sv.c
+	ui/cli/tap-wspstat.c
 )
 
 set(INSTALL_DIRS
@@ -782,8 +782,8 @@ if(BUILD_dftest)
 		${LIBEPAN_LIBS}
 	)
 	set(dftest_FILES
-		dftest.c
-		util.c
+		ui/cli/dftest.c
+		ui/util.c
 	)
 	add_executable(dftest ${dftest_FILES})
 	set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
diff --git a/Makefile.common b/Makefile.common
index 6903477b06..388ecfc5c2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -57,7 +57,7 @@ WIRESHARK_COMMON_SRC =	\
 	ps.c	\
 	sync_pipe_write.c	\
 	timestats.c	\
-	util.c	\
+	ui/util.c	\
 	tap-megaco-common.c	\
 	tap-rtp-common.c	\
 	version_info.c
@@ -83,7 +83,7 @@ WIRESHARK_COMMON_INCLUDES =	\
 	register.h	\
 	tempfile.h	\
 	timestats.h	\
-	util.h	\
+	ui/util.h	\
 	tap-megaco-common.h	\
 	tap-rtp-common.h	\
 	version_info.h
@@ -103,45 +103,45 @@ SHARK_COMMON_CAPTURE_INCLUDES =	\
 
 # sources for TShark taps
 TSHARK_TAP_SRC =	\
-	tap-afpstat.c	\
-	tap-ansi_astat.c	\
-	tap-bootpstat.c	\
-	tap-camelcounter.c	\
-	tap-camelsrt.c	\
-	tap-comparestat.c	\
-	tap-dcerpcstat.c	\
-	tap-diameter-avp.c \
-	tap-expert.c	\
-	tap-follow.c	\
-	tap-funnel.c \
-	tap-gsm_astat.c	\
-	tap-h225counter.c	\
-	tap-h225rassrt.c	\
-	tap-hosts.c	\
-	tap-httpstat.c	\
-	tap-icmpstat.c	\
-	tap-icmpv6stat.c	\
-	tap-iostat.c	\
-	tap-iousers.c	\
-	tap-macltestat.c	\
-	tap-mgcpstat.c	\
-	tap-megacostat.c	\
-	tap-protocolinfo.c	\
-	tap-protohierstat.c	\
-	tap-radiusstat.c	\
-	tap-rlcltestat.c	\
-	tap-rpcstat.c	\
-	tap-rpcprogs.c	\
-	tap-rtp.c	\
-	tap-rtspstat.c  \
-	tap-scsistat.c	\
-	tap-sctpchunkstat.c	\
-	tap-sipstat.c \
-	tap-smbsids.c	\
-	tap-smbstat.c	\
-	tap-stats_tree.c	\
-	tap-sv.c \
-	tap-wspstat.c
+	ui/cli/tap-afpstat.c	\
+	ui/cli/tap-ansi_astat.c	\
+	ui/cli/tap-bootpstat.c	\
+	ui/cli/tap-camelcounter.c	\
+	ui/cli/tap-camelsrt.c	\
+	ui/cli/tap-comparestat.c	\
+	ui/cli/tap-dcerpcstat.c	\
+	ui/cli/tap-diameter-avp.c \
+	ui/cli/tap-expert.c	\
+	ui/cli/tap-follow.c	\
+	ui/cli/tap-funnel.c	\
+	ui/cli/tap-gsm_astat.c	\
+	ui/cli/tap-h225counter.c	\
+	ui/cli/tap-h225rassrt.c	\
+	ui/cli/tap-hosts.c	\
+	ui/cli/tap-httpstat.c	\
+	ui/cli/tap-icmpstat.c	\
+	ui/cli/tap-icmpv6stat.c	\
+	ui/cli/tap-iostat.c	\
+	ui/cli/tap-iousers.c	\
+	ui/cli/tap-macltestat.c	\
+	ui/cli/tap-mgcpstat.c	\
+	ui/cli/tap-megacostat.c	\
+	ui/cli/tap-protocolinfo.c	\
+	ui/cli/tap-protohierstat.c	\
+	ui/cli/tap-radiusstat.c	\
+	ui/cli/tap-rlcltestat.c	\
+	ui/cli/tap-rpcstat.c	\
+	ui/cli/tap-rpcprogs.c	\
+	ui/cli/tap-rtp.c	\
+	ui/cli/tap-rtspstat.c	\
+	ui/cli/tap-scsistat.c	\
+	ui/cli/tap-sctpchunkstat.c	\
+	ui/cli/tap-sipstat.c	\
+	ui/cli/tap-smbsids.c	\
+	ui/cli/tap-smbstat.c	\
+	ui/cli/tap-stats_tree.c	\
+	ui/cli/tap-sv.c		\
+	ui/cli/tap-wspstat.c
 
 # wireshark specifics
 wireshark_SOURCES =	\
@@ -230,8 +230,8 @@ capinfos_SOURCES = \
 
 # dftest specifics
 dftest_SOURCES =	\
-	dftest.c	\
-	util.c
+	ui/cli/dftest.c	\
+	ui/util.c
 
 # randpkt specifics
 randpkt_SOURCES = \
diff --git a/capture.c b/capture.c
index 715eeac4c2..1c8887151c 100644
--- a/capture.c
+++ b/capture.c
@@ -45,7 +45,7 @@
 #include "capture_sync.h"
 #include "capture_info.h"
 #include "capture_ui_utils.h"
-#include "util.h"
+#include "ui/util.h"
 #include "capture-pcap-util.h"
 #include <epan/prefs.h>
 
diff --git a/rawshark.c b/rawshark.c
index bb8069c761..73131c5b1d 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -79,7 +79,7 @@
 #include <epan/column.h>
 #include "print.h"
 #include <epan/addr_resolv.h>
-#include "util.h"
+#include "ui/util.h"
 #include "clopts_common.h"
 #include "cmdarg_err.h"
 #include "version_info.h"
diff --git a/tshark.c b/tshark.c
index 6b3827a439..a38adc8109 100644
--- a/tshark.c
+++ b/tshark.c
@@ -70,7 +70,7 @@
 #include <epan/column.h>
 #include "print.h"
 #include <epan/addr_resolv.h>
-#include "util.h"
+#include "ui/util.h"
 #include "clopts_common.h"
 #include "console_io.h"
 #include "cmdarg_err.h"
diff --git a/dftest.c b/ui/cli/dftest.c
index c3f42f14f5..939f77be11 100644
--- a/dftest.c
+++ b/ui/cli/dftest.c
@@ -40,7 +40,7 @@
 #include <epan/filesystem.h>
 #include <wsutil/privileges.h>
 #include <epan/prefs.h>
-#include "util.h"
+#include "ui/util.h"
 #include "epan/dfilter/dfilter.h"
 #include "register.h"
 
diff --git a/tap-afpstat.c b/ui/cli/tap-afpstat.c
index e1960f474d..e1960f474d 100644
--- a/tap-afpstat.c
+++ b/ui/cli/tap-afpstat.c
diff --git a/tap-ansi_astat.c b/ui/cli/tap-ansi_astat.c
index ee368abb74..ee368abb74 100644
--- a/tap-ansi_astat.c
+++ b/ui/cli/tap-ansi_astat.c
diff --git a/tap-bootpstat.c b/ui/cli/tap-bootpstat.c
index 041364955d..041364955d 100644
--- a/tap-bootpstat.c
+++ b/ui/cli/tap-bootpstat.c
diff --git a/tap-camelcounter.c b/ui/cli/tap-camelcounter.c
index c922f19860..c922f19860 100644
--- a/tap-camelcounter.c
+++ b/ui/cli/tap-camelcounter.c
diff --git a/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index d4c16589ec..d4c16589ec 100644
--- a/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
diff --git a/tap-comparestat.c b/ui/cli/tap-comparestat.c
index 81b063b2d9..81b063b2d9 100644
--- a/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
diff --git a/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c
index 5fea8fc085..5fea8fc085 100644
--- a/tap-dcerpcstat.c
+++ b/ui/cli/tap-dcerpcstat.c
diff --git a/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index 002167c31f..002167c31f 100644
--- a/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
diff --git a/tap-expert.c b/ui/cli/tap-expert.c
index c32e93c97d..c32e93c97d 100644
--- a/tap-expert.c
+++ b/ui/cli/tap-expert.c
diff --git a/tap-follow.c b/ui/cli/tap-follow.c
index 2b4013cc53..2b4013cc53 100644
--- a/tap-follow.c
+++ b/ui/cli/tap-follow.c
diff --git a/tap-funnel.c b/ui/cli/tap-funnel.c
index 9fcd10ed33..9fcd10ed33 100644
--- a/tap-funnel.c
+++ b/ui/cli/tap-funnel.c
diff --git a/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c
index b84e377dfb..b84e377dfb 100644
--- a/tap-gsm_astat.c
+++ b/ui/cli/tap-gsm_astat.c
diff --git a/tap-h225counter.c b/ui/cli/tap-h225counter.c
index 6076f1c225..6076f1c225 100644
--- a/tap-h225counter.c
+++ b/ui/cli/tap-h225counter.c
diff --git a/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c
index a0c6d8e37e..a0c6d8e37e 100644
--- a/tap-h225rassrt.c
+++ b/ui/cli/tap-h225rassrt.c
diff --git a/tap-hosts.c b/ui/cli/tap-hosts.c
index a840932782..a840932782 100644
--- a/tap-hosts.c
+++ b/ui/cli/tap-hosts.c
diff --git a/tap-httpstat.c b/ui/cli/tap-httpstat.c
index fc12fcd9b2..fc12fcd9b2 100644
--- a/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
diff --git a/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index b8abbb2a5c..b8abbb2a5c 100644
--- a/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
diff --git a/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index 12659b26a7..12659b26a7 100644
--- a/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
diff --git a/tap-iostat.c b/ui/cli/tap-iostat.c
index 1104edd6d6..1104edd6d6 100644
--- a/tap-iostat.c
+++ b/ui/cli/tap-iostat.c
diff --git a/tap-iousers.c b/ui/cli/tap-iousers.c
index 175ec28155..175ec28155 100644
--- a/tap-iousers.c
+++ b/ui/cli/tap-iousers.c
diff --git a/tap-macltestat.c b/ui/cli/tap-macltestat.c
index b91a55396f..b91a55396f 100644
--- a/tap-macltestat.c
+++ b/ui/cli/tap-macltestat.c
diff --git a/tap-megacostat.c b/ui/cli/tap-megacostat.c
index 6e5186c688..6e5186c688 100644
--- a/tap-megacostat.c
+++ b/ui/cli/tap-megacostat.c
diff --git a/tap-mgcpstat.c b/ui/cli/tap-mgcpstat.c
index f5b0b1ee79..f5b0b1ee79 100644
--- a/tap-mgcpstat.c
+++ b/ui/cli/tap-mgcpstat.c
diff --git a/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
index a3f2b37666..a3f2b37666 100644
--- a/tap-protocolinfo.c
+++ b/ui/cli/tap-protocolinfo.c
diff --git a/tap-protohierstat.c b/ui/cli/tap-protohierstat.c
index 89eac20d1c..89eac20d1c 100644
--- a/tap-protohierstat.c
+++ b/ui/cli/tap-protohierstat.c
diff --git a/tap-radiusstat.c b/ui/cli/tap-radiusstat.c
index dd44e87c24..dd44e87c24 100644
--- a/tap-radiusstat.c
+++ b/ui/cli/tap-radiusstat.c
diff --git a/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c
index d1c3d74999..d1c3d74999 100644
--- a/tap-rlcltestat.c
+++ b/ui/cli/tap-rlcltestat.c
diff --git a/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
index accc64c00d..accc64c00d 100644
--- a/tap-rpcprogs.c
+++ b/ui/cli/tap-rpcprogs.c
diff --git a/tap-rpcstat.c b/ui/cli/tap-rpcstat.c
index 3f7245f425..3f7245f425 100644
--- a/tap-rpcstat.c
+++ b/ui/cli/tap-rpcstat.c
diff --git a/tap-rtp.c b/ui/cli/tap-rtp.c
index 2741ea84b7..2741ea84b7 100644
--- a/tap-rtp.c
+++ b/ui/cli/tap-rtp.c
diff --git a/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index feb8c8bd8e..feb8c8bd8e 100644
--- a/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
diff --git a/tap-scsistat.c b/ui/cli/tap-scsistat.c
index c12d78cb72..c12d78cb72 100644
--- a/tap-scsistat.c
+++ b/ui/cli/tap-scsistat.c
diff --git a/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
index fcb8285240..fcb8285240 100644
--- a/tap-sctpchunkstat.c
+++ b/ui/cli/tap-sctpchunkstat.c
diff --git a/tap-sipstat.c b/ui/cli/tap-sipstat.c
index b8273219ba..b8273219ba 100644
--- a/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.c
diff --git a/tap-smbsids.c b/ui/cli/tap-smbsids.c
index 2955bcfbed..2955bcfbed 100644
--- a/tap-smbsids.c
+++ b/ui/cli/tap-smbsids.c
diff --git a/tap-smbstat.c b/ui/cli/tap-smbstat.c
index 2a3439e6e1..2a3439e6e1 100644
--- a/tap-smbstat.c
+++ b/ui/cli/tap-smbstat.c
diff --git a/tap-stats_tree.c b/ui/cli/tap-stats_tree.c
index e9568b306c..e9568b306c 100644
--- a/tap-stats_tree.c
+++ b/ui/cli/tap-stats_tree.c
diff --git a/tap-sv.c b/ui/cli/tap-sv.c
index db3f84f8f8..db3f84f8f8 100644
--- a/tap-sv.c
+++ b/ui/cli/tap-sv.c
diff --git a/tap-wspstat.c b/ui/cli/tap-wspstat.c
index 40bce6cefc..40bce6cefc 100644
--- a/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 6b39a0432e..7f50f6525a 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -70,7 +70,7 @@
 #include "print.h"
 #include "register.h"
 #include "ringbuffer.h"
-#include "util.h"
+#include "ui/util.h"
 #include "clopts_common.h"
 #include "console_io.h"
 #include "cmdarg_err.h"
diff --git a/util.c b/ui/util.c
index a7a25578cf..63863f2097 100644
--- a/util.c
+++ b/ui/util.c
@@ -45,7 +45,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
 
-#include "util.h"
+#include "ui/util.h"
 
 /*
  * Collect command-line arguments as a string consisting of the arguments,
diff --git a/util.h b/ui/util.h
index 2849b05cd6..2849b05cd6 100644
--- a/util.h
+++ b/ui/util.h