Qt: use <> for including the generated ui_*.h files

this should make Visual Studio pick up the generated include files
from the build directory instead of the source directory (which may
contain lefovers from an in-tree build)

Change-Id: Ie3de4cdd85a2865e203118a42ab10f443372f03b
Reviewed-on: https://code.wireshark.org/review/9129
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ui/qt/about_dialog.cpp

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include "about_dialog.h"
-#include "ui_about_dialog.h"
+#include <ui_about_dialog.h>
 
 #include "wireshark_application.h"
 #include <wsutil/filesystem.h>

ui/qt/bluetooth_att_server_attributes_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "bluetooth_att_server_attributes_dialog.h"
-#include "ui_bluetooth_att_server_attributes_dialog.h"
+#include <ui_bluetooth_att_server_attributes_dialog.h>
 
 #include "epan/epan.h"
 #include "epan/to_str.h"

ui/qt/bluetooth_devices_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "bluetooth_devices_dialog.h"
-#include "ui_bluetooth_devices_dialog.h"
+#include <ui_bluetooth_devices_dialog.h>
 
 #include "epan/epan.h"
 #include "epan/addr_resolv.h"

ui/qt/capture_file_progress_frame.cpp

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include "capture_file_progress_frame.h"
-#include "ui_capture_file_progress_frame.h"
+#include <ui_capture_file_progress_frame.h>
 
 #include "ui/progress_dlg.h"
 

ui/qt/capture_file_properties_dialog.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "capture_file_properties_dialog.h"
-#include "ui_capture_file_properties_dialog.h"
+#include <ui_capture_file_properties_dialog.h>
 
 #include "summary.h"
 

ui/qt/capture_interfaces_dialog.cpp

@@ -25,7 +25,7 @@
 
 #include "capture_interfaces_dialog.h"
 #include "capture_filter_combo.h"
-#include "ui_capture_interfaces_dialog.h"
+#include <ui_capture_interfaces_dialog.h>
 #include "compiled_filter_output.h"
 #include "manage_interfaces_dialog.h"
 

ui/qt/capture_preferences_frame.cpp

@@ -28,7 +28,7 @@
 #endif
 
 #include "capture_preferences_frame.h"
-#include "ui_capture_preferences_frame.h"
+#include <ui_capture_preferences_frame.h>
 #include "wireshark_application.h"
 
 #include <QSpacerItem>

ui/qt/coloring_rules_dialog.cpp

@@ -26,7 +26,7 @@
 #include <glib.h>
 
 #include "coloring_rules_dialog.h"
-#include "ui_coloring_rules_dialog.h"
+#include <ui_coloring_rules_dialog.h>
 
 #include "color.h"
 #include "color_filters.h"

ui/qt/column_editor_frame.cpp

@@ -27,7 +27,7 @@
 #include <epan/column.h>
 
 #include "column_editor_frame.h"
-#include "ui_column_editor_frame.h"
+#include <ui_column_editor_frame.h>
 
 #include <QComboBox>
 

ui/qt/column_preferences_frame.cpp

@@ -34,7 +34,7 @@
 
 #include "qt_ui_utils.h"
 #include "column_preferences_frame.h"
-#include "ui_column_preferences_frame.h"
+#include <ui_column_preferences_frame.h>
 #include "syntax_line_edit.h"
 #include "wireshark_application.h"
 

ui/qt/compiled_filter_output.cpp

@@ -20,7 +20,7 @@
  */
 
 
-#include "ui_compiled_filter_output.h"
+#include <ui_compiled_filter_output.h>
 #include "compiled_filter_output.h"
 
 #include "capture_opts.h"

ui/qt/decode_as_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "decode_as_dialog.h"
-#include "ui_decode_as_dialog.h"
+#include <ui_decode_as_dialog.h>
 
 #include "epan/decode_as.h"
 #include "epan/dissectors/packet-dcerpc.h"

ui/qt/display_filter_expression_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "display_filter_expression_dialog.h"
-#include "ui_display_filter_expression_dialog.h"
+#include <ui_display_filter_expression_dialog.h>
 
 #include <epan/proto.h>
 #include <epan/range.h>

ui/qt/expert_info_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "expert_info_dialog.h"
-#include "ui_expert_info_dialog.h"
+#include <ui_expert_info_dialog.h>
 
 #include "file.h"
 

ui/qt/export_object_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "export_object_dialog.h"
-#include "ui_export_object_dialog.h"
+#include <ui_export_object_dialog.h>
 
 #include <ui/alert_box.h>
 #include <ui/utf8_entities.h>

ui/qt/export_pdu_dialog.cpp

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include "export_pdu_dialog.h"
-#include "ui_export_pdu_dialog.h"
+#include <ui_export_pdu_dialog.h>
 
 #include "globals.h"
 #include "pcap-encap.h"

ui/qt/file_set_dialog.cpp

@@ -31,7 +31,7 @@
 #include <wsutil/str_util.h>
 
 #include "file_set_dialog.h"
-#include "ui_file_set_dialog.h"
+#include <ui_file_set_dialog.h>
 #include "wireshark_application.h"
 
 #include <QDialogButtonBox>

ui/qt/filter_dialog.cpp

@@ -30,7 +30,7 @@
 #include <wsutil/filesystem.h>
 
 #include "filter_dialog.h"
-#include "ui_filter_dialog.h"
+#include <ui_filter_dialog.h>
 
 #include <QMessageBox>
 #include <QThread>

ui/qt/filter_expressions_preferences_frame.cpp

@@ -26,7 +26,7 @@
 #include <epan/filter_expressions.h>
 
 #include "filter_expressions_preferences_frame.h"
-#include "ui_filter_expressions_preferences_frame.h"
+#include <ui_filter_expressions_preferences_frame.h>
 #include "syntax_line_edit.h"
 #include "wireshark_application.h"
 

ui/qt/follow_stream_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "follow_stream_dialog.h"
-#include "ui_follow_stream_dialog.h"
+#include <ui_follow_stream_dialog.h>
 
 #include "main_window.h"
 #include "wireshark_application.h"

ui/qt/font_color_preferences_frame.cpp

@@ -22,7 +22,7 @@
 #include "qt_ui_utils.h"
 
 #include "font_color_preferences_frame.h"
-#include "ui_font_color_preferences_frame.h"
+#include <ui_font_color_preferences_frame.h>
 #include "color_utils.h"
 #include "wireshark_application.h"
 

ui/qt/io_graph_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "io_graph_dialog.h"
-#include "ui_io_graph_dialog.h"
+#include <ui_io_graph_dialog.h>
 
 #include "file.h"
 

ui/qt/layout_preferences_frame.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "layout_preferences_frame.h"
-#include "ui_layout_preferences_frame.h"
+#include <ui_layout_preferences_frame.h>
 
 #include <QAbstractButton>
 #include <QToolButton>

ui/qt/lbm_lbtrm_transport_dialog.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "lbm_lbtrm_transport_dialog.h"
-#include "ui_lbm_lbtrm_transport_dialog.h"
+#include <ui_lbm_lbtrm_transport_dialog.h>
 
 #include "file.h"
 

ui/qt/lbm_lbtru_transport_dialog.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "lbm_lbtru_transport_dialog.h"
-#include "ui_lbm_lbtru_transport_dialog.h"
+#include <ui_lbm_lbtru_transport_dialog.h>
 
 #include "file.h"
 

ui/qt/lbm_stream_dialog.cpp

@@ -24,7 +24,7 @@
 // Adapted from stats_tree_packet.cpp
 
 #include "lbm_stream_dialog.h"
-#include "ui_lbm_stream_dialog.h"
+#include <ui_lbm_stream_dialog.h>
 
 #include "file.h"
 

ui/qt/lbm_uimflow_dialog.cpp

@@ -24,7 +24,7 @@
 // Adapted from sequence_dialog.cpp
 
 #include "lbm_uimflow_dialog.h"
-#include "ui_lbm_uimflow_dialog.h"
+#include <ui_lbm_uimflow_dialog.h>
 
 #include "file.h"
 

ui/qt/main_welcome.cpp

@@ -30,7 +30,7 @@
 #include "wsutil/ws_version_info.h"
 
 #include "main_welcome.h"
-#include "ui_main_welcome.h"
+#include <ui_main_welcome.h>
 #include "tango_colors.h"
 
 #include "wireshark_application.h"

ui/qt/main_window.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "main_window.h"
-#include "ui_main_window.h"
+#include <ui_main_window.h>
 
 #include <epan/addr_resolv.h>
 #include <epan/epan_dissect.h>

ui/qt/main_window_preferences_frame.cpp

@@ -23,7 +23,7 @@
 #include "main_window_preferences_frame.h"
 #include "qt_ui_utils.h"
 
-#include "ui_main_window_preferences_frame.h"
+#include <ui_main_window_preferences_frame.h>
 #include "ui/language.h"
 
 #include <epan/prefs-int.h>

ui/qt/main_window_slots.cpp

@@ -30,7 +30,7 @@
 #endif
 
 #include "main_window.h"
-#include "ui_main_window.h"
+#include <ui_main_window.h>
 
 #ifdef _WIN32
 #include <windows.h>

ui/qt/manage_interfaces_dialog.cpp

@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include "manage_interfaces_dialog.h"
-#include "ui_manage_interfaces_dialog.h"
+#include <ui_manage_interfaces_dialog.h>
 #include "epan/prefs.h"
 #include "epan/to_str.h"
 #include "ui/last_open_dir.h"

ui/qt/module_preferences_scroll_area.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "module_preferences_scroll_area.h"
-#include "ui_module_preferences_scroll_area.h"
+#include <ui_module_preferences_scroll_area.h>
 #include "syntax_line_edit.h"
 #include "qt_ui_utils.h"
 #include "uat_dialog.h"

ui/qt/packet_comment_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "packet_comment_dialog.h"
-#include "ui_packet_comment_dialog.h"
+#include <ui_packet_comment_dialog.h>
 
 #include "wireshark_application.h"
 

ui/qt/packet_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "packet_dialog.h"
-#include "ui_packet_dialog.h"
+#include <ui_packet_dialog.h>
 
 #include "file.h"
 

ui/qt/packet_format_group_box.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "packet_format_group_box.h"
-#include "ui_packet_format_group_box.h"
+#include <ui_packet_format_group_box.h>
 
 #include <QStyle>
 

ui/qt/packet_range_group_box.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "packet_range_group_box.h"
-#include "ui_packet_range_group_box.h"
+#include <ui_packet_range_group_box.h>
 
 PacketRangeGroupBox::PacketRangeGroupBox(QWidget *parent) :
     QGroupBox(parent),

ui/qt/preference_editor_frame.cpp

@@ -29,7 +29,7 @@
 #include <ui/preference_utils.h>
 
 #include "preference_editor_frame.h"
-#include "ui_preference_editor_frame.h"
+#include <ui_preference_editor_frame.h>
 
 #include "qt_ui_utils.h"
 

ui/qt/preferences_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "preferences_dialog.h"
-#include "ui_preferences_dialog.h"
+#include <ui_preferences_dialog.h>
 
 #include "module_preferences_scroll_area.h"
 

ui/qt/print_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "print_dialog.h"
-#include "ui_print_dialog.h"
+#include <ui_print_dialog.h>
 
 #include <QPrintDialog>
 #include <QPageSetupDialog>

ui/qt/profile_dialog.cpp

@@ -30,7 +30,7 @@
 #include "ui/profile.h"
 
 #include "profile_dialog.h"
-#include "ui_profile_dialog.h"
+#include <ui_profile_dialog.h>
 #include "wireshark_application.h"
 #include "color_utils.h"
 

ui/qt/protocol_hierarchy_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "protocol_hierarchy_dialog.h"
-#include "ui_protocol_hierarchy_dialog.h"
+#include <ui_protocol_hierarchy_dialog.h>
 
 #include "cfile.h"
 

ui/qt/remote_capture_dialog.cpp

@@ -27,7 +27,7 @@
 #include "qt_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "remote_capture_dialog.h"
-#include "ui_remote_capture_dialog.h"
+#include <ui_remote_capture_dialog.h>
 #include "capture_opts.h"
 #include "caputils/capture-pcap-util.h"
 #include "ui/capture_ui_utils.h"

ui/qt/remote_settings_dialog.cpp

@@ -24,7 +24,7 @@
 #include "config.h"
 #ifdef HAVE_PCAP_REMOTE
 #include "remote_settings_dialog.h"
-#include "ui_remote_settings_dialog.h"
+#include <ui_remote_settings_dialog.h>
 
 RemoteSettingsDialog::RemoteSettingsDialog(QWidget *parent, interface_t *iface) :
     QDialog(parent),

ui/qt/rtp_stream_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "rtp_stream_dialog.h"
-#include "ui_rtp_stream_dialog.h"
+#include <ui_rtp_stream_dialog.h>
 
 #include "file.h"
 

ui/qt/sctp_all_assocs_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "sctp_all_assocs_dialog.h"
-#include "ui_sctp_all_assocs_dialog.h"
+#include <ui_sctp_all_assocs_dialog.h>
 #include "sctp_assoc_analyse_dialog.h"
 
 #include "qt_ui_utils.h"

ui/qt/sctp_assoc_analyse_dialog.cpp

@@ -22,7 +22,7 @@
 #include "epan/to_str.h"
 
 #include "sctp_assoc_analyse_dialog.h"
-#include "ui_sctp_assoc_analyse_dialog.h"
+#include <ui_sctp_assoc_analyse_dialog.h>
 
 #include "qt_ui_utils.h"
 #include "sctp_graph_dialog.h"

ui/qt/sctp_chunk_statistics_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "sctp_chunk_statistics_dialog.h"
-#include "ui_sctp_chunk_statistics_dialog.h"
+#include <ui_sctp_chunk_statistics_dialog.h>
 #include "uat_dialog.h"
 
 #include <string>

ui/qt/sctp_graph_arwnd_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "sctp_graph_arwnd_dialog.h"
-#include "ui_sctp_graph_arwnd_dialog.h"
+#include <ui_sctp_graph_arwnd_dialog.h>
 #include "sctp_assoc_analyse_dialog.h"
 
 #include <file.h>

ui/qt/sctp_graph_byte_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "sctp_graph_byte_dialog.h"
-#include "ui_sctp_graph_byte_dialog.h"
+#include <ui_sctp_graph_byte_dialog.h>
 
 #include <file.h>
 #include <math.h>

ui/qt/sctp_graph_dialog.cpp

@@ -22,7 +22,7 @@
 #include "ui/utf8_entities.h"
 
 #include "sctp_graph_dialog.h"
-#include "ui_sctp_graph_dialog.h"
+#include <ui_sctp_graph_dialog.h>
 #include "sctp_assoc_analyse_dialog.h"
 
 #include <file.h>

ui/qt/search_frame.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "search_frame.h"
-#include "ui_search_frame.h"
+#include <ui_search_frame.h>
 
 #include "file.h"
 

ui/qt/sequence_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "sequence_dialog.h"
-#include "ui_sequence_dialog.h"
+#include <ui_sequence_dialog.h>
 
 #include "epan/addr_resolv.h"
 

ui/qt/splash_overlay.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "splash_overlay.h"
-#include "ui_splash_overlay.h"
+#include <ui_splash_overlay.h>
 #include "wireshark_application.h"
 
 #include <QPainter>

ui/qt/tap_parameter_dialog.cpp

@@ -30,7 +30,7 @@
  */
 
 #include "tap_parameter_dialog.h"
-#include "ui_tap_parameter_dialog.h"
+#include <ui_tap_parameter_dialog.h>
 
 #include <errno.h>
 

ui/qt/tcp_stream_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "tcp_stream_dialog.h"
-#include "ui_tcp_stream_dialog.h"
+#include <ui_tcp_stream_dialog.h>
 
 #include "epan/to_str.h"
 

ui/qt/time_shift_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "time_shift_dialog.h"
-#include "ui_time_shift_dialog.h"
+#include <ui_time_shift_dialog.h>
 
 #include "wireshark_application.h"
 

ui/qt/traffic_table_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "traffic_table_dialog.h"
-#include "ui_traffic_table_dialog.h"
+#include <ui_traffic_table_dialog.h>
 
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>

ui/qt/uat_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "uat_dialog.h"
-#include "ui_uat_dialog.h"
+#include <ui_uat_dialog.h>
 #include "wireshark_application.h"
 
 #include "epan/strutil.h"

ui/qt/voip_calls_dialog.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "voip_calls_dialog.h"
-#include "ui_voip_calls_dialog.h"
+#include <ui_voip_calls_dialog.h>
 
 #include "file.h"
 

ui/qt/wireless_frame.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "wireless_frame.h"
-#include "ui_wireless_frame.h"
+#include <ui_wireless_frame.h>
 
 #include "config.h"