Changeset 52575 in webkit

Timestamp:

Dec 27, 2009 1:11:20 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-27 Yael Aharon <​yael.aharon@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:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/cpp_style.py (modified) (5 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-27  Yael Aharon  <yael.aharon@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@webkit.org>
 

trunk/WebKitTools/Scripts/modules/cpp_style.py

@@ -124 +124 @@
 _PRIMARY_HEADER = 1
 _OTHER_HEADER = 2
+_MOC_HEADER = 3
 
 
@@ -182 +183 @@
         _PRIMARY_HEADER: 'header this file implements',
         _OTHER_HEADER: 'other header',
+        _MOC_HEADER: 'moc file',
         }
     _SECTION_NAMES = {
@@ -218 +220 @@
         if header_type == _PRIMARY_HEADER and file_is_header:
             return 'Header file should not contain itself.'
+        if header_type == _MOC_HEADER:
+            return ''
 
         error_message = ''
@@ -2227 +2231 @@
         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
 
@@ -2297 +2308 @@
 
     # 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;