From 16b82845eee4198b2d56aa5a5c373008f5070f7f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Mar 2013 18:30:31 +0000 Subject: code cleanup: add 'const' to headers to quiet msvc warnings, also remove (char *) casts that aren't needed now we're on Python3.3 --- .../blender/python/generic/bpy_internal_import.c | 2 +- source/blender/python/intern/bpy.c | 2 +- source/blender/python/intern/bpy_driver.c | 4 +-- .../blender/python/intern/bpy_interface_atexit.c | 2 +- source/blender/python/intern/bpy_rna.c | 2 +- source/blender/python/mathutils/mathutils_noise.c | 34 +++++++++++----------- 6 files changed, 23 insertions(+), 23 deletions(-) (limited to 'source/blender/python') diff --git a/source/blender/python/generic/bpy_internal_import.c b/source/blender/python/generic/bpy_internal_import.c index 0c0ad50ebe4..734d4b6b83f 100644 --- a/source/blender/python/generic/bpy_internal_import.c +++ b/source/blender/python/generic/bpy_internal_import.c @@ -81,7 +81,7 @@ void bpy_import_init(PyObject *builtins) /* move reload here * XXX, use import hooks */ - mod = PyImport_ImportModuleLevel((char *)"imp", NULL, NULL, NULL, 0); + mod = PyImport_ImportModuleLevel("imp", NULL, NULL, NULL, 0); if (mod) { PyObject *mod_dict = PyModule_GetDict(mod); diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index a0e7c4332e1..36fd78db1b7 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -222,7 +222,7 @@ static PyMethodDef meth_bpy_resource_path = static PyObject *bpy_import_test(const char *modname) { - PyObject *mod = PyImport_ImportModuleLevel((char *)modname, NULL, NULL, NULL, 0); + PyObject *mod = PyImport_ImportModuleLevel(modname, NULL, NULL, NULL, 0); if (mod) { Py_DECREF(mod); } diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index c49794ad37a..72bfda89b64 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -75,14 +75,14 @@ int bpy_pydriver_create_dict(void) } /* add bpy to global namespace */ - mod = PyImport_ImportModuleLevel((char *)"bpy", NULL, NULL, NULL, 0); + mod = PyImport_ImportModuleLevel("bpy", NULL, NULL, NULL, 0); if (mod) { PyDict_SetItemString(bpy_pydriver_Dict, "bpy", mod); Py_DECREF(mod); } /* add noise to global namespace */ - mod = PyImport_ImportModuleLevel((char *)"mathutils", NULL, NULL, NULL, 0); + mod = PyImport_ImportModuleLevel("mathutils", NULL, NULL, NULL, 0); if (mod) { PyObject *modsub = PyDict_GetItemString(PyModule_GetDict(mod), "noise"); PyDict_SetItemString(bpy_pydriver_Dict, "noise", modsub); diff --git a/source/blender/python/intern/bpy_interface_atexit.c b/source/blender/python/intern/bpy_interface_atexit.c index d1d33a01e55..5c4f6ba327c 100644 --- a/source/blender/python/intern/bpy_interface_atexit.c +++ b/source/blender/python/intern/bpy_interface_atexit.c @@ -57,7 +57,7 @@ static void atexit_func_call(const char *func_name, PyObject *atexit_func_arg) * this is intended, but if its problematic it could be changed * - campbell */ - PyObject *atexit_mod = PyImport_ImportModuleLevel((char *)"atexit", NULL, NULL, NULL, 0); + PyObject *atexit_mod = PyImport_ImportModuleLevel("atexit", NULL, NULL, NULL, 0); PyObject *atexit_func = PyObject_GetAttrString(atexit_mod, func_name); PyObject *args = PyTuple_New(1); PyObject *ret; diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 0adb5e2e90e..8fe75032a46 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -6118,7 +6118,7 @@ static PyObject *pyrna_srna_ExternalType(StructRNA *srna) PyObject *newclass; if (bpy_types_dict == NULL) { - PyObject *bpy_types = PyImport_ImportModuleLevel((char *)"bpy_types", NULL, NULL, NULL, 0); + PyObject *bpy_types = PyImport_ImportModuleLevel("bpy_types", NULL, NULL, NULL, 0); if (bpy_types == NULL) { PyErr_Print(); diff --git a/source/blender/python/mathutils/mathutils_noise.c b/source/blender/python/mathutils/mathutils_noise.c index 4977663038d..31663bd369d 100644 --- a/source/blender/python/mathutils/mathutils_noise.c +++ b/source/blender/python/mathutils/mathutils_noise.c @@ -870,16 +870,16 @@ PyMODINIT_FUNC PyInit_mathutils_noise_types(void) { PyObject *submodule = PyModule_Create(&M_NoiseTypes_module_def); - PyModule_AddIntConstant(submodule, (char *)"BLENDER", TEX_BLENDER); - PyModule_AddIntConstant(submodule, (char *)"STDPERLIN", TEX_STDPERLIN); - PyModule_AddIntConstant(submodule, (char *)"NEWPERLIN", TEX_NEWPERLIN); - PyModule_AddIntConstant(submodule, (char *)"VORONOI_F1", TEX_VORONOI_F1); - PyModule_AddIntConstant(submodule, (char *)"VORONOI_F2", TEX_VORONOI_F2); - PyModule_AddIntConstant(submodule, (char *)"VORONOI_F3", TEX_VORONOI_F3); - PyModule_AddIntConstant(submodule, (char *)"VORONOI_F4", TEX_VORONOI_F4); - PyModule_AddIntConstant(submodule, (char *)"VORONOI_F2F1", TEX_VORONOI_F2F1); - PyModule_AddIntConstant(submodule, (char *)"VORONOI_CRACKLE", TEX_VORONOI_CRACKLE); - PyModule_AddIntConstant(submodule, (char *)"CELLNOISE", TEX_CELLNOISE); + PyModule_AddIntConstant(submodule, "BLENDER", TEX_BLENDER); + PyModule_AddIntConstant(submodule, "STDPERLIN", TEX_STDPERLIN); + PyModule_AddIntConstant(submodule, "NEWPERLIN", TEX_NEWPERLIN); + PyModule_AddIntConstant(submodule, "VORONOI_F1", TEX_VORONOI_F1); + PyModule_AddIntConstant(submodule, "VORONOI_F2", TEX_VORONOI_F2); + PyModule_AddIntConstant(submodule, "VORONOI_F3", TEX_VORONOI_F3); + PyModule_AddIntConstant(submodule, "VORONOI_F4", TEX_VORONOI_F4); + PyModule_AddIntConstant(submodule, "VORONOI_F2F1", TEX_VORONOI_F2F1); + PyModule_AddIntConstant(submodule, "VORONOI_CRACKLE", TEX_VORONOI_CRACKLE); + PyModule_AddIntConstant(submodule, "CELLNOISE", TEX_CELLNOISE); return submodule; } @@ -900,13 +900,13 @@ PyMODINIT_FUNC PyInit_mathutils_noise_metrics(void) { PyObject *submodule = PyModule_Create(&M_NoiseMetrics_module_def); - PyModule_AddIntConstant(submodule, (char *)"DISTANCE", TEX_DISTANCE); - PyModule_AddIntConstant(submodule, (char *)"DISTANCE_SQUARED", TEX_DISTANCE_SQUARED); - PyModule_AddIntConstant(submodule, (char *)"MANHATTAN", TEX_MANHATTAN); - PyModule_AddIntConstant(submodule, (char *)"CHEBYCHEV", TEX_CHEBYCHEV); - PyModule_AddIntConstant(submodule, (char *)"MINKOVSKY_HALF", TEX_MINKOVSKY_HALF); - PyModule_AddIntConstant(submodule, (char *)"MINKOVSKY_FOUR", TEX_MINKOVSKY_FOUR); - PyModule_AddIntConstant(submodule, (char *)"MINKOVSKY", TEX_MINKOVSKY); + PyModule_AddIntConstant(submodule, "DISTANCE", TEX_DISTANCE); + PyModule_AddIntConstant(submodule, "DISTANCE_SQUARED", TEX_DISTANCE_SQUARED); + PyModule_AddIntConstant(submodule, "MANHATTAN", TEX_MANHATTAN); + PyModule_AddIntConstant(submodule, "CHEBYCHEV", TEX_CHEBYCHEV); + PyModule_AddIntConstant(submodule, "MINKOVSKY_HALF", TEX_MINKOVSKY_HALF); + PyModule_AddIntConstant(submodule, "MINKOVSKY_FOUR", TEX_MINKOVSKY_FOUR); + PyModule_AddIntConstant(submodule, "MINKOVSKY", TEX_MINKOVSKY); return submodule; } -- cgit v1.2.3