Changeset 52636 in webkit

Timestamp:

Dec 29, 2009 3:06:30 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-29 Chang Shu <​Chang.Shu@nokia.com>

Reviewed by Adam Barth.

[Qt] Move logic that handles Qt headers before primary headers
so that Qt headers won't be treated as primary headers by mistake.
​https://bugs.webkit.org/show_bug.cgi?id=32991

• Scripts/modules/cpp_style.py:
• Scripts/modules/cpp_style_unittest.py:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-29  Chang Shu  <Chang.Shu@nokia.com>
+
+        Reviewed by Adam Barth.
+
+        [Qt] Move logic that handles Qt headers before primary headers
+        so that Qt headers won't be treated as primary headers by mistake.
+        https://bugs.webkit.org/show_bug.cgi?id=32991
+
+        * Scripts/modules/cpp_style.py:
+        * Scripts/modules/cpp_style_unittest.py:
+
 2009-12-29  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/modules/cpp_style.py

@@ -2217 +2217 @@
         return _OTHER_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
+
     # If the target file basename starts with the include we're checking
     # then we consider it the primary header.
@@ -2230 +2237 @@
     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

trunk/WebKitTools/Scripts/modules/cpp_style_unittest.py

@@ -2222 +2222 @@
                                           'Foo.h',
                                           False, include_state))
+        self.assertEqual(cpp_style._MOC_HEADER,
+                         classify_include('foo.cpp',
+                                          'foo.moc',
+                                          False, include_state))
+        self.assertEqual(cpp_style._MOC_HEADER,
+                         classify_include('foo.cpp',
+                                          'moc_foo.cpp',
+                                          False, include_state))
         # Tricky example where both includes might be classified as primary.
         self.assert_language_rules_check('ScrollbarThemeWince.cpp',