Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-12-20 02:42:57 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-12-20 02:42:57 +0300
commit9a9f39e4661163391bb8e3eb782438e425abe684 (patch)
treee67dc76e18b408a2708dc5b5f7a7b3e89bd552cf /source/blender/freestyle/intern/python/Iterator
parent6ccef2aa7e010c1e5b6986a696dc27ef8826c6c2 (diff)
Cleanup: remove redundant 'char *' casts
Diffstat (limited to 'source/blender/freestyle/intern/python/Iterator')
-rw-r--r--source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp8
-rw-r--r--source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp12
-rw-r--r--source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp16
-rw-r--r--source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp20
-rw-r--r--source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp18
-rw-r--r--source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp20
-rw-r--r--source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp16
-rw-r--r--source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp4
8 files changed, 39 insertions, 75 deletions
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 */
};