diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/bin/syncqt b/bin/syncqt index acfc6c4d57..90b32a1a81 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ############################################################################# ## ## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). @@ -763,7 +763,6 @@ my $class_lib_map_contents = ""; our @ignore_headers = (); our @ignore_for_master_contents = (); our @ignore_for_include_check = (); -our @ignore_for_qt_begin_header_check = (); our @ignore_for_qt_begin_namespace_check = (); our @ignore_for_qt_module_check = (); our %inject_headers = (); @@ -1124,7 +1123,6 @@ if($check_includes) { foreach my $subdir (@subdirs) { my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0); foreach my $header (@headers) { - my $header_skip_qt_begin_header_test = 0; my $header_skip_qt_begin_namespace_test = 0; $header = 0 if($header =~ /^ui_.*.h/); foreach (@ignore_headers) { @@ -1144,9 +1142,6 @@ if($check_includes) { foreach (@ignore_for_include_check) { $public_header = 0 if($header eq $_); } - foreach(@ignore_for_qt_begin_header_check) { - $header_skip_qt_begin_header_test = 1 if ($header eq $_); - } foreach(@ignore_for_qt_begin_namespace_check) { $header_skip_qt_begin_namespace_test = 1 if ($header eq $_); } @@ -1156,10 +1151,9 @@ if($check_includes) { my $iheader = $subdir . "/" . $header; if($public_header) { if(open(F, "<$iheader")) { - my $qt_begin_header_found = 0; - my $qt_end_header_found = 0; my $qt_begin_namespace_found = 0; my $qt_end_namespace_found = 0; + my $qt_namespace_suffix = ""; my $line; my $stop_processing = 0; while($line = <F>) { @@ -1184,25 +1178,13 @@ if($check_includes) { } } } - } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_BEGIN_HEADER\s*$/) { - $qt_begin_header_found = 1; - } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_END_HEADER\s*$/) { - $qt_end_header_found = 1; - } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_BEGIN_NAMESPACE\s*$/) { + } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_BEGIN_NAMESPACE(_[A-Z_]+)?\s*$/) { + $qt_namespace_suffix = $1 // ""; $qt_begin_namespace_found = 1; - } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) { + } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE$qt_namespace_suffix\s*$/) { $qt_end_namespace_found = 1; } } - if ($header_skip_qt_begin_header_test == 0 and $stop_processing == 0) { - if ($qt_begin_header_found == 0) { - print "$lib: WARNING: $iheader does not include QT_BEGIN_HEADER\n"; - } - - if ($qt_begin_header_found && $qt_end_header_found == 0) { - print "$lib: WARNING: $iheader has QT_BEGIN_HEADER but no QT_END_HEADER\n"; - } - } if ($header_skip_qt_begin_namespace_test == 0 and $stop_processing == 0) { if ($qt_begin_namespace_found == 0) { @@ -1210,7 +1192,7 @@ if($check_includes) { } if ($qt_begin_namespace_found && $qt_end_namespace_found == 0) { - print "$lib: WARNING: $iheader has QT_BEGIN_NAMESPACE but no QT_END_NAMESPACE\n"; + print "$lib: WARNING: $iheader has QT_BEGIN_NAMESPACE$qt_namespace_suffix but no QT_END_NAMESPACE$qt_namespace_suffix\n"; } } |