diff options
author | Peter Wu <peter@lekensteyn.nl> | 2017-10-14 21:14:14 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-10-15 01:14:26 +0000 |
commit | 1dea7f3dc17de6ac189f8d185d2c4c4294fed950 (patch) | |
tree | d537df267fbed159cdfb0752f4d63c29f5971f5b /ui/qt | |
parent | af09db8bd3f0defb319df00fa69cd82044ac1007 (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>
Diffstat (limited to 'ui/qt')
-rw-r--r-- | ui/qt/capture_interfaces_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/capture_preferences_frame.cpp | 2 | ||||
-rw-r--r-- | ui/qt/coloring_rules_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/extcap_options_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/geometry_state_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/main_window.h | 2 | ||||
-rw-r--r-- | ui/qt/main_window_slots.cpp | 2 | ||||
-rw-r--r-- | ui/qt/manage_interfaces_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/packet_list.cpp | 2 | ||||
-rw-r--r-- | ui/qt/remote_capture_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/utils/qt_ui_utils.cpp | 2 | ||||
-rw-r--r-- | ui/qt/wireless_frame.cpp | 2 | ||||
-rw-r--r-- | ui/qt/wireless_timeline.h | 2 | ||||
-rw-r--r-- | ui/qt/wireshark_dialog.cpp | 2 |
14 files changed, 14 insertions, 14 deletions
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> |