osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
pespin/amr
Peter Wu 2017-10-14 21:14:14 +01:00 committed by Michael Mann
parent af09db8bd3
commit 1dea7f3dc1
36 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
capchild/capture_sync.c
View File

@ -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>

2
file.c
View File

@ -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

2
sharkd.c
View File

@ -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"

2
tshark.c
View File

@ -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"

2
ui/Makefile.am
View File

@ -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

2
ui/capture.c
View File

@ -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"

2
ui/gtk/capture_file_dlg.c
View File

@ -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"

2
ui/gtk/export_sslkeys.c
View File

@ -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"

4
ui/gtk/gui_utils.c
View File

@ -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>

2
ui/gtk/gui_utils.h
View File

@ -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
*

2
ui/gtk/main.c
View File

@ -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"

2
ui/gtk/main_80211_toolbar.c
View File

@ -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"

2
ui/gtk/main_welcome.c
View File

@ -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"

2
ui/gtk/packet_list_store.c
View File

@ -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"

2
ui/gtk/packet_panes.c
View File

@ -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>

2
ui/gtk/packet_win.c
View File

@ -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"

2
ui/gtk/prefs_capture.c
View File

@ -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"

2
ui/qt/capture_interfaces_dialog.cpp
View File

@ -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"

2
ui/qt/capture_preferences_frame.cpp
View File

@ -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>

2
ui/qt/coloring_rules_dialog.cpp
View File

@ -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>

2
ui/qt/extcap_options_dialog.cpp
View File

@ -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>

2
ui/qt/geometry_state_dialog.cpp
View File

@ -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()
{

2
ui/qt/main_window.h
View File

@ -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>

2
ui/qt/main_window_slots.cpp
View File

@ -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"

2
ui/qt/manage_interfaces_dialog.cpp
View File

@ -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>

2
ui/qt/packet_list.cpp
View File

@ -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"

2
ui/qt/remote_capture_dialog.cpp
View File

@ -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>

2
ui/qt/utils/qt_ui_utils.cpp
View File

@ -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>

2
ui/qt/wireless_frame.cpp
View File

@ -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>

2
ui/qt/wireless_timeline.h
View File

@ -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>

2
ui/qt/wireshark_dialog.cpp
View File

@ -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>

2
ui/recent.h
View File

@ -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.

2
ui/time_shift.c
View File

@ -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)

2
ui/voip_calls.c
View File

@ -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)

2
ui/win32/file_dlg_win32.c
View File

@ -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"

2
ui/ui_util.h → ui/ws_ui_util.h
View File

@ -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.