Cleanup: remove redundant 'char *' casts

6 files changed, 66 insertions, 98 deletions

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 */
 };