Move u3.{h,c} and g711.{h,c} into wsutil.

Project g711.h against multiple inclusion and add C++ compatibility wrapper.

svn path=/trunk/; revision=50654

6 files changed, 18 insertions, 19 deletions

diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 142727c6b3..fe8de8db34 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -51,6 +51,10 @@
 
 #include <gtk/gtk.h>
 
+#include <wsutil/file_util.h>
+#include <wsutil/g711.h>
+#include <wsutil/tempfile.h>
+
 #include <epan/epan_dissect.h>
 #include <epan/filesystem.h>
 #include <epan/pint.h>
@@ -62,19 +66,15 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/strutil.h>
 
-#include "ui/util.h"
-#include "../g711.h"
 #include "../stat_menu.h"
-#include "wsutil/tempfile.h"
 
+#include "ui/util.h"
 #include "ui/alert_box.h"
 #include "ui/last_open_dir.h"
 #include "ui/progress_dlg.h"
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"
 
-#include <wsutil/file_util.h>
-
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/file_dlg.h"
@@ -85,7 +85,6 @@
 #include "ui/gtk/iax2_analysis.h"
 #include "ui/gtk/rtp_stream.h"
 #include "ui/gtk/rtp_stream_dlg.h"
-
 #include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/gui_utils.h"
 
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 812777b490..8aa1c6792b 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -64,10 +64,12 @@
 #endif /* HAVE_LIBPORTAUDIO */
 
 #include <wsutil/crash_info.h>
+#include <wsutil/u3.h>
+#include <wsutil/privileges.h>
+#include <wsutil/file_util.h>
 
 #include <epan/epan.h>
 #include <epan/filesystem.h>
-#include <wsutil/privileges.h>
 #include <epan/epan_dissect.h>
 #include <epan/timestamp.h>
 #include <epan/plugins.h>
@@ -103,7 +105,6 @@
 #include "../version_info.h"
 #include "../merge.h"
 #include "../log.h"
-#include "../u3.h"
 
 #include "gtk_iface_monitor.h"
 
@@ -121,8 +122,6 @@
 #include "ui/iface_lists.h"
 #endif
 
-#include <wsutil/file_util.h>
-
 #ifdef HAVE_LIBPCAP
 #include "capture_ui_utils.h"
 #include "capture-pcap-util.h"
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index e9b9081753..ea32ecd578 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <wsutil/u3.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
@@ -49,7 +51,6 @@
 #include "globals.h"
 #include "color_filters.h"
 #include "stat_menu.h"
-#include "u3.h"
 
 #include "ui/iface_lists.h"
 #include "ui/main_statusbar.h"
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 647775e6d4..b3d9778b73 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -50,6 +50,10 @@
 
 #include <gtk/gtk.h>
 
+#include <wsutil/file_util.h>
+#include <wsutil/tempfile.h>
+#include <wsutil/g711.h>
+
 #include <epan/epan_dissect.h>
 #include <epan/filesystem.h>
 #include <epan/pint.h>
@@ -60,18 +64,15 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/strutil.h>
 
-#include "ui/util.h"
-#include "../g711.h"
 #include "../stat_menu.h"
-#include "wsutil/tempfile.h"
 
+#include "ui/util.h"
 #include "ui/alert_box.h"
 #include "ui/last_open_dir.h"
 #include "ui/progress_dlg.h"
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"
 
-#include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 5570e5965d..ba271236a4 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -41,6 +41,8 @@
 #endif /* HAVE_LIBPORTAUDIO */
 
 #include <wsutil/crash_info.h>
+#include <wsutil/u3.h>
+#include <wsutil/file_util.h>
 
 #include <epan/epan.h>
 #include <epan/filesystem.h>
@@ -79,8 +81,6 @@
 #include "version_info.h"
 #include "merge.h"
 #include "log.h"
-#include "u3.h"
-#include <wsutil/file_util.h>
 
 #include "ui/alert_box.h"
 #include "ui/capture_globals.h"
diff --git a/ui/recent.c b/ui/recent.c
index db1881e585..c739397144 100644
--- a/ui/recent.c
+++ b/ui/recent.c
@@ -44,8 +44,7 @@
 #include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
 
-#include "u3.h"
-
+#include <wsutil/u3.h>
 #include <wsutil/file_util.h>
 #include <wsutil/str_util.h>