[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47634] trunk/blender/source: code cleanup : doxy comment filename corrections

[Campbell Barton]

Revision: 47634
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47634
Author:   campbellbarton
Date:     2012-06-08 23:43:11 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
code cleanup: doxy comment filename corrections

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_string_cursor_utf8.h
    trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
    trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
    trunk/blender/source/blender/bmesh/operators/bmo_utils.c
    trunk/blender/source/blender/editors/mask/mask_edit.c
    trunk/blender/source/blender/editors/mask/mask_relationships.c
    trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c
    trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_boxmask.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_switch.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c
    trunk/blender/source/tools/check_style_c.py

Modified: trunk/blender/source/blender/blenlib/BLI_string_cursor_utf8.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_string_cursor_utf8.h	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/blenlib/BLI_string_cursor_utf8.h	2012-06-08 23:43:11 UTC (rev 47634)
@@ -26,7 +26,7 @@
 #ifndef __BLI_STRING_CURSOR_UTF8_H__
 #define __BLI_STRING_CURSOR_UTF8_H__
 
-/** \file BLI_string_utf8.h
+/** \file BLI_string_cursor_utf8.h
  *  \ingroup bli
  */
 

Modified: trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -20,7 +20,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/operators/bmesh_mesh_conv.c
+/** \file blender/bmesh/operators/bmo_mesh_conv.c
  *  \ingroup bmesh
  *
  * This file contains functions

Modified: trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -20,7 +20,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/operators/bmo_subdivide.c
+/** \file blender/bmesh/operators/bmo_triangulate.c
  *  \ingroup bmesh
  */
 

Modified: trunk/blender/source/blender/bmesh/operators/bmo_utils.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_utils.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/bmesh/operators/bmo_utils.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -20,7 +20,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/operators/bmo_subdivide.c
+/** \file blender/bmesh/operators/bmo_utils.c
  *  \ingroup bmesh
  *
  * utility bmesh operators, e.g. transform,

Modified: trunk/blender/source/blender/editors/mask/mask_edit.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_edit.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/editors/mask/mask_edit.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/mask/mask_ops.c
+/** \file blender/editors/mask/mask_edit.c
  *  \ingroup edmask
  */
 

Modified: trunk/blender/source/blender/editors/mask/mask_relationships.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_relationships.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/editors/mask/mask_relationships.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/mask/mask_relationshops.c
+/** \file blender/editors/mask/mask_relationships.c
  *  \ingroup edmask
  */
 

Modified: trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_clip/clip_graph_draw.c
+/** \file blender/editors/space_clip/clip_dopesheet_draw.c
  *  \ingroup spclip
  */
 

Modified: trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_clip/clip_graph_ops.c
+/** \file blender/editors/space_clip/clip_dopesheet_ops.c
  *  \ingroup spclip
  */
 

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehblur.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehblur.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -28,7 +28,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_blur.c
+/** \file blender/nodes/composite/nodes/node_composite_bokehblur.c
  *  \ingroup cmpnodes
  */
 

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -28,7 +28,7 @@
 
 */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_gamma.c
+/** \file blender/nodes/composite/nodes/node_composite_bokehimage.c
  *  \ingroup cmpnodes
  */
 

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_boxmask.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_boxmask.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_boxmask.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_math.c
+/** \file blender/nodes/composite/nodes/node_composite_boxmask.c
  *  \ingroup cmpnodes
  */
 

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_math.c
+/** \file blender/nodes/composite/nodes/node_composite_ellipsemask.c
  *  \ingroup cmpnodes
  */
 

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_switch.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_switch.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_switch.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_switch.c
+/** \file blender/nodes/composite/nodes/node_composite_switch.c
  *  \ingroup cmpnodes
  */
 

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c	2012-06-08 23:43:11 UTC (rev 47634)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/bmesh/bmesh_py_api.c
+/** \file blender/python/bmesh/bmesh_py_utils.c
  *  \ingroup pybmesh
  *
  * This file defines the 'bmesh.utils' module.

Modified: trunk/blender/source/tools/check_style_c.py
===================================================================
--- trunk/blender/source/tools/check_style_c.py	2012-06-08 22:07:57 UTC (rev 47633)
+++ trunk/blender/source/tools/check_style_c.py	2012-06-08 23:43:11 UTC (rev 47634)
@@ -368,6 +368,7 @@
     global filepath
 
     filepath = fp
+    filepath_base = os.path.basename(filepath)
 
     #print(highlight(code, CLexer(), RawTokenFormatter()).decode('utf-8'))
     code = open(filepath, 'r', encoding="utf-8").read()
@@ -399,7 +400,18 @@
             if tokens[i - 1].type != Token.Operator:
                 op, index_kw_end = extract_operator(i)
                 blender_check_operator(i, index_kw_end, op)
+        elif tok.type in Token.Comment:
+            doxyfn = None
+            if "\\file" in tok.text:
+                doxyfn = tok.text.split("\\file", 1)[1].strip().split()[0]
+            elif "@file" in tok.text:
+                doxyfn = tok.text.split("@file", 1)[1].strip().split()[0]
 
+            if doxyfn is not None:
+                doxyfn_base = os.path.basename(doxyfn)
+                if doxyfn_base != filepath_base:
+                    warning("doxygen filename mismatch %s != %s" % (doxyfn_base, filepath_base), i, i)
+
         # ensure line length
         if (not args.no_length_check) and tok.type == Token.Text and tok.text == "\n":
             # check line len