aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2017-10-14 21:14:14 +0100
committerMichael Mann <mmann78@netscape.net>2017-10-15 01:14:26 +0000
commit1dea7f3dc17de6ac189f8d185d2c4c4294fed950 (patch)
treed537df267fbed159cdfb0752f4d63c29f5971f5b
parentaf09db8bd3f0defb319df00fa69cd82044ac1007 (diff)
Rename ui_util.h -> ws_ui_util.h
In preparation for possibly using AUTOUIC in CMake which treats "ui_*.h" files specially, rename ui_util.h. No other changes. Change-Id: Id026572c000b713ff0e9388dc7fff8d81d4df73e Reviewed-on: https://code.wireshark.org/review/23916 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--capchild/capture_sync.c2
-rw-r--r--file.c2
-rw-r--r--sharkd.c2
-rw-r--r--tshark.c2
-rw-r--r--ui/Makefile.am2
-rw-r--r--ui/capture.c2
-rw-r--r--ui/gtk/capture_file_dlg.c2
-rw-r--r--ui/gtk/export_sslkeys.c2
-rw-r--r--ui/gtk/gui_utils.c4
-rw-r--r--ui/gtk/gui_utils.h2
-rw-r--r--ui/gtk/main.c2
-rw-r--r--ui/gtk/main_80211_toolbar.c2
-rw-r--r--ui/gtk/main_welcome.c2
-rw-r--r--ui/gtk/packet_list_store.c2
-rw-r--r--ui/gtk/packet_panes.c2
-rw-r--r--ui/gtk/packet_win.c2
-rw-r--r--ui/gtk/prefs_capture.c2
-rw-r--r--ui/qt/capture_interfaces_dialog.cpp2
-rw-r--r--ui/qt/capture_preferences_frame.cpp2
-rw-r--r--ui/qt/coloring_rules_dialog.cpp2
-rw-r--r--ui/qt/extcap_options_dialog.cpp2
-rw-r--r--ui/qt/geometry_state_dialog.cpp2
-rw-r--r--ui/qt/main_window.h2
-rw-r--r--ui/qt/main_window_slots.cpp2
-rw-r--r--ui/qt/manage_interfaces_dialog.cpp2
-rw-r--r--ui/qt/packet_list.cpp2
-rw-r--r--ui/qt/remote_capture_dialog.cpp2
-rw-r--r--ui/qt/utils/qt_ui_utils.cpp2
-rw-r--r--ui/qt/wireless_frame.cpp2
-rw-r--r--ui/qt/wireless_timeline.h2
-rw-r--r--ui/qt/wireshark_dialog.cpp2
-rw-r--r--ui/recent.h2
-rw-r--r--ui/time_shift.c2
-rw-r--r--ui/voip_calls.c2
-rw-r--r--ui/win32/file_dlg_win32.c2
-rw-r--r--ui/ws_ui_util.h (renamed from ui/ui_util.h)2
36 files changed, 37 insertions, 37 deletions
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index a58db78aaa..1cc09d74cf 100644
--- a/capchild/capture_sync.c
+++ b/capchild/capture_sync.c
@@ -87,7 +87,7 @@
#include "caputils/capture-wpcap.h"
#endif
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include <wsutil/filesystem.h>
#include <wsutil/file_util.h>
diff --git a/file.c b/file.c
index 97a05630f6..bc4586003f 100644
--- a/file.c
+++ b/file.c
@@ -64,7 +64,7 @@
#include "ui/simple_dialog.h"
#include "ui/main_statusbar.h"
#include "ui/progress_dlg.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
/* Needed for addrinfo */
#ifdef HAVE_SYS_TYPES_H
diff --git a/sharkd.c b/sharkd.c
index 671c238aa8..05fde9078c 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -57,7 +57,7 @@
#include <epan/print.h>
#include <epan/addr_resolv.h>
#include "ui/util.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/decode_as_utils.h"
#include "ui/filter_files.h"
#include "ui/tap_export_pdu.h"
diff --git a/tshark.c b/tshark.c
index cb6b316687..cbae439fd8 100644
--- a/tshark.c
+++ b/tshark.c
@@ -86,7 +86,7 @@
#include "ui/capture_ui_utils.h"
#endif
#include "ui/util.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/decode_as_utils.h"
#include "ui/filter_files.h"
#include "ui/cli/tshark-tap.h"
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 55094edb3e..05327b867e 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -140,7 +140,7 @@ WIRESHARK_UI_INCLUDES = \
text_import_scanner.h \
time_shift.h \
traffic_table_ui.h \
- ui_util.h \
+ ws_ui_util.h \
util.h \
voip_calls.h
diff --git a/ui/capture.c b/ui/capture.c
index 518a716687..450bf57ddd 100644
--- a/ui/capture.c
+++ b/ui/capture.c
@@ -47,7 +47,7 @@
#endif
#include "ui/simple_dialog.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "wsutil/file_util.h"
#include "wsutil/str_util.h"
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index 3e1faa92b4..c1c5d7aac0 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -41,7 +41,7 @@
#include "ui/simple_dialog.h"
#include "ui/file_dialog.h"
#include "ui/recent.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/old-gtk-compat.h"
diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c
index 0e7cc03934..4ac2c51b43 100644
--- a/ui/gtk/export_sslkeys.c
+++ b/ui/gtk/export_sslkeys.c
@@ -47,7 +47,7 @@
#include "ui/recent.h"
#include "ui/simple_dialog.h"
#include "ui/ssl_key_export.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/gtk/keys.h"
#include "ui/gtk/color_utils.h"
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index 2054dd95ff..87740f6eaf 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -1,7 +1,7 @@
/* gui_utils.c
* UI utility routines, some GTK+-specific (declared in gtk/gui_utils.h)
* and some with GUI-independent APIs, with this file containing the GTK+
- * implementations of them (declared in ui_util.h)
+ * implementations of them (declared in ws_ui_util.h)
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -42,7 +42,7 @@
#include "../../globals.h"
#include "ui/recent.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include <wsutil/file_util.h>
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h
index 198fb2b389..b94d10e12a 100644
--- a/ui/gtk/gui_utils.h
+++ b/ui/gtk/gui_utils.h
@@ -23,7 +23,7 @@
#ifndef __GUI_UTILS_H__
#define __GUI_UTILS_H__
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
/** @defgroup windows_group Windows
*
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index d840e8475c..1343ef290e 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -108,7 +108,7 @@
#include "ui/recent.h"
#include "ui/recent_utils.h"
#include "ui/software_update.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/util.h"
#include "ui/dissect_opts.h"
#include "ui/commandline.h"
diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c
index 153b09d0cd..32fa326f82 100644
--- a/ui/gtk/main_80211_toolbar.c
+++ b/ui/gtk/main_80211_toolbar.c
@@ -35,7 +35,7 @@
#include "main_toolbar.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/gtk/old-gtk-compat.h"
#include "ui/gtk/main_80211_toolbar.h"
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 4a6abe89ac..3ad072998f 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -43,7 +43,7 @@
#include "ui/recent.h"
#include "ui/simple_dialog.h"
#include <wsutil/utf8_entities.h>
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/color_utils.h"
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index 2ea5d00a81..5af1dd4df1 100644
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -36,7 +36,7 @@
#include "packet_list_store.h"
#include "ui/progress_dlg.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/gtk/old-gtk-compat.h"
diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c
index 4a1cbac7df..ac6e7b582e 100644
--- a/ui/gtk/packet_panes.c
+++ b/ui/gtk/packet_panes.c
@@ -45,7 +45,7 @@
#include "ui/progress_dlg.h"
#include "ui/recent.h"
#include "ui/simple_dialog.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include <wsutil/file_util.h>
#include <wsutil/str_util.h>
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index 635f305bb5..a078e3b9f8 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -55,7 +55,7 @@
#include "ui/recent.h"
#include "ui/simple_dialog.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/gtk/font_utils.h"
#include "ui/gtk/main.h"
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index ff716c083b..4f938b655a 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -35,7 +35,7 @@
#include "ui/capture_globals.h"
#include "ui/iface_lists.h"
#include "ui/simple_dialog.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/gtk/prefs_capture.h"
#include "ui/gtk/prefs_dlg.h"
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index 5e31fed8a7..db82e82874 100644
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -44,7 +44,7 @@
#include "ui/iface_lists.h"
#include "ui/last_open_dir.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/util.h"
#include <wsutil/utf8_entities.h>
#include "ui/preference_utils.h"
diff --git a/ui/qt/capture_preferences_frame.cpp b/ui/qt/capture_preferences_frame.cpp
index 24804ed765..3791edb7a7 100644
--- a/ui/qt/capture_preferences_frame.cpp
+++ b/ui/qt/capture_preferences_frame.cpp
@@ -34,7 +34,7 @@
#include <QSpacerItem>
#include "ui/capture_ui_utils.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include <epan/prefs-int.h>
diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp
index a29dbfb68d..552e5a1eec 100644
--- a/ui/qt/coloring_rules_dialog.cpp
+++ b/ui/qt/coloring_rules_dialog.cpp
@@ -40,7 +40,7 @@
#include "wsutil/filesystem.h"
#include <ui/qt/utils/color_utils.h>
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include <ui/qt/widgets/display_filter_combo.h>
#include <ui/qt/widgets/syntax_line_edit.h>
#include <ui/qt/widgets/display_filter_edit.h>
diff --git a/ui/qt/extcap_options_dialog.cpp b/ui/qt/extcap_options_dialog.cpp
index 946007df58..61d717a138 100644
--- a/ui/qt/extcap_options_dialog.cpp
+++ b/ui/qt/extcap_options_dialog.cpp
@@ -43,7 +43,7 @@
#include "ui/iface_lists.h"
#include "ui/last_open_dir.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/util.h"
#include <wsutil/utf8_entities.h>
diff --git a/ui/qt/geometry_state_dialog.cpp b/ui/qt/geometry_state_dialog.cpp
index 4938b81a37..75d94decee 100644
--- a/ui/qt/geometry_state_dialog.cpp
+++ b/ui/qt/geometry_state_dialog.cpp
@@ -22,7 +22,7 @@
#include "geometry_state_dialog.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "ui/recent.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
GeometryStateDialog::~GeometryStateDialog()
{
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 2208be7fe5..0ab3614e4d 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -30,7 +30,7 @@
#include "file.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/iface_toolbar.h"
#include <epan/prefs.h>
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index ff0c3e4163..c71b116fd7 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -83,7 +83,7 @@ DIAG_ON(frame-larger-than=)
#include "ui/recent.h"
#include "ui/recent_utils.h"
#include "ui/ssl_key_export.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/all_files_wildcard.h"
#include "ui/qt/simple_dialog.h"
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index b124f46302..bd15009527 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -36,7 +36,7 @@
#endif
#include "ui/iface_lists.h"
#include "ui/preference_utils.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include <wsutil/utf8_entities.h>
#include <ui/qt/utils/qt_ui_utils.h>
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index f3a60a40d4..aa57dc3520 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -42,7 +42,7 @@
#include "ui/preference_utils.h"
#include "ui/recent.h"
#include "ui/recent_utils.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include <wsutil/utf8_entities.h>
#include "ui/util.h"
diff --git a/ui/qt/remote_capture_dialog.cpp b/ui/qt/remote_capture_dialog.cpp
index 0f90ae9321..258ca42319 100644
--- a/ui/qt/remote_capture_dialog.cpp
+++ b/ui/qt/remote_capture_dialog.cpp
@@ -33,7 +33,7 @@
#include "ui/capture_ui_utils.h"
#include "epan/prefs.h"
#include "epan/to_str.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/recent.h"
#include <QMessageBox>
diff --git a/ui/qt/utils/qt_ui_utils.cpp b/ui/qt/utils/qt_ui_utils.cpp
index 46debbcd14..41a6b53269 100644
--- a/ui/qt/utils/qt_ui_utils.cpp
+++ b/ui/qt/utils/qt_ui_utils.cpp
@@ -31,7 +31,7 @@
#include <epan/value_string.h>
#include <ui/recent.h>
-#include <ui/ui_util.h>
+#include "ui/ws_ui_util.h"
#include <wsutil/str_util.h>
diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
index 51c96def46..bd100e5cb8 100644
--- a/ui/qt/wireless_frame.cpp
+++ b/ui/qt/wireless_frame.cpp
@@ -31,7 +31,7 @@
#include <caputils/ws80211_utils.h>
-#include <ui/ui_util.h>
+#include "ui/ws_ui_util.h"
#include <wsutil/utf8_entities.h>
#include <wsutil/frequency-utils.h>
diff --git a/ui/qt/wireless_timeline.h b/ui/qt/wireless_timeline.h
index 4362951597..0f549e370c 100644
--- a/ui/qt/wireless_timeline.h
+++ b/ui/qt/wireless_timeline.h
@@ -36,7 +36,7 @@
#include "file.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include <epan/prefs.h>
#include <epan/plugin_if.h>
diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp
index 53e62eab47..1eea7f335b 100644
--- a/ui/qt/wireshark_dialog.cpp
+++ b/ui/qt/wireshark_dialog.cpp
@@ -32,7 +32,7 @@
#include "wireshark_dialog.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "ui/recent.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include <QMessageBox>
diff --git a/ui/recent.h b/ui/recent.h
index db16c29156..f21711fedb 100644
--- a/ui/recent.h
+++ b/ui/recent.h
@@ -31,7 +31,7 @@ extern "C" {
#include <glib.h>
#include <stdio.h>
#include "epan/timestamp.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
/** @file
* Recent user interface settings.
diff --git a/ui/time_shift.c b/ui/time_shift.c
index f02f0f6dc8..5c0e34ecb7 100644
--- a/ui/time_shift.c
+++ b/ui/time_shift.c
@@ -30,7 +30,7 @@
#include "time_shift.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#ifndef HAVE_FLOORL
#define floorl(x) floor((double)x)
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index 7bf41b4f8f..afa816d356 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -62,7 +62,7 @@
#include "ui/rtp_stream.h"
#include "ui/simple_dialog.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/voip_calls.h"
#define DUMP_PTR1(p) printf("#=> %p\n",(void *)p)
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index 2f3a014c73..de5fd9c195 100644
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -48,7 +48,7 @@
#include "ui/simple_dialog.h"
#include "ui/ssl_key_export.h"
#include "ui/util.h"
-#include "ui/ui_util.h"
+#include "ui/ws_ui_util.h"
#include "ui/all_files_wildcard.h"
#include "file_dlg_win32.h"
diff --git a/ui/ui_util.h b/ui/ws_ui_util.h
index 5a20ab7b8e..053a992ed5 100644
--- a/ui/ui_util.h
+++ b/ui/ws_ui_util.h
@@ -1,4 +1,4 @@
-/* ui_util.h
+/* ws_ui_util.h
* Declarations of UI utility routines; these routines have GUI-independent
* APIs, but GUI-dependent implementations, so that they can be called by
* GUI-independent code to affect the GUI.