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>

diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index a58db78aaac16980124bf9063ca328c5e56788cc..1cc09d74cfc16d147a3eeac349a9c98f5a3c8fb0 100644 (file)
--- 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 97a05630f64b19b61364580c238d5d9f6273ca41..bc4586003facbac9baaffa948f52765ade3692c6 100644 (file)
--- 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 671c238aa88db38e4f1c01d07d48e197632f2364..05fde9078c609a8242a661b14a8a8b3d97df1494 100644 (file)
--- 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 cb6b316687cbe5a765189de312271a52c9652e9a..cbae439fd83770f69acacb0470b36250d1685915 100644 (file)
--- 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 55094edb3ed6dd8d10b93f675a51acd903da3a0d..05327b867ee226cef5a39a6a7c3722f10effc198 100644 (file)
--- 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 518a716687b62b171bdc544ae96b71b4fe504607..450bf57dddeb04a8e067aff56603f667f31ec50b 100644 (file)
--- 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 3e1faa92b48a19e5713861460a509e41d61ee2db..c1c5d7aac08486375cee38424376c63a1b4c9dea 100644 (file)
--- 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 0e7cc03934e9ab72ec17f51c1ce16019f5ec9f07..4ac2c51b43a44fb1aa5282f575b1cee270992466 100644 (file)
--- 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 2054dd95ff07efae45743ae3c5fc382789e9f879..87740f6eaff4adae65fd3cdf7d1a361751f79b28 100644 (file)
--- 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 198fb2b38916283b79309c871fb8bdfc199d3ac5..b94d10e12a2d1b2451ea095f50132767c25af5dc 100644 (file)
--- 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 d840e8475c6bc7d0bc11854b911f339f60681455..1343ef290e88f6f67418b2111d1d24f6075db5e4 100644 (file)
--- 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 153b09d0cd81a9b1925a970ce439879dd074a3bc..32fa326f8232fa18a6eb781a9c648a77680511e9 100644 (file)
--- 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 4a6abe89acee37556d1b434b5d5164cf6f4d1ef6..3ad072998fb00b082977f9be1936208e90a8c283 100644 (file)
--- 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 2ea5d00a81fcf07c8464b4a515d2097917814a4c..5af1dd4df15f105c3ad8c9578a393656381d1856 100644 (file)
--- 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 4a1cbac7df671ec81988e97053c49c233a45a848..ac6e7b582e691929990bb03d77ebdad04cafac13 100644 (file)
--- 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 635f305bb502a9e9ddd110b17d36d44cbf693a1c..a078e3b9f80291a08ca68d5afbccbd1eab478a73 100644 (file)
--- 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 ff716c083b5f2db2540af1ef4057405c4ebdbab8..4f938b655a3b82b45121b4c115a8ba96a574d91a 100644 (file)
--- 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 5e31fed8a7a2c6766fa3594bc8771b6c240864cf..db82e8287497486ef57836fac7c84dba84ff23c6 100644 (file)
--- 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 24804ed765f620f353d5ab841fb71c763b6d54f7..3791edb7a779cf0cd6d3c58ac95ca3dba6aa773e 100644 (file)
--- 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 a29dbfb68d80d7a4a98aa6f7f71eb5296fc79b0d..552e5a1eecd54b3946a14cf33973bb2cf580c5f2 100644 (file)
--- 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 946007df58f2511f80e061b1a400e7cf67a710ef..61d717a138fec76b6c127045c715b7f89b0efaf7 100644 (file)
--- 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 4938b81a37b7a7678c433516a6a9e2c1481806b9..75d94decee4e8d213f23e4adf3aea8ae4cf008df 100644 (file)
--- 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 2208be7fe598c25f9e514f26f90f70be73d20594..0ab3614e4da1b01819fac12363dcf05f2cdbf8d1 100644 (file)
--- 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 ff0c3e4163175c6c79d0c8ef3ea247ae2980d2c7..c71b116fd7a34347082f1df40e1b5229914cbc8b 100644 (file)
--- 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 b124f46302f713cd158a7d3d0fada44830d2c4d3..bd15009527eb5d54b6fd975da23026794fdfd30a 100644 (file)
--- 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 f3a60a40d441a4d498977cae0292e094b2677e69..aa57dc3520743c3a223666b234473ac4ae95353a 100644 (file)
--- 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 0f90ae932192880674a1fb42dc4e071dfdda69c3..258ca423199df9ef5f35a5eada105a57d937fcca 100644 (file)
--- 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 46debbcd140e867228c4116bb4ce3508aaa57b5f..41a6b5326941e135fc93157fe0a898d7fd06bc83 100644 (file)
--- 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 51c96def46789b9e2ba7017649b305862c3fc5d2..bd100e5cb8d200d27dd43fa4fdc0653305bbe5e6 100644 (file)
--- 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 4362951597210c6274197d6ed671ef6db1da7363..0f549e370c05d1f940ea5a0a12415af3ea666094 100644 (file)
--- 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 53e62eab475ce586ede64bcac4d648fda2653cd8..1eea7f335bfa9b1c19345e9bd40d8b1700ceddce 100644 (file)
--- 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 db16c2915642bb0d60174f2493470c2b744bf96b..f21711fedb3c22b2323218522ab52e5b96785004 100644 (file)
--- 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 f02f0f6dc86853e20d52aac2cf12b1c4d0375be8..5c0e34ecb7b841cc4cec665ccb7980735ec499d5 100644 (file)
--- 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 7bf41b4f8ff0cd77cc86d078817a108b1d537e70..afa816d356af5f8cdc8f7db0cc5c2590998d5151 100644 (file)
--- 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 2f3a014c7397717757aa34451102216244147c22..de5fd9c1953b62ca094a97e6783bc8df1b1c2861 100644 (file)
--- 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
similarity index 99%
rename from ui/ui_util.h
rename to ui/ws_ui_util.h
index 5a20ab7b8e28a94fdb89befbe34fdfca8e4d6bba..053a992ed5f6aec1e3cfe1164e7a22c088cecd4a 100644 (file)
--- 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.