code cleanup:

- remove unused defines.
- quiet some shadow warnings.
- bevel, ifdef out some asserts that are too common.
- style

19 files changed, 53 insertions, 53 deletions

diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index 0bd09146f3a..2918ec8bce7 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -123,7 +123,7 @@ void BL_ActionActuator::ProcessReplica()
 	
 }
 
-void BL_ActionActuator::SetBlendTime (float newtime)
+void BL_ActionActuator::SetBlendTime(float newtime)
 {
 	m_blendframe = newtime;
 }
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index c5dea5d0b43..dcf99502a3e 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -2107,7 +2107,7 @@ struct parentChildLink {
 #include "DNA_constraint_types.h"
 //XXX #include "BIF_editconstraint.h"
 
-static bPoseChannel *get_active_posechannel2 (Object *ob)
+static bPoseChannel *get_active_posechannel2(Object *ob)
 {
 	bArmature *arm= (bArmature*)ob->data;
 	bPoseChannel *pchan;
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index 4806ed04cc6..67712c683f9 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -105,7 +105,7 @@ void BL_ShapeActionActuator::ProcessReplica()
 	m_lastUpdate=-1;
 }
 
-void BL_ShapeActionActuator::SetBlendTime (float newtime)
+void BL_ShapeActionActuator::SetBlendTime(float newtime)
 {
 	m_blendframe = newtime;
 }
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index 706cfc13ca3..7b20b4b2d97 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -144,7 +144,7 @@ effect: deletes the object
 #define VALUE_POS(val1)       (val1)->Calc(VALUE_POS_OPERATOR, val1)
 
 
-STR_String CValue::op2str (VALUE_OPERATOR op)
+STR_String CValue::op2str(VALUE_OPERATOR op)
 {
 	//pre:
 	//ret: the stringrepresentation of operator op
diff --git a/source/gameengine/GameLogic/SCA_LogicManager.cpp b/source/gameengine/GameLogic/SCA_LogicManager.cpp
index 1263514d475..adf57dec278 100644
--- a/source/gameengine/GameLogic/SCA_LogicManager.cpp
+++ b/source/gameengine/GameLogic/SCA_LogicManager.cpp
@@ -249,7 +249,7 @@ void SCA_LogicManager::UpdateFrame(double curtime, bool frame)
 
 
 
-void* SCA_LogicManager::GetActionByName (const STR_String& actname)
+void *SCA_LogicManager::GetActionByName(const STR_String& actname)
 {
 	STR_HashedString an = actname;
 	void** actptr = m_mapStringToActions[an];
diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp
index 138124f9b1a..95798900ccc 100644
--- a/source/gameengine/Ketsji/KX_FontObject.cpp
+++ b/source/gameengine/Ketsji/KX_FontObject.cpp
@@ -117,7 +117,7 @@ void KX_FontObject::ProcessReplica()
 	KX_GetActiveScene()->AddFont(this);
 }
 
-int GetFontId (VFont *vfont)
+int GetFontId(VFont *vfont)
 {
 	PackedFile *packedfile=NULL;
 	int fontid = -1;
diff --git a/source/gameengine/VideoTexture/Exception.cpp b/source/gameengine/VideoTexture/Exception.cpp
index 8b8918d8141..89d95d26971 100644
--- a/source/gameengine/VideoTexture/Exception.cpp
+++ b/source/gameengine/VideoTexture/Exception.cpp
@@ -40,8 +40,8 @@
 ExceptionID ErrGeneral, ErrNotFound;
 
 // exception descriptions
-ExpDesc errGenerDesc (ErrGeneral, "General Error");
-ExpDesc errNFoundDesc (ErrNotFound, "Error description not found");
+ExpDesc errGenerDesc(ErrGeneral, "General Error");
+ExpDesc errNFoundDesc(ErrNotFound, "Error description not found");
 
 
 
diff --git a/source/gameengine/VideoTexture/FilterBase.cpp b/source/gameengine/VideoTexture/FilterBase.cpp
index a232bcc1201..66552cde928 100644
--- a/source/gameengine/VideoTexture/FilterBase.cpp
+++ b/source/gameengine/VideoTexture/FilterBase.cpp
@@ -105,7 +105,7 @@ PyObject *Filter_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 // object deallocation
-void Filter_dealloc (PyFilter *self)
+void Filter_dealloc(PyFilter *self)
 {
 	// release object attributes
 	if (self->m_filter != NULL)
@@ -139,7 +139,7 @@ PyObject *Filter_getPrevious (PyFilter *self, void *closure)
 
 
 // set previous pixel filter object
-int Filter_setPrevious (PyFilter *self, PyObject *value, void *closure)
+int Filter_setPrevious(PyFilter *self, PyObject *value, void *closure)
 {
 	// if filter object is available
 	if (self->m_filter != NULL)
diff --git a/source/gameengine/VideoTexture/FilterBlueScreen.cpp b/source/gameengine/VideoTexture/FilterBlueScreen.cpp
index 662ecabd283..857da12c28d 100644
--- a/source/gameengine/VideoTexture/FilterBlueScreen.cpp
+++ b/source/gameengine/VideoTexture/FilterBlueScreen.cpp
@@ -84,7 +84,7 @@ static PyObject *getColor (PyFilter *self, void *closure)
 }
 
 // set color
-static int setColor (PyFilter *self, PyObject *value, void *closure)
+static int setColor(PyFilter *self, PyObject *value, void *closure)
 {
 	// check validity of parameter
 	if (value == NULL ||
@@ -114,7 +114,7 @@ static PyObject *getLimits (PyFilter *self, void *closure)
 }
 
 // set limit
-static int setLimits (PyFilter *self, PyObject *value, void *closure)
+static int setLimits(PyFilter *self, PyObject *value, void *closure)
 {
 	// check validity of parameter
 	if (value == NULL ||
diff --git a/source/gameengine/VideoTexture/FilterColor.cpp b/source/gameengine/VideoTexture/FilterColor.cpp
index e4101b5587d..5efb59efe4c 100644
--- a/source/gameengine/VideoTexture/FilterColor.cpp
+++ b/source/gameengine/VideoTexture/FilterColor.cpp
@@ -130,7 +130,7 @@ static PyObject *getMatrix (PyFilter *self, void *closure)
 }
 
 // set color matrix
-static int setMatrix (PyFilter *self, PyObject *value, void *closure)
+static int setMatrix(PyFilter *self, PyObject *value, void *closure)
 {
 	// matrix to store items
 	ColorMatrix mat;
@@ -263,7 +263,7 @@ static PyObject *getLevels (PyFilter *self, void *closure)
 }
 
 // set color levels
-static int setLevels (PyFilter *self, PyObject *value, void *closure)
+static int setLevels(PyFilter *self, PyObject *value, void *closure)
 {
 	// matrix to store items
 	ColorLevel lev;
diff --git a/source/gameengine/VideoTexture/FilterNormal.cpp b/source/gameengine/VideoTexture/FilterNormal.cpp
index ba963d93079..78a09f8afac 100644
--- a/source/gameengine/VideoTexture/FilterNormal.cpp
+++ b/source/gameengine/VideoTexture/FilterNormal.cpp
@@ -76,7 +76,7 @@ static PyObject *getColor (PyFilter *self, void *closure)
 }
 
 // set index of color used to calculate normal
-static int setColor (PyFilter *self, PyObject *value, void *closure)
+static int setColor(PyFilter *self, PyObject *value, void *closure)
 {
 	// check validity of parameter
 	if (value == NULL || !PyLong_Check(value))
@@ -98,7 +98,7 @@ static PyObject *getDepth (PyFilter *self, void *closure)
 }
 
 // set depth
-static int setDepth (PyFilter *self, PyObject *value, void *closure)
+static int setDepth(PyFilter *self, PyObject *value, void *closure)
 {
 	// check validity of parameter
 	if (value)
diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp
index 3b6dec21e52..4745ce784c0 100644
--- a/source/gameengine/VideoTexture/ImageBase.cpp
+++ b/source/gameengine/VideoTexture/ImageBase.cpp
@@ -182,8 +182,8 @@ void ImageBase::setFilter (PyFilter * filt)
 ExceptionID ImageHasExports;
 ExceptionID InvalidColorChannel;
 
-ExpDesc ImageHasExportsDesc (ImageHasExports, "Image has exported buffers, cannot resize");
-ExpDesc InvalidColorChannelDesc (InvalidColorChannel, "Invalid or too many color channels specified. At most 4 values within R, G, B, A, 0, 1");
+ExpDesc ImageHasExportsDesc(ImageHasExports, "Image has exported buffers, cannot resize");
+ExpDesc InvalidColorChannelDesc(InvalidColorChannel, "Invalid or too many color channels specified. At most 4 values within R, G, B, A, 0, 1");
 
 // initialize image data
 void ImageBase::init (short width, short height)
@@ -375,7 +375,7 @@ PyObject *Image_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 // object deallocation
-void Image_dealloc (PyImage *self)
+void Image_dealloc(PyImage *self)
 {
 	// release object attributes
 	if (self->m_image != NULL)
@@ -514,7 +514,7 @@ PyObject *Image_getScale (PyImage *self, void *closure)
 }
 
 // set scale
-int Image_setScale (PyImage *self, PyObject *value, void *closure)
+int Image_setScale(PyImage *self, PyObject *value, void *closure)
 {
 	// check parameter, report failure
 	if (value == NULL || !PyBool_Check(value))
@@ -536,7 +536,7 @@ PyObject *Image_getFlip (PyImage *self, void *closure)
 }
 
 // set flip
-int Image_setFlip (PyImage *self, PyObject *value, void *closure)
+int Image_setFlip(PyImage *self, PyObject *value, void *closure)
 {
 	// check parameter, report failure
 	if (value == NULL || !PyBool_Check(value))
@@ -558,7 +558,7 @@ PyObject * Image_getZbuff (PyImage * self, void * closure)
 }
 
 // set zbuff
-int Image_setZbuff (PyImage * self, PyObject * value, void * closure)
+int Image_setZbuff(PyImage *self, PyObject *value, void *closure)
 {
 	// check parameter, report failure
 	if (value == NULL || !PyBool_Check(value))
@@ -580,7 +580,7 @@ PyObject * Image_getDepth (PyImage * self, void * closure)
 }
 
 // set depth
-int Image_setDepth (PyImage * self, PyObject * value, void * closure)
+int Image_setDepth(PyImage *self, PyObject *value, void *closure)
 {
 	// check parameter, report failure
 	if (value == NULL || !PyBool_Check(value))
@@ -678,7 +678,7 @@ PyObject *Image_getFilter (PyImage *self, void *closure)
 
 
 // set pixel filter object
-int Image_setFilter (PyImage *self, PyObject *value, void *closure)
+int Image_setFilter(PyImage *self, PyObject *value, void *closure)
 {
 	// if image object is available
 	if (self->m_image != NULL)
diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp
index 1593a08bb4b..80ad9b40c24 100644
--- a/source/gameengine/VideoTexture/ImageBuff.cpp
+++ b/source/gameengine/VideoTexture/ImageBuff.cpp
@@ -51,7 +51,7 @@ FilterRGB24 defFilter;
 // forward declaration;
 extern PyTypeObject ImageBuffType;
 
-static int ImageBuff_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
+static int ImageBuff_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
 {
 	short width = -1;
 	short height = -1;
diff --git a/source/gameengine/VideoTexture/ImageMix.cpp b/source/gameengine/VideoTexture/ImageMix.cpp
index 27c4fed6fe6..ee6e16d0a86 100644
--- a/source/gameengine/VideoTexture/ImageMix.cpp
+++ b/source/gameengine/VideoTexture/ImageMix.cpp
@@ -69,7 +69,7 @@ bool ImageMix::setWeight (const char * id, short weight)
 
 ExceptionID ImageSizesNotMatch;
 
-ExpDesc ImageSizesNotMatchDesc (ImageSizesNotMatch, "Image sizes of sources are different");
+ExpDesc ImageSizesNotMatchDesc(ImageSizesNotMatch, "Image sizes of sources are different");
 
 // calculate image from sources and set its availability
 void ImageMix::calcImage (unsigned int texId, double ts)
diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp
index f778f840864..0b34824fd08 100644
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@@ -52,14 +52,14 @@
 
 ExceptionID SceneInvalid, CameraInvalid, ObserverInvalid;
 ExceptionID MirrorInvalid, MirrorSizeInvalid, MirrorNormalInvalid, MirrorHorizontal, MirrorTooSmall;
-ExpDesc SceneInvalidDesc (SceneInvalid, "Scene object is invalid");
-ExpDesc CameraInvalidDesc (CameraInvalid, "Camera object is invalid");
-ExpDesc ObserverInvalidDesc (ObserverInvalid, "Observer object is invalid");
-ExpDesc MirrorInvalidDesc (MirrorInvalid, "Mirror object is invalid");
-ExpDesc MirrorSizeInvalidDesc (MirrorSizeInvalid, "Mirror has no vertex or no size");
-ExpDesc MirrorNormalInvalidDesc (MirrorNormalInvalid, "Cannot determine mirror plane");
-ExpDesc MirrorHorizontalDesc (MirrorHorizontal, "Mirror is horizontal in local space");
-ExpDesc MirrorTooSmallDesc (MirrorTooSmall, "Mirror is too small");
+ExpDesc SceneInvalidDesc(SceneInvalid, "Scene object is invalid");
+ExpDesc CameraInvalidDesc(CameraInvalid, "Camera object is invalid");
+ExpDesc ObserverInvalidDesc(ObserverInvalid, "Observer object is invalid");
+ExpDesc MirrorInvalidDesc(MirrorInvalid, "Mirror object is invalid");
+ExpDesc MirrorSizeInvalidDesc(MirrorSizeInvalid, "Mirror has no vertex or no size");
+ExpDesc MirrorNormalInvalidDesc(MirrorNormalInvalid, "Cannot determine mirror plane");
+ExpDesc MirrorHorizontalDesc(MirrorHorizontal, "Mirror is horizontal in local space");
+ExpDesc MirrorTooSmallDesc(MirrorTooSmall, "Mirror is too small");
 
 // constructor
 ImageRender::ImageRender (KX_Scene * scene, KX_Camera * camera) : 
@@ -294,7 +294,7 @@ BlendType<KX_Camera> cameraType ("KX_Camera");
 
 
 // object initialization
-static int ImageRender_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
+static int ImageRender_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
 {
 	// parameters - scene object
 	PyObject *scene;
@@ -347,7 +347,7 @@ static PyObject *getBackground (PyImage *self, void *closure)
 }
 
 // set color
-static int setBackground (PyImage *self, PyObject *value, void *closure)
+static int setBackground(PyImage *self, PyObject *value, void *closure)
 {
 	// check validity of parameter
 	if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 4
@@ -441,7 +441,7 @@ PyTypeObject ImageRenderType =
 };
 
 // object initialization
-static int ImageMirror_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
+static int ImageMirror_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
 {
 	// parameters - scene object
 	PyObject *scene;
@@ -523,7 +523,7 @@ static PyObject *getClip (PyImage *self, void *closure)
 }
 
 // set clip
-static int setClip (PyImage *self, PyObject *value, void *closure)
+static int setClip(PyImage *self, PyObject *value, void *closure)
 {
 	// check validity of parameter
 	double clip;
diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp
index 5fc388bdefb..19d0289be20 100644
--- a/source/gameengine/VideoTexture/ImageViewport.cpp
+++ b/source/gameengine/VideoTexture/ImageViewport.cpp
@@ -210,7 +210,7 @@ PyObject *ImageViewport_getWhole (PyImage *self, void *closure)
 }
 
 // set whole
-int ImageViewport_setWhole (PyImage *self, PyObject *value, void *closure)
+int ImageViewport_setWhole(PyImage *self, PyObject *value, void *closure)
 {
 	// check parameter, report failure
 	if (value == NULL || !PyBool_Check(value))
@@ -240,7 +240,7 @@ PyObject *ImageViewport_getAlpha (PyImage *self, void *closure)
 }
 
 // set whole
-int ImageViewport_setAlpha (PyImage *self, PyObject *value, void *closure)
+int ImageViewport_setAlpha(PyImage *self, PyObject *value, void *closure)
 {
 	// check parameter, report failure
 	if (value == NULL || !PyBool_Check(value))
@@ -266,7 +266,7 @@ static PyObject *ImageViewport_getPosition (PyImage *self, void *closure)
 }
 
 // set position
-static int ImageViewport_setPosition (PyImage *self, PyObject *value, void *closure)
+static int ImageViewport_setPosition(PyImage *self, PyObject *value, void *closure)
 {
 	// check validity of parameter
 	if (value == NULL ||
@@ -299,7 +299,7 @@ PyObject *ImageViewport_getCaptureSize (PyImage *self, void *closure)
 }
 
 // set capture size
-int ImageViewport_setCaptureSize (PyImage *self, PyObject *value, void *closure)
+int ImageViewport_setCaptureSize(PyImage *self, PyObject *value, void *closure)
 {
 	// check validity of parameter
 	if (value == NULL ||
diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp
index 98d36d19ddf..ebad7a92437 100644
--- a/source/gameengine/VideoTexture/Texture.cpp
+++ b/source/gameengine/VideoTexture/Texture.cpp
@@ -68,8 +68,8 @@ BlendType<KX_LightObject> lightObjectType ("KX_LightObject");
 
 
 // load texture
-void loadTexture (unsigned int texId, unsigned int * texture, short * size,
-				  bool mipmap)
+void loadTexture(unsigned int texId, unsigned int *texture, short *size,
+                 bool mipmap)
 {
 	// load texture for rendering
 	glBindTexture(GL_TEXTURE_2D, texId);
@@ -171,8 +171,8 @@ static PyObject *Texture_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 
 
 // forward declaration
-PyObject *Texture_close(Texture * self);
-int Texture_setSource (Texture * self, PyObject *value, void *closure);
+PyObject *Texture_close(Texture *self);
+int Texture_setSource(Texture *self, PyObject *value, void *closure);
 
 
 // Texture object deallocation
@@ -191,7 +191,7 @@ static void Texture_dealloc(Texture *self)
 
 
 ExceptionID MaterialNotAvail;
-ExpDesc MaterialNotAvailDesc (MaterialNotAvail, "Texture material is not available");
+ExpDesc MaterialNotAvailDesc(MaterialNotAvail, "Texture material is not available");
 
 // Texture object initialization
 static int Texture_init(Texture *self, PyObject *args, PyObject *kwds)
@@ -439,7 +439,7 @@ static PyObject *Texture_getSource(Texture *self, PyObject *value, void *closure
 
 
 // set source object
-int Texture_setSource (Texture * self, PyObject *value, void *closure)
+int Texture_setSource(Texture *self, PyObject *value, void *closure)
 {
 	// check new value
 	if (value == NULL || !pyImageTypes.in(Py_TYPE(value)))
diff --git a/source/gameengine/VideoTexture/VideoBase.cpp b/source/gameengine/VideoTexture/VideoBase.cpp
index 576e358fe75..edf03dea484 100644
--- a/source/gameengine/VideoTexture/VideoBase.cpp
+++ b/source/gameengine/VideoTexture/VideoBase.cpp
@@ -102,11 +102,11 @@ void VideoBase::process (BYTE * sample)
 
 // exceptions for video source initialization
 ExceptionID SourceVideoEmpty, SourceVideoCreation;
-ExpDesc SourceVideoEmptyDesc (SourceVideoEmpty, "Source Video is empty");
-ExpDesc SourceVideoCreationDesc (SourceVideoCreation, "SourceVideo object was not created");
+ExpDesc SourceVideoEmptyDesc(SourceVideoEmpty, "Source Video is empty");
+ExpDesc SourceVideoCreationDesc(SourceVideoCreation, "SourceVideo object was not created");
 
 // open video source
-void Video_open (VideoBase * self, char * file, short captureID)
+void Video_open(VideoBase * self, char * file, short captureID)
 {
 	// if file is empty, throw exception
 	if (file == NULL) THRWEXCP(SourceVideoEmpty, S_OK);
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp
index 93a1d09869b..4e584cc89ad 100644
--- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp
+++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp
@@ -1085,7 +1085,7 @@ inline VideoFFmpeg * getVideoFFmpeg (PyImage *self)
 
 
 // object initialization
-static int VideoFFmpeg_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
+static int VideoFFmpeg_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
 {
 	PyImage *self = reinterpret_cast<PyImage*>(pySelf);
 	// parameters - video source
@@ -1243,7 +1243,7 @@ PyTypeObject VideoFFmpegType =
 };
 
 // object initialization
-static int ImageFFmpeg_init (PyObject *pySelf, PyObject *args, PyObject *kwds)
+static int ImageFFmpeg_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
 {
 	PyImage *self = reinterpret_cast<PyImage*>(pySelf);
 	// parameters - video source