[Bf-blender-cvs] [9a9f39e4661] master: Cleanup: remove redundant 'char *' casts
Campbell Barton
noreply at git.blender.org
Fri Dec 20 00:48:18 CET 2019
Commit: 9a9f39e4661163391bb8e3eb782438e425abe684
Author: Campbell Barton
Date: Fri Dec 20 10:42:57 2019 +1100
Branches: master
https://developer.blender.org/rB9a9f39e4661163391bb8e3eb782438e425abe684
Cleanup: remove redundant 'char *' casts
===================================================================
M source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
M source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
M source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
M source/blender/freestyle/intern/python/BPy_Id.cpp
M source/blender/freestyle/intern/python/BPy_Interface0D.cpp
M source/blender/freestyle/intern/python/BPy_Interface1D.cpp
M source/blender/freestyle/intern/python/BPy_Iterator.cpp
M source/blender/freestyle/intern/python/BPy_SShape.cpp
M source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
M source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
M source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
M source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
M source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
M source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
M source/blender/freestyle/intern/python/BPy_ViewMap.cpp
M source/blender/freestyle/intern/python/BPy_ViewShape.cpp
M source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
M source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
M source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
M source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
M source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
M source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
M source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
M source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
M source/blender/python/bmesh/bmesh_py_ops.c
M source/blender/python/bmesh/bmesh_py_types.c
M source/blender/python/bmesh/bmesh_py_types_customdata.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blender/python/bmesh/bmesh_py_types_select.c
M source/blender/python/generic/bgl.c
M source/blender/python/generic/idprop_py_api.c
M source/blender/python/generic/imbuf_py_api.c
M source/blender/python/gpu/gpu_py_offscreen.c
M source/blender/python/gpu/gpu_py_shader.c
M source/blender/python/intern/bpy_app.c
M source/blender/python/intern/bpy_app_alembic.c
M source/blender/python/intern/bpy_app_build_options.c
M source/blender/python/intern/bpy_app_ffmpeg.c
M source/blender/python/intern/bpy_app_handlers.c
M source/blender/python/intern/bpy_app_ocio.c
M source/blender/python/intern/bpy_app_oiio.c
M source/blender/python/intern/bpy_app_opensubdiv.c
M source/blender/python/intern/bpy_app_openvdb.c
M source/blender/python/intern/bpy_app_sdl.c
M source/blender/python/intern/bpy_app_translations.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/intern/bpy_utils_units.c
M source/blender/python/mathutils/mathutils_Color.c
M source/blender/python/mathutils/mathutils_Euler.c
M source/blender/python/mathutils/mathutils_Matrix.c
M source/blender/python/mathutils/mathutils_Quaternion.c
M source/blender/python/mathutils/mathutils_bvhtree.c
M source/blender/python/mathutils/mathutils_kdtree.c
===================================================================
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
index ee207e06b35..a631b45f6d4 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
@@ -139,11 +139,7 @@ static PyObject *BinaryPredicate0D_name_get(BPy_BinaryPredicate0D *self, void *U
}
static PyGetSetDef BPy_BinaryPredicate0D_getseters[] = {
- {(char *)"name",
- (getter)BinaryPredicate0D_name_get,
- (setter)NULL,
- (char *)BinaryPredicate0D_name_doc,
- NULL},
+ {"name", (getter)BinaryPredicate0D_name_get, (setter)NULL, BinaryPredicate0D_name_doc, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
index 647b5522d35..9add706bea7 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
@@ -175,11 +175,7 @@ static PyObject *BinaryPredicate1D_name_get(BPy_BinaryPredicate1D *self, void *U
}
static PyGetSetDef BPy_BinaryPredicate1D_getseters[] = {
- {(char *)"name",
- (getter)BinaryPredicate1D_name_get,
- (setter)NULL,
- (char *)BinaryPredicate1D_name_doc,
- NULL},
+ {"name", (getter)BinaryPredicate1D_name_get, (setter)NULL, BinaryPredicate1D_name_doc, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index 7a5469cd414..2c226e330d7 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -459,40 +459,40 @@ static int FrsMaterial_priority_set(BPy_FrsMaterial *self, PyObject *value, void
}
static PyGetSetDef BPy_FrsMaterial_getseters[] = {
- {(char *)"line",
+ {"line",
(getter)FrsMaterial_line_get,
(setter)FrsMaterial_line_set,
- (char *)FrsMaterial_line_doc,
+ FrsMaterial_line_doc,
NULL},
- {(char *)"diffuse",
+ {"diffuse",
(getter)FrsMaterial_diffuse_get,
(setter)FrsMaterial_diffuse_set,
- (char *)FrsMaterial_diffuse_doc,
+ FrsMaterial_diffuse_doc,
NULL},
- {(char *)"specular",
+ {"specular",
(getter)FrsMaterial_specular_get,
(setter)FrsMaterial_specular_set,
- (char *)FrsMaterial_specular_doc,
+ FrsMaterial_specular_doc,
NULL},
- {(char *)"ambient",
+ {"ambient",
(getter)FrsMaterial_ambient_get,
(setter)FrsMaterial_ambient_set,
- (char *)FrsMaterial_ambient_doc,
+ FrsMaterial_ambient_doc,
NULL},
- {(char *)"emission",
+ {"emission",
(getter)FrsMaterial_emission_get,
(setter)FrsMaterial_emission_set,
- (char *)FrsMaterial_emission_doc,
+ FrsMaterial_emission_doc,
NULL},
- {(char *)"shininess",
+ {"shininess",
(getter)FrsMaterial_shininess_get,
(setter)FrsMaterial_shininess_set,
- (char *)FrsMaterial_shininess_doc,
+ FrsMaterial_shininess_doc,
NULL},
- {(char *)"priority",
+ {"priority",
(getter)FrsMaterial_priority_get,
(setter)FrsMaterial_priority_set,
- (char *)FrsMaterial_priority_doc,
+ FrsMaterial_priority_doc,
NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp
index 2c50767c5aa..4f61ba847f6 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Id.cpp
@@ -162,8 +162,8 @@ static int Id_second_set(BPy_Id *self, PyObject *value, void *UNUSED(closure))
}
static PyGetSetDef BPy_Id_getseters[] = {
- {(char *)"first", (getter)Id_first_get, (setter)Id_first_set, (char *)Id_first_doc, NULL},
- {(char *)"second", (getter)Id_second_get, (setter)Id_second_set, (char *)Id_second_doc, NULL},
+ {"first", (getter)Id_first_get, (setter)Id_first_set, Id_first_doc, NULL},
+ {"second", (getter)Id_second_get, (setter)Id_second_set, Id_second_doc, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index 40e5267460b..628a9d43b6c 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -275,42 +275,26 @@ static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void *UNUSED(clos
}
static PyGetSetDef BPy_Interface0D_getseters[] = {
- {(char *)"name",
- (getter)Interface0D_name_get,
- (setter)NULL,
- (char *)Interface0D_name_doc,
- NULL},
- {(char *)"point_3d",
- (getter)Interface0D_point_3d_get,
- (setter)NULL,
- (char *)Interface0D_point_3d_doc,
- NULL},
- {(char *)"projected_x",
+ {"name", (getter)Interface0D_name_get, (setter)NULL, Interface0D_name_doc, NULL},
+ {"point_3d", (getter)Interface0D_point_3d_get, (setter)NULL, Interface0D_point_3d_doc, NULL},
+ {"projected_x",
(getter)Interface0D_projected_x_get,
(setter)NULL,
- (char *)Interface0D_projected_x_doc,
+ Interface0D_projected_x_doc,
NULL},
- {(char *)"projected_y",
+ {"projected_y",
(getter)Interface0D_projected_y_get,
(setter)NULL,
- (char *)Interface0D_projected_y_doc,
+ Interface0D_projected_y_doc,
NULL},
- {(char *)"projected_z",
+ {"projected_z",
(getter)Interface0D_projected_z_get,
(setter)NULL,
- (char *)Interface0D_projected_z_doc,
- NULL},
- {(char *)"point_2d",
- (getter)Interface0D_point_2d_get,
- (setter)NULL,
- (char *)Interface0D_point_2d_doc,
- NULL},
- {(char *)"id", (getter)Interface0D_id_get, (setter)NULL, (char *)Interface0D_id_doc, NULL},
- {(char *)"nature",
- (getter)Interface0D_nature_get,
- (setter)NULL,
- (char *)Interface0D_nature_doc,
+ Interface0D_projected_z_doc,
NULL},
+ {"point_2d", (getter)Interface0D_point_2d_get, (setter)NULL, Interface0D_point_2d_doc, NULL},
+ {"id", (getter)Interface0D_id_get, (setter)NULL, Interface0D_id_doc, NULL},
+ {"nature", (getter)Interface0D_nature_get, (setter)NULL, Interface0D_nature_doc, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index ca14a473216..af1f8d2d549 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -318,26 +318,18 @@ static int Interface1D_time_stamp_set(BPy_Interface1D *self,
}
static PyGetSetDef BPy_Interface1D_getseters[] = {
- {(char *)"name",
- (getter)Interface1D_name_get,
- (setter)NULL,
- (char *)Interface1D_name_doc,
- NULL},
- {(char *)"id", (getter)Interface1D_id_get, (setter)NULL, (char *)Interface1D_id_doc, NULL},
- {(char *)"nature",
- (getter)Interface1D_nature_get,
- (setter)NULL,
- (char *)Interface1D_nature_doc,
- NULL},
- {(char *)"length_2d",
+ {"name", (getter)Interface1D_name_get, (setter)NULL, Interface1D_name_doc, NULL},
+ {"id", (getter)Interface1D_id_get, (setter)NULL, Interface1D_id_doc, NULL},
+ {"nature", (getter)Interface1D_nature_get, (setter)NULL, Interface1D_nature_doc, NULL},
+ {"length_2d",
(getter)Interface1D_length_2d_get,
(setter)NULL,
- (char *)Interface1D_length_2d_doc,
+ Interface1D_length_2d_doc,
NULL},
- {(char *)"time_stamp",
+ {"time_stamp",
(getter)Interface1D_time_stamp_get,
(setter)Interface1D_time_stamp_set,
- (char *)Interface1D_time_stamp_doc,
+ Interface1D_time_stamp_doc,
NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index d2575b3b5e9..daa2bdbef81 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -217,17 +217,9 @@ static PyObject *Iterator_is_end_get(BPy_Iterator *self, void *UNUSED(closure))
}
static PyGetSetDef BPy_Iterator_getseters[] = {
- {(char *)"name", (getter)Iterator_name_get, (setter)NULL, (char *)Iterator_name_doc, NULL},
- {(char *)"is_begin",
- (getter)Iterator_is_begin_get,
- (setter)NULL,
- (char *)Iterator_is_begin_doc,
- NULL},
- {(char *)"is_end",
- (getter)Iterator_is_end_get,
- (setter)NULL,
- (char *)Iterator_is_end_doc,
- NULL},
+ {"name", (getter)Iterator_name_get, (setter)NULL, Iterator_name_doc, NULL},
+ {"is_begin", (getter)Iterator_is_begin_get, (setter)NULL, Iterator_is_begin_doc, NULL},
+ {"is_end", (getter)Iterator_is_end_get, (setter)NULL, Iterator_is_end_doc, NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp
index d007fead345..d4b5f426a8b 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp
@@ -268,23 +268,11 @@ static PyObject *SShape_edges_get(BPy_SShape *self, void *UNUSED(closure))
}
static PyGetSetDef BPy_SShape_getseters[] = {
- {(char *)"id", (getter)SShape_id_get, (setter)SShape_id_set, (char *)SShape_id_doc, NULL},
- {(char *)"name",
- (getter)SShape_name_get,
- (setter)SShape_name_set,
- (char *)SShape_name_doc,
- NULL},
- {(char *)"bbox",
- (getter)SShape_bbox_get,
- (setter)SShape_bbox_set,
- (char *)SShape_bbox_doc,
- NULL},
- {(char *)"edges", (getter)SShape_edges_get, (setter)NULL, (char *)SShape_edges_doc, NULL},
- {(char *)"vertices",
- (getter)SShape_vertices_get,
- (setter)NULL,
- (char *)SShape_vertices_doc,
- NULL},
+ {"id", (
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list