diff options
author | Martin Kaiser <wireshark@kaiser.cx> | 2016-06-12 14:00:21 -0700 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-06-13 21:17:06 +0000 |
commit | dda2acc06fa42f7251c9e60a01aab970488116fb (patch) | |
tree | 176de5e687b9b46ba20dfbefc9df2e2a220df904 /ui | |
parent | 4ca4768b561fca0e47f6736e24a616d50b931f79 (diff) |
qt: use #include <file.h> for generated include files
make sure that generated include files are picked up only from the
directories set by -I (or /I), not from the current directory
if we use #include "file.h", Visual Studio searches for file.h in the
same diretory as the source file that includes file.h
if we do an out-of-tree build with cmake and the source directory
contains files from an in-tree build (done with autotools), we might end
up including the wrong file
Change-Id: Iaaed2626258b6ff0c12485fe3f436bd03bbb5adf
Reviewed-on: https://code.wireshark.org/review/15873
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/bluetooth_device_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/bluetooth_hci_summary_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/conversation_hash_tables_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/dissector_tables_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/enabled_protocols_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/filter_expression_frame.cpp | 2 | ||||
-rw-r--r-- | ui/qt/firewall_rules_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/funnel_string_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/funnel_text_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/gsm_map_summary_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/iax2_analysis_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/mtp3_summary_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/resolved_addresses_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/rtp_analysis_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/rtp_player_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/supported_protocols_dialog.cpp | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/ui/qt/bluetooth_device_dialog.cpp b/ui/qt/bluetooth_device_dialog.cpp index 83a97fedc8..5c72f2d2a4 100644 --- a/ui/qt/bluetooth_device_dialog.cpp +++ b/ui/qt/bluetooth_device_dialog.cpp @@ -20,7 +20,7 @@ */ #include "bluetooth_device_dialog.h" -#include "ui_bluetooth_device_dialog.h" +#include <ui_bluetooth_device_dialog.h> #include "epan/epan.h" #include "epan/addr_resolv.h" diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp index 490224ec2b..a29d3f8136 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.cpp +++ b/ui/qt/bluetooth_hci_summary_dialog.cpp @@ -20,7 +20,7 @@ */ #include "bluetooth_hci_summary_dialog.h" -#include "ui_bluetooth_hci_summary_dialog.h" +#include <ui_bluetooth_hci_summary_dialog.h> #include "epan/epan.h" #include "epan/addr_resolv.h" diff --git a/ui/qt/conversation_hash_tables_dialog.cpp b/ui/qt/conversation_hash_tables_dialog.cpp index db4c095c70..713d711bc5 100644 --- a/ui/qt/conversation_hash_tables_dialog.cpp +++ b/ui/qt/conversation_hash_tables_dialog.cpp @@ -20,7 +20,7 @@ */ #include "conversation_hash_tables_dialog.h" -#include "ui_conversation_hash_tables_dialog.h" +#include <ui_conversation_hash_tables_dialog.h> #include "config.h" diff --git a/ui/qt/dissector_tables_dialog.cpp b/ui/qt/dissector_tables_dialog.cpp index 4c41338ece..07483bb113 100644 --- a/ui/qt/dissector_tables_dialog.cpp +++ b/ui/qt/dissector_tables_dialog.cpp @@ -20,7 +20,7 @@ */ #include "dissector_tables_dialog.h" -#include "ui_dissector_tables_dialog.h" +#include <ui_dissector_tables_dialog.h> #include "config.h" diff --git a/ui/qt/enabled_protocols_dialog.cpp b/ui/qt/enabled_protocols_dialog.cpp index 793a5a0e98..a3641e1b5c 100644 --- a/ui/qt/enabled_protocols_dialog.cpp +++ b/ui/qt/enabled_protocols_dialog.cpp @@ -20,7 +20,7 @@ */ #include "enabled_protocols_dialog.h" -#include "ui_enabled_protocols_dialog.h" +#include <ui_enabled_protocols_dialog.h> #include <errno.h> diff --git a/ui/qt/filter_expression_frame.cpp b/ui/qt/filter_expression_frame.cpp index b94e9d2ffd..2057cf1ee4 100644 --- a/ui/qt/filter_expression_frame.cpp +++ b/ui/qt/filter_expression_frame.cpp @@ -20,7 +20,7 @@ */ #include "filter_expression_frame.h" -#include "ui_filter_expression_frame.h" +#include <ui_filter_expression_frame.h> #include <epan/filter_expressions.h> #include <ui/preference_utils.h> diff --git a/ui/qt/firewall_rules_dialog.cpp b/ui/qt/firewall_rules_dialog.cpp index 296ffad68f..4b38d7d793 100644 --- a/ui/qt/firewall_rules_dialog.cpp +++ b/ui/qt/firewall_rules_dialog.cpp @@ -22,7 +22,7 @@ #include <config.h> #include "firewall_rules_dialog.h" -#include "ui_firewall_rules_dialog.h" +#include <ui_firewall_rules_dialog.h> #include "epan/packet_info.h" #include "epan/to_str.h" diff --git a/ui/qt/funnel_string_dialog.cpp b/ui/qt/funnel_string_dialog.cpp index 027f779367..37b3ed6314 100644 --- a/ui/qt/funnel_string_dialog.cpp +++ b/ui/qt/funnel_string_dialog.cpp @@ -20,7 +20,7 @@ */ #include "funnel_string_dialog.h" -#include "ui_funnel_string_dialog.h" +#include <ui_funnel_string_dialog.h> #include <QLabel> #include <QLineEdit> diff --git a/ui/qt/funnel_text_dialog.cpp b/ui/qt/funnel_text_dialog.cpp index 2e76af4f0d..6ba873f451 100644 --- a/ui/qt/funnel_text_dialog.cpp +++ b/ui/qt/funnel_text_dialog.cpp @@ -20,7 +20,7 @@ */ #include "funnel_text_dialog.h" -#include "ui_funnel_text_dialog.h" +#include <ui_funnel_text_dialog.h> #include <QPushButton> #include <QRegExp> diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp index b813f48772..3265068e94 100644 --- a/ui/qt/gsm_map_summary_dialog.cpp +++ b/ui/qt/gsm_map_summary_dialog.cpp @@ -24,7 +24,7 @@ */ #include "gsm_map_summary_dialog.h" -#include "ui_gsm_map_summary_dialog.h" +#include <ui_gsm_map_summary_dialog.h> #include "config.h" diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index eb76952e35..ff1db2713e 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -20,7 +20,7 @@ */ #include "iax2_analysis_dialog.h" -#include "ui_iax2_analysis_dialog.h" +#include <ui_iax2_analysis_dialog.h> #include "file.h" #include "frame_tvbuff.h" diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp index 791318f7a0..f009f939e9 100644 --- a/ui/qt/mtp3_summary_dialog.cpp +++ b/ui/qt/mtp3_summary_dialog.cpp @@ -24,7 +24,7 @@ */ #include "mtp3_summary_dialog.h" -#include "ui_mtp3_summary_dialog.h" +#include <ui_mtp3_summary_dialog.h> #include "config.h" diff --git a/ui/qt/resolved_addresses_dialog.cpp b/ui/qt/resolved_addresses_dialog.cpp index 08719aa36e..06409b54d7 100644 --- a/ui/qt/resolved_addresses_dialog.cpp +++ b/ui/qt/resolved_addresses_dialog.cpp @@ -20,7 +20,7 @@ */ #include "resolved_addresses_dialog.h" -#include "ui_resolved_addresses_dialog.h" +#include <ui_resolved_addresses_dialog.h> #include "config.h" diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index e12da20fa0..eb72dc5d2e 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -20,7 +20,7 @@ */ #include "rtp_analysis_dialog.h" -#include "ui_rtp_analysis_dialog.h" +#include <ui_rtp_analysis_dialog.h> #include "file.h" #include "frame_tvbuff.h" diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index 161132973b..100daa1adb 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -20,7 +20,7 @@ */ #include "rtp_player_dialog.h" -#include "ui_rtp_player_dialog.h" +#include <ui_rtp_player_dialog.h> #ifdef QT_MULTIMEDIA_LIB diff --git a/ui/qt/supported_protocols_dialog.cpp b/ui/qt/supported_protocols_dialog.cpp index b170104e96..0d9c582124 100644 --- a/ui/qt/supported_protocols_dialog.cpp +++ b/ui/qt/supported_protocols_dialog.cpp @@ -26,7 +26,7 @@ #endif #include "supported_protocols_dialog.h" -#include "ui_supported_protocols_dialog.h" +#include <ui_supported_protocols_dialog.h> #include "config.h" |