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

Qt: Move utils to separate utils directory 

Following the move for widgets directory, moving utils
to the utils directory. Guidelines for this directory are:

 - Generic use but not a widget
 - Utility functionality used by many classes
 
 Note: additionally all includes affected by this move have been changed
 to absolute path includes, instead of relative ones.

Change-Id: I019ae4b6e6f6d06a5745a63ed195edbd36fb936b
Reviewed-on: https://code.wireshark.org/review/22602
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Roland Knall 2017-07-25 16:15:18 +02:00 committed by Roland Knall
parent 95930c2d1f
commit ddfc1d37cc
151 changed files with 277 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ui/qt/CMakeLists.txt
View File

@ -29,6 +29,7 @@ set(WIRESHARK_WIDGET_HEADERS
widgets/clickable_label.h
widgets/display_filter_combo.h
widgets/display_filter_edit.h
widgets/drag_drop_toolbar.h
widgets/elided_label.h
widgets/field_filter_edit.h
widgets/find_line_edit.h
@ -36,9 +37,18 @@ set(WIRESHARK_WIDGET_HEADERS
widgets/interface_toolbar_lineedit.h
widgets/label_stack.h
widgets/overlay_scroll_bar.h
widgets/qcustomplot.h
widgets/stock_icon_tool_button.h
widgets/syntax_line_edit.h
widgets/tabnav_tree_view.h
widgets/drag_drop_toolbar.h
)
set(WIRESHARK_UTILS_HEADERS
utils/color_utils.h
utils/stock_icon.h
utils/qt_ui_utils.h
utils/variant_pointer.h
uat_delegate.h
)
# All .h files which inherit from QObject aka which use the Q_OBJECT macro
@ -62,7 +72,6 @@ set(WIRESHARK_QT_HEADERS
capture_info_dialog.h
capture_interfaces_dialog.h
capture_preferences_frame.h
color_utils.h
coloring_rules_dialog.h
column_preferences_frame.h
column_editor_frame.h
@ -135,7 +144,6 @@ set(WIRESHARK_QT_HEADERS
proto_tree.h
protocol_hierarchy_dialog.h
protocol_preferences_menu.h
qcustomplot.h
recent_file_status.h
related_packet_delegate.h
resolved_addresses_dialog.h
@ -159,7 +167,6 @@ set(WIRESHARK_QT_HEADERS
stats_tree_dialog.h
service_response_time_dialog.h
simple_statistics_dialog.h
stock_icon_tool_button.h
supported_protocols_dialog.h
tabnav_tree_widget.h
tap_parameter_dialog.h
@ -201,9 +208,9 @@ endif()
file(GLOB EXTRA_QT_HEADERS
packet_list_record.h
qt_ui_utils.h
utils/qt_ui_utils.h
sparkline_delegate.h
stock_icon.h
utils/stock_icon.h
)
set(WIRESHARK_WIDGET_SRCS
@ -214,6 +221,7 @@ set(WIRESHARK_WIDGET_SRCS
widgets/clickable_label.cpp
widgets/display_filter_combo.cpp
widgets/display_filter_edit.cpp
widgets/drag_drop_toolbar.cpp
widgets/elided_label.cpp
widgets/field_filter_edit.cpp
widgets/find_line_edit.cpp
@ -221,9 +229,16 @@ set(WIRESHARK_WIDGET_SRCS
widgets/interface_toolbar_lineedit.cpp
widgets/label_stack.cpp
widgets/overlay_scroll_bar.cpp
widgets/qcustomplot.cpp
widgets/stock_icon_tool_button.cpp
widgets/syntax_line_edit.cpp
widgets/tabnav_tree_view.cpp
widgets/drag_drop_toolbar.cpp
)
set(WIRESHARK_UTILS_SRCS
utils/color_utils.cpp
utils/stock_icon.cpp
utils/qt_ui_utils.cpp
)
set(WIRESHARK_QT_SRC
@ -244,7 +259,6 @@ set(WIRESHARK_QT_SRC
capture_info_dialog.cpp
capture_interfaces_dialog.cpp
capture_preferences_frame.cpp
color_utils.cpp
coloring_rules_dialog.cpp
column_preferences_frame.cpp
column_editor_frame.cpp
@ -312,8 +326,6 @@ set(WIRESHARK_QT_SRC
proto_tree.cpp
protocol_hierarchy_dialog.cpp
protocol_preferences_menu.cpp
qcustomplot.cpp
qt_ui_utils.cpp
recent_file_status.cpp
related_packet_delegate.cpp
resolved_addresses_dialog.cpp
@ -338,8 +350,6 @@ set(WIRESHARK_QT_SRC
simple_statistics_dialog.cpp
sparkline_delegate.cpp
splash_overlay.cpp
stock_icon.cpp
stock_icon_tool_button.cpp
supported_protocols_dialog.cpp
tabnav_tree_widget.cpp
tap_parameter_dialog.cpp
@ -522,28 +532,16 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
SET(CMAKE_AUTOMOC TRUE)
if (QT_VERSION EQUAL 5)
QT5_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
QT5_ADD_RESOURCES(WIRESHARK_QT_QRC_SRC ${WIRESHARK_QT_QRC})
QT5_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI})
# For now, do the moc stuff manually
QT5_WRAP_CPP(WIRESHARK_QT_MOC_SRC ${WIRESHARK_QT_HEADERS} ${WIRESHARK_WIDGET_HEADERS}
OPTIONS ${MOC_OPTIONS})
# Starting with cmake 2.8.6, we may also use
# set(CMAKE_AUTOMOC TRUE)
# or
# set_target_properties(${some-source-files} PROPERTIES AUTOMOC TRUE)
else()
QT4_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
QT4_ADD_RESOURCES(WIRESHARK_QT_QRC_SRC ${WIRESHARK_QT_QRC})
QT4_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI})
# For now, do the moc stuff manually
QT4_WRAP_CPP(WIRESHARK_QT_MOC_SRC ${WIRESHARK_QT_HEADERS} ${WIRESHARK_WIDGET_HEADERS}
OPTIONS ${MOC_OPTIONS})
# Starting with cmake 2.8.6, we may also use
# set(CMAKE_AUTOMOC TRUE)
# or
# set_target_properties(${some-source-files} PROPERTIES AUTOMOC TRUE)
endif()
foreach(_file ${WIRESHARK_QT_QM})
@ -580,14 +578,18 @@ source_group("qrc Files" FILES ${WIRESHARK_QT_QRC_SRC} ${WIRESHARK_QT_QRC})
source_group("Header Files" FILES ${WIRESHARK_QT_HEADERS})
source_group("Widget Header Files" FILES ${WIRESHARK_WIDGET_HEADERS})
source_group("Widget Source Files" FILES ${WIRESHARK_WIDGET_SRCS})
source_group("Utils Header Files" FILES ${WIRESHARK_UTILS_HEADERS})
source_group("Utils Source Files" FILES ${WIRESHARK_UTILS_SRCS})
add_library(qtui STATIC
#Included so that Visual Studio can properly put header files in solution
${WIRESHARK_QT_HEADERS}
${WIRESHARK_WIDGET_HEADERS}
${WIRESHARK_UTILS_HEADERS}
${WIRESHARK_QT_SRC}
${WIRESHARK_WIDGET_SRCS}
${WIRESHARK_UTILS_SRCS}
${WIRESHARK_QT_TAP_SRC}
${WIRESHARK_QT_UI_SRC}
${WIRESHARK_QT_MOC_SRC}

51
ui/qt/Makefile.am
View File

@ -150,6 +150,7 @@ NODIST_GENERATED_FILES = \
# Files that generate compileable files
GENERATOR_FILES =
# Files that are basic widgets for every tool to be used
MOC_WIDGET_HDRS = \
widgets/additional_toolbar.h \
widgets/apply_line_edit.h \
@ -166,8 +167,16 @@ MOC_WIDGET_HDRS = \
widgets/label_stack.h \
widgets/overlay_scroll_bar.h \
widgets/syntax_line_edit.h \
widgets/stock_icon_tool_button.h \
widgets/tabnav_tree_view.h \
widgets/drag_drop_toolbar.h
widgets/drag_drop_toolbar.h \
widgets/qcustomplot.h
# Files that are utility classes with multi-purpose, but no widgets
MOC_UTILS_HDRS = \
utils/color_utils.h \
utils/stock_icon.h \
utils/qt_ui_utils.h \
utils/variant_pointer.h
#
# Headers that have to be run through moc.
@ -191,7 +200,6 @@ MOC_HDRS = \
capture_interfaces_dialog.h \
capture_preferences_frame.h \
coloring_rules_dialog.h \
color_utils.h \
column_preferences_frame.h \
column_editor_frame.h \
compiled_filter_output.h \
@ -262,7 +270,6 @@ MOC_HDRS = \
proto_tree.h \
protocol_hierarchy_dialog.h \
protocol_preferences_menu.h \
qcustomplot.h \
recent_file_status.h \
related_packet_delegate.h \
remote_capture_dialog.h \
@ -290,7 +297,6 @@ MOC_HDRS = \
sparkline_delegate.h \
splash_overlay.h \
stats_tree_dialog.h \
stock_icon_tool_button.h \
supported_protocols_dialog.h \
tabnav_tree_widget.h \
tap_parameter_dialog.h \
@ -309,7 +315,8 @@ MOC_HDRS = \
wireshark_application.h \
wireshark_dialog.h \
wlan_statistics_dialog.h \
$(MOC_WIDGET_HDRS)
$(MOC_WIDGET_HDRS) \
$(MOC_UTILS_HDRS)
#
# .ui files.
@ -457,17 +464,23 @@ WIRESHARK_QT_WIDGET_SRC = \
widgets/clickable_label.cpp \
widgets/display_filter_combo.cpp \
widgets/display_filter_edit.cpp \
widgets/elided_label.cpp \
widgets/elided_label.cpp \
widgets/field_filter_edit.cpp \
widgets/find_line_edit.cpp \
widgets/follow_stream_text.cpp \
widgets/interface_toolbar_lineedit.cpp \
widgets/label_stack.cpp \
widgets/overlay_scroll_bar.cpp \
widgets/stock_icon_tool_button.cpp \
widgets/syntax_line_edit.cpp \
widgets/tabnav_tree_view.cpp \
widgets/drag_drop_toolbar.cpp
widgets/drag_drop_toolbar.cpp \
widgets/qcustomplot.cpp
WIRESHARK_QT_UTILS_SRC = \
utils/color_utils.cpp \
utils/stock_icon.cpp \
utils/qt_ui_utils.cpp \
WIRESHARK_QT_SRC = \
about_dialog.cpp \
@ -487,7 +500,6 @@ WIRESHARK_QT_SRC = \
capture_info_dialog.cpp \
capture_interfaces_dialog.cpp \
capture_preferences_frame.cpp \
color_utils.cpp \
coloring_rules_dialog.cpp \
column_preferences_frame.cpp \
column_editor_frame.cpp \
@ -555,8 +567,6 @@ WIRESHARK_QT_SRC = \
proto_tree.cpp \
protocol_hierarchy_dialog.cpp \
protocol_preferences_menu.cpp \
qcustomplot.cpp \
qt_ui_utils.cpp \
recent_file_status.cpp \
related_packet_delegate.cpp \
remote_capture_dialog.cpp \
@ -583,8 +593,6 @@ WIRESHARK_QT_SRC = \
simple_statistics_dialog.cpp \
sparkline_delegate.cpp \
splash_overlay.cpp \
stock_icon.cpp \
stock_icon_tool_button.cpp \
supported_protocols_dialog.cpp \
tabnav_tree_widget.cpp \
tap_parameter_dialog.cpp \
@ -602,7 +610,8 @@ WIRESHARK_QT_SRC = \
wireless_timeline.cpp \
wireshark_application.cpp \
wireshark_dialog.cpp \
$(WIRESHARK_QT_WIDGET_SRC)
$(WIRESHARK_QT_WIDGET_SRC) \
$(WIRESHARK_QT_UTILS_SRC)
WIRESHARK_QT_TAP_SRC = \
expert_info_dialog.cpp \
@ -620,14 +629,14 @@ WIRESHARK_QT_TAP_SRC = \
wlan_statistics_dialog.cpp
noinst_HEADERS = \
$(MOC_HDRS) \
packet_list_record.h \
qcustomplot.h \
qt_ui_utils.h \
simple_dialog.h \
stock_icon.h \
tango_colors.h \
variant_pointer.h
$(MOC_HDRS) \
packet_list_record.h \
simple_dialog.h \
widgets/qcustomplot.h \
utils/qt_ui_utils.h \
utils/stock_icon.h \
utils/tango_colors.h \
utils/variant_pointer.h
if HAVE_EXTCAP
NODIST_GENERATED_HEADER_FILES += \

2
ui/qt/about_dialog.cpp
View File

@ -57,7 +57,7 @@
#include "extcap.h"
#endif
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <QFontMetrics>
#include <QKeySequence>

2
ui/qt/address_editor_frame.cpp
View File

@ -35,7 +35,7 @@
#include <QPushButton>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
// To do:
// - Fill in currently resolved address.

2
ui/qt/bluetooth_att_server_attributes_dialog.cpp
View File

@ -22,7 +22,7 @@
#include "bluetooth_att_server_attributes_dialog.h"
#include <ui_bluetooth_att_server_attributes_dialog.h>
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "epan/epan.h"
#include "epan/to_str.h"

4
ui/qt/bluetooth_device_dialog.cpp
View File

@ -22,7 +22,7 @@
#include "bluetooth_device_dialog.h"
#include <ui_bluetooth_device_dialog.h>
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "epan/epan.h"
#include "epan/addr_resolv.h"
@ -34,7 +34,7 @@
#include "ui/simple_dialog.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <QClipboard>
#include <QContextMenuEvent>

4
ui/qt/bluetooth_devices_dialog.cpp
View File

@ -24,7 +24,7 @@
#include "bluetooth_device_dialog.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "epan/epan.h"
#include "epan/addr_resolv.h"
@ -34,7 +34,7 @@
#include "epan/dissectors/packet-bluetooth.h"
#include "epan/dissectors/packet-bthci_evt.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include "ui/simple_dialog.h"

4
ui/qt/bluetooth_hci_summary_dialog.cpp
View File

@ -24,7 +24,7 @@
#include "bluetooth_device_dialog.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "epan/epan.h"
#include "epan/addr_resolv.h"
@ -35,7 +35,7 @@
#include "epan/dissectors/packet-bthci_cmd.h"
#include "epan/dissectors/packet-bthci_evt.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include "ui/simple_dialog.h"

2
ui/qt/byte_view_tab.cpp
View File

@ -28,7 +28,7 @@
#include <QTabBar>
#include <QTreeWidgetItem>
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
// To do:
// - We might want to add a callback to free_data_sources in so that we

4
ui/qt/byte_view_text.cpp
View File

@ -28,11 +28,11 @@
#include <wsutil/utf8_entities.h>
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "wireshark_application.h"
#include "ui/recent.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <QActionGroup>
#include <QMouseEvent>

2
ui/qt/capture_file_dialog.cpp
View File

@ -53,7 +53,7 @@
#include <QPushButton>
#include "epan/prefs.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <wireshark_application.h>
CaptureFileDialog::CaptureFileDialog(QWidget *parent, capture_file *cf, QString &display_filter) :

2
ui/qt/capture_file_dialog.h
View File

@ -28,6 +28,8 @@
#include "ui/help_url.h"
#endif // Q_OS_WIN
#include <ui/packet_range.h>
#include "packet_list_record.h"
#include "cfile.h"

2
ui/qt/capture_file_properties_dialog.cpp
View File

@ -30,7 +30,7 @@
#include "wsutil/utf8_entities.h"
#include "ws_version_info.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QPushButton>

4
ui/qt/capture_interfaces_dialog.cpp
View File

@ -57,8 +57,8 @@
#include <wiretap/wtap.h>
#include "qt_ui_utils.h"
#include "sparkline_delegate.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <ui/qt/sparkline_delegate.h>
// To do:
// - Set a size hint for item delegates.

2
ui/qt/coloring_rules_dialog.cpp
View File

@ -39,7 +39,7 @@
#include "wsutil/filesystem.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "ui/ui_util.h"
#include <ui/qt/widgets/display_filter_combo.h>
#include <ui/qt/widgets/syntax_line_edit.h>

2
ui/qt/column_preferences_frame.cpp
View File

@ -30,7 +30,7 @@
#include <ui/preference_utils.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "column_preferences_frame.h"
#include <ui_column_preferences_frame.h>
#include <ui/qt/widgets/syntax_line_edit.h>

2
ui/qt/conversation_colorize_action.cpp
View File

@ -29,7 +29,7 @@
#include <QMenu>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
ConversationAction::ConversationAction(QObject *parent, conversation_filter_s *conv_filter) :
QAction(parent),

4
ui/qt/conversation_dialog.cpp
View File

@ -30,8 +30,8 @@
#include "wsutil/str_util.h"
#include "qt_ui_utils.h"
#include "timeline_delegate.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <ui/qt/timeline_delegate.h>
#include "wireshark_application.h"
#include <QCheckBox>

2
ui/qt/conversation_hash_tables_dialog.cpp
View File

@ -29,7 +29,7 @@
#include <epan/conversation.h>
#include <epan/conversation_debug.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
ConversationHashTablesDialog::ConversationHashTablesDialog(QWidget *parent) :

4
ui/qt/decode_as_dialog.cpp
View File

@ -32,10 +32,10 @@
#include "ui/simple_dialog.h"
#include <wsutil/utf8_entities.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <QComboBox>
#include <QFont>

4
ui/qt/display_filter_expression_dialog.cpp
View File

@ -31,10 +31,10 @@
#include <wsutil/utf8_entities.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <QPushButton>
#include <QDialogButtonBox>

2
ui/qt/endpoint_dialog.cpp
View File

@ -34,7 +34,7 @@
#include "wsutil/str_util.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QCheckBox>

2
ui/qt/expert_info_dialog.cpp
View File

@ -29,7 +29,7 @@
#include <epan/stat_tap_ui.h>
#include <epan/tap.h>
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "wireshark_application.h"
#include <QAction>

2
ui/qt/export_dissection_dialog.cpp
View File

@ -34,7 +34,7 @@
#include <epan/print.h>
#include <wsutil/filesystem.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <QDialogButtonBox>

2
ui/qt/export_object_action.cpp
View File

@ -30,7 +30,7 @@
#include <QMenu>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
ExportObjectAction::ExportObjectAction(QObject *parent, register_eo_t *eo) :
QAction(parent),

2
ui/qt/export_object_dialog.cpp
View File

@ -28,7 +28,7 @@
#include <wsutil/filesystem.h>
#include <wsutil/str_util.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QDialogButtonBox>

2
ui/qt/extcap_argument.cpp
View File

@ -49,7 +49,7 @@
#include <extcap.h>
#include <epan/prefs.h>
#include <epan/prefs-int.h>
#include <color_utils.h>
#include <ui/qt/utils/color_utils.h>
#include <extcap_parser.h>
#include <extcap_argument_file.h>

2
ui/qt/extcap_argument_file.cpp
View File

@ -36,7 +36,7 @@
#include <QVariant>
#include <epan/prefs.h>
#include <color_utils.h>
#include <ui/qt/utils/color_utils.h>
#include <ui/all_files_wildcard.h>

2
ui/qt/extcap_argument_multiselect.cpp
View File

@ -33,7 +33,7 @@
#include <QVariant>
#include <epan/prefs.h>
#include <color_utils.h>
#include <ui/qt/utils/color_utils.h>
#include <extcap_parser.h>
#include <extcap_argument_multiselect.h>

4
ui/qt/extcap_options_dialog.cpp
View File

@ -54,13 +54,13 @@
#include <extcap.h>
#include <extcap_parser.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <epan/prefs.h>
#include <ui/preference_utils.h>
#include <ui/qt/wireshark_application.h>
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <ui/qt/extcap_argument.h>
#include <ui/qt/extcap_argument_file.h>

2
ui/qt/file_set_dialog.cpp
View File

@ -28,7 +28,7 @@
#include "ui/help_url.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <wsutil/str_util.h>

4
ui/qt/follow_stream_dialog.cpp
View File

@ -44,10 +44,10 @@
#include "ws_symbol_export.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "progress_frame.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <QElapsedTimer>
#include <QKeyEvent>

4
ui/qt/font_color_preferences_frame.cpp
View File

@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "font_color_preferences_frame.h"
#include <ui_font_color_preferences_frame.h>
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "wireshark_application.h"
#include <QFontDialog>

2
ui/qt/funnel_string_dialog.cpp
View File

@ -25,7 +25,7 @@
#include <QLabel>
#include <QLineEdit>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
// Helper object used for sending close signal to open dialogs from a C function

2
ui/qt/funnel_text_dialog.cpp
View File

@ -27,7 +27,7 @@
#include <QTextCharFormat>
#include <QTextCursor>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
// To do:

2
ui/qt/geometry_state_dialog.cpp
View File

@ -20,7 +20,7 @@
*/
#include "geometry_state_dialog.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "ui/recent.h"
#include "ui/ui_util.h"

2
ui/qt/gsm_map_summary_dialog.cpp
View File

@ -43,7 +43,7 @@
#include "ui/capture_globals.h"
#include "ui/simple_dialog.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QTextStream>

6
ui/qt/iax2_analysis_dialog.cpp
View File

@ -46,9 +46,9 @@
#include <QPushButton>
#include <QTemporaryFile>
#include "color_utils.h"
#include "qt_ui_utils.h"
#include "stock_icon.h"
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/utils/qt_ui_utils.h>
#include <ui/qt/utils/stock_icon.h>
#include "wireshark_application.h"
/*

2
ui/qt/iax2_analysis_dialog.ui
View File

@ -343,7 +343,7 @@
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<header>widgets/qcustomplot.h</header>
<container>1</container>
</customwidget>
<customwidget>

2
ui/qt/import_text_dialog.cpp
View File

@ -41,7 +41,7 @@
#include <ui_import_text_dialog.h>
#include "wireshark_application.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <QFileDialog>
#include <QDebug>

2
ui/qt/interface_frame.cpp
View File

@ -27,7 +27,7 @@
#include "ui/qt/interface_frame.h"
#include "ui/qt/interface_tree_model.h"
#include "sparkline_delegate.h"
#include <ui/qt/sparkline_delegate.h>
#include "wireshark_application.h"
#ifdef HAVE_EXTCAP

2
ui/qt/interface_sort_filter_model.cpp
View File

@ -28,7 +28,7 @@
#include <epan/prefs.h>
#include <ui/preference_utils.h>
#include <ui/qt/qt_ui_utils.h>
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"

2
ui/qt/interface_tree_cache_model.cpp
View File

@ -27,7 +27,7 @@
#include "epan/prefs.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "ui/capture_globals.h"
#include "wsutil/utf8_entities.h"

6
ui/qt/interface_tree_model.cpp
View File

@ -34,12 +34,12 @@
#include "wsutil/filesystem.h"
#include "qt_ui_utils.h"
#include "stock_icon.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <ui/qt/utils/stock_icon.h>
#include "wireshark_application.h"
/* Needed for the meta type declaration of QList<int>* */
#include "sparkline_delegate.h"
#include <ui/qt/sparkline_delegate.h>
#ifdef HAVE_EXTCAP
#include "extcap.h"

10
ui/qt/io_graph_dialog.cpp
View File

@ -30,14 +30,14 @@
#include <wsutil/utf8_entities.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include "color_utils.h"
#include "qcustomplot.h"
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/widgets/qcustomplot.h>
#include "progress_frame.h"
#include "stock_icon.h"
#include <ui/qt/utils/stock_icon.h>
#include <ui/qt/widgets/syntax_line_edit.h>
#include <ui/qt/widgets/display_filter_edit.h>
#include <ui/qt/widgets/field_filter_edit.h>

2
ui/qt/io_graph_dialog.ui
View File

@ -505,7 +505,7 @@
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<header>widgets/qcustomplot.h</header>
<container>1</container>
</customwidget>
<customwidget>

2
ui/qt/lbm_lbtrm_transport_dialog.cpp
View File

@ -26,7 +26,7 @@
#include "file.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QClipboard>

2
ui/qt/lbm_lbtru_transport_dialog.cpp
View File

@ -26,7 +26,7 @@
#include "file.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QClipboard>

2
ui/qt/lbm_stream_dialog.cpp
View File

@ -28,7 +28,7 @@
#include "file.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QClipboard>

2
ui/qt/lbm_uimflow_dialog.cpp
View File

@ -37,7 +37,7 @@
#include <wsutil/utf8_entities.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "sequence_diagram.h"
#include "wireshark_application.h"

2
ui/qt/lbm_uimflow_dialog.ui
View File

@ -287,7 +287,7 @@
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<header>widgets/qcustomplot.h</header>
<container>1</container>
</customwidget>
</customwidgets>

4
ui/qt/lte_mac_statistics_dialog.cpp
View File

@ -31,8 +31,8 @@
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include "percent_bar_delegate.h"
#include "qt_ui_utils.h"
#include <ui/qt/percent_bar_delegate.h>
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"

4
ui/qt/lte_rlc_graph_dialog.cpp
View File

@ -31,12 +31,12 @@
#include <epan/tvbuff.h>
#include <frame_tvbuff.h>
#include "tango_colors.h"
#include <ui/qt/utils/tango_colors.h>
#include <QMenu>
#include <QRubberBand>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include "simple_dialog.h"

2
ui/qt/lte_rlc_graph_dialog.h
View File

@ -25,7 +25,7 @@
#include "wireshark_dialog.h"
#include <ui/tap-rlc-graph.h>
#include "qcustomplot.h"
#include <ui/qt/widgets/qcustomplot.h>
class QMenu;
class QRubberBand;

2
ui/qt/lte_rlc_graph_dialog.ui
View File

@ -351,7 +351,7 @@
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<header>widgets/qcustomplot.h</header>
<container>1</container>
</customwidget>
</customwidgets>

2
ui/qt/lte_rlc_statistics_dialog.cpp
View File

@ -33,7 +33,7 @@
#include <QPushButton>
#include "lte_rlc_graph_dialog.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include "ui/recent.h"

6
ui/qt/main_status_bar.cpp
View File

@ -32,14 +32,14 @@
#include "ui/main_statusbar.h"
#include "ui/profile.h"
#include "ui/qt/qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "capture_file.h"
#include "main_status_bar.h"
#include "profile_dialog.h"
#include "stock_icon.h"
#include "tango_colors.h"
#include <ui/qt/utils/stock_icon.h>
#include <ui/qt/utils/tango_colors.h>
#include <QAction>
#include <QHBoxLayout>

7
ui/qt/main_welcome.cpp
View File

@ -32,10 +32,9 @@
#include "main_welcome.h"
#include <ui_main_welcome.h>
#include "tango_colors.h"
#include "color_utils.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/tango_colors.h>
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QClipboard>

6
ui/qt/main_window.cpp
View File

@ -74,15 +74,15 @@ DIAG_ON(frame-larger-than=)
#include "wireless_timeline.h"
#include "proto_tree.h"
#include "simple_dialog.h"
#include "stock_icon.h"
#include <ui/qt/utils/stock_icon.h>
#include "tap_parameter_dialog.h"
#include "wireless_frame.h"
#include "wireshark_application.h"
#include <ui/qt/widgets/additional_toolbar.h>
#include "variant_pointer.h"
#include <ui/qt/utils/variant_pointer.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <ui/qt/widgets/drag_drop_toolbar.h>

2
ui/qt/main_window_preferences_frame.cpp
View File

@ -21,7 +21,7 @@
#include "wireshark_application.h"
#include "main_window_preferences_frame.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <ui_main_window_preferences_frame.h>
#include "ui/language.h"

8
ui/qt/main_window_slots.cpp
View File

@ -87,7 +87,7 @@ DIAG_ON(frame-larger-than=)
#include "ui/all_files_wildcard.h"
#include "ui/qt/simple_dialog.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <ui/qt/widgets/drag_drop_toolbar.h>
#ifdef HAVE_SOFTWARE_UPDATE
@ -103,7 +103,7 @@ DIAG_ON(frame-larger-than=)
#ifdef HAVE_LIBPCAP
#include "capture_interfaces_dialog.h"
#endif
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "coloring_rules_dialog.h"
#include "conversation_dialog.h"
#include "conversation_colorize_action.h"
@ -147,7 +147,7 @@ DIAG_ON(frame-larger-than=)
#include "print_dialog.h"
#include "profile_dialog.h"
#include "protocol_hierarchy_dialog.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "resolved_addresses_dialog.h"
#include "rpc_service_response_time_dialog.h"
#include "rtp_stream_dialog.h"
@ -158,7 +158,7 @@ DIAG_ON(frame-larger-than=)
#include "sequence_dialog.h"
#include "show_packet_bytes_dialog.h"
#include "stats_tree_dialog.h"
#include "stock_icon.h"
#include <ui/qt/utils/stock_icon.h>
#include "supported_protocols_dialog.h"
#include "tap_parameter_dialog.h"
#include "tcp_stream_dialog.h"

4
ui/qt/manage_interfaces_dialog.cpp
View File

@ -39,7 +39,7 @@
#include "ui/ui_util.h"
#include <wsutil/utf8_entities.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
@ -49,7 +49,7 @@
#include "ui/capture_ui_utils.h"
#include "ui/qt/path_chooser_delegate.h"
#include <ui/qt/path_chooser_delegate.h>
#include <QCheckBox>
#include <QFileDialog>

4
ui/qt/module_preferences_scroll_area.cpp
View File

@ -22,11 +22,11 @@
#include "module_preferences_scroll_area.h"
#include <ui_module_preferences_scroll_area.h>
#include <ui/qt/widgets/syntax_line_edit.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "uat_dialog.h"
#include "wireshark_application.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <epan/prefs-int.h>

2
ui/qt/mtp3_summary_dialog.cpp
View File

@ -42,7 +42,7 @@
#include "ui/capture_globals.h"
#include "ui/simple_dialog.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <QTextStream>

2
ui/qt/multicast_statistics_dialog.cpp
View File

@ -26,7 +26,7 @@
#include <QPushButton>
#include <QTreeWidget>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <ui/qt/widgets/syntax_line_edit.h>
#include "wireshark_application.h"

4
ui/qt/packet_list.cpp
View File

@ -51,10 +51,10 @@
#include <epan/color_filters.h>
#include "frame_tvbuff.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/widgets/overlay_scroll_bar.h>
#include "proto_tree.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QAction>

2
ui/qt/packet_list.h
View File

@ -27,7 +27,7 @@
#include "preferences_dialog.h"
#include "proto_tree.h"
#include "protocol_preferences_menu.h"
#include "related_packet_delegate.h"
#include <ui/qt/related_packet_delegate.h>
#include <QMenu>
#include <QTime>

2
ui/qt/packet_list_model.cpp
View File

@ -35,7 +35,7 @@
#include <epan/color_filters.h>
#include "frame_tvbuff.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "wireshark_application.h"
#include <QColor>

2
ui/qt/packet_range_group_box.h
View File

@ -26,7 +26,7 @@
#include <glib.h>
#include "ui/packet_range.h"
#include <ui/packet_range.h>
#include <ui/qt/widgets/syntax_line_edit.h>
#include <QGroupBox>

2
ui/qt/percent_bar_delegate.cpp
View File

@ -21,7 +21,7 @@
#include "percent_bar_delegate.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include <QApplication>
#include <QPainter>

2
ui/qt/preference_editor_frame.cpp
View File

@ -33,7 +33,7 @@
#include "preference_editor_frame.h"
#include <ui_preference_editor_frame.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <wsutil/utf8_entities.h>
#include "wireshark_application.h"

4
ui/qt/preferences_dialog.cpp
View File

@ -39,11 +39,11 @@
#include <main_window.h>
#include <ui/qt/widgets/syntax_line_edit.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "uat_dialog.h"
#include "wireshark_application.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <QColorDialog>
#include <QComboBox>

6
ui/qt/profile_dialog.cpp
View File

@ -25,16 +25,16 @@
#include "wsutil/filesystem.h"
#include "epan/prefs.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "ui/profile.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include "profile_dialog.h"
#include <ui_profile_dialog.h>
#include "wireshark_application.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include <QBrush>
#include <QDir>

2
ui/qt/progress_frame.cpp
View File

@ -31,7 +31,7 @@
#include <QBoxLayout>
#include <QPropertyAnimation>
#include "stock_icon_tool_button.h"
#include <ui/qt/widgets/stock_icon_tool_button.h>
#include "wireshark_application.h"
// To do:

2
ui/qt/progress_frame.ui
View File

@ -58,7 +58,7 @@
<customwidget>
<class>StockIconToolButton</class>
<extends>QToolButton</extends>
<header>stock_icon_tool_button.h</header>
<header>widgets/stock_icon_tool_button.h</header>
</customwidget>
</customwidgets>
<resources/>

4
ui/qt/proto_tree.cpp
View File

@ -26,9 +26,9 @@
#include <epan/ftypes/ftypes.h>
#include <epan/prefs.h>
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <QApplication>
#include <QContextMenuEvent>

4
ui/qt/protocol_hierarchy_dialog.cpp
View File

@ -26,11 +26,11 @@
#include "ui/proto_hier_stats.h"
#include <ui/qt/variant_pointer.h>
#include <ui/qt/utils/variant_pointer.h>
#include <wsutil/utf8_entities.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
#include <QClipboard>

2
ui/qt/protocol_hierarchy_dialog.h
View File

@ -25,7 +25,7 @@
#include <QMenu>
#include "filter_action.h"
#include "percent_bar_delegate.h"
#include <ui/qt/percent_bar_delegate.h>
#include "wireshark_dialog.h"
class QPushButton;

2
ui/qt/protocol_preferences_menu.cpp
View File

@ -33,7 +33,7 @@
#include "protocol_preferences_menu.h"
#include "enabled_protocols_dialog.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "uat_dialog.h"
#include "wireshark_application.h"

2
ui/qt/related_packet_delegate.cpp
View File

@ -22,7 +22,7 @@
#include "related_packet_delegate.h"
#include "packet_list_record.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include <QApplication>
#include <QPainter>

2
ui/qt/remote_capture_dialog.cpp
View File

@ -24,7 +24,7 @@
#include "config.h"
#ifdef HAVE_PCAP_REMOTE
#include <glib.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "ui/capture_globals.h"
#include "remote_capture_dialog.h"
#include <ui_remote_capture_dialog.h>

2
ui/qt/response_time_delay_dialog.cpp
View File

@ -28,7 +28,7 @@
#include <QTreeWidget>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
static QHash<const QString, register_rtd_t *> cfg_str_to_rtd_;

2
ui/qt/rpc_service_response_time_dialog.cpp
View File

@ -35,7 +35,7 @@
#include <epan/guid-utils.h>
#include <epan/srt_table.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include <QComboBox>
#include <QHBoxLayout>

6
ui/qt/rtp_analysis_dialog.cpp
View File

@ -43,10 +43,10 @@
#include <QPushButton>
#include <QTemporaryFile>
#include "color_utils.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/utils/qt_ui_utils.h>
#include "rtp_player_dialog.h"
#include "stock_icon.h"
#include <ui/qt/utils/stock_icon.h>
#include "wireshark_application.h"
/*

2
ui/qt/rtp_analysis_dialog.ui
View File

@ -459,7 +459,7 @@
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<header>widgets/qcustomplot.h</header>
<container>1</container>
</customwidget>
<customwidget>

10
ui/qt/rtp_player_dialog.cpp
View File

@ -28,11 +28,11 @@
#include <wsutil/utf8_entities.h>
#include "color_utils.h"
#include "qcustomplot.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/widgets/qcustomplot.h>
#include <ui/qt/utils/qt_ui_utils.h>
#include "rtp_audio_stream.h"
#include "tango_colors.h"
#include <ui/qt/utils/tango_colors.h>
#include <QAudio>
#include <QAudioDeviceInfo>
@ -44,7 +44,7 @@
#include <QPushButton>
#include "stock_icon.h"
#include <ui/qt/utils/stock_icon.h>
#include "wireshark_application.h"
// To do:

2
ui/qt/rtp_player_dialog.ui
View File

@ -436,7 +436,7 @@
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<header>widgets/qcustomplot.h</header>
<container>1</container>
</customwidget>
</customwidgets>

4
ui/qt/rtp_stream_dialog.cpp
View File

@ -29,7 +29,7 @@
#include <wsutil/utf8_entities.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "rtp_analysis_dialog.h"
#include "wireshark_application.h"
@ -42,7 +42,7 @@
#include <QTreeWidgetItem>
#include <QTreeWidgetItemIterator>
#include "tango_colors.h"
#include <ui/qt/utils/tango_colors.h>
/*
* @file RTP stream dialog

2
ui/qt/sctp_all_assocs_dialog.cpp
View File

@ -23,7 +23,7 @@
#include <ui_sctp_all_assocs_dialog.h>
#include "sctp_assoc_analyse_dialog.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
//#include "wireshark_application.h"
#include "file.h"
#include "ui/qt/main_window.h"

2
ui/qt/sctp_assoc_analyse_dialog.cpp
View File

@ -24,7 +24,7 @@
#include "sctp_assoc_analyse_dialog.h"
#include <ui_sctp_assoc_analyse_dialog.h>
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "sctp_graph_dialog.h"
#include "sctp_graph_arwnd_dialog.h"
#include "sctp_graph_byte_dialog.h"

2
ui/qt/sctp_graph_arwnd_dialog.cpp
View File

@ -30,7 +30,7 @@
#include "ui/tap-sctp-analysis.h"
#include "qcustomplot.h"
#include <ui/qt/widgets/qcustomplot.h>
#include "sctp_graph_dialog.h"
SCTPGraphArwndDialog::SCTPGraphArwndDialog(QWidget *parent, sctp_assoc_info_t *assoc, _capture_file *cf, int dir) :

2
ui/qt/sctp_graph_arwnd_dialog.ui
View File

@ -99,7 +99,7 @@
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<header>widgets/qcustomplot.h</header>
<container>1</container>
</customwidget>
</customwidgets>

2
ui/qt/sctp_graph_byte_dialog.cpp
View File

@ -29,7 +29,7 @@
#include "ui/tap-sctp-analysis.h"
#include "qcustomplot.h"
#include <ui/qt/widgets/qcustomplot.h>
#include "sctp_graph_dialog.h"
#include "sctp_assoc_analyse_dialog.h"

2
ui/qt/sctp_graph_byte_dialog.ui
View File

@ -99,7 +99,7 @@
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<header>widgets/qcustomplot.h</header>
<container>1</container>
</customwidget>
</customwidgets>

2
ui/qt/sctp_graph_dialog.cpp
View File

@ -35,7 +35,7 @@
#include <QFileDialog>
#include <QMessageBox>
#include "qcustomplot.h"
#include <ui/qt/widgets/qcustomplot.h>
#include "wireshark_application.h"
SCTPGraphDialog::SCTPGraphDialog(QWidget *parent, sctp_assoc_info_t *assoc, capture_file *cf, int dir) :

2
ui/qt/sctp_graph_dialog.ui
View File

@ -129,7 +129,7 @@
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header>qcustomplot.h</header>
<header>widgets/qcustomplot.h</header>
<container>1</container>
</customwidget>
</customwidgets>

4
ui/qt/sequence_diagram.cpp
View File

@ -25,8 +25,8 @@
#include "ui/tap-sequence-analysis.h"
#include "color_utils.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/utils/qt_ui_utils.h>
#include <QFont>
#include <QFontMetrics>

2
ui/qt/sequence_diagram.h
View File

@ -30,7 +30,7 @@
#include <QObject>
#include <QMultiMap>
#include "qcustomplot.h"
#include <ui/qt/widgets/qcustomplot.h>
struct _seq_analysis_info;
struct _seq_analysis_item;

4
ui/qt/sequence_dialog.cpp
View File

@ -28,9 +28,9 @@
#include "wsutil/nstime.h"
#include "wsutil/utf8_entities.h"
#include "color_utils.h"
#include <ui/qt/utils/color_utils.h>
#include "progress_frame.h"
#include "qt_ui_utils.h"
#include <ui/qt/utils/qt_ui_utils.h>
#include "sequence_diagram.h"
#include "wireshark_application.h"

2
ui/qt/sequence_dialog.h
View File

@ -32,7 +32,7 @@
#include "ui/tap-sequence-analysis.h"
#include "qcustomplot.h"
#include <ui/qt/widgets/qcustomplot.h>
#include "wireshark_dialog.h"
#include <QMenu>

Some files were not shown because too many files have changed in this diff Show More