forked from osmocom/wireshark
Qt: Move all utility widgets to widgets subdirectory
Move all utility widgets to the widgets subdirectory and add separate source_group for their files Correct some alphabetization in ui/qt/CMakeLists.txt noticed during compare. Change-Id: I2d664edc2b32f126438fb673ea53a5ae94cd43d1 Reviewed-on: https://code.wireshark.org/review/22531 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Roland Knall
Michael Mann
parent
66cc2ed39d
commit
ee699eb720
|
|
@ -21,14 +21,31 @@
|
|||
|
||||
ADD_CUSTOM_CMAKE_INCLUDE()
|
||||
|
||||
set(WIRESHARK_WIDGET_HEADERS
|
||||
widgets/additional_toolbar.h
|
||||
widgets/apply_line_edit.h
|
||||
widgets/capture_filter_combo.h
|
||||
widgets/capture_filter_edit.h
|
||||
widgets/clickable_label.h
|
||||
widgets/display_filter_combo.h
|
||||
widgets/display_filter_edit.h
|
||||
widgets/elided_label.h
|
||||
widgets/field_filter_edit.h
|
||||
widgets/find_line_edit.h
|
||||
widgets/follow_stream_text.h
|
||||
widgets/interface_toolbar_lineedit.h
|
||||
widgets/label_stack.h
|
||||
widgets/overlay_scroll_bar.h
|
||||
widgets/syntax_line_edit.h
|
||||
widgets/drag_drop_toolbar.h
|
||||
)
|
||||
|
||||
# All .h files which inherit from QObject aka which use the Q_OBJECT macro
|
||||
# need to go here.
|
||||
set(WIRESHARK_QT_HEADERS
|
||||
about_dialog.h
|
||||
accordion_frame.h
|
||||
additional_toolbar.h
|
||||
address_editor_frame.h
|
||||
apply_line_edit.h
|
||||
bluetooth_att_server_attributes_dialog.h
|
||||
bluetooth_device_dialog.h
|
||||
bluetooth_devices_dialog.h
|
||||
|
|
@ -40,13 +57,10 @@ set(WIRESHARK_QT_HEADERS
|
|||
capture_file.h
|
||||
capture_file_dialog.h
|
||||
capture_file_properties_dialog.h
|
||||
capture_filter_combo.h
|
||||
capture_filter_edit.h
|
||||
capture_filter_syntax_worker.h
|
||||
capture_info_dialog.h
|
||||
capture_interfaces_dialog.h
|
||||
capture_preferences_frame.h
|
||||
clickable_label.h
|
||||
color_utils.h
|
||||
coloring_rules_dialog.h
|
||||
column_preferences_frame.h
|
||||
|
|
@ -56,11 +70,8 @@ set(WIRESHARK_QT_HEADERS
|
|||
conversation_dialog.h
|
||||
conversation_hash_tables_dialog.h
|
||||
decode_as_dialog.h
|
||||
widgets/display_filter_combo.h
|
||||
display_filter_edit.h
|
||||
display_filter_expression_dialog.h
|
||||
dissector_tables_dialog.h
|
||||
elided_label.h
|
||||
enabled_protocols_dialog.h
|
||||
endpoint_dialog.h
|
||||
expert_info_dialog.h
|
||||
|
|
@ -68,16 +79,13 @@ set(WIRESHARK_QT_HEADERS
|
|||
export_object_action.h
|
||||
export_object_dialog.h
|
||||
export_pdu_dialog.h
|
||||
field_filter_edit.h
|
||||
file_set_dialog.h
|
||||
filter_action.h
|
||||
filter_dialog.h
|
||||
filter_dialog.h
|
||||
filter_expression_frame.h
|
||||
find_line_edit.h
|
||||
firewall_rules_dialog.h
|
||||
follow_stream_dialog.h
|
||||
follow_stream_text.h
|
||||
font_color_preferences_frame.h
|
||||
funnel_string_dialog.h
|
||||
funnel_text_dialog.h
|
||||
|
|
@ -88,13 +96,11 @@ set(WIRESHARK_QT_HEADERS
|
|||
import_text_dialog.h
|
||||
interface_toolbar.h
|
||||
interface_toolbar_reader.h
|
||||
interface_toolbar_lineedit.h
|
||||
interface_tree_model.h
|
||||
interface_tree_cache_model.h
|
||||
interface_sort_filter_model.h
|
||||
interface_frame.h
|
||||
io_graph_dialog.h
|
||||
label_stack.h
|
||||
layout_preferences_frame.h
|
||||
lbm_lbtrm_transport_dialog.h
|
||||
lbm_lbtru_transport_dialog.h
|
||||
|
|
@ -112,7 +118,6 @@ set(WIRESHARK_QT_HEADERS
|
|||
mtp3_summary_dialog.h
|
||||
numeric_value_chooser_delegate.h
|
||||
multicast_statistics_dialog.h
|
||||
overlay_scroll_bar.h
|
||||
packet_comment_dialog.h
|
||||
packet_dialog.h
|
||||
packet_format_group_box.h
|
||||
|
|
@ -156,7 +161,6 @@ set(WIRESHARK_QT_HEADERS
|
|||
simple_statistics_dialog.h
|
||||
stock_icon_tool_button.h
|
||||
supported_protocols_dialog.h
|
||||
syntax_line_edit.h
|
||||
tap_parameter_dialog.h
|
||||
tcp_stream_dialog.h
|
||||
time_shift_dialog.h
|
||||
|
|
@ -174,7 +178,6 @@ set(WIRESHARK_QT_HEADERS
|
|||
wireshark_application.h
|
||||
wireshark_dialog.h
|
||||
wlan_statistics_dialog.h
|
||||
widgets/drag_drop_toolbar.h
|
||||
${WIRESHARK_CUSTOM_QT_HEADERS}
|
||||
)
|
||||
|
||||
|
|
@ -203,12 +206,29 @@ file(GLOB EXTRA_QT_HEADERS
|
|||
stock_icon.h
|
||||
)
|
||||
|
||||
set(WIRESHARK_WIDGET_SRCS
|
||||
widgets/additional_toolbar.cpp
|
||||
widgets/apply_line_edit.cpp
|
||||
widgets/capture_filter_combo.cpp
|
||||
widgets/capture_filter_edit.cpp
|
||||
widgets/clickable_label.cpp
|
||||
widgets/display_filter_combo.cpp
|
||||
widgets/display_filter_edit.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/syntax_line_edit.cpp
|
||||
widgets/drag_drop_toolbar.cpp
|
||||
)
|
||||
|
||||
set(WIRESHARK_QT_SRC
|
||||
about_dialog.cpp
|
||||
accordion_frame.cpp
|
||||
additional_toolbar.cpp
|
||||
address_editor_frame.cpp
|
||||
apply_line_edit.cpp
|
||||
bluetooth_att_server_attributes_dialog.cpp
|
||||
bluetooth_device_dialog.cpp
|
||||
bluetooth_devices_dialog.cpp
|
||||
|
|
@ -219,13 +239,10 @@ set(WIRESHARK_QT_SRC
|
|||
capture_file.cpp
|
||||
capture_file_dialog.cpp
|
||||
capture_file_properties_dialog.cpp
|
||||
capture_filter_combo.cpp
|
||||
capture_filter_edit.cpp
|
||||
capture_filter_syntax_worker.cpp
|
||||
capture_info_dialog.cpp
|
||||
capture_interfaces_dialog.cpp
|
||||
capture_preferences_frame.cpp
|
||||
clickable_label.cpp
|
||||
color_utils.cpp
|
||||
coloring_rules_dialog.cpp
|
||||
column_preferences_frame.cpp
|
||||
|
|
@ -235,47 +252,39 @@ set(WIRESHARK_QT_SRC
|
|||
conversation_dialog.cpp
|
||||
conversation_hash_tables_dialog.cpp
|
||||
decode_as_dialog.cpp
|
||||
widgets/display_filter_combo.cpp
|
||||
display_filter_edit.cpp
|
||||
display_filter_expression_dialog.cpp
|
||||
dissector_tables_dialog.cpp
|
||||
elided_label.cpp
|
||||
enabled_protocols_dialog.cpp
|
||||
endpoint_dialog.cpp
|
||||
export_dissection_dialog.cpp
|
||||
export_object_action.cpp
|
||||
export_object_dialog.cpp
|
||||
export_pdu_dialog.cpp
|
||||
field_filter_edit.cpp
|
||||
file_set_dialog.cpp
|
||||
filter_action.cpp
|
||||
filter_dialog.cpp
|
||||
filter_expression_frame.cpp
|
||||
find_line_edit.cpp
|
||||
firewall_rules_dialog.cpp
|
||||
follow_stream_dialog.cpp
|
||||
follow_stream_text.cpp
|
||||
font_color_preferences_frame.cpp
|
||||
funnel_string_dialog.cpp
|
||||
funnel_text_dialog.cpp
|
||||
geometry_state_dialog.cpp
|
||||
iax2_analysis_dialog.cpp
|
||||
import_text_dialog.cpp
|
||||
interface_frame.cpp
|
||||
interface_toolbar.cpp
|
||||
interface_toolbar_reader.cpp
|
||||
interface_toolbar_lineedit.cpp
|
||||
interface_tree_model.cpp
|
||||
interface_tree_cache_model.cpp
|
||||
interface_sort_filter_model.cpp
|
||||
interface_frame.cpp
|
||||
label_stack.cpp
|
||||
layout_preferences_frame.cpp
|
||||
lbm_lbtrm_transport_dialog.cpp
|
||||
lbm_lbtru_transport_dialog.cpp
|
||||
lbm_stream_dialog.cpp
|
||||
lbm_uimflow_dialog.cpp
|
||||
lte_rlc_graph_dialog.cpp
|
||||
lte_mac_statistics_dialog.cpp
|
||||
lte_rlc_graph_dialog.cpp
|
||||
lte_rlc_statistics_dialog.cpp
|
||||
main_status_bar.cpp
|
||||
main_welcome.cpp
|
||||
|
|
@ -285,7 +294,6 @@ set(WIRESHARK_QT_SRC
|
|||
manage_interfaces_dialog.cpp
|
||||
module_preferences_scroll_area.cpp
|
||||
numeric_value_chooser_delegate.cpp
|
||||
overlay_scroll_bar.cpp
|
||||
packet_comment_dialog.cpp
|
||||
packet_dialog.cpp
|
||||
packet_format_group_box.cpp
|
||||
|
|
@ -324,15 +332,14 @@ set(WIRESHARK_QT_SRC
|
|||
sequence_diagram.cpp
|
||||
sequence_dialog.cpp
|
||||
service_response_time_dialog.cpp
|
||||
show_packet_bytes_dialog.cpp
|
||||
simple_dialog.cpp
|
||||
simple_statistics_dialog.cpp
|
||||
show_packet_bytes_dialog.cpp
|
||||
splash_overlay.cpp
|
||||
sparkline_delegate.cpp
|
||||
splash_overlay.cpp
|
||||
stock_icon.cpp
|
||||
stock_icon_tool_button.cpp
|
||||
supported_protocols_dialog.cpp
|
||||
syntax_line_edit.cpp
|
||||
tap_parameter_dialog.cpp
|
||||
tcp_stream_dialog.cpp
|
||||
time_shift_dialog.cpp
|
||||
|
|
@ -349,7 +356,6 @@ set(WIRESHARK_QT_SRC
|
|||
wireless_timeline.cpp
|
||||
wireshark_application.cpp
|
||||
wireshark_dialog.cpp
|
||||
widgets/drag_drop_toolbar.cpp
|
||||
${WIRESHARK_CUSTOM_QT_SRCS}
|
||||
)
|
||||
|
||||
|
|
@ -520,7 +526,7 @@ if (QT_VERSION EQUAL 5)
|
|||
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}
|
||||
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)
|
||||
|
|
@ -531,7 +537,7 @@ else()
|
|||
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}
|
||||
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)
|
||||
|
|
@ -571,10 +577,16 @@ source_group("ui Header Files" FILES ${WIRESHARK_QT_UI_SRC})
|
|||
source_group("ui Files" FILES ${WIRESHARK_QT_UI})
|
||||
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})
|
||||
|
||||
add_library(qtui STATIC
|
||||
${WIRESHARK_QT_HEADERS} #Included so that Visual Studio can properly put header files in solution
|
||||
#Included so that Visual Studio can properly put header files in solution
|
||||
${WIRESHARK_QT_HEADERS}
|
||||
${WIRESHARK_WIDGET_HEADERS}
|
||||
|
||||
${WIRESHARK_QT_SRC}
|
||||
${WIRESHARK_WIDGET_SRCS}
|
||||
${WIRESHARK_QT_TAP_SRC}
|
||||
${WIRESHARK_QT_UI_SRC}
|
||||
${WIRESHARK_QT_MOC_SRC}
|
||||
|
|
|
|||
|
|
@ -150,15 +150,31 @@ NODIST_GENERATED_FILES = \
|
|||
# Files that generate compileable files
|
||||
GENERATOR_FILES =
|
||||
|
||||
MOC_WIDGET_HDRS = \
|
||||
widgets/additional_toolbar.h \
|
||||
widgets/apply_line_edit.h \
|
||||
widgets/capture_filter_combo.h \
|
||||
widgets/capture_filter_edit.h \
|
||||
widgets/clickable_label.h \
|
||||
widgets/display_filter_combo.h \
|
||||
widgets/display_filter_edit.h \
|
||||
widgets/elided_label.h \
|
||||
widgets/field_filter_edit.h \
|
||||
widgets/find_line_edit.h \
|
||||
widgets/follow_stream_text.h \
|
||||
widgets/interface_toolbar_lineedit.h \
|
||||
widgets/label_stack.h \
|
||||
widgets/overlay_scroll_bar.h \
|
||||
widgets/syntax_line_edit.h \
|
||||
widgets/drag_drop_toolbar.h
|
||||
|
||||
#
|
||||
# Headers that have to be run through moc.
|
||||
#
|
||||
MOC_HDRS = \
|
||||
about_dialog.h \
|
||||
accordion_frame.h \
|
||||
additional_toolbar.h \
|
||||
address_editor_frame.h \
|
||||
apply_line_edit.h \
|
||||
bluetooth_att_server_attributes_dialog.h \
|
||||
bluetooth_device_dialog.h \
|
||||
bluetooth_devices_dialog.h \
|
||||
|
|
@ -169,14 +185,11 @@ MOC_HDRS = \
|
|||
capture_file.h \
|
||||
capture_file_dialog.h \
|
||||
capture_file_properties_dialog.h \
|
||||
capture_filter_combo.h \
|
||||
capture_filter_edit.h \
|
||||
capture_filter_syntax_worker.h \
|
||||
capture_info_dialog.h \
|
||||
capture_interfaces_dialog.h \
|
||||
capture_preferences_frame.h \
|
||||
coloring_rules_dialog.h \
|
||||
clickable_label.h \
|
||||
color_utils.h \
|
||||
column_preferences_frame.h \
|
||||
column_editor_frame.h \
|
||||
|
|
@ -185,11 +198,8 @@ MOC_HDRS = \
|
|||
conversation_dialog.h \
|
||||
conversation_hash_tables_dialog.h \
|
||||
decode_as_dialog.h \
|
||||
widgets/display_filter_combo.h \
|
||||
display_filter_edit.h \
|
||||
display_filter_expression_dialog.h \
|
||||
dissector_tables_dialog.h \
|
||||
elided_label.h \
|
||||
enabled_protocols_dialog.h \
|
||||
endpoint_dialog.h \
|
||||
expert_info_dialog.h \
|
||||
|
|
@ -197,15 +207,12 @@ MOC_HDRS = \
|
|||
export_object_action.h \
|
||||
export_object_dialog.h \
|
||||
export_pdu_dialog.h \
|
||||
field_filter_edit.h \
|
||||
file_set_dialog.h \
|
||||
filter_action.h \
|
||||
filter_dialog.h \
|
||||
filter_expression_frame.h \
|
||||
find_line_edit.h \
|
||||
firewall_rules_dialog.h \
|
||||
follow_stream_dialog.h \
|
||||
follow_stream_text.h \
|
||||
font_color_preferences_frame.h \
|
||||
funnel_string_dialog.h \
|
||||
funnel_text_dialog.h \
|
||||
|
|
@ -216,13 +223,11 @@ MOC_HDRS = \
|
|||
import_text_dialog.h \
|
||||
interface_frame.h \
|
||||
interface_toolbar.h \
|
||||
interface_toolbar_lineedit.h \
|
||||
interface_toolbar_reader.h \
|
||||
interface_tree_model.h \
|
||||
interface_tree_cache_model.h \
|
||||
interface_sort_filter_model.h \
|
||||
io_graph_dialog.h \
|
||||
label_stack.h \
|
||||
layout_preferences_frame.h \
|
||||
lbm_lbtrm_transport_dialog.h \
|
||||
lbm_lbtru_transport_dialog.h \
|
||||
|
|
@ -240,7 +245,6 @@ MOC_HDRS = \
|
|||
multicast_statistics_dialog.h \
|
||||
mtp3_summary_dialog.h \
|
||||
numeric_value_chooser_delegate.h \
|
||||
overlay_scroll_bar.h \
|
||||
packet_comment_dialog.h \
|
||||
path_chooser_delegate.h \
|
||||
packet_dialog.h \
|
||||
|
|
@ -288,7 +292,6 @@ MOC_HDRS = \
|
|||
stats_tree_dialog.h \
|
||||
stock_icon_tool_button.h \
|
||||
supported_protocols_dialog.h \
|
||||
syntax_line_edit.h \
|
||||
tap_parameter_dialog.h \
|
||||
tcp_stream_dialog.h \
|
||||
time_shift_dialog.h \
|
||||
|
|
@ -306,7 +309,7 @@ MOC_HDRS = \
|
|||
wireshark_application.h \
|
||||
wireshark_dialog.h \
|
||||
wlan_statistics_dialog.h \
|
||||
widgets/drag_drop_toolbar.h
|
||||
$(MOC_WIDGET_HDRS)
|
||||
|
||||
#
|
||||
# .ui files.
|
||||
|
|
@ -446,12 +449,29 @@ TS_FILES = \
|
|||
#
|
||||
QM_FILES = $(TS_FILES:.ts=.qm)
|
||||
|
||||
WIRESHARK_QT_WIDGET_SRC = \
|
||||
widgets/additional_toolbar.cpp \
|
||||
widgets/apply_line_edit.cpp \
|
||||
widgets/capture_filter_combo.cpp \
|
||||
widgets/capture_filter_edit.cpp \
|
||||
widgets/clickable_label.cpp \
|
||||
widgets/display_filter_combo.cpp \
|
||||
widgets/display_filter_edit.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/syntax_line_edit.cpp \
|
||||
widgets/drag_drop_toolbar.cpp
|
||||
|
||||
|
||||
WIRESHARK_QT_SRC = \
|
||||
about_dialog.cpp \
|
||||
accordion_frame.cpp \
|
||||
additional_toolbar.cpp \
|
||||
address_editor_frame.cpp \
|
||||
apply_line_edit.cpp \
|
||||
bluetooth_att_server_attributes_dialog.cpp \
|
||||
bluetooth_device_dialog.cpp \
|
||||
bluetooth_devices_dialog.cpp \
|
||||
|
|
@ -462,13 +482,10 @@ WIRESHARK_QT_SRC = \
|
|||
capture_file.cpp \
|
||||
capture_file_dialog.cpp \
|
||||
capture_file_properties_dialog.cpp \
|
||||
capture_filter_combo.cpp \
|
||||
capture_filter_edit.cpp \
|
||||
capture_filter_syntax_worker.cpp \
|
||||
capture_info_dialog.cpp \
|
||||
capture_interfaces_dialog.cpp \
|
||||
capture_preferences_frame.cpp \
|
||||
clickable_label.cpp \
|
||||
color_utils.cpp \
|
||||
coloring_rules_dialog.cpp \
|
||||
column_preferences_frame.cpp \
|
||||
|
|
@ -478,26 +495,20 @@ WIRESHARK_QT_SRC = \
|
|||
conversation_dialog.cpp \
|
||||
conversation_hash_tables_dialog.cpp \
|
||||
decode_as_dialog.cpp \
|
||||
widgets/display_filter_combo.cpp \
|
||||
display_filter_edit.cpp \
|
||||
display_filter_expression_dialog.cpp \
|
||||
dissector_tables_dialog.cpp \
|
||||
elided_label.cpp \
|
||||
enabled_protocols_dialog.cpp \
|
||||
endpoint_dialog.cpp \
|
||||
export_dissection_dialog.cpp \
|
||||
export_object_action.cpp \
|
||||
export_object_dialog.cpp \
|
||||
export_pdu_dialog.cpp \
|
||||
field_filter_edit.cpp \
|
||||
file_set_dialog.cpp \
|
||||
filter_action.cpp \
|
||||
filter_dialog.cpp \
|
||||
filter_expression_frame.cpp \
|
||||
find_line_edit.cpp \
|
||||
firewall_rules_dialog.cpp \
|
||||
follow_stream_dialog.cpp \
|
||||
follow_stream_text.cpp \
|
||||
font_color_preferences_frame.cpp \
|
||||
funnel_string_dialog.cpp \
|
||||
funnel_text_dialog.cpp \
|
||||
|
|
@ -506,12 +517,10 @@ WIRESHARK_QT_SRC = \
|
|||
import_text_dialog.cpp \
|
||||
interface_frame.cpp \
|
||||
interface_toolbar.cpp \
|
||||
interface_toolbar_lineedit.cpp \
|
||||
interface_toolbar_reader.cpp \
|
||||
interface_tree_model.cpp \
|
||||
interface_tree_cache_model.cpp \
|
||||
interface_sort_filter_model.cpp \
|
||||
label_stack.cpp \
|
||||
layout_preferences_frame.cpp \
|
||||
lbm_lbtrm_transport_dialog.cpp \
|
||||
lbm_lbtru_transport_dialog.cpp \
|
||||
|
|
@ -528,7 +537,6 @@ WIRESHARK_QT_SRC = \
|
|||
manage_interfaces_dialog.cpp \
|
||||
module_preferences_scroll_area.cpp \
|
||||
numeric_value_chooser_delegate.cpp \
|
||||
overlay_scroll_bar.cpp \
|
||||
packet_comment_dialog.cpp \
|
||||
packet_dialog.cpp \
|
||||
packet_format_group_box.cpp \
|
||||
|
|
@ -577,7 +585,6 @@ WIRESHARK_QT_SRC = \
|
|||
stock_icon.cpp \
|
||||
stock_icon_tool_button.cpp \
|
||||
supported_protocols_dialog.cpp \
|
||||
syntax_line_edit.cpp \
|
||||
tap_parameter_dialog.cpp \
|
||||
tcp_stream_dialog.cpp \
|
||||
time_shift_dialog.cpp \
|
||||
|
|
@ -594,7 +601,7 @@ WIRESHARK_QT_SRC = \
|
|||
wireless_timeline.cpp \
|
||||
wireshark_application.cpp \
|
||||
wireshark_dialog.cpp \
|
||||
widgets/drag_drop_toolbar.cpp
|
||||
$(WIRESHARK_QT_WIDGET_SRC)
|
||||
|
||||
WIRESHARK_QT_TAP_SRC = \
|
||||
expert_info_dialog.cpp \
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
<customwidget>
|
||||
<class>SyntaxLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>syntax_line_edit.h</header>
|
||||
<header>widgets/syntax_line_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -717,7 +717,7 @@
|
|||
<customwidget>
|
||||
<class>DisplayFilterEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>display_filter_edit.h</header>
|
||||
<header>widgets/display_filter_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#define CAPTURE_FILE_DIALOG_H
|
||||
|
||||
#ifndef Q_OS_WIN
|
||||
#include "display_filter_edit.h"
|
||||
#include <ui/qt/widgets/display_filter_edit.h>
|
||||
#include "packet_range_group_box.h"
|
||||
#include "ui/help_url.h"
|
||||
#endif // Q_OS_WIN
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#endif
|
||||
|
||||
#include "capture_filter_syntax_worker.h"
|
||||
#include "syntax_line_edit.h"
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
|
||||
#include <QMutexLocker>
|
||||
#include <QSet>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include <glib.h>
|
||||
|
||||
#include "capture_interfaces_dialog.h"
|
||||
#include "capture_filter_combo.h"
|
||||
#include <ui/qt/widgets/capture_filter_combo.h>
|
||||
#include <ui_capture_interfaces_dialog.h>
|
||||
#include "compiled_filter_output.h"
|
||||
#include "manage_interfaces_dialog.h"
|
||||
|
|
|
|||
|
|
@ -801,7 +801,7 @@ PLEASE NOTE: One option MUST be selected.</string>
|
|||
<customwidget>
|
||||
<class>CaptureFilterCombo</class>
|
||||
<extends>QComboBox</extends>
|
||||
<header>capture_filter_combo.h</header>
|
||||
<header>widgets/capture_filter_combo.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@
|
|||
#include "color_utils.h"
|
||||
#include "ui/ui_util.h"
|
||||
#include <ui/qt/widgets/display_filter_combo.h>
|
||||
#include "syntax_line_edit.h"
|
||||
#include "display_filter_edit.h"
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
#include <ui/qt/widgets/display_filter_edit.h>
|
||||
#include "wireshark_application.h"
|
||||
|
||||
#include <QColorDialog>
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@
|
|||
<customwidget>
|
||||
<class>SyntaxLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>syntax_line_edit.h</header>
|
||||
<header>widgets/syntax_line_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@
|
|||
#include "qt_ui_utils.h"
|
||||
#include "column_preferences_frame.h"
|
||||
#include <ui_column_preferences_frame.h>
|
||||
#include "syntax_line_edit.h"
|
||||
#include "field_filter_edit.h"
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
#include <ui/qt/widgets/field_filter_edit.h>
|
||||
#include "wireshark_application.h"
|
||||
|
||||
#include <QComboBox>
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@
|
|||
<customwidget>
|
||||
<class>DisplayFilterEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>display_filter_edit.h</header>
|
||||
<header>widgets/display_filter_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<customwidget>
|
||||
<class>DisplayFilterEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>display_filter_edit.h</header>
|
||||
<header>widgets/display_filter_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<connections>
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<connections>
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@
|
|||
#include <QMessageBox>
|
||||
#include <QThread>
|
||||
|
||||
#include "capture_filter_edit.h"
|
||||
#include <ui/qt/widgets/capture_filter_edit.h>
|
||||
//#include "capture_filter_syntax_worker.h"
|
||||
#include "display_filter_edit.h"
|
||||
#include <ui/qt/widgets/display_filter_edit.h>
|
||||
#include "wireshark_application.h"
|
||||
|
||||
// To do:
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -196,12 +196,12 @@
|
|||
<customwidget>
|
||||
<class>SyntaxLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>syntax_line_edit.h</header>
|
||||
<header>widgets/syntax_line_edit.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>DisplayFilterEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>display_filter_edit.h</header>
|
||||
<header>widgets/display_filter_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -135,12 +135,12 @@
|
|||
<customwidget>
|
||||
<class>FollowStreamText</class>
|
||||
<extends>QTextEdit</extends>
|
||||
<header>follow_stream_text.h</header>
|
||||
<header>widgets/follow_stream_text.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>FindLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>find_line_edit.h</header>
|
||||
<header>widgets/find_line_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include "ui/text_import.h"
|
||||
|
||||
#include "syntax_line_edit.h"
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
|
||||
#include <QDialog>
|
||||
#include <QPushButton>
|
||||
|
|
|
|||
|
|
@ -489,7 +489,7 @@
|
|||
<customwidget>
|
||||
<class>SyntaxLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>syntax_line_edit.h</header>
|
||||
<header>widgets/syntax_line_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include <errno.h>
|
||||
|
||||
#include "interface_toolbar.h"
|
||||
#include "interface_toolbar_lineedit.h"
|
||||
#include <ui/qt/widgets/interface_toolbar_lineedit.h>
|
||||
#include "simple_dialog.h"
|
||||
#include "ui/main_statusbar.h"
|
||||
#include <ui_interface_toolbar.h>
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@
|
|||
#include "qcustomplot.h"
|
||||
#include "progress_frame.h"
|
||||
#include "stock_icon.h"
|
||||
#include "syntax_line_edit.h"
|
||||
#include "display_filter_edit.h"
|
||||
#include "field_filter_edit.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>
|
||||
#include "wireshark_application.h"
|
||||
|
||||
#include <QClipboard>
|
||||
|
|
|
|||
|
|
@ -511,7 +511,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -691,7 +691,7 @@
|
|||
<customwidget>
|
||||
<class>DisplayFilterEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>display_filter_edit.h</header>
|
||||
<header>widgets/display_filter_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<connections>
|
||||
|
|
|
|||
|
|
@ -1123,7 +1123,7 @@
|
|||
<customwidget>
|
||||
<class>DisplayFilterEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>display_filter_edit.h</header>
|
||||
<header>widgets/display_filter_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<connections>
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@
|
|||
<customwidget>
|
||||
<class>DisplayFilterEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>display_filter_edit.h</header>
|
||||
<header>widgets/display_filter_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<connections>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#include "capchild/capture_session.h"
|
||||
|
||||
#include "label_stack.h"
|
||||
#include <ui/qt/widgets/label_stack.h>
|
||||
#include "progress_frame.h"
|
||||
#include "wireshark_application.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ a:hover {
|
|||
<customwidget>
|
||||
<class>CaptureFilterCombo</class>
|
||||
<extends>QComboBox</extends>
|
||||
<header>capture_filter_combo.h</header>
|
||||
<header>widgets/capture_filter_combo.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>AccordionFrame</class>
|
||||
|
|
@ -340,7 +340,7 @@ a:hover {
|
|||
<customwidget>
|
||||
<class>ClickableLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>clickable_label.h</header>
|
||||
<header>widgets/clickable_label.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ DIAG_ON(frame-larger-than=)
|
|||
#endif
|
||||
#include "conversation_colorize_action.h"
|
||||
#include "export_object_action.h"
|
||||
#include "display_filter_edit.h"
|
||||
#include <ui/qt/widgets/display_filter_edit.h>
|
||||
#include "export_dissection_dialog.h"
|
||||
#include "file_set_dialog.h"
|
||||
#include "funnel_statistics.h"
|
||||
|
|
@ -79,7 +79,7 @@ DIAG_ON(frame-larger-than=)
|
|||
#include "wireless_frame.h"
|
||||
#include "wireshark_application.h"
|
||||
|
||||
#include "additional_toolbar.h"
|
||||
#include <ui/qt/widgets/additional_toolbar.h>
|
||||
#include "variant_pointer.h"
|
||||
|
||||
#include "qt_ui_utils.h"
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ DIAG_ON(frame-larger-than=)
|
|||
#include "conversation_hash_tables_dialog.h"
|
||||
#include "enabled_protocols_dialog.h"
|
||||
#include "decode_as_dialog.h"
|
||||
#include "display_filter_edit.h"
|
||||
#include <ui/qt/widgets/display_filter_edit.h>
|
||||
#include "display_filter_expression_dialog.h"
|
||||
#include "dissector_tables_dialog.h"
|
||||
#include "endpoint_dialog.h"
|
||||
|
|
@ -130,7 +130,7 @@ DIAG_ON(frame-larger-than=)
|
|||
#include "iax2_analysis_dialog.h"
|
||||
#include "interface_toolbar.h"
|
||||
#include "io_graph_dialog.h"
|
||||
#include <additional_toolbar.h>
|
||||
#include <ui/qt/widgets/additional_toolbar.h>
|
||||
#include "lbm_stream_dialog.h"
|
||||
#include "lbm_uimflow_dialog.h"
|
||||
#include "lbm_lbtrm_transport_dialog.h"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "module_preferences_scroll_area.h"
|
||||
#include <ui_module_preferences_scroll_area.h>
|
||||
#include "syntax_line_edit.h"
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
#include "qt_ui_utils.h"
|
||||
#include "uat_dialog.h"
|
||||
#include "wireshark_application.h"
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include <QTreeWidget>
|
||||
|
||||
#include "qt_ui_utils.h"
|
||||
#include "syntax_line_edit.h"
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
#include "wireshark_application.h"
|
||||
|
||||
enum {
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
#include "frame_tvbuff.h"
|
||||
|
||||
#include "color_utils.h"
|
||||
#include "overlay_scroll_bar.h"
|
||||
#include <ui/qt/widgets/overlay_scroll_bar.h>
|
||||
#include "proto_tree.h"
|
||||
#include "qt_ui_utils.h"
|
||||
#include "wireshark_application.h"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#include "ui/packet_range.h"
|
||||
|
||||
#include "syntax_line_edit.h"
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
#include <QGroupBox>
|
||||
|
||||
namespace Ui {
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@
|
|||
<customwidget>
|
||||
<class>SyntaxLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>syntax_line_edit.h</header>
|
||||
<header>widgets/syntax_line_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<connections/>
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@
|
|||
<customwidget>
|
||||
<class>SyntaxLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>syntax_line_edit.h</header>
|
||||
<header>widgets/syntax_line_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#include <ui/recent.h>
|
||||
#include <main_window.h>
|
||||
|
||||
#include "syntax_line_edit.h"
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
#include "qt_ui_utils.h"
|
||||
#include "uat_dialog.h"
|
||||
#include "wireshark_application.h"
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@
|
|||
<customwidget>
|
||||
<class>SyntaxLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>syntax_line_edit.h</header>
|
||||
<header>widgets/syntax_line_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@
|
|||
<customwidget>
|
||||
<class>FindLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>find_line_edit.h</header>
|
||||
<header>widgets/find_line_edit.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>ShowPacketBytesTextEdit</class>
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@
|
|||
<customwidget>
|
||||
<class>DisplayFilterEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>display_filter_edit.h</header>
|
||||
<header>widgets/display_filter_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#include "cfile.h"
|
||||
|
||||
#include "syntax_line_edit.h"
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
|
||||
#include <QDialog>
|
||||
#include <QPushButton>
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@
|
|||
<customwidget>
|
||||
<class>SyntaxLineEdit</class>
|
||||
<extends>QLineEdit</extends>
|
||||
<header>syntax_line_edit.h</header>
|
||||
<header>widgets/syntax_line_edit.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#include <QLineEdit>
|
||||
#include <QCheckBox>
|
||||
|
||||
#include "display_filter_edit.h"
|
||||
#include <ui/qt/widgets/display_filter_edit.h>
|
||||
|
||||
UatDelegate::UatDelegate(QObject *parent) : QStyledItemDelegate(parent)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>UatTreeView</class>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include "uat_frame.h"
|
||||
#include <ui_uat_frame.h>
|
||||
#include "display_filter_edit.h"
|
||||
#include <ui/qt/widgets/display_filter_edit.h>
|
||||
#include "wireshark_application.h"
|
||||
|
||||
#include "qt_ui_utils.h"
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@
|
|||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>elided_label.h</header>
|
||||
<header>widgets/elided_label.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>UatTreeView</class>
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@
|
|||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include <additional_toolbar.h>
|
||||
#include <config.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <ui/qt/apply_line_edit.h>
|
||||
#include <ui/qt/widgets/additional_toolbar.h>
|
||||
#include <ui/qt/widgets/apply_line_edit.h>
|
||||
#include <ui/qt/qt_ui_utils.h>
|
||||
#include <ui/qt/variant_pointer.h>
|
||||
#include <ui/qt/wireshark_application.h>
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include <ui/qt/apply_line_edit.h>
|
||||
#include <ui/qt/widgets/apply_line_edit.h>
|
||||
|
||||
#include <epan/prefs.h>
|
||||
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "ui/qt/clickable_label.h"
|
||||
#include <ui/qt/widgets/clickable_label.h>
|
||||
|
||||
#include <QMouseEvent>
|
||||
|
||||
|
|
@ -22,8 +22,8 @@
|
|||
#ifndef DISPLAYFILTEREDIT_H
|
||||
#define DISPLAYFILTEREDIT_H
|
||||
|
||||
#include "preferences_dialog.h"
|
||||
#include "syntax_line_edit.h"
|
||||
#include <ui/qt/preferences_dialog.h>
|
||||
#include <ui/qt/widgets/syntax_line_edit.h>
|
||||
|
||||
class QEvent;
|
||||
class StockIconToolButton;
|
||||
Loading…
Reference in New Issue