From ee699eb7200aa4470622abe4d1b8a80c461dae0c Mon Sep 17 00:00:00 2001 From: Roland Knall Date: Wed, 5 Jul 2017 16:56:45 +0200 Subject: [PATCH] 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 Reviewed-by: Roland Knall Reviewed-by: Michael Mann --- ui/qt/CMakeLists.txt | 90 +++++++++++-------- ui/qt/Makefile.am | 71 ++++++++------- ui/qt/address_editor_frame.ui | 2 +- ui/qt/bluetooth_hci_summary_dialog.ui | 2 +- ui/qt/capture_file_dialog.h | 2 +- ui/qt/capture_filter_syntax_worker.cpp | 2 +- ui/qt/capture_interfaces_dialog.cpp | 2 +- ui/qt/capture_interfaces_dialog.ui | 2 +- ui/qt/coloring_rules_dialog.cpp | 4 +- ui/qt/column_editor_frame.ui | 2 +- ui/qt/column_preferences_frame.cpp | 4 +- ui/qt/decode_as_dialog.ui | 2 +- ui/qt/display_filter_expression_dialog.ui | 2 +- ui/qt/expert_info_dialog.ui | 2 +- ui/qt/export_pdu_dialog.ui | 2 +- ui/qt/file_set_dialog.ui | 2 +- ui/qt/filter_dialog.cpp | 4 +- ui/qt/filter_dialog.ui | 2 +- ui/qt/filter_expression_frame.ui | 4 +- ui/qt/follow_stream_dialog.ui | 4 +- ui/qt/import_text_dialog.h | 2 +- ui/qt/import_text_dialog.ui | 2 +- ui/qt/interface_toolbar.cpp | 2 +- ui/qt/io_graph_dialog.cpp | 6 +- ui/qt/io_graph_dialog.ui | 2 +- ui/qt/lbm_lbtrm_transport_dialog.ui | 2 +- ui/qt/lbm_lbtru_transport_dialog.ui | 2 +- ui/qt/lbm_stream_dialog.ui | 2 +- ui/qt/main_status_bar.h | 2 +- ui/qt/main_welcome.ui | 4 +- ui/qt/main_window.cpp | 4 +- ui/qt/main_window_slots.cpp | 4 +- ui/qt/module_preferences_scroll_area.cpp | 2 +- ui/qt/multicast_statistics_dialog.cpp | 2 +- ui/qt/packet_dialog.ui | 2 +- ui/qt/packet_list.cpp | 2 +- ui/qt/packet_range_group_box.h | 2 +- ui/qt/packet_range_group_box.ui | 2 +- ui/qt/preference_editor_frame.ui | 2 +- ui/qt/preferences_dialog.cpp | 2 +- ui/qt/profile_dialog.ui | 2 +- ui/qt/search_frame.ui | 2 +- ui/qt/sequence_dialog.ui | 2 +- ui/qt/show_packet_bytes_dialog.ui | 2 +- ui/qt/tap_parameter_dialog.ui | 2 +- ui/qt/time_shift_dialog.h | 2 +- ui/qt/time_shift_dialog.ui | 2 +- ui/qt/uat_delegate.cpp | 2 +- ui/qt/uat_dialog.ui | 2 +- ui/qt/uat_frame.cpp | 2 +- ui/qt/uat_frame.ui | 2 +- ui/qt/{ => widgets}/additional_toolbar.cpp | 4 +- ui/qt/{ => widgets}/additional_toolbar.h | 0 ui/qt/{ => widgets}/apply_line_edit.cpp | 2 +- ui/qt/{ => widgets}/apply_line_edit.h | 0 ui/qt/{ => widgets}/capture_filter_combo.cpp | 0 ui/qt/{ => widgets}/capture_filter_combo.h | 0 ui/qt/{ => widgets}/capture_filter_edit.cpp | 0 ui/qt/{ => widgets}/capture_filter_edit.h | 0 ui/qt/{ => widgets}/clickable_label.cpp | 2 +- ui/qt/{ => widgets}/clickable_label.h | 0 ui/qt/{ => widgets}/display_filter_edit.cpp | 0 ui/qt/{ => widgets}/display_filter_edit.h | 4 +- ui/qt/{ => widgets}/elided_label.cpp | 0 ui/qt/{ => widgets}/elided_label.h | 0 ui/qt/{ => widgets}/field_filter_edit.cpp | 0 ui/qt/{ => widgets}/field_filter_edit.h | 0 ui/qt/{ => widgets}/find_line_edit.cpp | 0 ui/qt/{ => widgets}/find_line_edit.h | 0 ui/qt/{ => widgets}/follow_stream_text.cpp | 0 ui/qt/{ => widgets}/follow_stream_text.h | 0 .../interface_toolbar_lineedit.cpp | 0 .../interface_toolbar_lineedit.h | 0 ui/qt/{ => widgets}/label_stack.cpp | 0 ui/qt/{ => widgets}/label_stack.h | 0 ui/qt/{ => widgets}/overlay_scroll_bar.cpp | 0 ui/qt/{ => widgets}/overlay_scroll_bar.h | 0 ui/qt/{ => widgets}/syntax_line_edit.cpp | 0 ui/qt/{ => widgets}/syntax_line_edit.h | 0 79 files changed, 155 insertions(+), 136 deletions(-) rename ui/qt/{ => widgets}/additional_toolbar.cpp (99%) rename ui/qt/{ => widgets}/additional_toolbar.h (100%) rename ui/qt/{ => widgets}/apply_line_edit.cpp (99%) rename ui/qt/{ => widgets}/apply_line_edit.h (100%) rename ui/qt/{ => widgets}/capture_filter_combo.cpp (100%) rename ui/qt/{ => widgets}/capture_filter_combo.h (100%) rename ui/qt/{ => widgets}/capture_filter_edit.cpp (100%) rename ui/qt/{ => widgets}/capture_filter_edit.h (100%) rename ui/qt/{ => widgets}/clickable_label.cpp (97%) rename ui/qt/{ => widgets}/clickable_label.h (100%) rename ui/qt/{ => widgets}/display_filter_edit.cpp (100%) rename ui/qt/{ => widgets}/display_filter_edit.h (97%) rename ui/qt/{ => widgets}/elided_label.cpp (100%) rename ui/qt/{ => widgets}/elided_label.h (100%) rename ui/qt/{ => widgets}/field_filter_edit.cpp (100%) rename ui/qt/{ => widgets}/field_filter_edit.h (100%) rename ui/qt/{ => widgets}/find_line_edit.cpp (100%) rename ui/qt/{ => widgets}/find_line_edit.h (100%) rename ui/qt/{ => widgets}/follow_stream_text.cpp (100%) rename ui/qt/{ => widgets}/follow_stream_text.h (100%) rename ui/qt/{ => widgets}/interface_toolbar_lineedit.cpp (100%) rename ui/qt/{ => widgets}/interface_toolbar_lineedit.h (100%) rename ui/qt/{ => widgets}/label_stack.cpp (100%) rename ui/qt/{ => widgets}/label_stack.h (100%) rename ui/qt/{ => widgets}/overlay_scroll_bar.cpp (100%) rename ui/qt/{ => widgets}/overlay_scroll_bar.h (100%) rename ui/qt/{ => widgets}/syntax_line_edit.cpp (100%) rename ui/qt/{ => widgets}/syntax_line_edit.h (100%) diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index e34169fe4e..085dc9a635 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -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} diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index ed9f95d155..8c88d61bbd 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -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 \ diff --git a/ui/qt/address_editor_frame.ui b/ui/qt/address_editor_frame.ui index 5c99f0de72..fdf49ccb5d 100644 --- a/ui/qt/address_editor_frame.ui +++ b/ui/qt/address_editor_frame.ui @@ -130,7 +130,7 @@ SyntaxLineEdit QLineEdit -
syntax_line_edit.h
+
widgets/syntax_line_edit.h
 diff --git a/ui/qt/bluetooth_hci_summary_dialog.ui b/ui/qt/bluetooth_hci_summary_dialog.ui index fd93949c6b..c2ba52a27a 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.ui +++ b/ui/qt/bluetooth_hci_summary_dialog.ui @@ -717,7 +717,7 @@ DisplayFilterEdit QLineEdit -
display_filter_edit.h
+
widgets/display_filter_edit.h
 diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h index d213ed0e2b..ef7ac2f839 100644 --- a/ui/qt/capture_file_dialog.h +++ b/ui/qt/capture_file_dialog.h @@ -23,7 +23,7 @@ #define CAPTURE_FILE_DIALOG_H #ifndef Q_OS_WIN -#include "display_filter_edit.h" +#include #include "packet_range_group_box.h" #include "ui/help_url.h" #endif // Q_OS_WIN diff --git a/ui/qt/capture_filter_syntax_worker.cpp b/ui/qt/capture_filter_syntax_worker.cpp index 0a0733aff5..2132f50897 100644 --- a/ui/qt/capture_filter_syntax_worker.cpp +++ b/ui/qt/capture_filter_syntax_worker.cpp @@ -34,7 +34,7 @@ #endif #include "capture_filter_syntax_worker.h" -#include "syntax_line_edit.h" +#include #include #include diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp index 135941da5d..944e0f359a 100644 --- a/ui/qt/capture_interfaces_dialog.cpp +++ b/ui/qt/capture_interfaces_dialog.cpp @@ -24,7 +24,7 @@ #include #include "capture_interfaces_dialog.h" -#include "capture_filter_combo.h" +#include #include #include "compiled_filter_output.h" #include "manage_interfaces_dialog.h" diff --git a/ui/qt/capture_interfaces_dialog.ui b/ui/qt/capture_interfaces_dialog.ui index 17c648ad8d..ca46ca0cf1 100644 --- a/ui/qt/capture_interfaces_dialog.ui +++ b/ui/qt/capture_interfaces_dialog.ui @@ -801,7 +801,7 @@ PLEASE NOTE: One option MUST be selected. CaptureFilterCombo QComboBox -
capture_filter_combo.h
+
widgets/capture_filter_combo.h
 diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp index 9014011515..cb48a4b82e 100644 --- a/ui/qt/coloring_rules_dialog.cpp +++ b/ui/qt/coloring_rules_dialog.cpp @@ -42,8 +42,8 @@ #include "color_utils.h" #include "ui/ui_util.h" #include -#include "syntax_line_edit.h" -#include "display_filter_edit.h" +#include +#include #include "wireshark_application.h" #include diff --git a/ui/qt/column_editor_frame.ui b/ui/qt/column_editor_frame.ui index 333a05a96e..67de739e7a 100644 --- a/ui/qt/column_editor_frame.ui +++ b/ui/qt/column_editor_frame.ui @@ -143,7 +143,7 @@ SyntaxLineEdit QLineEdit -
syntax_line_edit.h
+
widgets/syntax_line_edit.h
 diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp index 5b9aed7ba9..9e6cf9d51e 100644 --- a/ui/qt/column_preferences_frame.cpp +++ b/ui/qt/column_preferences_frame.cpp @@ -33,8 +33,8 @@ #include "qt_ui_utils.h" #include "column_preferences_frame.h" #include -#include "syntax_line_edit.h" -#include "field_filter_edit.h" +#include +#include #include "wireshark_application.h" #include diff --git a/ui/qt/decode_as_dialog.ui b/ui/qt/decode_as_dialog.ui index ced46ed447..b65242104f 100644 --- a/ui/qt/decode_as_dialog.ui +++ b/ui/qt/decode_as_dialog.ui @@ -146,7 +146,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 diff --git a/ui/qt/display_filter_expression_dialog.ui b/ui/qt/display_filter_expression_dialog.ui index 2f45bfefcc..1581c7584c 100644 --- a/ui/qt/display_filter_expression_dialog.ui +++ b/ui/qt/display_filter_expression_dialog.ui @@ -200,7 +200,7 @@ DisplayFilterEdit QLineEdit -
display_filter_edit.h
+
widgets/display_filter_edit.h
 diff --git a/ui/qt/expert_info_dialog.ui b/ui/qt/expert_info_dialog.ui index b777aa77fb..1e4074dcb8 100644 --- a/ui/qt/expert_info_dialog.ui +++ b/ui/qt/expert_info_dialog.ui @@ -211,7 +211,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 diff --git a/ui/qt/export_pdu_dialog.ui b/ui/qt/export_pdu_dialog.ui index 4d046541aa..2a0fae814d 100644 --- a/ui/qt/export_pdu_dialog.ui +++ b/ui/qt/export_pdu_dialog.ui @@ -66,7 +66,7 @@ DisplayFilterEdit QLineEdit -
display_filter_edit.h
+
widgets/display_filter_edit.h
 diff --git a/ui/qt/file_set_dialog.ui b/ui/qt/file_set_dialog.ui index 1248d70776..901e7ac4d0 100644 --- a/ui/qt/file_set_dialog.ui +++ b/ui/qt/file_set_dialog.ui @@ -118,7 +118,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 diff --git a/ui/qt/filter_dialog.cpp b/ui/qt/filter_dialog.cpp index dd05ead167..f64d692857 100644 --- a/ui/qt/filter_dialog.cpp +++ b/ui/qt/filter_dialog.cpp @@ -35,9 +35,9 @@ #include #include -#include "capture_filter_edit.h" +#include //#include "capture_filter_syntax_worker.h" -#include "display_filter_edit.h" +#include #include "wireshark_application.h" // To do: diff --git a/ui/qt/filter_dialog.ui b/ui/qt/filter_dialog.ui index 1791f110f0..5ae188028f 100644 --- a/ui/qt/filter_dialog.ui +++ b/ui/qt/filter_dialog.ui @@ -131,7 +131,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 diff --git a/ui/qt/filter_expression_frame.ui b/ui/qt/filter_expression_frame.ui index b0d3e401f9..31d1cb375d 100644 --- a/ui/qt/filter_expression_frame.ui +++ b/ui/qt/filter_expression_frame.ui @@ -196,12 +196,12 @@ SyntaxLineEdit QLineEdit -
syntax_line_edit.h
+
widgets/syntax_line_edit.h
 DisplayFilterEdit QLineEdit -
display_filter_edit.h
+
widgets/display_filter_edit.h
 diff --git a/ui/qt/follow_stream_dialog.ui b/ui/qt/follow_stream_dialog.ui index 030b619d38..066b90b857 100644 --- a/ui/qt/follow_stream_dialog.ui +++ b/ui/qt/follow_stream_dialog.ui @@ -135,12 +135,12 @@ FollowStreamText QTextEdit -
follow_stream_text.h
+
widgets/follow_stream_text.h
 FindLineEdit QLineEdit -
find_line_edit.h
+
widgets/find_line_edit.h
 diff --git a/ui/qt/import_text_dialog.h b/ui/qt/import_text_dialog.h index ce2efea85d..c728ecb13d 100644 --- a/ui/qt/import_text_dialog.h +++ b/ui/qt/import_text_dialog.h @@ -30,7 +30,7 @@ #include "ui/text_import.h" -#include "syntax_line_edit.h" +#include #include #include diff --git a/ui/qt/import_text_dialog.ui b/ui/qt/import_text_dialog.ui index 0dedc55f14..d6c497987f 100644 --- a/ui/qt/import_text_dialog.ui +++ b/ui/qt/import_text_dialog.ui @@ -489,7 +489,7 @@ SyntaxLineEdit QLineEdit -
syntax_line_edit.h
+
widgets/syntax_line_edit.h
 diff --git a/ui/qt/interface_toolbar.cpp b/ui/qt/interface_toolbar.cpp index 778b9aa19c..b7bdaadbba 100644 --- a/ui/qt/interface_toolbar.cpp +++ b/ui/qt/interface_toolbar.cpp @@ -24,7 +24,7 @@ #include #include "interface_toolbar.h" -#include "interface_toolbar_lineedit.h" +#include #include "simple_dialog.h" #include "ui/main_statusbar.h" #include diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index bd76d42304..c7960db4b8 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -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 +#include +#include #include "wireshark_application.h" #include diff --git a/ui/qt/io_graph_dialog.ui b/ui/qt/io_graph_dialog.ui index f50431719a..6a3d4f4c3c 100644 --- a/ui/qt/io_graph_dialog.ui +++ b/ui/qt/io_graph_dialog.ui @@ -511,7 +511,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 diff --git a/ui/qt/lbm_lbtrm_transport_dialog.ui b/ui/qt/lbm_lbtrm_transport_dialog.ui index bb8c6e3ae5..4873d56d48 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.ui +++ b/ui/qt/lbm_lbtrm_transport_dialog.ui @@ -691,7 +691,7 @@ DisplayFilterEdit QLineEdit -
display_filter_edit.h
+
widgets/display_filter_edit.h
 diff --git a/ui/qt/lbm_lbtru_transport_dialog.ui b/ui/qt/lbm_lbtru_transport_dialog.ui index 9dd0f32895..f96176e6d9 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.ui +++ b/ui/qt/lbm_lbtru_transport_dialog.ui @@ -1123,7 +1123,7 @@ DisplayFilterEdit QLineEdit -
display_filter_edit.h
+
widgets/display_filter_edit.h
 diff --git a/ui/qt/lbm_stream_dialog.ui b/ui/qt/lbm_stream_dialog.ui index 3c9d95c6bf..f25881b327 100644 --- a/ui/qt/lbm_stream_dialog.ui +++ b/ui/qt/lbm_stream_dialog.ui @@ -118,7 +118,7 @@ DisplayFilterEdit QLineEdit -
display_filter_edit.h
+
widgets/display_filter_edit.h
 diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h index 7b3ad6b8c0..8bf752936b 100644 --- a/ui/qt/main_status_bar.h +++ b/ui/qt/main_status_bar.h @@ -28,7 +28,7 @@ #include "capchild/capture_session.h" -#include "label_stack.h" +#include #include "progress_frame.h" #include "wireshark_application.h" diff --git a/ui/qt/main_welcome.ui b/ui/qt/main_welcome.ui index 20375a3b76..43d721dce1 100644 --- a/ui/qt/main_welcome.ui +++ b/ui/qt/main_welcome.ui @@ -329,7 +329,7 @@ a:hover { CaptureFilterCombo QComboBox -
capture_filter_combo.h
+
widgets/capture_filter_combo.h
 AccordionFrame @@ -340,7 +340,7 @@ a:hover { ClickableLabel QLabel -
clickable_label.h
+
widgets/clickable_label.h
 diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 143b906581..2678698a2c 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -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 #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 #include "variant_pointer.h" #include "qt_ui_utils.h" diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index fb71836b3e..9eff2b3e1a 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -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 #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 +#include #include "lbm_stream_dialog.h" #include "lbm_uimflow_dialog.h" #include "lbm_lbtrm_transport_dialog.h" diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp index 0ff2589f0a..7b0fc88066 100644 --- a/ui/qt/module_preferences_scroll_area.cpp +++ b/ui/qt/module_preferences_scroll_area.cpp @@ -21,7 +21,7 @@ #include "module_preferences_scroll_area.h" #include -#include "syntax_line_edit.h" +#include #include "qt_ui_utils.h" #include "uat_dialog.h" #include "wireshark_application.h" diff --git a/ui/qt/multicast_statistics_dialog.cpp b/ui/qt/multicast_statistics_dialog.cpp index 4d9ee656de..bfa689417b 100644 --- a/ui/qt/multicast_statistics_dialog.cpp +++ b/ui/qt/multicast_statistics_dialog.cpp @@ -27,7 +27,7 @@ #include #include "qt_ui_utils.h" -#include "syntax_line_edit.h" +#include #include "wireshark_application.h" enum { diff --git a/ui/qt/packet_dialog.ui b/ui/qt/packet_dialog.ui index b61aaea765..605e42c8b2 100644 --- a/ui/qt/packet_dialog.ui +++ b/ui/qt/packet_dialog.ui @@ -50,7 +50,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index e966d6deaf..f34044c716 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -52,7 +52,7 @@ #include "frame_tvbuff.h" #include "color_utils.h" -#include "overlay_scroll_bar.h" +#include #include "proto_tree.h" #include "qt_ui_utils.h" #include "wireshark_application.h" diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h index 7a96e5862f..d3295af273 100644 --- a/ui/qt/packet_range_group_box.h +++ b/ui/qt/packet_range_group_box.h @@ -28,7 +28,7 @@ #include "ui/packet_range.h" -#include "syntax_line_edit.h" +#include #include namespace Ui { diff --git a/ui/qt/packet_range_group_box.ui b/ui/qt/packet_range_group_box.ui index 471f401fe7..2371175c72 100644 --- a/ui/qt/packet_range_group_box.ui +++ b/ui/qt/packet_range_group_box.ui @@ -249,7 +249,7 @@ SyntaxLineEdit QLineEdit -
syntax_line_edit.h
+
widgets/syntax_line_edit.h
 diff --git a/ui/qt/preference_editor_frame.ui b/ui/qt/preference_editor_frame.ui index 84d5c58fbb..2def3bcd9a 100644 --- a/ui/qt/preference_editor_frame.ui +++ b/ui/qt/preference_editor_frame.ui @@ -101,7 +101,7 @@ SyntaxLineEdit QLineEdit -
syntax_line_edit.h
+
widgets/syntax_line_edit.h
 diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp index 9f97fdc75a..e0f0cc501e 100644 --- a/ui/qt/preferences_dialog.cpp +++ b/ui/qt/preferences_dialog.cpp @@ -38,7 +38,7 @@ #include #include -#include "syntax_line_edit.h" +#include #include "qt_ui_utils.h" #include "uat_dialog.h" #include "wireshark_application.h" diff --git a/ui/qt/profile_dialog.ui b/ui/qt/profile_dialog.ui index a8f2bd33ec..9b9cbf57c7 100644 --- a/ui/qt/profile_dialog.ui +++ b/ui/qt/profile_dialog.ui @@ -129,7 +129,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 diff --git a/ui/qt/search_frame.ui b/ui/qt/search_frame.ui index 7fa722aa7c..8d709d0f3d 100644 --- a/ui/qt/search_frame.ui +++ b/ui/qt/search_frame.ui @@ -197,7 +197,7 @@ SyntaxLineEdit QLineEdit -
syntax_line_edit.h
+
widgets/syntax_line_edit.h
 diff --git a/ui/qt/sequence_dialog.ui b/ui/qt/sequence_dialog.ui index c4d59a4dbc..223f6f833c 100644 --- a/ui/qt/sequence_dialog.ui +++ b/ui/qt/sequence_dialog.ui @@ -406,7 +406,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 diff --git a/ui/qt/show_packet_bytes_dialog.ui b/ui/qt/show_packet_bytes_dialog.ui index 08cfd4574d..4747702bac 100644 --- a/ui/qt/show_packet_bytes_dialog.ui +++ b/ui/qt/show_packet_bytes_dialog.ui @@ -135,7 +135,7 @@ FindLineEdit QLineEdit -
find_line_edit.h
+
widgets/find_line_edit.h
 ShowPacketBytesTextEdit diff --git a/ui/qt/tap_parameter_dialog.ui b/ui/qt/tap_parameter_dialog.ui index 44c6727def..ec739e80e9 100644 --- a/ui/qt/tap_parameter_dialog.ui +++ b/ui/qt/tap_parameter_dialog.ui @@ -101,7 +101,7 @@ DisplayFilterEdit QLineEdit -
display_filter_edit.h
+
widgets/display_filter_edit.h
 diff --git a/ui/qt/time_shift_dialog.h b/ui/qt/time_shift_dialog.h index ee2746d791..58c3cc4e22 100644 --- a/ui/qt/time_shift_dialog.h +++ b/ui/qt/time_shift_dialog.h @@ -28,7 +28,7 @@ #include "cfile.h" -#include "syntax_line_edit.h" +#include #include #include diff --git a/ui/qt/time_shift_dialog.ui b/ui/qt/time_shift_dialog.ui index 1ada0ba9cc..a92bed328a 100644 --- a/ui/qt/time_shift_dialog.ui +++ b/ui/qt/time_shift_dialog.ui @@ -212,7 +212,7 @@ SyntaxLineEdit QLineEdit -
syntax_line_edit.h
+
widgets/syntax_line_edit.h
 diff --git a/ui/qt/uat_delegate.cpp b/ui/qt/uat_delegate.cpp index 09e9ef848b..3068e23cf1 100644 --- a/ui/qt/uat_delegate.cpp +++ b/ui/qt/uat_delegate.cpp @@ -30,7 +30,7 @@ #include #include -#include "display_filter_edit.h" +#include UatDelegate::UatDelegate(QObject *parent) : QStyledItemDelegate(parent) { diff --git a/ui/qt/uat_dialog.ui b/ui/qt/uat_dialog.ui index 61f3da487d..e8fcdf74a7 100644 --- a/ui/qt/uat_dialog.ui +++ b/ui/qt/uat_dialog.ui @@ -127,7 +127,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 UatTreeView diff --git a/ui/qt/uat_frame.cpp b/ui/qt/uat_frame.cpp index cb6b6f6f8e..036a0b1637 100644 --- a/ui/qt/uat_frame.cpp +++ b/ui/qt/uat_frame.cpp @@ -27,7 +27,7 @@ #include "uat_frame.h" #include -#include "display_filter_edit.h" +#include #include "wireshark_application.h" #include "qt_ui_utils.h" diff --git a/ui/qt/uat_frame.ui b/ui/qt/uat_frame.ui index 010e074a9d..b99bf4ddd8 100644 --- a/ui/qt/uat_frame.ui +++ b/ui/qt/uat_frame.ui @@ -135,7 +135,7 @@ ElidedLabel QLabel -
elided_label.h
+
widgets/elided_label.h
 UatTreeView diff --git a/ui/qt/additional_toolbar.cpp b/ui/qt/widgets/additional_toolbar.cpp similarity index 99% rename from ui/qt/additional_toolbar.cpp rename to ui/qt/widgets/additional_toolbar.cpp index 6a76651a0a..c0abea68f7 100644 --- a/ui/qt/additional_toolbar.cpp +++ b/ui/qt/widgets/additional_toolbar.cpp @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include #include #include -#include +#include +#include #include #include #include diff --git a/ui/qt/additional_toolbar.h b/ui/qt/widgets/additional_toolbar.h similarity index 100% rename from ui/qt/additional_toolbar.h rename to ui/qt/widgets/additional_toolbar.h diff --git a/ui/qt/apply_line_edit.cpp b/ui/qt/widgets/apply_line_edit.cpp similarity index 99% rename from ui/qt/apply_line_edit.cpp rename to ui/qt/widgets/apply_line_edit.cpp index 2e2acc7454..0dc1ea023b 100644 --- a/ui/qt/apply_line_edit.cpp +++ b/ui/qt/widgets/apply_line_edit.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include #include diff --git a/ui/qt/apply_line_edit.h b/ui/qt/widgets/apply_line_edit.h similarity index 100% rename from ui/qt/apply_line_edit.h rename to ui/qt/widgets/apply_line_edit.h diff --git a/ui/qt/capture_filter_combo.cpp b/ui/qt/widgets/capture_filter_combo.cpp similarity index 100% rename from ui/qt/capture_filter_combo.cpp rename to ui/qt/widgets/capture_filter_combo.cpp diff --git a/ui/qt/capture_filter_combo.h b/ui/qt/widgets/capture_filter_combo.h similarity index 100% rename from ui/qt/capture_filter_combo.h rename to ui/qt/widgets/capture_filter_combo.h diff --git a/ui/qt/capture_filter_edit.cpp b/ui/qt/widgets/capture_filter_edit.cpp similarity index 100% rename from ui/qt/capture_filter_edit.cpp rename to ui/qt/widgets/capture_filter_edit.cpp diff --git a/ui/qt/capture_filter_edit.h b/ui/qt/widgets/capture_filter_edit.h similarity index 100% rename from ui/qt/capture_filter_edit.h rename to ui/qt/widgets/capture_filter_edit.h diff --git a/ui/qt/clickable_label.cpp b/ui/qt/widgets/clickable_label.cpp similarity index 97% rename from ui/qt/clickable_label.cpp rename to ui/qt/widgets/clickable_label.cpp index eb376066d8..74515c61b1 100644 --- a/ui/qt/clickable_label.cpp +++ b/ui/qt/widgets/clickable_label.cpp @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ui/qt/clickable_label.h" +#include #include diff --git a/ui/qt/clickable_label.h b/ui/qt/widgets/clickable_label.h similarity index 100% rename from ui/qt/clickable_label.h rename to ui/qt/widgets/clickable_label.h diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/widgets/display_filter_edit.cpp similarity index 100% rename from ui/qt/display_filter_edit.cpp rename to ui/qt/widgets/display_filter_edit.cpp diff --git a/ui/qt/display_filter_edit.h b/ui/qt/widgets/display_filter_edit.h similarity index 97% rename from ui/qt/display_filter_edit.h rename to ui/qt/widgets/display_filter_edit.h index ad860e5407..a7e57107d5 100644 --- a/ui/qt/display_filter_edit.h +++ b/ui/qt/widgets/display_filter_edit.h @@ -22,8 +22,8 @@ #ifndef DISPLAYFILTEREDIT_H #define DISPLAYFILTEREDIT_H -#include "preferences_dialog.h" -#include "syntax_line_edit.h" +#include +#include class QEvent; class StockIconToolButton; diff --git a/ui/qt/elided_label.cpp b/ui/qt/widgets/elided_label.cpp similarity index 100% rename from ui/qt/elided_label.cpp rename to ui/qt/widgets/elided_label.cpp diff --git a/ui/qt/elided_label.h b/ui/qt/widgets/elided_label.h similarity index 100% rename from ui/qt/elided_label.h rename to ui/qt/widgets/elided_label.h diff --git a/ui/qt/field_filter_edit.cpp b/ui/qt/widgets/field_filter_edit.cpp similarity index 100% rename from ui/qt/field_filter_edit.cpp rename to ui/qt/widgets/field_filter_edit.cpp diff --git a/ui/qt/field_filter_edit.h b/ui/qt/widgets/field_filter_edit.h similarity index 100% rename from ui/qt/field_filter_edit.h rename to ui/qt/widgets/field_filter_edit.h diff --git a/ui/qt/find_line_edit.cpp b/ui/qt/widgets/find_line_edit.cpp similarity index 100% rename from ui/qt/find_line_edit.cpp rename to ui/qt/widgets/find_line_edit.cpp diff --git a/ui/qt/find_line_edit.h b/ui/qt/widgets/find_line_edit.h similarity index 100% rename from ui/qt/find_line_edit.h rename to ui/qt/widgets/find_line_edit.h diff --git a/ui/qt/follow_stream_text.cpp b/ui/qt/widgets/follow_stream_text.cpp similarity index 100% rename from ui/qt/follow_stream_text.cpp rename to ui/qt/widgets/follow_stream_text.cpp diff --git a/ui/qt/follow_stream_text.h b/ui/qt/widgets/follow_stream_text.h similarity index 100% rename from ui/qt/follow_stream_text.h rename to ui/qt/widgets/follow_stream_text.h diff --git a/ui/qt/interface_toolbar_lineedit.cpp b/ui/qt/widgets/interface_toolbar_lineedit.cpp similarity index 100% rename from ui/qt/interface_toolbar_lineedit.cpp rename to ui/qt/widgets/interface_toolbar_lineedit.cpp diff --git a/ui/qt/interface_toolbar_lineedit.h b/ui/qt/widgets/interface_toolbar_lineedit.h similarity index 100% rename from ui/qt/interface_toolbar_lineedit.h rename to ui/qt/widgets/interface_toolbar_lineedit.h diff --git a/ui/qt/label_stack.cpp b/ui/qt/widgets/label_stack.cpp similarity index 100% rename from ui/qt/label_stack.cpp rename to ui/qt/widgets/label_stack.cpp diff --git a/ui/qt/label_stack.h b/ui/qt/widgets/label_stack.h similarity index 100% rename from ui/qt/label_stack.h rename to ui/qt/widgets/label_stack.h diff --git a/ui/qt/overlay_scroll_bar.cpp b/ui/qt/widgets/overlay_scroll_bar.cpp similarity index 100% rename from ui/qt/overlay_scroll_bar.cpp rename to ui/qt/widgets/overlay_scroll_bar.cpp diff --git a/ui/qt/overlay_scroll_bar.h b/ui/qt/widgets/overlay_scroll_bar.h similarity index 100% rename from ui/qt/overlay_scroll_bar.h rename to ui/qt/widgets/overlay_scroll_bar.h diff --git a/ui/qt/syntax_line_edit.cpp b/ui/qt/widgets/syntax_line_edit.cpp similarity index 100% rename from ui/qt/syntax_line_edit.cpp rename to ui/qt/widgets/syntax_line_edit.cpp diff --git a/ui/qt/syntax_line_edit.h b/ui/qt/widgets/syntax_line_edit.h similarity index 100% rename from ui/qt/syntax_line_edit.h rename to ui/qt/widgets/syntax_line_edit.h