Start moving files to ui/ and ui/cli/

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41047 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bb54e46ddeb37ca72f7bcc98d8b3be87d988f4e..60486204dcae41d96733fa0c1224ad0bad42da72 100644 (file)
--- 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 6903477b06f12ef6fcc0c51019952b52d29c79a4..388ecfc5c27858376a1df62c8efcda146cca8967 100644 (file)
--- 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 715eeac4c22fefdd32c924d40ab9b8389bb2c738..1c8887151ceb76f752542d2ac568412d4994e7d8 100644 (file)
--- 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 bb8069c761eaf835aa9d43d35db4071187123864..73131c5b1de855aab0a40601b0f972930eefd045 100644 (file)
--- 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 6b3827a439cf0a032b2eeb376318414295ac7eb4..a38adc8109bc6d0bc10b1e4b64389283b5d5bd33 100644 (file)
--- 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
similarity index 99%
rename from dftest.c
rename to ui/cli/dftest.c
index c3f42f14f586ef0e043d7b1f50eb8ebb9b3103dc..939f77be11f6eab03e2d9c3bbe8055ead4ab93cd 100644 (file)
--- 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
similarity index 100%
rename from tap-afpstat.c
rename to ui/cli/tap-afpstat.c

diff --git a/tap-ansi_astat.c b/ui/cli/tap-ansi_astat.c
similarity index 100%
rename from tap-ansi_astat.c
rename to ui/cli/tap-ansi_astat.c

diff --git a/tap-bootpstat.c b/ui/cli/tap-bootpstat.c
similarity index 100%
rename from tap-bootpstat.c
rename to ui/cli/tap-bootpstat.c

diff --git a/tap-camelcounter.c b/ui/cli/tap-camelcounter.c
similarity index 100%
rename from tap-camelcounter.c
rename to ui/cli/tap-camelcounter.c

diff --git a/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
similarity index 100%
rename from tap-camelsrt.c
rename to ui/cli/tap-camelsrt.c

diff --git a/tap-comparestat.c b/ui/cli/tap-comparestat.c
similarity index 100%
rename from tap-comparestat.c
rename to ui/cli/tap-comparestat.c

diff --git a/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c
similarity index 100%
rename from tap-dcerpcstat.c
rename to ui/cli/tap-dcerpcstat.c

diff --git a/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
similarity index 100%
rename from tap-diameter-avp.c
rename to ui/cli/tap-diameter-avp.c

diff --git a/tap-expert.c b/ui/cli/tap-expert.c
similarity index 100%
rename from tap-expert.c
rename to ui/cli/tap-expert.c

diff --git a/tap-follow.c b/ui/cli/tap-follow.c
similarity index 100%
rename from tap-follow.c
rename to ui/cli/tap-follow.c

diff --git a/tap-funnel.c b/ui/cli/tap-funnel.c
similarity index 100%
rename from tap-funnel.c
rename to ui/cli/tap-funnel.c

diff --git a/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c
similarity index 100%
rename from tap-gsm_astat.c
rename to ui/cli/tap-gsm_astat.c

diff --git a/tap-h225counter.c b/ui/cli/tap-h225counter.c
similarity index 100%
rename from tap-h225counter.c
rename to ui/cli/tap-h225counter.c

diff --git a/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c
similarity index 100%
rename from tap-h225rassrt.c
rename to ui/cli/tap-h225rassrt.c

diff --git a/tap-hosts.c b/ui/cli/tap-hosts.c
similarity index 100%
rename from tap-hosts.c
rename to ui/cli/tap-hosts.c

diff --git a/tap-httpstat.c b/ui/cli/tap-httpstat.c
similarity index 100%
rename from tap-httpstat.c
rename to ui/cli/tap-httpstat.c

diff --git a/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
similarity index 100%
rename from tap-icmpstat.c
rename to ui/cli/tap-icmpstat.c

diff --git a/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
similarity index 100%
rename from tap-icmpv6stat.c
rename to ui/cli/tap-icmpv6stat.c

diff --git a/tap-iostat.c b/ui/cli/tap-iostat.c
similarity index 100%
rename from tap-iostat.c
rename to ui/cli/tap-iostat.c

diff --git a/tap-iousers.c b/ui/cli/tap-iousers.c
similarity index 100%
rename from tap-iousers.c
rename to ui/cli/tap-iousers.c

diff --git a/tap-macltestat.c b/ui/cli/tap-macltestat.c
similarity index 100%
rename from tap-macltestat.c
rename to ui/cli/tap-macltestat.c

diff --git a/tap-megacostat.c b/ui/cli/tap-megacostat.c
similarity index 100%
rename from tap-megacostat.c
rename to ui/cli/tap-megacostat.c

diff --git a/tap-mgcpstat.c b/ui/cli/tap-mgcpstat.c
similarity index 100%
rename from tap-mgcpstat.c
rename to ui/cli/tap-mgcpstat.c

diff --git a/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
similarity index 100%
rename from tap-protocolinfo.c
rename to ui/cli/tap-protocolinfo.c

diff --git a/tap-protohierstat.c b/ui/cli/tap-protohierstat.c
similarity index 100%
rename from tap-protohierstat.c
rename to ui/cli/tap-protohierstat.c

diff --git a/tap-radiusstat.c b/ui/cli/tap-radiusstat.c
similarity index 100%
rename from tap-radiusstat.c
rename to ui/cli/tap-radiusstat.c

diff --git a/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c
similarity index 100%
rename from tap-rlcltestat.c
rename to ui/cli/tap-rlcltestat.c

diff --git a/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
similarity index 100%
rename from tap-rpcprogs.c
rename to ui/cli/tap-rpcprogs.c

diff --git a/tap-rpcstat.c b/ui/cli/tap-rpcstat.c
similarity index 100%
rename from tap-rpcstat.c
rename to ui/cli/tap-rpcstat.c

diff --git a/tap-rtp.c b/ui/cli/tap-rtp.c
similarity index 100%
rename from tap-rtp.c
rename to ui/cli/tap-rtp.c

diff --git a/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
similarity index 100%
rename from tap-rtspstat.c
rename to ui/cli/tap-rtspstat.c

diff --git a/tap-scsistat.c b/ui/cli/tap-scsistat.c
similarity index 100%
rename from tap-scsistat.c
rename to ui/cli/tap-scsistat.c

diff --git a/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
similarity index 100%
rename from tap-sctpchunkstat.c
rename to ui/cli/tap-sctpchunkstat.c

diff --git a/tap-sipstat.c b/ui/cli/tap-sipstat.c
similarity index 100%
rename from tap-sipstat.c
rename to ui/cli/tap-sipstat.c

diff --git a/tap-smbsids.c b/ui/cli/tap-smbsids.c
similarity index 100%
rename from tap-smbsids.c
rename to ui/cli/tap-smbsids.c

diff --git a/tap-smbstat.c b/ui/cli/tap-smbstat.c
similarity index 100%
rename from tap-smbstat.c
rename to ui/cli/tap-smbstat.c

diff --git a/tap-stats_tree.c b/ui/cli/tap-stats_tree.c
similarity index 100%
rename from tap-stats_tree.c
rename to ui/cli/tap-stats_tree.c

diff --git a/tap-sv.c b/ui/cli/tap-sv.c
similarity index 100%
rename from tap-sv.c
rename to ui/cli/tap-sv.c

diff --git a/tap-wspstat.c b/ui/cli/tap-wspstat.c
similarity index 100%
rename from tap-wspstat.c
rename to ui/cli/tap-wspstat.c

diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 6b39a0432eae176350b74e5ce9c1f12f061f2695..7f50f6525ad59a86310ef43399eb285749b94fa3 100644 (file)
--- 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
similarity index 99%
rename from util.c
rename to ui/util.c
index a7a25578cf5206a1cc9da371b3c587c44df88a4b..63863f2097ff4fd3ade6a3b2af2f64842e2c0304 100644 (file)
--- 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
similarity index 100%
rename from util.h
rename to ui/util.h