[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 67ee41e8d4c20a593cab9ccc928f4423b7ba234c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 27 09:11:20 2009 +0000

    2009-12-27  Yael Aharon  <yael.aharon at nokia.com>
    
            Reviewed by Darin Adler.
    
            check-webkit-style should not mark moc files inclusion as errors
            https://bugs.webkit.org/show_bug.cgi?id=32669
    
            Add a new header type for moc files, and skip them when checking the order of header files.
    
            * Scripts/modules/cpp_style.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52575 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2033ae1..2a21b1c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-27  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        check-webkit-style should not mark moc files inclusion as errors
+        https://bugs.webkit.org/show_bug.cgi?id=32669
+
+        Add a new header type for moc files, and skip them when checking the order of header files.
+
+        * Scripts/modules/cpp_style.py:
+
 2009-12-26  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/modules/cpp_style.py b/WebKitTools/Scripts/modules/cpp_style.py
index 64e3905..a0e4022 100644
--- a/WebKitTools/Scripts/modules/cpp_style.py
+++ b/WebKitTools/Scripts/modules/cpp_style.py
@@ -123,6 +123,7 @@ for op, inv_replacement in [('==', 'NE'), ('!=', 'EQ'),
 _CONFIG_HEADER = 0
 _PRIMARY_HEADER = 1
 _OTHER_HEADER = 2
+_MOC_HEADER = 3
 
 
 # The regexp compilation caching is inlined in all regexp functions for
@@ -181,6 +182,7 @@ class _IncludeState(dict):
         _CONFIG_HEADER: 'WebCore config.h',
         _PRIMARY_HEADER: 'header this file implements',
         _OTHER_HEADER: 'other header',
+        _MOC_HEADER: 'moc file',
         }
     _SECTION_NAMES = {
         _INITIAL_SECTION: "... nothing.",
@@ -217,6 +219,8 @@ class _IncludeState(dict):
             return 'Header file should not contain WebCore config.h.'
         if header_type == _PRIMARY_HEADER and file_is_header:
             return 'Header file should not contain itself.'
+        if header_type == _MOC_HEADER:
+            return ''
 
         error_message = ''
         if self._section != self._OTHER_SECTION:
@@ -2226,6 +2230,13 @@ def _classify_include(filename, include, is_system, include_state):
     elif include_state.visited_primary_section() and target_base == include_base:
         return _PRIMARY_HEADER
 
+    # Qt's moc files do not follow the naming and ordering rules, so they should be skipped
+    if include.startswith('moc_') and include.endswith('.cpp'):
+        return _MOC_HEADER
+
+    if include.endswith('.moc'):
+        return _MOC_HEADER
+
     return _OTHER_HEADER
 
 
@@ -2296,7 +2307,7 @@ def check_include_line(filename, clean_lines, line_number, include_state, error)
                   'You should add a blank line after implementation file\'s own header.')
 
     # Check to make sure all headers besides config.h and the primary header are
-    # alphabetically sorted.
+    # alphabetically sorted. Skip Qt's moc files.
     if not error_message and header_type == _OTHER_HEADER:
          previous_line_number = line_number - 1;
          previous_line = clean_lines.lines[previous_line_number]

-- 
WebKit Debian packaging