[Bf-blender-cvs] [6ffc988] master: BGE Clean-up: New EXP prefix for the BGE Expression module

Jorge Bernal noreply at git.blender.org
Sun Jul 12 16:58:39 CEST 2015 

Commit: 6ffc988ae3aa57822be89e9580146908c938e0a0
Author: Jorge Bernal
Date:   Sun Jul 12 16:55:33 2015 +0200
Branches: master
https://developer.blender.org/rB6ffc988ae3aa57822be89e9580146908c938e0a0

BGE Clean-up: New EXP prefix for the BGE Expression module

The expression module now uses an EXP prefix and it follows a
distribution similar to blender.

Additionally the hash function in EXP_HashedPtr.h was simplified and the
files EXP_C-Api.h &.EXP_C-Api.cpp were deleted because were unused.

Reviewers: campbellbarton, moguri, sybren, hg1

Projects: #game_engine

Differential Revision: https://developer.blender.org/D1221

===================================================================

M	source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
M	source/gameengine/Converter/BL_ActionActuator.cpp
M	source/gameengine/Converter/BL_ArmatureChannel.h
M	source/gameengine/Converter/BL_ArmatureConstraint.h
M	source/gameengine/Converter/BL_BlenderDataConversion.h
M	source/gameengine/Converter/BL_ShapeActionActuator.cpp
M	source/gameengine/Converter/KX_BlenderSceneConverter.h
M	source/gameengine/Converter/KX_ConvertActuators.cpp
M	source/gameengine/Converter/KX_ConvertControllers.cpp
M	source/gameengine/Converter/KX_ConvertControllers.h
M	source/gameengine/Converter/KX_ConvertProperties.cpp
M	source/gameengine/Converter/KX_ConvertSensors.cpp
M	source/gameengine/Converter/KX_LibLoadStatus.h
D	source/gameengine/Expressions/BoolValue.cpp
D	source/gameengine/Expressions/BoolValue.h
M	source/gameengine/Expressions/CMakeLists.txt
D	source/gameengine/Expressions/ConstExpr.cpp
D	source/gameengine/Expressions/ConstExpr.h
A	source/gameengine/Expressions/EXP_BoolValue.h
D	source/gameengine/Expressions/EXP_C-Api.cpp
D	source/gameengine/Expressions/EXP_C-Api.h
A	source/gameengine/Expressions/EXP_ConstExpr.h
A	source/gameengine/Expressions/EXP_EmptyValue.h
A	source/gameengine/Expressions/EXP_ErrorValue.h
A	source/gameengine/Expressions/EXP_Expression.h
A	source/gameengine/Expressions/EXP_FloatValue.h
A	source/gameengine/Expressions/EXP_HashedPtr.h
A	source/gameengine/Expressions/EXP_IdentifierExpr.h
A	source/gameengine/Expressions/EXP_IfExpr.h
A	source/gameengine/Expressions/EXP_InputParser.h
A	source/gameengine/Expressions/EXP_IntValue.h
A	source/gameengine/Expressions/EXP_ListValue.h
A	source/gameengine/Expressions/EXP_Operator1Expr.h
A	source/gameengine/Expressions/EXP_Operator2Expr.h
A	source/gameengine/Expressions/EXP_PyObjectPlus.h
A	source/gameengine/Expressions/EXP_Python.h
A	source/gameengine/Expressions/EXP_PythonCallBack.h
A	source/gameengine/Expressions/EXP_StringValue.h
A	source/gameengine/Expressions/EXP_Value.h
A	source/gameengine/Expressions/EXP_VectorValue.h
A	source/gameengine/Expressions/EXP_VoidValue.h
D	source/gameengine/Expressions/EmptyValue.cpp
D	source/gameengine/Expressions/EmptyValue.h
D	source/gameengine/Expressions/ErrorValue.cpp
D	source/gameengine/Expressions/ErrorValue.h
D	source/gameengine/Expressions/Expression.cpp
D	source/gameengine/Expressions/Expression.h
D	source/gameengine/Expressions/FloatValue.cpp
D	source/gameengine/Expressions/FloatValue.h
D	source/gameengine/Expressions/IdentifierExpr.cpp
D	source/gameengine/Expressions/IdentifierExpr.h
D	source/gameengine/Expressions/IfExpr.cpp
D	source/gameengine/Expressions/IfExpr.h
D	source/gameengine/Expressions/InputParser.cpp
D	source/gameengine/Expressions/InputParser.h
D	source/gameengine/Expressions/IntValue.cpp
D	source/gameengine/Expressions/IntValue.h
D	source/gameengine/Expressions/KX_HashedPtr.cpp
D	source/gameengine/Expressions/KX_HashedPtr.h
D	source/gameengine/Expressions/KX_Python.h
D	source/gameengine/Expressions/KX_PythonCallBack.cpp
D	source/gameengine/Expressions/KX_PythonCallBack.h
D	source/gameengine/Expressions/ListValue.cpp
D	source/gameengine/Expressions/ListValue.h
D	source/gameengine/Expressions/Operator1Expr.cpp
D	source/gameengine/Expressions/Operator1Expr.h
D	source/gameengine/Expressions/Operator2Expr.cpp
D	source/gameengine/Expressions/Operator2Expr.h
D	source/gameengine/Expressions/PyObjectPlus.cpp
D	source/gameengine/Expressions/PyObjectPlus.h
M	source/gameengine/Expressions/SConscript
D	source/gameengine/Expressions/StringValue.cpp
D	source/gameengine/Expressions/StringValue.h
D	source/gameengine/Expressions/Value.cpp
D	source/gameengine/Expressions/Value.h
D	source/gameengine/Expressions/VectorValue.cpp
D	source/gameengine/Expressions/VectorValue.h
D	source/gameengine/Expressions/VoidValue.h
A	source/gameengine/Expressions/intern/BoolValue.cpp
A	source/gameengine/Expressions/intern/ConstExpr.cpp
A	source/gameengine/Expressions/intern/EmptyValue.cpp
A	source/gameengine/Expressions/intern/ErrorValue.cpp
A	source/gameengine/Expressions/intern/Expression.cpp
A	source/gameengine/Expressions/intern/FloatValue.cpp
A	source/gameengine/Expressions/intern/HashedPtr.cpp
A	source/gameengine/Expressions/intern/IdentifierExpr.cpp
A	source/gameengine/Expressions/intern/IfExpr.cpp
A	source/gameengine/Expressions/intern/InputParser.cpp
A	source/gameengine/Expressions/intern/IntValue.cpp
A	source/gameengine/Expressions/intern/ListValue.cpp
A	source/gameengine/Expressions/intern/Operator1Expr.cpp
A	source/gameengine/Expressions/intern/Operator2Expr.cpp
A	source/gameengine/Expressions/intern/PyObjectPlus.cpp
A	source/gameengine/Expressions/intern/PythonCallBack.cpp
A	source/gameengine/Expressions/intern/StringValue.cpp
A	source/gameengine/Expressions/intern/Value.cpp
A	source/gameengine/Expressions/intern/VectorValue.cpp
M	source/gameengine/GameLogic/SCA_ANDController.cpp
M	source/gameengine/GameLogic/SCA_ExpressionController.cpp
M	source/gameengine/GameLogic/SCA_IController.cpp
M	source/gameengine/GameLogic/SCA_IController.h
M	source/gameengine/GameLogic/SCA_ILogicBrick.cpp
M	source/gameengine/GameLogic/SCA_ILogicBrick.h
M	source/gameengine/GameLogic/SCA_IObject.cpp
M	source/gameengine/GameLogic/SCA_IObject.h
M	source/gameengine/GameLogic/SCA_IScene.cpp
M	source/gameengine/GameLogic/SCA_JoystickSensor.cpp
M	source/gameengine/GameLogic/SCA_KeyboardManager.cpp
M	source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
M	source/gameengine/GameLogic/SCA_KeyboardSensor.h
M	source/gameengine/GameLogic/SCA_LogicManager.cpp
M	source/gameengine/GameLogic/SCA_LogicManager.h
M	source/gameengine/GameLogic/SCA_MouseManager.cpp
M	source/gameengine/GameLogic/SCA_MouseSensor.cpp
M	source/gameengine/GameLogic/SCA_MouseSensor.h
M	source/gameengine/GameLogic/SCA_NANDController.cpp
M	source/gameengine/GameLogic/SCA_NORController.cpp
M	source/gameengine/GameLogic/SCA_ORController.cpp
M	source/gameengine/GameLogic/SCA_PropertyActuator.cpp
M	source/gameengine/GameLogic/SCA_PropertySensor.cpp
M	source/gameengine/GameLogic/SCA_PythonController.cpp
M	source/gameengine/GameLogic/SCA_PythonController.h
M	source/gameengine/GameLogic/SCA_PythonJoystick.h
M	source/gameengine/GameLogic/SCA_PythonKeyboard.h
M	source/gameengine/GameLogic/SCA_PythonMouse.h
M	source/gameengine/GameLogic/SCA_RandomActuator.cpp
M	source/gameengine/GameLogic/SCA_RandomSensor.cpp
M	source/gameengine/GameLogic/SCA_RandomSensor.h
M	source/gameengine/GameLogic/SCA_TimeEventManager.cpp
M	source/gameengine/GameLogic/SCA_TimeEventManager.h
M	source/gameengine/GameLogic/SCA_XNORController.cpp
M	source/gameengine/GameLogic/SCA_XORController.cpp
M	source/gameengine/Ketsji/BL_Shader.h
M	source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
M	source/gameengine/Ketsji/KX_BlenderMaterial.h
M	source/gameengine/Ketsji/KX_Camera.cpp
M	source/gameengine/Ketsji/KX_Camera.h
M	source/gameengine/Ketsji/KX_CameraActuator.cpp
M	source/gameengine/Ketsji/KX_CharacterWrapper.h
M	source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
M	source/gameengine/Ketsji/KX_ConstraintWrapper.h
M	source/gameengine/Ketsji/KX_FontObject.cpp
M	source/gameengine/Ketsji/KX_GameObject.cpp
M	source/gameengine/Ketsji/KX_GameObject.h
M	source/gameengine/Ketsji/KX_ISceneConverter.h
M	source/gameengine/Ketsji/KX_IpoActuator.cpp
M	source/gameengine/Ketsji/KX_KetsjiEngine.cpp
M	source/gameengine/Ketsji/KX_KetsjiEngine.h
M	source/gameengine/Ketsji/KX_MeshProxy.cpp
M	source/gameengine/Ketsji/KX_NavMeshObject.cpp
M	source/gameengine/Ketsji/KX_NavMeshObject.h
M	source/gameengine/Ketsji/KX_ParentActuator.cpp
M	source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
M	source/gameengine/Ketsji/KX_PyMath.cpp
M	source/gameengine/Ketsji/KX_PyMath.h
M	source/gameengine/Ketsji/KX_PythonInit.cpp
M	source/gameengine/Ketsji/KX_PythonInit.h
M	source/gameengine/Ketsji/KX_PythonSeq.h
M	source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
M	source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
M	source/gameengine/Ketsji/KX_Scene.cpp
M	source/gameengine/Ketsji/KX_Scene.h
M	source/gameengine/Ketsji/KX_TouchSensor.h
M	source/gameengine/Ketsji/KX_TrackToActuator.cpp
M	source/gameengine/Ketsji/KX_VehicleWrapper.cpp
M	source/gameengine/Ketsji/KX_VehicleWrapper.h
M	source/gameengine/Ketsji/KX_WorldInfo.h
M	source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
M	source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
M	source/gameengine/VideoTexture/Exception.cpp
M	source/gameengine/VideoTexture/FilterBase.cpp
M	source/gameengine/VideoTexture/FilterBase.h
M	source/gameengine/VideoTexture/FilterBlueScreen.cpp
M	source/gameengine/VideoTexture/FilterColor.cpp
M	source/gameengine/VideoTexture/FilterNormal.cpp
M	source/gameengine/VideoTexture/FilterSource.cpp
M	source/gameengine/VideoTexture/ImageBase.cpp
M	source/gameengine/VideoTexture/ImageBase.h
M	source/gameengine/VideoTexture/ImageBuff.cpp
M	source/gameengine/VideoTexture/ImageMix.cpp
M	source/gameengine/VideoTexture/ImageRender.cpp
M	source/gameengine/VideoTexture/ImageViewport.cpp
M	source/gameengine/VideoTexture/PyTypeList.cpp
M	source/gameengine/VideoTexture/PyTypeList.h
M	source/gameengine/VideoTexture/Texture.cpp
M	source/gameengine/VideoTexture/Texture.h
M	source/gameengine/VideoTexture/VideoBase.h
M	source/gameengine/VideoTexture/blendVideoTex.cpp

===================================================================

diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index 1a19892..9b99574 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -63,7 +63,7 @@
 #include "BL_System.h"
 
 #include "GPU_extensions.h"
-#include "Value.h"
+#include "EXP_Value.h"
 
 
 extern "C" {
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index c756d86..d40ba8d 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -49,8 +49,8 @@
 #include "MT_Matrix4x4.h"
 
 #include "BKE_action.h"
-#include "FloatValue.h"
-#include "PyObjectPlus.h"
+#include "EXP_FloatValue.h"
+#include "EXP_PyObjectPlus.h"
 #include "KX_PyMath.h"
 
 extern "C" {
diff --git a/source/gameengine/Converter/BL_ArmatureChannel.h b/source/gameengine/Converter/BL_ArmatureChannel.h
index 51114c5..d349e6e 100644
--- a/source/gameengine/Converter/BL_ArmatureChannel.h
+++ b/source/gameengine/Converter/BL_ArmatureChannel.h
@@ -35,7 +35,7 @@
 #include "DNA_action_types.h"
 #include "CTR_HashedPtr.h"
 #include "CTR_Map.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_IObject;
 class KX_GameObject;
diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.h b/source/gameengine/Converter/BL_ArmatureConstraint.h
index 98c2954..1d9f7f0 100644
--- a/source/gameengine/Converter/BL_ArmatureConstraint.h
+++ b/source/gameengine/Converter/BL_ArmatureConstraint.h
@@ -35,7 +35,7 @@
 #include "DNA_constraint_types.h"
 #include "CTR_HashedPtr.h"
 #include "CTR_Map.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_IObject;
 class KX_GameObject;
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.h b/source/gameengine/Converter/BL_BlenderDataConversion.h
index 6bd7795..22210cc 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.h
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.h
@@ -34,7 +34,7 @@
 
 #include "CTR_HashedPtr.h"
 #include "STR_String.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "KX_PhysicsEngineEnums.h"
 #include "SCA_IInputDevice.h"
 
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index 67712c6..e8f4512 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -48,8 +48,8 @@
 #include "BLI_math.h"
 #include "MT_Matrix4x4.h"
 
-#include "FloatValue.h"
-#include "PyObjectPlus.h"
+#include "EXP_FloatValue.h"
+#include "EXP_PyObjectPlus.h"
 
 extern "C" {
 	#include "BKE_animsys.h"
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
index 3ae9030..a40188d 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.h
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -32,7 +32,7 @@
 #ifndef __KX_BLENDERSCENECONVERTER_H__
 #define __KX_BLENDERSCENECONVERTER_H__
 
-#include "KX_HashedPtr.h"
+#include "EXP_HashedPtr.h"
 #include "CTR_Map.h"
 #include <stdio.h>
 
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index ff4b5a6..10ee228 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -75,7 +75,7 @@
 #include "KX_Scene.h"
 #include "KX_KetsjiEngine.h"
 
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include "KX_GameObject.h"
 
 /* This little block needed for linking to Blender... */
diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp
index 0215b60..e369708 100644
--- a/source/gameengine/Converter/KX_ConvertControllers.cpp
+++ b/source/gameengine/Converter/KX_ConvertControllers.cpp
@@ -34,7 +34,7 @@
 
 #include "KX_BlenderSceneConverter.h"
 #include "KX_ConvertControllers.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
 
 // Controller
 #include "SCA_ANDController.h"
@@ -48,7 +48,7 @@
 
 #include "SCA_LogicManager.h"
 #include "KX_GameObject.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 
 /* This little block needed for linking to Blender... */
 #ifdef WIN32
diff --git a/source/gameengine/Converter/KX_ConvertControllers.h b/source/gameengine/Converter/KX_ConvertControllers.h
index babe3e2..0ec1c3c 100644
--- a/source/gameengine/Converter/KX_ConvertControllers.h
+++ b/source/gameengine/Converter/KX_ConvertControllers.h
@@ -32,7 +32,7 @@
 #ifndef __KX_CONVERTCONTROLLERS_H__
 #define __KX_CONVERTCONTROLLERS_H__
 
-#include "KX_Python.h"
+#include "EXP_Python.h"
 
 void BL_ConvertControllers(
 	struct Object* blenderobject,
diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp
index 3b4ba68..2cb6120 100644
--- a/source/gameengine/Converter/KX_ConvertProperties.cpp
+++ b/source/gameengine/Converter/KX_ConvertProperties.cpp
@@ -38,13 +38,13 @@
 /* end of blender include block */
 
 
-#include "Value.h"
-#include "VectorValue.h"
-#include "BoolValue.h"
-#include "StringValue.h"
-#include "FloatValue.h"
+#include "EXP_Value.h"
+#include "EXP_VectorValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_FloatValue.h"
 #include "KX_GameObject.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include "SCA_TimeEventManager.h"
 #include "SCA_IScene.h"
 
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp
index 854ae5b..79fd9cb 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.cpp
+++ b/source/gameengine/Converter/KX_ConvertSensors.cpp
@@ -79,7 +79,7 @@
 #include "SCA_LogicManager.h"
 #include "KX_BlenderInputDevice.h"
 #include "KX_Scene.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include "KX_BlenderKeyboardDevice.h"
 #include "RAS_ICanvas.h"
 #include "PHY_IPhysicsEnvironment.h"
diff --git a/source/gameengine/Converter/KX_LibLoadStatus.h b/source/gameengine/Converter/KX_LibLoadStatus.h
index 3da7329..bedf449 100644
--- a/source/gameengine/Converter/KX_LibLoadStatus.h
+++ b/source/gameengine/Converter/KX_LibLoadStatus.h
@@ -27,7 +27,7 @@
 #ifndef __KX_LIBLOADSTATUS_H__
 #define __KX_LIBLOADSTATUS_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class KX_LibLoadStatus : public PyObjectPlus
 {
diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index f827a95..6ab4d3f 100644
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -36,54 +36,52 @@ set(INC_SYS
 )
 
 set(SRC
-	BoolValue.cpp
-	ConstExpr.cpp
-	EXP_C-Api.cpp
-	EmptyValue.cpp
-	ErrorValue.cpp
-	Expression.cpp
-	FloatValue.cpp
-	IdentifierExpr.cpp
-	IfExpr.cpp
-	InputParser.cpp
-	IntValue.cpp
-	KX_HashedPtr.cpp
-	ListValue.cpp
-	Operator1Expr.cpp
-	Operator2Expr.cpp
-	PyObjectPlus.cpp
-	StringValue.cpp
-	Value.cpp
-	VectorValue.cpp
+	intern/BoolValue.cpp
+	intern/ConstExpr.cpp
+	intern/EmptyValue.cpp
+	intern/ErrorValue.cpp
+	intern/Expression.cpp
+	intern/FloatValue.cpp
+	intern/IdentifierExpr.cpp
+	intern/IfExpr.cpp
+	intern/InputParser.cpp
+	intern/IntValue.cpp
+	intern/HashedPtr.cpp
+	intern/ListValue.cpp
+	intern/Operator1Expr.cpp
+	intern/Operator2Expr.cpp
+	intern/PyObjectPlus.cpp
+	intern/StringValue.cpp
+	intern/Value.cpp
+	intern/VectorValue.cpp
 
-	BoolValue.h
-	ConstExpr.h
-	EXP_C-Api.h
-	EmptyValue.h
-	ErrorValue.h
-	Expression.h
-	FloatValue.h
-	IdentifierExpr.h
-	IfExpr.h
-	InputParser.h
-	IntValue.h
-	KX_HashedPtr.h
-	KX_Python.h
-	ListValue.h
-	Operator1Expr.h
-	Operator2Expr.h
-	PyObjectPlus.h
-	StringValue.h
-	Value.h
-	VectorValue.h
-	VoidValue.h
+	EXP_BoolValue.h
+	EXP_ConstExpr.h
+	EXP_EmptyValue.h
+	EXP_ErrorValue.h
+	EXP_Expression.h
+	EXP_FloatValue.h
+	EXP_HashedPtr.h
+	EXP_IdentifierExpr.h
+	EXP_IfExpr.h
+	EXP_InputParser.h
+	EXP_IntValue.h
+	EXP_ListValue.h
+	EXP_Operator1Expr.h
+	EXP_Operator2Expr.h
+	EXP_PyObjectPlus.h
+	EXP_Python.h
+	EXP_StringValue.h
+	EXP_Value.h
+	EXP_VectorValue.h
+	EXP_VoidValue.h
 )
 
 if(WITH_PYTHON)
 	list(APPEND SRC
-		KX_PythonCallBack.cpp
+		intern/PythonCallBack.cpp
 
-		KX_PythonCallBack.h
+		EXP_PythonCallBack.h
 	)
 endif()
 
diff --git a/source/gameengine/Expressions/BoolValue.h b/source/gameengine/Expressions/EXP_BoolValue.h
similarity index 92%
rename from source/gameengine/Expressions/BoolValue.h
rename to source/gameengine/Expressions/EXP_BoolValue.h
index 161d611..98ba1d7 100644
--- a/source/gameengine/Expressions/BoolValue.h
+++ b/source/gameengine/Expressions/EXP_BoolValue.h
@@ -12,14 +12,14 @@
  *
  */
 
-/** \file BoolValue.h
+/** \file EXP_BoolValue.h
  *  \ingroup expressions
  */
 
-#ifndef __BOOLVALUE_H__
-#define __BOOLVALUE_H__
+#ifndef __EXP_BOOLVALUE_H__
+#define __EXP_BOOLVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 /**
  *	Smart Boolean Value class.
@@ -62,4 +62,4 @@ private:
 #endif
 };
 
-#endif  /* __BOOLVALUE_H__ */
+#endif  /* __EXP_BOOLVALUE_H__ */
diff --git a/source/gameengine/Expressions/EXP_C-Api.cpp b/source/gameengine/Expressions/EXP_C-Api.cpp
deleted file mode 100644
index 2822fd8..0000000
--- a/source/gameengine/Expressions/EXP_C-Api.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list