[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55359] trunk/blender/source: code cleanup : add 'const' to headers to quiet msvc warnings, also remove (char *) casts that aren't needed now we're on Python3.3
Campbell Barton
ideasman42 at gmail.com
Sun Mar 17 19:30:32 CET 2013
Revision: 55359
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55359
Author: campbellbarton
Date: 2013-03-17 18:30:31 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
code cleanup: add 'const' to headers to quiet msvc warnings, also remove (char *) casts that aren't needed now we're on Python3.3
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_path_util.h
trunk/blender/source/blender/python/generic/bpy_internal_import.c
trunk/blender/source/blender/python/intern/bpy.c
trunk/blender/source/blender/python/intern/bpy_driver.c
trunk/blender/source/blender/python/intern/bpy_interface_atexit.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/python/mathutils/mathutils_noise.c
trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
trunk/blender/source/gameengine/VideoTexture/PyTypeList.cpp
trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
Modified: trunk/blender/source/blender/blenlib/BLI_path_util.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_path_util.h 2013-03-17 18:09:09 UTC (rev 55358)
+++ trunk/blender/source/blender/blenlib/BLI_path_util.h 2013-03-17 18:30:31 UTC (rev 55359)
@@ -86,10 +86,10 @@
void BLI_make_file_string(const char *relabase, char *string, const char *dir, const char *file);
void BLI_make_exist(char *dir);
void BLI_make_existing_file(const char *name);
-void BLI_split_dirfile(const char *string, char *dir, char *file, size_t dirlen, size_t filelen);
-void BLI_split_dir_part(const char *string, char *dir, size_t dirlen);
-void BLI_split_file_part(const char *string, char *file, size_t filelen);
-void BLI_join_dirfile(char *string, size_t maxlen, const char *dir, const char *file);
+void BLI_split_dirfile(const char *string, char *dir, char *file, const size_t dirlen, const size_t filelen);
+void BLI_split_dir_part(const char *string, char *dir, const size_t dirlen);
+void BLI_split_file_part(const char *string, char *file, const size_t filelen);
+void BLI_join_dirfile(char *string, const size_t maxlen, const char *dir, const char *file);
const char *BLI_path_basename(const char *path);
typedef enum bli_rebase_state {
@@ -105,7 +105,7 @@
void BLI_del_slash(char *string);
const char *BLI_first_slash(const char *string);
-void BLI_getlastdir(const char *dir, char *last, size_t maxlen);
+void BLI_getlastdir(const char *dir, char *last, const size_t maxlen);
bool BLI_testextensie(const char *str, const char *ext);
bool BLI_testextensie_array(const char *str, const char **ext_array);
bool BLI_testextensie_glob(const char *str, const char *ext_fnmatch);
@@ -117,7 +117,7 @@
void BLI_newname(char *name, int add);
int BLI_stringdec(const char *string, char *head, char *start, unsigned short *numlen);
void BLI_stringenc(char *string, const char *head, const char *tail, unsigned short numlen, int pic);
-int BLI_split_name_num(char *left, int *nr, const char *name, char delim);
+int BLI_split_name_num(char *left, int *nr, const char *name, const char delim);
/* make sure path separators conform to system one */
void BLI_clean(char *path)
Modified: trunk/blender/source/blender/python/generic/bpy_internal_import.c
===================================================================
--- trunk/blender/source/blender/python/generic/bpy_internal_import.c 2013-03-17 18:09:09 UTC (rev 55358)
+++ trunk/blender/source/blender/python/generic/bpy_internal_import.c 2013-03-17 18:30:31 UTC (rev 55359)
@@ -81,7 +81,7 @@
/* 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);
Modified: trunk/blender/source/blender/python/intern/bpy.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy.c 2013-03-17 18:09:09 UTC (rev 55358)
+++ trunk/blender/source/blender/python/intern/bpy.c 2013-03-17 18:30:31 UTC (rev 55359)
@@ -222,7 +222,7 @@
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);
}
Modified: trunk/blender/source/blender/python/intern/bpy_driver.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_driver.c 2013-03-17 18:09:09 UTC (rev 55358)
+++ trunk/blender/source/blender/python/intern/bpy_driver.c 2013-03-17 18:30:31 UTC (rev 55359)
@@ -75,14 +75,14 @@
}
/* 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);
Modified: trunk/blender/source/blender/python/intern/bpy_interface_atexit.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface_atexit.c 2013-03-17 18:09:09 UTC (rev 55358)
+++ trunk/blender/source/blender/python/intern/bpy_interface_atexit.c 2013-03-17 18:30:31 UTC (rev 55359)
@@ -57,7 +57,7 @@
* 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;
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2013-03-17 18:09:09 UTC (rev 55358)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2013-03-17 18:30:31 UTC (rev 55359)
@@ -6118,7 +6118,7 @@
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();
Modified: trunk/blender/source/blender/python/mathutils/mathutils_noise.c
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils_noise.c 2013-03-17 18:09:09 UTC (rev 55358)
+++ trunk/blender/source/blender/python/mathutils/mathutils_noise.c 2013-03-17 18:30:31 UTC (rev 55359)
@@ -870,16 +870,16 @@
{
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 @@
{
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;
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp 2013-03-17 18:09:09 UTC (rev 55358)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp 2013-03-17 18:30:31 UTC (rev 55359)
@@ -270,7 +270,7 @@
* their user count. Not to mention holding references to wrapped data.
* This is especially bad when the PyObject for the wrapped data is freed, after blender
* has already dealocated the pointer */
- PySys_SetObject( (char *)"last_traceback", NULL);
+ PySys_SetObject("last_traceback", NULL);
PyErr_Clear(); /* just to be sure */
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp 2013-03-17 18:09:09 UTC (rev 55358)
+++ trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp 2013-03-17 18:30:31 UTC (rev 55359)
@@ -154,7 +154,7 @@
{
PyErr_Print();
PyErr_Clear();
- PySys_SetObject( (char *)"last_traceback", NULL);
+ PySys_SetObject("last_traceback", NULL);
}
}
else
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2013-03-17 18:09:09 UTC (rev 55358)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list