Title: [98950] trunk/Tools
- Revision
- 98950
- Author
- [email protected]
- Date
- 2011-11-01 04:36:17 -0700 (Tue, 01 Nov 2011)
Log Message
check-webkit-style: Allow names starting with "_q_".
https://bugs.webkit.org/show_bug.cgi?id=70625
Reviewed by Tor Arne Vestbø.
Used by the Qt port as the standard prefix for private slots.
* Scripts/webkitpy/style/checkers/cpp.py:
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (98949 => 98950)
--- trunk/Tools/ChangeLog 2011-11-01 10:35:36 UTC (rev 98949)
+++ trunk/Tools/ChangeLog 2011-11-01 11:36:17 UTC (rev 98950)
@@ -1,3 +1,15 @@
+2011-11-01 Jocelyn Turcotte <[email protected]>
+
+ check-webkit-style: Allow names starting with "_q_".
+ https://bugs.webkit.org/show_bug.cgi?id=70625
+
+ Reviewed by Tor Arne Vestbø.
+
+ Used by the Qt port as the standard prefix for private slots.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+
2011-11-01 Simon Hausmann <[email protected]>
[Qt][WK2] Fix valgrind error about uninitialized variable
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (98949 => 98950)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2011-11-01 10:35:36 UTC (rev 98949)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2011-11-01 11:36:17 UTC (rev 98950)
@@ -3047,12 +3047,14 @@
and not modified_identifier.startswith('NPP_')
and not modified_identifier.startswith('NP_')
and not modified_identifier.startswith('qt_')
+ and not modified_identifier.startswith('_q_')
and not modified_identifier.startswith('cairo_')
and not modified_identifier.startswith('Ecore_')
and not modified_identifier.startswith('Eina_')
and not modified_identifier.startswith('Evas_')
and not modified_identifier.startswith('Ewk_')
and not modified_identifier.find('::qt_') >= 0
+ and not modified_identifier.find('::_q_') >= 0
and not modified_identifier == "const_iterator"
and not modified_identifier == "vm_throw"):
error(line_number, 'readability/naming', 4, identifier + " is incorrectly named. Don't use underscores in your identifier names.")
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (98949 => 98950)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2011-11-01 10:35:36 UTC (rev 98949)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2011-11-01 11:36:17 UTC (rev 98950)
@@ -4421,9 +4421,11 @@
# There is an exception for some unit tests that begin with "tst_".
self.assert_lint('void tst_QWebFrame::arrayObjectEnumerable(int var1, int var2)', '')
- # The Qt API uses names that begin with "qt_".
+ # The Qt API uses names that begin with "qt_" or "_q_".
self.assert_lint('void QTFrame::qt_drt_is_awesome(int var1, int var2)', '')
+ self.assert_lint('void QTFrame::_q_drt_is_awesome(int var1, int var2)', '')
self.assert_lint('void qt_drt_is_awesome(int var1, int var2);', '')
+ self.assert_lint('void _q_drt_is_awesome(int var1, int var2);', '')
# Cairo forward-declarations should not be a failure.
self.assert_lint('typedef struct _cairo cairo_t;', '')
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
