diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:35:33 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:35:33 +0000 |
| commit | 0a669967fa719111db64437f7dd3b2869091f9e8 (patch) | |
| tree | 35aa1a3589fe2927087c1482683afaccb0183c89 /ui | |
| parent | d331c33b4ff4f5ce6c001a040db5ba1a0ded1c60 (diff) | |
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
svn path=/trunk/; revision=50656
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/capture_file_dlg.c | 5 | ||||
| -rw-r--r-- | ui/gtk/main.c | 3 | ||||
| -rw-r--r-- | ui/qt/QtShark.pro | 1 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 3 | ||||
| -rw-r--r-- | ui/win32/file_dlg_win32.c | 8 |
5 files changed, 12 insertions, 8 deletions
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index 6d24dff82c..0c97311512 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -39,11 +39,12 @@ #include "globals.h" #include "color.h" #include "color_filters.h" -#include "merge.h" -#include "ui/util.h" #include <wsutil/file_util.h> +#include <wiretap/merge.h> + +#include "ui/util.h" #include "ui/alert_box.h" #include "ui/file_dialog.h" #include "ui/recent.h" diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 8aa1c6792b..ab137a2d97 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -68,6 +68,8 @@ #include <wsutil/privileges.h> #include <wsutil/file_util.h> +#include <wiretap/merge.h> + #include <epan/epan.h> #include <epan/filesystem.h> #include <epan/epan_dissect.h> @@ -103,7 +105,6 @@ #include "../clopts_common.h" #include "../cmdarg_err.h" #include "../version_info.h" -#include "../merge.h" #include "../log.h" #include "gtk_iface_monitor.h" diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index c590d0643f..dad81c2af3 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -177,7 +177,6 @@ SOURCES_WS_C = \ ../../filters.c \ ../../frame_tvbuff.c \ ../../g711.c \ - ../../merge.c \ ../../proto_hier_stats.c \ ../../summary.c \ ../../sync_pipe_write.c \ diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index ba271236a4..9f497e9803 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -44,6 +44,8 @@ #include <wsutil/u3.h> #include <wsutil/file_util.h> +#include <wiretap/merge.h> + #include <epan/epan.h> #include <epan/filesystem.h> #include <wsutil/privileges.h> @@ -79,7 +81,6 @@ #include "clopts_common.h" #include "cmdarg_err.h" #include "version_info.h" -#include "merge.h" #include "log.h" #include "ui/alert_box.h" diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index c9fa01b997..955767f156 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -40,16 +40,18 @@ #include <gtk/gtk.h> +#include "wsutil/file_util.h" +#include "wsutil/unicode-utils.h" + +#include "wiretap/merge.h" + #include "epan/filesystem.h" #include "epan/addr_resolv.h" #include "epan/prefs.h" #include "epan/print.h" -#include "wsutil/file_util.h" -#include "wsutil/unicode-utils.h" #include "color.h" #include "color_filters.h" -#include "merge.h" #include "ui/alert_box.h" #include "ui/help_url.h" |