Cleanup: remove redundant 'char *' casts

44 files changed, 223 insertions, 383 deletions

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", (getter)SShape_id_get, (setter)SShape_id_set, SShape_id_doc, NULL},
+    {"name", (getter)SShape_name_get, (setter)SShape_name_set, SShape_name_doc, NULL},
+    {"bbox", (getter)SShape_bbox_get, (setter)SShape_bbox_set, SShape_bbox_doc, NULL},
+    {"edges", (getter)SShape_edges_get, (setter)NULL, SShape_edges_doc, NULL},
+    {"vertices", (getter)SShape_vertices_get, (setter)NULL, SShape_vertices_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
index e3d6738058e..5f5407e82e3 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
@@ -657,25 +657,25 @@ static int StrokeAttribute_visible_set(BPy_StrokeAttribute *self,
 }
 
 static PyGetSetDef BPy_StrokeAttribute_getseters[] = {
-    {(char *)"alpha",
+    {"alpha",
      (getter)StrokeAttribute_alpha_get,
      (setter)StrokeAttribute_alpha_set,
-     (char *)StrokeAttribute_alpha_doc,
+     StrokeAttribute_alpha_doc,
      NULL},
-    {(char *)"color",
+    {"color",
      (getter)StrokeAttribute_color_get,
      (setter)StrokeAttribute_color_set,
-     (char *)StrokeAttribute_color_doc,
+     StrokeAttribute_color_doc,
      NULL},
-    {(char *)"thickness",
+    {"thickness",
      (getter)StrokeAttribute_thickness_get,
      (setter)StrokeAttribute_thickness_set,
-     (char *)StrokeAttribute_thickness_doc,
+     StrokeAttribute_thickness_doc,
      NULL},
-    {(char *)"visible",
+    {"visible",
      (getter)StrokeAttribute_visible_get,
      (setter)StrokeAttribute_visible_set,
-     (char *)StrokeAttribute_visible_doc,
+     StrokeAttribute_visible_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
index baeb8cc4994..993afc2e32e 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
@@ -273,11 +273,7 @@ static PyObject *StrokeShader_name_get(BPy_StrokeShader *self, void *UNUSED(clos
 }
 
 static PyGetSetDef BPy_StrokeShader_getseters[] = {
-    {(char *)"name",
-     (getter)StrokeShader_name_get,
-     (setter)NULL,
-     (char *)StrokeShader_name_doc,
-     NULL},
+    {"name", (getter)StrokeShader_name_get, (setter)NULL, StrokeShader_name_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
index 81e72c2c7f2..6214ea94f41 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
@@ -109,11 +109,7 @@ static PyObject *UnaryFunction0D_name_get(BPy_UnaryFunction0D *self, void *UNUSE
 }
 
 static PyGetSetDef BPy_UnaryFunction0D_getseters[] = {
-    {(char *)"name",
-     (getter)UnaryFunction0D_name_get,
-     (setter)NULL,
-     (char *)UnaryFunction0D_name_doc,
-     NULL},
+    {"name", (getter)UnaryFunction0D_name_get, (setter)NULL, UnaryFunction0D_name_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
index b2bd6e657fe..18d6479a498 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
@@ -103,11 +103,7 @@ static PyObject *UnaryFunction1D_name_get(BPy_UnaryFunction1D *self, void *UNUSE
 }
 
 static PyGetSetDef BPy_UnaryFunction1D_getseters[] = {
-    {(char *)"name",
-     (getter)UnaryFunction1D_name_get,
-     (setter)NULL,
-     (char *)UnaryFunction1D_name_doc,
-     NULL},
+    {"name", (getter)UnaryFunction1D_name_get, (setter)NULL, UnaryFunction1D_name_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index f4f1205bb09..3d4191c2c44 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -154,11 +154,7 @@ static PyObject *UnaryPredicate0D_name_get(BPy_UnaryPredicate0D *self, void *UNU
 }
 
 static PyGetSetDef BPy_UnaryPredicate0D_getseters[] = {
-    {(char *)"name",
-     (getter)UnaryPredicate0D_name_get,
-     (setter)NULL,
-     (char *)UnaryPredicate0D_name_doc,
-     NULL},
+    {"name", (getter)UnaryPredicate0D_name_get, (setter)NULL, UnaryPredicate0D_name_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index 8bdd9823140..ba68d21f941 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -212,11 +212,7 @@ static PyObject *UnaryPredicate1D_name_get(BPy_UnaryPredicate1D *self, void *UNU
 }
 
 static PyGetSetDef BPy_UnaryPredicate1D_getseters[] = {
-    {(char *)"name",
-     (getter)UnaryPredicate1D_name_get,
-     (setter)NULL,
-     (char *)UnaryPredicate1D_name_doc,
-     NULL},
+    {"name", (getter)UnaryPredicate1D_name_get, (setter)NULL, UnaryPredicate1D_name_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
index b6ca377fb40..1f162997c44 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
@@ -171,10 +171,10 @@ static int ViewMap_scene_bbox_set(BPy_ViewMap *self, PyObject *value, void *UNUS
 }
 
 static PyGetSetDef BPy_ViewMap_getseters[] = {
-    {(char *)"scene_bbox",
+    {"scene_bbox",
      (getter)ViewMap_scene_bbox_get,
      (setter)ViewMap_scene_bbox_set,
-     (char *)ViewMap_scene_bbox_doc,
+     ViewMap_scene_bbox_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
index 79eeba17529..c08e7eea7b9 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
@@ -326,28 +326,24 @@ static PyObject *ViewShape_id_get(BPy_ViewShape *self, void *UNUSED(closure))
 }
 
 static PyGetSetDef BPy_ViewShape_getseters[] = {
-    {(char *)"sshape",
+    {"sshape",
      (getter)ViewShape_sshape_get,
      (setter)ViewShape_sshape_set,
-     (char *)ViewShape_sshape_doc,
+     ViewShape_sshape_doc,
      NULL},
-    {(char *)"vertices",
+    {"vertices",
      (getter)ViewShape_vertices_get,
      (setter)ViewShape_vertices_set,
-     (char *)ViewShape_vertices_doc,
+     ViewShape_vertices_doc,
      NULL},
-    {(char *)"edges",
-     (getter)ViewShape_edges_get,
-     (setter)ViewShape_edges_set,
-     (char *)ViewShape_edges_doc,
-     NULL},
-    {(char *)"name", (getter)ViewShape_name_get, (setter)NULL, (char *)ViewShape_name_doc, NULL},
-    {(char *)"library_path",
+    {"edges", (getter)ViewShape_edges_get, (setter)ViewShape_edges_set, ViewShape_edges_doc, NULL},
+    {"name", (getter)ViewShape_name_get, (setter)NULL, ViewShape_name_doc, NULL},
+    {"library_path",
      (getter)ViewShape_library_path_get,
      (setter)NULL,
-     (char *)ViewShape_library_path_doc,
+     ViewShape_library_path_doc,
      NULL},
-    {(char *)"id", (getter)ViewShape_id_get, (setter)NULL, (char *)ViewShape_id_doc, NULL},
+    {"id", (getter)ViewShape_id_get, (setter)NULL, ViewShape_id_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
index 49cd98376c5..6af80c4bfd9 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
@@ -233,22 +233,18 @@ static int CurvePoint_t2d_set(BPy_CurvePoint *self, PyObject *value, void *UNUSE
 }
 
 static PyGetSetDef BPy_CurvePoint_getseters[] = {
-    {(char *)"first_svertex",
+    {"first_svertex",
      (getter)CurvePoint_first_svertex_get,
      (setter)CurvePoint_first_svertex_set,
-     (char *)CurvePoint_first_svertex_doc,
+     CurvePoint_first_svertex_doc,
      NULL},
-    {(char *)"second_svertex",
+    {"second_svertex",
      (getter)CurvePoint_second_svertex_get,
      (setter)CurvePoint_second_svertex_set,
-     (char *)CurvePoint_second_svertex_doc,
-     NULL},
-    {(char *)"fedge", (getter)CurvePoint_fedge_get, NULL, CurvePoint_fedge_doc, NULL},
-    {(char *)"t2d",
-     (getter)CurvePoint_t2d_get,
-     (setter)CurvePoint_t2d_set,
-     (char *)CurvePoint_t2d_doc,
+     CurvePoint_second_svertex_doc,
      NULL},
+    {"fedge", (getter)CurvePoint_fedge_get, NULL, CurvePoint_fedge_doc, NULL},
+    {"t2d", (getter)CurvePoint_t2d_get, (setter)CurvePoint_t2d_set, CurvePoint_t2d_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index 08ad378ab75..71a87c2c01e 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -424,37 +424,25 @@ static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void *UNUSED(closure)
 }
 
 static PyGetSetDef BPy_SVertex_getseters[] = {
-    {(char *)"point_3d",
+    {"point_3d",
      (getter)SVertex_point_3d_get,
      (setter)SVertex_point_3d_set,
-     (char *)SVertex_point_3d_doc,
+     SVertex_point_3d_doc,
      NULL},
-    {(char *)"point_2d",
+    {"point_2d",
      (getter)SVertex_point_2d_get,
      (setter)SVertex_point_2d_set,
-     (char *)SVertex_point_2d_doc,
+     SVertex_point_2d_doc,
      NULL},
-    {(char *)"id", (getter)SVertex_id_get, (setter)SVertex_id_set, (char *)SVertex_id_doc, NULL},
-    {(char *)"normals",
-     (getter)SVertex_normals_get,
-     (setter)NULL,
-     (char *)SVertex_normals_doc,
-     NULL},
-    {(char *)"normals_size",
+    {"id", (getter)SVertex_id_get, (setter)SVertex_id_set, SVertex_id_doc, NULL},
+    {"normals", (getter)SVertex_normals_get, (setter)NULL, SVertex_normals_doc, NULL},
+    {"normals_size",
      (getter)SVertex_normals_size_get,
      (setter)NULL,
-     (char *)SVertex_normals_size_doc,
-     NULL},
-    {(char *)"viewvertex",
-     (getter)SVertex_viewvertex_get,
-     (setter)NULL,
-     (char *)SVertex_viewvertex_doc,
-     NULL},
-    {(char *)"curvatures",
-     (getter)SVertex_curvatures_get,
-     (setter)NULL,
-     (char *)SVertex_curvatures_doc,
+     SVertex_normals_size_doc,
      NULL},
+    {"viewvertex", (getter)SVertex_viewvertex_get, (setter)NULL, SVertex_viewvertex_doc, NULL},
+    {"curvatures", (getter)SVertex_curvatures_get, (setter)NULL, SVertex_curvatures_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
index 29bba040316..5ddb8a605ff 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
@@ -150,10 +150,10 @@ static int ViewVertex_nature_set(BPy_ViewVertex *self, PyObject *value, void *UN
 }
 
 static PyGetSetDef BPy_ViewVertex_getseters[] = {
-    {(char *)"nature",
+    {"nature",
      (getter)ViewVertex_nature_get,
      (setter)ViewVertex_nature_set,
-     (char *)ViewVertex_nature_doc,
+     ViewVertex_nature_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index 74d8fe4ce60..07373c91726 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -348,27 +348,27 @@ static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void *UNUSED(closure
 }
 
 static PyGetSetDef BPy_StrokeVertex_getseters[] = {
-    {(char *)"attribute",
+    {"attribute",
      (getter)StrokeVertex_attribute_get,
      (setter)StrokeVertex_attribute_set,
-     (char *)StrokeVertex_attribute_doc,
+     StrokeVertex_attribute_doc,
      NULL},
-    {(char *)"curvilinear_abscissa",
+    {"curvilinear_abscissa",
      (getter)StrokeVertex_curvilinear_abscissa_get,
      (setter)StrokeVertex_curvilinear_abscissa_set,
-     (char *)StrokeVertex_curvilinear_abscissa_doc,
+     StrokeVertex_curvilinear_abscissa_doc,
      NULL},
-    {(char *)"point",
+    {"point",
      (getter)StrokeVertex_point_get,
      (setter)StrokeVertex_point_set,
-     (char *)StrokeVertex_point_doc,
+     StrokeVertex_point_doc,
      NULL},
-    {(char *)"stroke_length",
+    {"stroke_length",
      (getter)StrokeVertex_stroke_length_get,
      (setter)StrokeVertex_stroke_length_set,
-     (char *)StrokeVertex_stroke_length_doc,
+     StrokeVertex_stroke_length_doc,
      NULL},
-    {(char *)"u", (getter)StrokeVertex_u_get, (setter)NULL, (char *)StrokeVertex_u_doc, NULL},
+    {"u", (getter)StrokeVertex_u_get, (setter)NULL, StrokeVertex_u_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
index 315c0b16061..9295e4f424b 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
@@ -97,10 +97,10 @@ static int NonTVertex_svertex_set(BPy_NonTVertex *self, PyObject *value, void *U
 }
 
 static PyGetSetDef BPy_NonTVertex_getseters[] = {
-    {(char *)"svertex",
+    {"svertex",
      (getter)NonTVertex_svertex_get,
      (setter)NonTVertex_svertex_set,
-     (char *)NonTVertex_svertex_doc,
+     NonTVertex_svertex_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
index 7b23fdb04f1..8fa48e54b55 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
@@ -199,17 +199,17 @@ static int TVertex_id_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closu
 }
 
 static PyGetSetDef BPy_TVertex_getseters[] = {
-    {(char *)"front_svertex",
+    {"front_svertex",
      (getter)TVertex_front_svertex_get,
      (setter)TVertex_front_svertex_set,
-     (char *)TVertex_front_svertex_doc,
+     TVertex_front_svertex_doc,
      NULL},
-    {(char *)"back_svertex",
+    {"back_svertex",
      (getter)TVertex_back_svertex_get,
      (setter)TVertex_back_svertex_set,
-     (char *)TVertex_back_svertex_doc,
+     TVertex_back_svertex_doc,
      NULL},
-    {(char *)"id", (getter)TVertex_id_get, (setter)TVertex_id_set, (char *)TVertex_id_doc, NULL},
+    {"id", (getter)TVertex_id_get, (setter)TVertex_id_set, TVertex_id_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
index 070e54c9305..adbf01cd777 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
@@ -323,42 +323,34 @@ static int FEdge_nature_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closu
 }
 
 static PyGetSetDef BPy_FEdge_getseters[] = {
-    {(char *)"first_svertex",
+    {"first_svertex",
      (getter)FEdge_first_svertex_get,
      (setter)FEdge_first_svertex_set,
-     (char *)FEdge_first_svertex_doc,
+     FEdge_first_svertex_doc,
      NULL},
-    {(char *)"second_svertex",
+    {"second_svertex",
      (getter)FEdge_second_svertex_get,
      (setter)FEdge_second_svertex_set,
-     (char *)FEdge_second_svertex_doc,
+     FEdge_second_svertex_doc,
      NULL},
-    {(char *)"next_fedge",
+    {"next_fedge",
      (getter)FEdge_next_fedge_get,
      (setter)FEdge_next_fedge_set,
-     (char *)FEdge_next_fedge_doc,
+     FEdge_next_fedge_doc,
      NULL},
-    {(char *)"previous_fedge",
+    {"previous_fedge",
      (getter)FEdge_previous_fedge_get,
      (setter)FEdge_previous_fedge_set,
-     (char *)FEdge_previous_fedge_doc,
+     FEdge_previous_fedge_doc,
      NULL},
-    {(char *)"viewedge",
-     (getter)FEdge_viewedge_get,
-     (setter)FEdge_viewedge_set,
-     (char *)FEdge_viewedge_doc,
-     NULL},
-    {(char *)"is_smooth",
+    {"viewedge", (getter)FEdge_viewedge_get, (setter)FEdge_viewedge_set, FEdge_viewedge_doc, NULL},
+    {"is_smooth",
      (getter)FEdge_is_smooth_get,
      (setter)FEdge_is_smooth_set,
-     (char *)FEdge_is_smooth_doc,
-     NULL},
-    {(char *)"id", (getter)FEdge_id_get, (setter)FEdge_id_set, (char *)FEdge_id_doc, NULL},
-    {(char *)"nature",
-     (getter)FEdge_nature_get,
-     (setter)FEdge_nature_set,
-     (char *)FEdge_nature_doc,
+     FEdge_is_smooth_doc,
      NULL},
+    {"id", (getter)FEdge_id_get, (setter)FEdge_id_set, FEdge_id_doc, NULL},
+    {"nature", (getter)FEdge_nature_get, (setter)FEdge_nature_set, FEdge_nature_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
index 932911fb6e6..fd434f9c4ef 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
@@ -180,15 +180,11 @@ static PyObject *FrsCurve_segments_size_get(BPy_FrsCurve *self, void *UNUSED(clo
 }
 
 static PyGetSetDef BPy_FrsCurve_getseters[] = {
-    {(char *)"is_empty",
-     (getter)FrsCurve_is_empty_get,
-     (setter)NULL,
-     (char *)FrsCurve_is_empty_doc,
-     NULL},
-    {(char *)"segments_size",
+    {"is_empty", (getter)FrsCurve_is_empty_get, (setter)NULL, FrsCurve_is_empty_doc, NULL},
+    {"segments_size",
      (getter)FrsCurve_segments_size_get,
      (setter)NULL,
-     (char *)FrsCurve_segments_size_doc,
+     FrsCurve_segments_size_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
index df80f61a7a6..444a69adf30 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
@@ -466,27 +466,23 @@ static int Stroke_id_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure
 }
 
 static PyGetSetDef BPy_Stroke_getseters[] = {
-    {(char *)"medium_type",
+    {"medium_type",
      (getter)Stroke_medium_type_get,
      (setter)Stroke_medium_type_set,
-     (char *)Stroke_medium_type_doc,
+     Stroke_medium_type_doc,
      NULL},
-    {(char *)"texture_id",
+    {"texture_id",
      (getter)Stroke_texture_id_get,
      (setter)Stroke_texture_id_set,
-     (char *)Stroke_texture_id_doc,
+     Stroke_texture_id_doc,
      NULL},
-    {(char *)"tips",
-     (getter)Stroke_tips_get,
-     (setter)Stroke_tips_set,
-     (char *)Stroke_tips_doc,
-     NULL},
-    {(char *)"length_2d",
+    {"tips", (getter)Stroke_tips_get, (setter)Stroke_tips_set, Stroke_tips_doc, NULL},
+    {"length_2d",
      (getter)Stroke_length_2d_get,
      (setter)Stroke_length_2d_set,
-     (char *)Stroke_length_2d_doc,
+     Stroke_length_2d_doc,
      NULL},
-    {(char *)"id", (getter)Stroke_id_get, (setter)Stroke_id_set, (char *)Stroke_id_doc, NULL},
+    {"id", (getter)Stroke_id_get, (setter)Stroke_id_set, Stroke_id_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
index 208d6cbfd6d..0570d9790ab 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
@@ -331,60 +331,48 @@ static int ViewEdge_chaining_time_stamp_set(BPy_ViewEdge *self,
 }
 
 static PyGetSetDef BPy_ViewEdge_getseters[] = {
-    {(char *)"first_viewvertex",
+    {"first_viewvertex",
      (getter)ViewEdge_first_viewvertex_get,
      (setter)ViewEdge_first_viewvertex_set,
-     (char *)ViewEdge_first_viewvertex_doc,
+     ViewEdge_first_viewvertex_doc,
      NULL},
-    {(char *)"last_viewvertex",
+    {"last_viewvertex",
      (getter)ViewEdge_last_viewvertex_get,
      (setter)ViewEdge_last_viewvertex_set,
-     (char *)ViewEdge_last_viewvertex_doc,
+     ViewEdge_last_viewvertex_doc,
      NULL},
-    {(char *)"first_fedge",
+    {"first_fedge",
      (getter)ViewEdge_first_fedge_get,
      (setter)ViewEdge_first_fedge_set,
-     (char *)ViewEdge_first_fedge_doc,
+     ViewEdge_first_fedge_doc,
      NULL},
-    {(char *)"last_fedge",
+    {"last_fedge",
      (getter)ViewEdge_last_fedge_get,
      (setter)ViewEdge_last_fedge_set,
-     (char *)ViewEdge_last_fedge_doc,
+     ViewEdge_last_fedge_doc,
      NULL},
-    {(char *)"viewshape",
+    {"viewshape",
      (getter)ViewEdge_viewshape_get,
      (setter)ViewEdge_viewshape_set,
-     (char *)ViewEdge_viewshape_doc,
+     ViewEdge_viewshape_doc,
      NULL},
-    {(char *)"occludee",
+    {"occludee",
      (getter)ViewEdge_occludee_get,
      (setter)ViewEdge_occludee_set,
-     (char *)ViewEdge_occludee_doc,
+     ViewEdge_occludee_doc,
      NULL},
-    {(char *)"is_closed",
-     (getter)ViewEdge_is_closed_get,
-     (setter)NULL,
-     (char *)ViewEdge_is_closed_doc,
-     NULL},
-    {(char *)"id",
-     (getter)ViewEdge_id_get,
-     (setter)ViewEdge_id_set,
-     (char *)ViewEdge_id_doc,
-     NULL},
-    {(char *)"nature",
+    {"is_closed", (getter)ViewEdge_is_closed_get, (setter)NULL, ViewEdge_is_closed_doc, NULL},
+    {"id", (getter)ViewEdge_id_get, (setter)ViewEdge_id_set, ViewEdge_id_doc, NULL},
+    {"nature",
      (getter)ViewEdge_nature_get,
      (setter)ViewEdge_nature_set,
-     (char *)ViewEdge_nature_doc,
-     NULL},
-    {(char *)"qi",
-     (getter)ViewEdge_qi_get,
-     (setter)ViewEdge_qi_set,
-     (char *)ViewEdge_qi_doc,
+     ViewEdge_nature_doc,
      NULL},
-    {(char *)"chaining_time_stamp",
+    {"qi", (getter)ViewEdge_qi_get, (setter)ViewEdge_qi_set, ViewEdge_qi_doc, NULL},
+    {"chaining_time_stamp",
      (getter)ViewEdge_chaining_time_stamp_get,
      (setter)ViewEdge_chaining_time_stamp_set,
-     (char *)ViewEdge_chaining_time_stamp_doc,
+     ViewEdge_chaining_time_stamp_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
index 018d0c77bb0..725daa80b5e 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
@@ -364,45 +364,45 @@ static int FEdgeSharp_face_mark_left_set(BPy_FEdgeSharp *self,
 }
 
 static PyGetSetDef BPy_FEdgeSharp_getseters[] = {
-    {(char *)"normal_right",
+    {"normal_right",
      (getter)FEdgeSharp_normal_right_get,
      (setter)FEdgeSharp_normal_right_set,
-     (char *)FEdgeSharp_normal_right_doc,
+     FEdgeSharp_normal_right_doc,
      NULL},
-    {(char *)"normal_left",
+    {"normal_left",
      (getter)FEdgeSharp_normal_left_get,
      (setter)FEdgeSharp_normal_left_set,
-     (char *)FEdgeSharp_normal_left_doc,
+     FEdgeSharp_normal_left_doc,
      NULL},
-    {(char *)"material_index_right",
+    {"material_index_right",
      (getter)FEdgeSharp_material_index_right_get,
      (setter)FEdgeSharp_material_index_right_set,
-     (char *)FEdgeSharp_material_index_right_doc,
+     FEdgeSharp_material_index_right_doc,
      NULL},
-    {(char *)"material_index_left",
+    {"material_index_left",
      (getter)FEdgeSharp_material_index_left_get,
      (setter)FEdgeSharp_material_index_left_set,
-     (char *)FEdgeSharp_material_index_left_doc,
+     FEdgeSharp_material_index_left_doc,
      NULL},
-    {(char *)"material_right",
+    {"material_right",
      (getter)FEdgeSharp_material_right_get,
      (setter)NULL,
-     (char *)FEdgeSharp_material_right_doc,
+     FEdgeSharp_material_right_doc,
      NULL},
-    {(char *)"material_left",
+    {"material_left",
      (getter)FEdgeSharp_material_left_get,
      (setter)NULL,
-     (char *)FEdgeSharp_material_left_doc,
+     FEdgeSharp_material_left_doc,
      NULL},
-    {(char *)"face_mark_right",
+    {"face_mark_right",
      (getter)FEdgeSharp_face_mark_right_get,
      (setter)FEdgeSharp_face_mark_right_set,
-     (char *)FEdgeSharp_face_mark_right_doc,
+     FEdgeSharp_face_mark_right_doc,
      NULL},
-    {(char *)"face_mark_left",
+    {"face_mark_left",
      (getter)FEdgeSharp_face_mark_left_get,
      (setter)FEdgeSharp_face_mark_left_set,
-     (char *)FEdgeSharp_face_mark_left_doc,
+     FEdgeSharp_face_mark_left_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
index 4c2785509f0..65d9dcbe01f 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -229,25 +229,21 @@ static int FEdgeSmooth_face_mark_set(BPy_FEdgeSmooth *self, PyObject *value, voi
 }
 
 static PyGetSetDef BPy_FEdgeSmooth_getseters[] = {
-    {(char *)"normal",
+    {"normal",
      (getter)FEdgeSmooth_normal_get,
      (setter)FEdgeSmooth_normal_set,
-     (char *)FEdgeSmooth_normal_doc,
+     FEdgeSmooth_normal_doc,
      NULL},
-    {(char *)"material_index",
+    {"material_index",
      (getter)FEdgeSmooth_material_index_get,
      (setter)FEdgeSmooth_material_index_set,
-     (char *)FEdgeSmooth_material_index_doc,
+     FEdgeSmooth_material_index_doc,
      NULL},
-    {(char *)"material",
-     (getter)FEdgeSmooth_material_get,
-     (setter)NULL,
-     (char *)FEdgeSmooth_material_doc,
-     NULL},
-    {(char *)"face_mark",
+    {"material", (getter)FEdgeSmooth_material_get, (setter)NULL, FEdgeSmooth_material_doc, NULL},
+    {"face_mark",
      (getter)FEdgeSmooth_face_mark_get,
      (setter)FEdgeSmooth_face_mark_set,
-     (char *)FEdgeSmooth_face_mark_doc,
+     FEdgeSmooth_face_mark_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
index 4264e96afc3..74ae7809284 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -172,15 +172,15 @@ static PyObject *AdjacencyIterator_is_incoming_get(BPy_AdjacencyIterator *self,
 }
 
 static PyGetSetDef BPy_AdjacencyIterator_getseters[] = {
-    {(char *)"is_incoming",
+    {"is_incoming",
      (getter)AdjacencyIterator_is_incoming_get,
      (setter)NULL,
-     (char *)AdjacencyIterator_is_incoming_doc,
+     AdjacencyIterator_is_incoming_doc,
      NULL},
-    {(char *)"object",
+    {"object",
      (getter)AdjacencyIterator_object_get,
      (setter)NULL,
-     (char *)AdjacencyIterator_object_doc,
+     AdjacencyIterator_object_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
index b2042107453..b6d841c5b64 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
@@ -234,20 +234,20 @@ static PyObject *ChainingIterator_is_incrementing_get(BPy_ChainingIterator *self
 }
 
 static PyGetSetDef BPy_ChainingIterator_getseters[] = {
-    {(char *)"object",
+    {"object",
      (getter)ChainingIterator_object_get,
      (setter)NULL,
-     (char *)ChainingIterator_object_doc,
+     ChainingIterator_object_doc,
      NULL},
-    {(char *)"next_vertex",
+    {"next_vertex",
      (getter)ChainingIterator_next_vertex_get,
      (setter)NULL,
-     (char *)ChainingIterator_next_vertex_doc,
+     ChainingIterator_next_vertex_doc,
      NULL},
-    {(char *)"is_incrementing",
+    {"is_incrementing",
      (getter)ChainingIterator_is_incrementing_get,
      (setter)NULL,
-     (char *)ChainingIterator_is_incrementing_doc,
+     ChainingIterator_is_incrementing_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
index abc10b75ea1..6ea61a060cb 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
@@ -123,21 +123,13 @@ static PyObject *CurvePointIterator_u_get(BPy_CurvePointIterator *self, void *UN
 }
 
 static PyGetSetDef BPy_CurvePointIterator_getseters[] = {
-    {(char *)"object",
+    {"object",
      (getter)CurvePointIterator_object_get,
      (setter)NULL,
-     (char *)CurvePointIterator_object_doc,
-     NULL},
-    {(char *)"t",
-     (getter)CurvePointIterator_t_get,
-     (setter)NULL,
-     (char *)CurvePointIterator_t_doc,
-     NULL},
-    {(char *)"u",
-     (getter)CurvePointIterator_u_get,
-     (setter)NULL,
-     (char *)CurvePointIterator_u_doc,
+     CurvePointIterator_object_doc,
      NULL},
+    {"t", (getter)CurvePointIterator_t_get, (setter)NULL, CurvePointIterator_t_doc, NULL},
+    {"u", (getter)CurvePointIterator_u_get, (setter)NULL, CurvePointIterator_u_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index 8428badc0fd..0dbef9f325c 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -192,25 +192,17 @@ static PyObject *Interface0DIterator_at_last_get(BPy_Interface0DIterator *self,
 }
 
 static PyGetSetDef BPy_Interface0DIterator_getseters[] = {
-    {(char *)"object",
+    {"object",
      (getter)Interface0DIterator_object_get,
      (setter)NULL,
-     (char *)Interface0DIterator_object_doc,
+     Interface0DIterator_object_doc,
      NULL},
-    {(char *)"t",
-     (getter)Interface0DIterator_t_get,
-     (setter)NULL,
-     (char *)Interface0DIterator_t_doc,
-     NULL},
-    {(char *)"u",
-     (getter)Interface0DIterator_u_get,
-     (setter)NULL,
-     (char *)Interface0DIterator_u_doc,
-     NULL},
-    {(char *)"at_last",
+    {"t", (getter)Interface0DIterator_t_get, (setter)NULL, Interface0DIterator_t_doc, NULL},
+    {"u", (getter)Interface0DIterator_u_get, (setter)NULL, Interface0DIterator_u_doc, NULL},
+    {"at_last",
      (getter)Interface0DIterator_at_last_get,
      (setter)NULL,
-     (char *)Interface0DIterator_at_last_doc,
+     Interface0DIterator_at_last_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
index 260776e8965..dd738b97473 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -151,21 +151,9 @@ static PyObject *SVertexIterator_u_get(BPy_SVertexIterator *self, void *UNUSED(c
 }
 
 static PyGetSetDef BPy_SVertexIterator_getseters[] = {
-    {(char *)"object",
-     (getter)SVertexIterator_object_get,
-     (setter)NULL,
-     (char *)SVertexIterator_object_doc,
-     NULL},
-    {(char *)"t",
-     (getter)SVertexIterator_t_get,
-     (setter)NULL,
-     (char *)SVertexIterator_t_doc,
-     NULL},
-    {(char *)"u",
-     (getter)SVertexIterator_u_get,
-     (setter)NULL,
-     (char *)SVertexIterator_u_doc,
-     NULL},
+    {"object", (getter)SVertexIterator_object_get, (setter)NULL, SVertexIterator_object_doc, NULL},
+    {"t", (getter)SVertexIterator_t_get, (setter)NULL, SVertexIterator_t_doc, NULL},
+    {"u", (getter)SVertexIterator_u_get, (setter)NULL, SVertexIterator_u_doc, NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
 
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
index 4269dfb3cdd..84f57f1fe31 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -265,25 +265,17 @@ static PyObject *StrokeVertexIterator_at_last_get(BPy_StrokeVertexIterator *self
 }
 
 static PyGetSetDef BPy_StrokeVertexIterator_getseters[] = {
-    {(char *)"object",
+    {"object",
      (getter)StrokeVertexIterator_object_get,
      (setter)NULL,
-     (char *)StrokeVertexIterator_object_doc,
+     StrokeVertexIterator_object_doc,
      NULL},
-    {(char *)"t",
-     (getter)StrokeVertexIterator_t_get,
-     (setter)NULL,
-     (char *)StrokeVertexIterator_t_doc,
-     NULL},
-    {(char *)"u",
-     (getter)StrokeVertexIterator_u_get,
-     (setter)NULL,
-     (char *)StrokeVertexIterator_u_doc,
-     NULL},
-    {(char *)"at_last",
+    {"t", (getter)StrokeVertexIterator_t_get, (setter)NULL, StrokeVertexIterator_t_doc, NULL},
+    {"u", (getter)StrokeVertexIterator_u_get, (setter)NULL, StrokeVertexIterator_u_doc, NULL},
+    {"at_last",
      (getter)StrokeVertexIterator_at_last_get,
      (setter)NULL,
-     (char *)StrokeVertexIterator_at_last_doc,
+     StrokeVertexIterator_at_last_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index df56cbe822e..c8a978784a4 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -214,25 +214,25 @@ static int ViewEdgeIterator_begin_set(BPy_ViewEdgeIterator *self,
 }
 
 static PyGetSetDef BPy_ViewEdgeIterator_getseters[] = {
-    {(char *)"object",
+    {"object",
      (getter)ViewEdgeIterator_object_get,
      (setter)NULL,
-     (char *)ViewEdgeIterator_object_doc,
+     ViewEdgeIterator_object_doc,
      NULL},
-    {(char *)"current_edge",
+    {"current_edge",
      (getter)ViewEdgeIterator_current_edge_get,
      (setter)ViewEdgeIterator_current_edge_set,
-     (char *)ViewEdgeIterator_current_edge_doc,
+     ViewEdgeIterator_current_edge_doc,
      NULL},
-    {(char *)"orientation",
+    {"orientation",
      (getter)ViewEdgeIterator_orientation_get,
      (setter)ViewEdgeIterator_orientation_set,
-     (char *)ViewEdgeIterator_orientation_doc,
+     ViewEdgeIterator_orientation_doc,
      NULL},
-    {(char *)"begin",
+    {"begin",
      (getter)ViewEdgeIterator_begin_get,
      (setter)ViewEdgeIterator_begin_set,
-     (char *)ViewEdgeIterator_begin_doc,
+     ViewEdgeIterator_begin_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
index 821a92184d1..fe6210468d1 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -131,10 +131,10 @@ static PyObject *orientedViewEdgeIterator_object_get(BPy_orientedViewEdgeIterato
 }
 
 static PyGetSetDef BPy_orientedViewEdgeIterator_getseters[] = {
-    {(char *)"object",
+    {"object",
      (getter)orientedViewEdgeIterator_object_get,
      (setter)NULL,
-     (char *)orientedViewEdgeIterator_object_doc,
+     orientedViewEdgeIterator_object_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
index bed2d5d578a..543375fa85b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
@@ -258,10 +258,10 @@ static int integration_type_set(BPy_UnaryFunction1DDouble *self,
 }
 
 static PyGetSetDef BPy_UnaryFunction1DDouble_getseters[] = {
-    {(char *)"integration_type",
+    {"integration_type",
      (getter)integration_type_get,
      (setter)integration_type_set,
-     (char *)integration_type_doc,
+     integration_type_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
index e122454c00d..fcc72cf7b71 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
@@ -165,10 +165,10 @@ static int integration_type_set(BPy_UnaryFunction1DEdgeNature *self,
 }
 
 static PyGetSetDef BPy_UnaryFunction1DEdgeNature_getseters[] = {
-    {(char *)"integration_type",
+    {"integration_type",
      (getter)integration_type_get,
      (setter)integration_type_set,
-     (char *)integration_type_doc,
+     integration_type_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
index 95d49612672..ef4de9a77dc 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
@@ -154,10 +154,10 @@ static int integration_type_set(BPy_UnaryFunction1DFloat *self,
 }
 
 static PyGetSetDef BPy_UnaryFunction1DFloat_getseters[] = {
-    {(char *)"integration_type",
+    {"integration_type",
      (getter)integration_type_get,
      (setter)integration_type_set,
-     (char *)integration_type_doc,
+     integration_type_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
index 851fc45d583..5be9e2dee28 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
@@ -165,10 +165,10 @@ static int integration_type_set(BPy_UnaryFunction1DUnsigned *self,
 }
 
 static PyGetSetDef BPy_UnaryFunction1DUnsigned_getseters[] = {
-    {(char *)"integration_type",
+    {"integration_type",
      (getter)integration_type_get,
      (setter)integration_type_set,
-     (char *)integration_type_doc,
+     integration_type_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
index 75225fd6381..58ab705e8c1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
@@ -169,10 +169,10 @@ static int integration_type_set(BPy_UnaryFunction1DVec2f *self,
 }
 
 static PyGetSetDef BPy_UnaryFunction1DVec2f_getseters[] = {
-    {(char *)"integration_type",
+    {"integration_type",
      (getter)integration_type_get,
      (setter)integration_type_set,
-     (char *)integration_type_doc,
+     integration_type_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
index a2767e826ab..e1f64e7cd82 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
@@ -162,10 +162,10 @@ static int integration_type_set(BPy_UnaryFunction1DVec3f *self,
 }
 
 static PyGetSetDef BPy_UnaryFunction1DVec3f_getseters[] = {
-    {(char *)"integration_type",
+    {"integration_type",
      (getter)integration_type_get,
      (setter)integration_type_set,
-     (char *)integration_type_doc,
+     integration_type_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
index 0739f327f55..12b985bc707 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
@@ -190,10 +190,10 @@ static int integration_type_set(BPy_UnaryFunction1DVectorViewShape *self,
 }
 
 static PyGetSetDef BPy_UnaryFunction1DVectorViewShape_getseters[] = {
-    {(char *)"integration_type",
+    {"integration_type",
      (getter)integration_type_get,
      (setter)integration_type_set,
-     (char *)integration_type_doc,
+     integration_type_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
index ca1e35f66bd..3b55a20939e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
@@ -177,10 +177,10 @@ static int integration_type_set(BPy_UnaryFunction1DVoid *self,
 }
 
 static PyGetSetDef BPy_UnaryFunction1DVoid_getseters[] = {
-    {(char *)"integration_type",
+    {"integration_type",
      (getter)integration_type_get,
      (setter)integration_type_set,
-     (char *)integration_type_doc,
+     integration_type_doc,
      NULL},
     {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
 };