[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16628] trunk/blender/source: [#17600] char* -> const char*

Campbell Barton ideasman42 at gmail.com
Sat Sep 20 13:08:35 CEST 2008


Revision: 16628
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16628
Author:   campbellbarton
Date:     2008-09-20 13:08:35 +0200 (Sat, 20 Sep 2008)

Log Message:
-----------
[#17600] char* -> const char*
Thanks to Sean Bartell (wtachi), was causing many many warnings which distracted from the real problems.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/action.c
    trunk/blender/source/blender/blenlib/BLI_blenlib.h
    trunk/blender/source/blender/blenlib/intern/util.c
    trunk/blender/source/blender/yafray/intern/export_File.cpp
    trunk/blender/source/blender/yafray/intern/export_Plugin.cpp
    trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
    trunk/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_PythonController.h
    trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    trunk/blender/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
    trunk/blender/source/gameengine/GamePlayer/common/GPC_RawImage.h
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
    trunk/blender/source/gameengine/Ketsji/BL_Shader.h
    trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_ConstraintActuator.h
    trunk/blender/source/gameengine/Ketsji/KX_GameActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
    trunk/blender/source/gameengine/Ketsji/KX_RaySensor.cpp
    trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_StateActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
    trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c	2008-09-20 11:04:01 UTC (rev 16627)
+++ trunk/blender/source/blender/blenkernel/intern/action.c	2008-09-20 11:08:35 UTC (rev 16628)
@@ -1048,7 +1048,7 @@
 static float stridechannel_frame(Object *ob, float sizecorr, bActionStrip *strip, Path *path, float pathdist, float *stride_offset)
 {
 	bAction *act= strip->act;
-	char *name= strip->stridechannel;
+	const char *name= strip->stridechannel;
 	bActionChannel *achan= get_action_channel(act, name);
 	int stride_axis= strip->stride_axis;
 

Modified: trunk/blender/source/blender/blenlib/BLI_blenlib.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_blenlib.h	2008-09-20 11:04:01 UTC (rev 16627)
+++ trunk/blender/source/blender/blenlib/BLI_blenlib.h	2008-09-20 11:08:35 UTC (rev 16628)
@@ -224,7 +224,7 @@
 
 /* in util.c */
 #ifdef WITH_ICONV
-void BLI_string_to_utf8(char *original, char *utf_8, char *code);
+void BLI_string_to_utf8(char *original, char *utf_8, const char *code);
 #endif
 
 	/**

Modified: trunk/blender/source/blender/blenlib/intern/util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/util.c	2008-09-20 11:04:01 UTC (rev 16627)
+++ trunk/blender/source/blender/blenlib/intern/util.c	2008-09-20 11:08:35 UTC (rev 16628)
@@ -1955,7 +1955,7 @@
 #include "iconv.h"
 #include "localcharset.h"
 
-void BLI_string_to_utf8(char *original, char *utf_8, char *code)
+void BLI_string_to_utf8(char *original, char *utf_8, const char *code)
 {
 	size_t inbytesleft=strlen(original);
 	size_t outbytesleft=512;

Modified: trunk/blender/source/blender/yafray/intern/export_File.cpp
===================================================================
--- trunk/blender/source/blender/yafray/intern/export_File.cpp	2008-09-20 11:04:01 UTC (rev 16627)
+++ trunk/blender/source/blender/yafray/intern/export_File.cpp	2008-09-20 11:08:35 UTC (rev 16628)
@@ -96,7 +96,7 @@
 
 static string unixYafrayPath()
 {
-	static char *alternative[]=
+	static const char *alternative[]=
 	{
 		"/usr/local/bin/",
 		"/usr/bin/",

Modified: trunk/blender/source/blender/yafray/intern/export_Plugin.cpp
===================================================================
--- trunk/blender/source/blender/yafray/intern/export_Plugin.cpp	2008-09-20 11:04:01 UTC (rev 16627)
+++ trunk/blender/source/blender/yafray/intern/export_Plugin.cpp	2008-09-20 11:08:35 UTC (rev 16628)
@@ -98,7 +98,7 @@
 	string path=find_path();
 	return path;
 #else
-	static char *alternative[]=
+	static const char *alternative[]=
 	{
 		"/usr/local/lib/",
 #ifdef __x86_64__
@@ -124,7 +124,7 @@
 #ifdef WIN32
 	return find_path()+"\\plugins";
 #else
-	static char *alternative[]=
+	static const char *alternative[]=
 	{
 		"/usr/local/lib/yafray",
 #ifdef __x86_64__

Modified: trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp	2008-09-20 11:04:01 UTC (rev 16627)
+++ trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp	2008-09-20 11:08:35 UTC (rev 16628)
@@ -480,7 +480,7 @@
 }
 
 /*     setStart                                                              */
-char BL_ActionActuator::GetAction_doc[] = 
+const char BL_ActionActuator::GetAction_doc[] = 
 "getAction()\n"
 "\tReturns a string containing the name of the current action.\n";
 
@@ -494,7 +494,7 @@
 }
 
 /*     getProperty                                                             */
-char BL_ActionActuator::GetProperty_doc[] = 
+const char BL_ActionActuator::GetProperty_doc[] = 
 "getProperty()\n"
 "\tReturns the name of the property to be used in FromProp mode.\n";
 
@@ -509,7 +509,7 @@
 }
 
 /*     getProperty                                                             */
-char BL_ActionActuator::GetFrameProperty_doc[] = 
+const char BL_ActionActuator::GetFrameProperty_doc[] = 
 "getFrameProperty()\n"
 "\tReturns the name of the property, that is set to the current frame number.\n";
 
@@ -524,7 +524,7 @@
 }
 
 /*     getFrame                                                              */
-char BL_ActionActuator::GetFrame_doc[] = 
+const char BL_ActionActuator::GetFrame_doc[] = 
 "getFrame()\n"
 "\tReturns the current frame number.\n";
 
@@ -539,7 +539,7 @@
 }
 
 /*     getEnd                                                                */
-char BL_ActionActuator::GetEnd_doc[] = 
+const char BL_ActionActuator::GetEnd_doc[] = 
 "getEnd()\n"
 "\tReturns the last frame of the action.\n";
 
@@ -554,7 +554,7 @@
 }
 
 /*     getStart                                                              */
-char BL_ActionActuator::GetStart_doc[] = 
+const char BL_ActionActuator::GetStart_doc[] = 
 "getStart()\n"
 "\tReturns the starting frame of the action.\n";
 
@@ -569,7 +569,7 @@
 }
 
 /*     getBlendin                                                            */
-char BL_ActionActuator::GetBlendin_doc[] = 
+const char BL_ActionActuator::GetBlendin_doc[] = 
 "getBlendin()\n"
 "\tReturns the number of interpolation animation frames to be\n"
 "\tgenerated when this actuator is triggered.\n";
@@ -585,7 +585,7 @@
 }
 
 /*     getPriority                                                           */
-char BL_ActionActuator::GetPriority_doc[] = 
+const char BL_ActionActuator::GetPriority_doc[] = 
 "getPriority()\n"
 "\tReturns the priority for this actuator.  Actuators with lower\n"
 "\tPriority numbers will override actuators with higher numbers.\n";
@@ -601,7 +601,7 @@
 }
 
 /*     setAction                                                             */
-char BL_ActionActuator::SetAction_doc[] = 
+const char BL_ActionActuator::SetAction_doc[] = 
 "setAction(action, (reset))\n"
 "\t - action    : The name of the action to set as the current action.\n"
 "\t - reset     : Optional parameter indicating whether to reset the\n"
@@ -640,7 +640,7 @@
 }
 
 /*     setStart                                                              */
-char BL_ActionActuator::SetStart_doc[] = 
+const char BL_ActionActuator::SetStart_doc[] = 
 "setStart(start)\n"
 "\t - start     : Specifies the starting frame of the animation.\n";
 
@@ -661,7 +661,7 @@
 }
 
 /*     setEnd                                                                */
-char BL_ActionActuator::SetEnd_doc[] = 
+const char BL_ActionActuator::SetEnd_doc[] = 
 "setEnd(end)\n"
 "\t - end       : Specifies the ending frame of the animation.\n";
 
@@ -682,7 +682,7 @@
 }
 
 /*     setBlendin                                                            */
-char BL_ActionActuator::SetBlendin_doc[] = 
+const char BL_ActionActuator::SetBlendin_doc[] = 
 "setBlendin(blendin)\n"
 "\t - blendin   : Specifies the number of frames of animation to generate\n"
 "\t               when making transitions between actions.\n";
@@ -704,7 +704,7 @@
 }
 
 /*     setBlendtime                                                          */
-char BL_ActionActuator::SetBlendtime_doc[] = 
+const char BL_ActionActuator::SetBlendtime_doc[] = 
 "setBlendtime(blendtime)\n"
 "\t - blendtime : Allows the script to directly modify the internal timer\n"
 "\t               used when generating transitions between actions.  This\n"
@@ -731,7 +731,7 @@
 }
 
 /*     setPriority                                                           */
-char BL_ActionActuator::SetPriority_doc[] = 
+const char BL_ActionActuator::SetPriority_doc[] = 
 "setPriority(priority)\n"
 "\t - priority  : Specifies the new priority.  Actuators will lower\n"
 "\t               priority numbers will override actuators with higher\n"
@@ -754,7 +754,7 @@
 }
 
 /*     setFrame                                                              */
-char BL_ActionActuator::SetFrame_doc[] = 
+const char BL_ActionActuator::SetFrame_doc[] = 
 "setFrame(frame)\n"
 "\t - frame     : Specifies the new current frame for the animation\n";
 
@@ -779,7 +779,7 @@
 }
 
 /*     setProperty                                                           */
-char BL_ActionActuator::SetProperty_doc[] = 
+const char BL_ActionActuator::SetProperty_doc[] = 
 "setProperty(prop)\n"
 "\t - prop      : A string specifying the property name to be used in\n"
 "\t               FromProp playback mode.\n";
@@ -801,7 +801,7 @@
 }
 
 /*     setFrameProperty                                                          */
-char BL_ActionActuator::SetFrameProperty_doc[] = 
+const char BL_ActionActuator::SetFrameProperty_doc[] = 
 "setFrameProperty(prop)\n"
 "\t - prop      : A string specifying the property of the frame set up update.\n";
 
@@ -840,7 +840,7 @@
 */
 
 /*     setChannel                                                            */
-char BL_ActionActuator::SetChannel_doc[] = 
+const char BL_ActionActuator::SetChannel_doc[] = 
 "setChannel(channel, matrix)\n"
 "\t - channel   : A string specifying the name of the bone channel.\n"
 "\t - matrix    : A 4x4 matrix specifying the overriding transformation\n"
@@ -924,7 +924,7 @@
 }
 
 /* getType */
-char BL_ActionActuator::GetType_doc[] =
+const char BL_ActionActuator::GetType_doc[] =
 "getType()\n"
 "\tReturns the operation mode of the actuator.\n";
 PyObject* BL_ActionActuator::PyGetType(PyObject* self,
@@ -934,7 +934,7 @@
 }
 
 /* setType */
-char BL_ActionActuator::SetType_doc[] =
+const char BL_ActionActuator::SetType_doc[] =
 "setType(mode)\n"
 "\t - mode: Play (0), Flipper (2), LoopStop (3), LoopEnd (4) or Property (6)\n"
 "\tSet the operation mode of the actuator.\n";

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2008-09-20 11:04:01 UTC (rev 16627)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2008-09-20 11:08:35 UTC (rev 16628)
@@ -308,7 +308,7 @@
 typedef struct MTF_localLayer
 {
 	MTFace *face;
-	char *name;
+	const char *name;
 }MTF_localLayer;
 
 // ------------------------------------

Modified: trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
===================================================================

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list