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

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" {

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" {

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;

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;

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"
 

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"

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>
 

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... */

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

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,

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"
 

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"

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
 {

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()
 

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__ */

source/gameengine/Expressions/EXP_C-Api.cpp

@@ -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 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file gameengine/Expressions/EXP_C-Api.cpp
- *  \ingroup expressions
- */
-
-#include "EXP_C-Api.h"
-#include "IntValue.h"
-#include "BoolValue.h"
-#include "StringValue.h"
-#include "ErrorValue.h"
-#include "InputParser.h"
-
-EXP_ValueHandle EXP_CreateInt(int innie)
-{
-	return (EXP_ValueHandle) new CIntValue(innie);
-}
-
-
-
-EXP_ValueHandle EXP_CreateBool(int innie)
-{
-	return (EXP_ValueHandle) new CBoolValue(innie!=0);
-}
-
-
-
-EXP_ValueHandle EXP_CreateString(const char* str)
-{
-	
-	return (EXP_ValueHandle) new CStringValue(str,"");
-}
-
-
-
-void EXP_SetName(EXP_ValueHandle inval,const char* newname)
-{
-	((CValue*) inval)->SetName(newname);
-}
-
-
-
-/* calculate expression from inputtext */
-EXP_ValueHandle EXP_ParseInput(const char* inputtext)
-{
-	CValue* resultval=NULL;
-	CParser parser;
-	CExpression* expr = parser.ProcessText(inputtext);
-	if (expr)
-	{
-		resultval = expr->Calculate();
-		expr->Release();
-	}
-	else
-	{
-		resultval = new CErrorValue("couldn't parsetext");
-	}
-
-	return (EXP_ValueHandle) resultval;
-}
-
-
-
-void EXP_ReleaseValue(EXP_ValueHandle inval)
-{
-	((CValue*) inval)->Release();
-}
-
-
-
-int EXP_IsValid(EXP_ValueHandle inval)
-{
-	return !((CValue*) inval)->IsError();
-}
-
-
-
-/* assign property 'propval' to 'destinationval' */
-void EXP_SetProperty(EXP_ValueHandle destinationval,
-                     const char *propname,
-                     EXP_ValueHandle propval)
-{
-	((CValue*) destinationval)->SetProperty(propname,(CValue*)propval);
-}
-
-
-
-const char* EXP_GetText(EXP_ValueHandle inval)
-{
-	return ((CValue*) inval)->GetText();
-}
-
-
-
-EXP_ValueHandle EXP_GetProperty(EXP_ValueHandle inval,const char* propname)
-{
-	return (EXP_ValueHandle) ((CValue*)inval)->GetProperty(propname);
-}

source/gameengine/Expressions/EXP_C-Api.h

@@ -1,67 +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 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file EXP_C-Api.h
- *  \ingroup expressions
- */
-
-#ifndef __EXP_C_API_H__
-#define __EXP_C_API_H__
-
-#define EXP_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
-
-EXP_DECLARE_HANDLE(EXP_ValueHandle);
-EXP_DECLARE_HANDLE(EXP_ExpressionHandle);
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern EXP_ValueHandle		EXP_CreateInt(int innie);
-extern EXP_ValueHandle		EXP_CreateBool(int innie);
-extern EXP_ValueHandle		EXP_CreateString(const char* str);
-extern void					EXP_SetName(EXP_ValueHandle,const char* newname);
-
-/* calculate expression from inputtext */
-extern EXP_ValueHandle		EXP_ParseInput(const char* inputtext);
-extern void					EXP_ReleaseValue(EXP_ValueHandle);
-extern int					EXP_IsValid(EXP_ValueHandle);
-
-/* assign property 'propval' to 'destinationval' */
-extern void					EXP_SetProperty(EXP_ValueHandle destinationval, const char *propname, EXP_ValueHandle propval);
-
-/* returns NULL if property doesn't exist */
-extern EXP_ValueHandle		EXP_GetProperty(EXP_ValueHandle inval,const char* propname);
-
-const char*					EXP_GetText(EXP_ValueHandle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __EXP_C_API_H__ */

source/gameengine/Expressions/EXP_ConstExpr.h

@@ -12,15 +12,15 @@
  *
  */
 
-/** \file ConstExpr.h
+/** \file EXP_ConstExpr.h
  *  \ingroup expressions
  */
 
-#ifndef __CONSTEXPR_H__
-#define __CONSTEXPR_H__
+#ifndef __EXP_CONSTEXPR_H__
+#define __EXP_CONSTEXPR_H__
 
-#include "Expression.h"
-#include "Value.h"	// Added by ClassView
+#include "EXP_Expression.h"
+#include "EXP_Value.h"	// Added by ClassView
 
 class CConstExpr : public CExpression  
 {
@@ -51,4 +51,4 @@ private:
 #endif
 };
 
-#endif  /* __CONSTEXPR_H__ */
+#endif  /* __EXP_CONSTEXPR_H__ */

source/gameengine/Expressions/EXP_EmptyValue.h

@@ -12,14 +12,14 @@
  *
  */
 
-/** \file EmptyValue.h
+/** \file EXP_EmptyValue.h
  *  \ingroup expressions
  */
 
-#ifndef __EMPTYVALUE_H__
-#define __EMPTYVALUE_H__
+#ifndef __EXP_EMPTYVALUE_H__
+#define __EXP_EMPTYVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CListValue;
 
@@ -46,4 +46,4 @@ public:
 #endif
 };
 
-#endif  /* __EMPTYVALUE_H__ */
+#endif  /* __EXP_EMPTYVALUE_H__ */

source/gameengine/Expressions/EXP_ErrorValue.h

@@ -12,14 +12,14 @@
  *
  */
 
-/** \file ErrorValue.h
+/** \file EXP_ErrorValue.h
  *  \ingroup expressions
  */
 
-#ifndef __ERRORVALUE_H__
-#define __ERRORVALUE_H__
+#ifndef __EXP_ERRORVALUE_H__
+#define __EXP_ERRORVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CErrorValue : public CPropValue  
 {
@@ -44,4 +44,4 @@ private:
 #endif
 };
 
-#endif  /* __ERRORVALUE_H__ */
+#endif  /* __EXP_ERRORVALUE_H__ */

source/gameengine/Expressions/EXP_Expression.h

@@ -12,14 +12,14 @@
  *
  */
 
-/** \file Expression.h
+/** \file EXP_Expression.h
  *  \ingroup expressions
  */
 
-#ifndef __EXPRESSION_H__
-#define __EXPRESSION_H__
+#ifndef __EXP_EXPRESSION_H__
+#define __EXP_EXPRESSION_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 //extern int gRefCountExpr; // only for debugging purposes (detect mem.leaks)
 
@@ -146,4 +146,4 @@ protected:
 #endif
 };
 
-#endif  /* __EXPRESSION_H__ */
+#endif  /* __EXP_EXPRESSION_H__ */

source/gameengine/Expressions/EXP_FloatValue.h

@@ -12,14 +12,14 @@
  *
  */
 
-/** \file FloatValue.h
+/** \file EXP_FloatValue.h
  *  \ingroup expressions
  */
 
-#ifndef __FLOATVALUE_H__
-#define __FLOATVALUE_H__
+#ifndef __EXP_FLOATVALUE_H__
+#define __EXP_FLOATVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CFloatValue : public CPropValue 
 {
@@ -55,4 +55,4 @@ protected:
 #endif
 };
 
-#endif  /* __FLOATVALUE_H__ */
+#endif  /* __EXP_FLOATVALUE_H__ */

source/gameengine/Expressions/EXP_HashedPtr.h

@@ -25,19 +25,17 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file KX_HashedPtr.h
+/** \file EXP_HashedPtr.h
  *  \ingroup expressions
  */
 
-#ifndef __KX_HASHEDPTR_H__
-#define __KX_HASHEDPTR_H__
+#ifndef __EXP_HASHEDPTR_H__
+#define __EXP_HASHEDPTR_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
 #endif
 
-unsigned int			KX_Hash(void *inDWord);
-
 class CHashedPtr
 {
 	void* m_valptr;
@@ -58,4 +56,4 @@ public:
 #endif
 };
 
-#endif  /* __KX_HASHEDPTR_H__ */
+#endif  /* __EXP_HASHEDPTR_H__ */

source/gameengine/Expressions/EXP_IdentifierExpr.h

@@ -25,14 +25,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file IdentifierExpr.h
+/** \file EXP_IdentifierExpr.h
  *  \ingroup expressions
  */
 
-#ifndef __IDENTIFIEREXPR_H__
-#define __IDENTIFIEREXPR_H__
+#ifndef __EXP_IDENTIFIEREXPR_H__
+#define __EXP_IDENTIFIEREXPR_H__
 
-#include "Expression.h"
+#include "EXP_Expression.h"
 
 class CIdentifierExpr : public CExpression
 {
@@ -56,4 +56,4 @@ public:
 #endif
 };
 
-#endif  /* __IDENTIFIEREXPR_H__ */
+#endif  /* __EXP_IDENTIFIEREXPR_H__ */

source/gameengine/Expressions/EXP_IfExpr.h

@@ -12,14 +12,14 @@
  *
  */
 
-/** \file IfExpr.h
+/** \file EXP_IfExpr.h
  *  \ingroup expressions
  */
 
-#ifndef __IFEXPR_H__
-#define __IFEXPR_H__
+#ifndef __EXP_IFEXPR_H__
+#define __EXP_IFEXPR_H__
 
-#include "Expression.h"
+#include "EXP_Expression.h"
 
 class CIfExpr : public CExpression  
 {
@@ -51,4 +51,4 @@ public:
 #endif
 };
 
-#endif  /* __IFEXPR_H__ */
+#endif  /* __EXP_IFEXPR_H__ */

source/gameengine/Expressions/EXP_InputParser.h

@@ -14,15 +14,15 @@
  *
  */
 
-/** \file InputParser.h
+/** \file EXP_InputParser.h
  *  \ingroup expressions
  */
 
-#ifndef __INPUTPARSER_H__
-#define __INPUTPARSER_H__
+#ifndef __EXP_INPUTPARSER_H__
+#define __EXP_INPUTPARSER_H__
 
 class CParser;
-#include "Expression.h"
+#include "EXP_Expression.h"
 
 
 class CParser
@@ -114,5 +114,5 @@ private:
 #endif
 };
 
-#endif
+#endif /* __EXP_INPUTPARSER_H__ */
 

source/gameengine/Expressions/EXP_IntValue.h

@@ -12,15 +12,15 @@
  *
  */
 
-/** \file IntValue.h
+/** \file EXP_IntValue.h
  *  \ingroup expressions
  */
 
-#ifndef __INTVALUE_H__
-#define __INTVALUE_H__
+#ifndef __EXP_INTVALUE_H__
+#define __EXP_INTVALUE_H__
 
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 typedef long long cInt; 
 
@@ -70,4 +70,4 @@ private:
 #endif
 };
 
-#endif  /* __INTVALUE_H__ */
+#endif  /* __EXP_INTVALUE_H__ */

source/gameengine/Expressions/EXP_ListValue.h

@@ -12,14 +12,14 @@
  *
  */
 
-/** \file ListValue.h
+/** \file EXP_ListValue.h
  *  \ingroup expressions
  */
 
-#ifndef __LISTVALUE_H__
-#define __LISTVALUE_H__
+#ifndef __EXP_LISTVALUE_H__
+#define __EXP_LISTVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CListValue : public CPropValue  
 {
@@ -88,5 +88,5 @@ private:
 	bool	m_bReleaseContents;
 };
 
-#endif  /* __LISTVALUE_H__ */
+#endif  /* __EXP_LISTVALUE_H__ */
 

source/gameengine/Expressions/EXP_Operator1Expr.h

@@ -12,14 +12,14 @@
  *
  */
 
-/** \file Operator1Expr.h
+/** \file EXP_Operator1Expr.h
  *  \ingroup expressions
  */
 
-#ifndef __OPERATOR1EXPR_H__
-#define __OPERATOR1EXPR_H__
+#ifndef __EXP_OPERATOR1EXPR_H__
+#define __EXP_OPERATOR1EXPR_H__
 
-#include "Expression.h"
+#include "EXP_Expression.h"
 
 class COperator1Expr : public CExpression  
 {
@@ -56,4 +56,4 @@ private:
 #endif
 };
 
-#endif  /* __OPERATOR1EXPR_H__ */
+#endif  /* __EXP_OPERATOR1EXPR_H__ */

source/gameengine/Expressions/EXP_Operator2Expr.h

@@ -12,16 +12,16 @@
  *
  */
 
-/** \file Operator2Expr.h
+/** \file EXP_Operator2Expr.h
  *  \ingroup expressions
  */
 
-#ifndef __OPERATOR2EXPR_H__
-#define __OPERATOR2EXPR_H__
+#ifndef __EXP_OPERATOR2EXPR_H__
+#define __EXP_OPERATOR2EXPR_H__
 
 
-#include "Expression.h"
-#include "Value.h"	// Added by ClassView
+#include "EXP_Expression.h"
+#include "EXP_Value.h"	// Added by ClassView
 
 class COperator2Expr : public CExpression  
 {
@@ -62,5 +62,5 @@ private:
 #endif
 };
 
-#endif  /* __OPERATOR2EXPR_H__ */
+#endif  /* __EXP_OPERATOR2EXPR_H__ */
 

source/gameengine/Expressions/EXP_PyObjectPlus.h

@@ -25,12 +25,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file PyObjectPlus.h
+/** \file EXP_PyObjectPlus.h
  *  \ingroup expressions
  */
 
-#ifndef __PYOBJECTPLUS_H__
-#define __PYOBJECTPLUS_H__
+#ifndef __EXP_PYOBJECTPLUS_H__
+#define __EXP_PYOBJECTPLUS_H__
 
 /* for now keep weakrefs optional */
 #define USE_WEAKREFS
@@ -40,7 +40,7 @@
 #error Must be compiled with C++
 #endif
 
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "STR_String.h"
 #include "MT_Vector3.h"
 #include "SG_QList.h"
@@ -645,5 +645,4 @@ inline PyObject *_bge_proxy_from_ref_borrow(void *self_v)
 
 #endif
 
-
-#endif  /* __PYOBJECTPLUS_H__ */
+#endif  /* __EXP_PYOBJECTPLUS_H__ */

source/gameengine/Expressions/EXP_Python.h

@@ -25,12 +25,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file KX_Python.h
+/** \file EXP_Python.h
  *  \ingroup expressions
  */
 
-#ifndef __KX_PYTHON_H__
-#define __KX_PYTHON_H__
+#ifndef __EXP_PYTHON_H__
+#define __EXP_PYTHON_H__
 
 //#define USE_DL_EXPORT
 
@@ -79,4 +79,4 @@
 #undef toupper
 #endif
 
-#endif  /* __KX_PYTHON_H__ */
+#endif  /* __EXP_PYTHON_H__ */

source/gameengine/Expressions/EXP_PythonCallBack.h

@@ -20,14 +20,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file KX_PythonCallBack.h
+/** \file EXP_PythonCallBack.h
  *  \ingroup expressions
  */
 
-#ifndef __KX_PYTHON_CALLBACK_H__
-#define __KX_PYTHON_CALLBACK_H__
+#ifndef __EXP_PYTHON_CALLBACK_H__
+#define __EXP_PYTHON_CALLBACK_H__
 
-#include "KX_Python.h"
+#include "EXP_Python.h"
 
 /** Execute each functions with at least one argument
  * \param functionlist The python list which contains callbacks.
@@ -37,4 +37,4 @@
  */
 void RunPythonCallBackList(PyObject *functionlist, PyObject **arglist, unsigned int minargcount, unsigned int maxargcount);
 
-#endif // __KX_PYTHON_CALLBACK_H__
+#endif // __EXP_PYTHON_CALLBACK_H__

source/gameengine/Expressions/EXP_StringValue.h

@@ -12,14 +12,14 @@
  *
  */
 
-/** \file StringValue.h
+/** \file EXP_StringValue.h
  *  \ingroup expressions
  */
 
-#ifndef __STRINGVALUE_H__
-#define __STRINGVALUE_H__
+#ifndef __EXP_STRINGVALUE_H__
+#define __EXP_STRINGVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CStringValue : public CPropValue  
 {
@@ -58,4 +58,4 @@ private:
 #endif
 };
 
-#endif  /* __STRINGVALUE_H__ */
+#endif  /* __EXP_STRINGVALUE_H__ */

source/gameengine/Expressions/EXP_Value.h

@@ -12,12 +12,12 @@
  *
  */
 
-/** \file Value.h
+/** \file EXP_Value.h
  *  \ingroup expressions
  */
 
-#ifndef __VALUE_H__
-#define __VALUE_H__
+#ifndef __EXP_VALUE_H__
+#define __EXP_VALUE_H__
 
 #ifdef _MSC_VER
 #  pragma warning (disable:4786)
@@ -159,7 +159,7 @@ public:
 };
 
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #ifdef WITH_PYTHON
 #include "object.h"
 #endif
@@ -429,4 +429,4 @@ protected:
 #endif
 };
 
-#endif  /* __VALUE_H__ */
+#endif  /* __EXP_VALUE_H__ */

source/gameengine/Expressions/EXP_VectorValue.h

@@ -12,14 +12,14 @@
  *
  */
 
-/** \file VectorValue.h
+/** \file EXP_VectorValue.h
  *  \ingroup expressions
  */
 
-#ifndef __VECTORVALUE_H__
-#define __VECTORVALUE_H__
+#ifndef __EXP_VECTORVALUE_H__
+#define __EXP_VECTORVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 #define KX_X 0
 #define KX_Y 1
@@ -91,4 +91,4 @@ protected:
 #endif
 };
 
-#endif  /* __VECTORVALUE_H__ */
+#endif  /* __EXP_VECTORVALUE_H__ */

source/gameengine/Expressions/EXP_VoidValue.h

@@ -27,14 +27,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file VoidValue.h
+/** \file EXP_VoidValue.h
  *  \ingroup expressions
  */
 
-#ifndef __VOIDVALUE_H__
-#define __VOIDVALUE_H__
+#ifndef __EXP_VOIDVALUE_H__
+#define __EXP_VOIDVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 //
 // Void value, used to transport *any* type of data
@@ -78,4 +78,4 @@ public:
 #endif
 };
 
-#endif  /* __VOIDVALUE_H__ */
+#endif  /* __EXP_VOIDVALUE_H__ */

source/gameengine/Expressions/SConscript

@@ -27,7 +27,7 @@
 
 Import ('env')
 
-sources = env.Glob('*.cpp')
+sources = env.Glob('intern/*.cpp')
 
 incs = [
     '.',

source/gameengine/Expressions/intern/BoolValue.cpp

@@ -16,10 +16,10 @@
  *
  */
 
-#include "BoolValue.h"
-#include "StringValue.h"
-#include "ErrorValue.h"
-#include "VoidValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/ConstExpr.cpp

@@ -16,9 +16,9 @@
  *
  */
 
-#include "Value.h" // for precompiled header
-#include "ConstExpr.h"
-#include "VectorValue.h"
+#include "EXP_Value.h" // for precompiled header
+#include "EXP_ConstExpr.h"
+#include "EXP_VectorValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/EmptyValue.cpp

@@ -16,13 +16,13 @@
  *
  */
 
-#include "EmptyValue.h"
-#include "IntValue.h"
-#include "FloatValue.h"
-#include "StringValue.h"
-#include "ErrorValue.h"
-#include "ListValue.h"
-#include "VoidValue.h"
+#include "EXP_EmptyValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_ListValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/ErrorValue.cpp

@@ -15,7 +15,7 @@
  *
  */
 
-#include "ErrorValue.h"
+#include "EXP_ErrorValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/Expression.cpp

@@ -15,8 +15,8 @@
  *
  */
 
-#include "Expression.h"
-#include "ErrorValue.h"
+#include "EXP_Expression.h"
+#include "EXP_ErrorValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/FloatValue.cpp

@@ -15,12 +15,12 @@
  *
  */
 
-#include "FloatValue.h"
-#include "IntValue.h"
-#include "StringValue.h"
-#include "BoolValue.h"
-#include "ErrorValue.h"
-#include "VoidValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/HashedPtr.cpp

@@ -30,16 +30,22 @@
  */
 
 
-#include "KX_HashedPtr.h"
+#include "EXP_HashedPtr.h"
 
-unsigned int KX_Hash(void *inDWord)
+
+CHashedPtr::CHashedPtr(void* val) : m_valptr(val)
+{
+}
+
+
+unsigned int CHashedPtr::hash() const
 {
 #if defined(_WIN64) && !defined(FREE_WINDOWS64)
-	unsigned __int64 key = (unsigned __int64)inDWord;
+	unsigned __int64 key = (unsigned __int64)m_valptr;
 #elif defined(FREE_WINDOWS64)
-	unsigned long long key = (unsigned long long)inDWord;
+	unsigned long long key = (unsigned long long)m_valptr;
 #else
-	unsigned long key = (unsigned long)inDWord;
+	unsigned long key = (unsigned long)m_valptr;
 #endif
 
 	key += ~(key << 16);
@@ -51,15 +57,3 @@ unsigned int KX_Hash(void *inDWord)
 
 	return (unsigned int)(key & 0xffffffff);
 }
-
-
-CHashedPtr::CHashedPtr(void* val) : m_valptr(val)
-{
-}
-
-
-
-unsigned int CHashedPtr::hash() const
-{
-	return KX_Hash(m_valptr);
-}

source/gameengine/Expressions/intern/IdentifierExpr.cpp

@@ -30,7 +30,7 @@
  */
 
 
-#include "IdentifierExpr.h"
+#include "EXP_IdentifierExpr.h"
 
 CIdentifierExpr::CIdentifierExpr(const STR_String& identifier,CValue* id_context)
 :m_identifier(identifier)

source/gameengine/Expressions/intern/IfExpr.cpp

@@ -15,10 +15,10 @@
  *
  */
 
-#include "IfExpr.h"
-#include "EmptyValue.h"
-#include "ErrorValue.h"
-#include "BoolValue.h"
+#include "EXP_IfExpr.h"
+#include "EXP_EmptyValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_BoolValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/InputParser.cpp

@@ -19,23 +19,23 @@
 
 #include "MT_assert.h"
 
-#include "Value.h"
-#include "InputParser.h"
-#include "ErrorValue.h"
-#include "IntValue.h"
-#include "StringValue.h"
-#include "FloatValue.h"
-#include "BoolValue.h"
-#include "EmptyValue.h"
-#include "ConstExpr.h"
-#include "Operator2Expr.h"
-#include "Operator1Expr.h"
-#include "IdentifierExpr.h"
+#include "EXP_Value.h"
+#include "EXP_InputParser.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_EmptyValue.h"
+#include "EXP_ConstExpr.h"
+#include "EXP_Operator2Expr.h"
+#include "EXP_Operator1Expr.h"
+#include "EXP_IdentifierExpr.h"
 
 // this is disable at the moment, I expected a memleak from it, but the error-cleanup was the reason
 // well, looks we don't need it anyway, until maybe the Curved Surfaces are integrated into CSG 
 // cool things like (IF(LOD==1,CCurvedValue,IF(LOD==2,CCurvedValue2)) etc...
-#include "IfExpr.h" 
+#include "EXP_IfExpr.h"
 
 #if (defined(WIN32) || defined(WIN64)) && !defined(FREE_WINDOWS)
 #define strcasecmp	_stricmp

source/gameengine/Expressions/intern/IntValue.cpp

@@ -17,12 +17,12 @@
 
 #include <stdio.h>
 
-#include "IntValue.h"
-#include "ErrorValue.h"
-#include "FloatValue.h"
-#include "BoolValue.h"
-#include "StringValue.h"
-#include "VoidValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/ListValue.cpp

@@ -19,11 +19,11 @@
 
 #include <stdio.h>
 
-#include "ListValue.h"
-#include "StringValue.h"
-#include "VoidValue.h"
+#include "EXP_ListValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_VoidValue.h"
 #include <algorithm>
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 #include "BLI_sys_types.h" /* for intptr_t support */
 

source/gameengine/Expressions/intern/Operator1Expr.cpp

@@ -15,8 +15,8 @@
  *
  */
 
-#include "Operator1Expr.h"
-#include "EmptyValue.h"
+#include "EXP_Operator1Expr.h"
+#include "EXP_EmptyValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/Operator2Expr.cpp

@@ -19,9 +19,9 @@
 // have to do the trick
 // when expression is cached, there will be a call to UpdateCalc() instead of Calc()
 
-#include "Operator2Expr.h"
-#include "StringValue.h"
-#include "VoidValue.h"
+#include "EXP_Operator2Expr.h"
+#include "EXP_StringValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/PyObjectPlus.cpp

@@ -47,7 +47,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include "STR_String.h"
 #include "MT_Vector3.h"
 #include "MEM_guardedalloc.h"

source/gameengine/Expressions/intern/PythonCallBack.cpp

@@ -20,11 +20,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file gameengine/Expressions/KX_PythonCallBack.cpp
+/** \file gameengine/Expressions/intern/PythonCallBack.cpp
  *  \ingroup expressions
  */
 
-#include "KX_PythonCallBack.h"
+#include "EXP_PythonCallBack.h"
 #include <iostream>
 #include <stdarg.h>
 

source/gameengine/Expressions/intern/StringValue.cpp

@@ -15,10 +15,10 @@
  *
  */
 
-#include "StringValue.h"
-#include "BoolValue.h"
-#include "ErrorValue.h"
-#include "VoidValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/Value.cpp

@@ -17,15 +17,15 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  *
  */
-#include "Value.h"
-#include "BoolValue.h"
-#include "FloatValue.h"
-#include "IntValue.h"
-#include "VectorValue.h"
-#include "VoidValue.h"
-#include "StringValue.h"
-#include "ErrorValue.h"
-#include "ListValue.h"
+#include "EXP_Value.h"
+#include "EXP_BoolValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_VectorValue.h"
+#include "EXP_VoidValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_ListValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

source/gameengine/Expressions/intern/VectorValue.cpp

@@ -19,12 +19,12 @@
 #  pragma warning (disable:4786)
 #endif
 
-#include "Value.h"
-#include "VectorValue.h"
-#include "ErrorValue.h"
+#include "EXP_Value.h"
+#include "EXP_VectorValue.h"
+#include "EXP_ErrorValue.h"
 //#include "MatrixValue.h"
-#include "VoidValue.h"
-#include "StringValue.h"
+#include "EXP_VoidValue.h"
+#include "EXP_StringValue.h"
 //#include "FactoryManager.h"
 
 

source/gameengine/GameLogic/SCA_ANDController.cpp

@@ -36,7 +36,7 @@
 #include "SCA_ANDController.h"
 #include "SCA_ISensor.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */

source/gameengine/GameLogic/SCA_ExpressionController.cpp

@@ -36,8 +36,8 @@
 #include "SCA_ExpressionController.h"
 #include "SCA_ISensor.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
-#include "InputParser.h"
+#include "EXP_BoolValue.h"
+#include "EXP_InputParser.h"
 #include "MT_Transform.h" // for fuzzyZero
 
 #include <stdio.h>

source/gameengine/GameLogic/SCA_IController.cpp

@@ -36,7 +36,7 @@
 #include "SCA_LogicManager.h"
 #include "SCA_IActuator.h"
 #include "SCA_ISensor.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include "../Ketsji/KX_PythonSeq.h" /* not nice, only need for KX_PythonSeq_CreatePyObject */
 
 #include <stdio.h>

source/gameengine/GameLogic/SCA_IController.h

@@ -33,7 +33,7 @@
 #define __SCA_ICONTROLLER_H__
 
 #include "SCA_ILogicBrick.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 /**
  * Use of SG_DList element: none

source/gameengine/GameLogic/SCA_ILogicBrick.cpp

@@ -33,7 +33,7 @@
 #include <stddef.h>
 
 #include "SCA_ILogicBrick.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 SCA_LogicManager* SCA_ILogicBrick::m_sCurrentLogicManager = NULL;
 

source/gameengine/GameLogic/SCA_ILogicBrick.h

@@ -32,9 +32,9 @@
 #ifndef __SCA_ILOGICBRICK_H__
 #define __SCA_ILOGICBRICK_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 #include "SCA_IObject.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 #include "CTR_Map.h"
 #include "CTR_HashedPtr.h"
 

source/gameengine/GameLogic/SCA_IObject.cpp

@@ -37,7 +37,7 @@
 #include "SCA_IController.h"
 #include "SCA_IActuator.h"
 #include "MT_Point3.h"
-#include "ListValue.h"
+#include "EXP_ListValue.h"
 
 MT_Point3 SCA_IObject::m_sDummy=MT_Point3(0,0,0);
 SG_QList SCA_IObject::m_activeBookmarkedControllers;

source/gameengine/GameLogic/SCA_IObject.h

@@ -34,7 +34,7 @@
 #ifndef __SCA_IOBJECT_H__
 #define __SCA_IOBJECT_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 #include <vector>
 
 class SCA_IObject;

source/gameengine/GameLogic/SCA_IScene.cpp

@@ -31,7 +31,7 @@
 
 
 #include "SCA_IScene.h"
-#include "Value.h"
+#include "EXP_Value.h"
 
 SCA_DebugProp::SCA_DebugProp(): m_obj(NULL)
 {

source/gameengine/GameLogic/SCA_JoystickSensor.cpp

@@ -35,7 +35,7 @@
 #include "SCA_EventManager.h"
 #include "SCA_LogicManager.h"
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include <stdio.h>
 #include <stddef.h>

source/gameengine/GameLogic/SCA_KeyboardManager.cpp

@@ -33,10 +33,10 @@
  */
 
 
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 #include "SCA_KeyboardManager.h"
 #include "SCA_KeyboardSensor.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include <vector>
 
 SCA_KeyboardManager::SCA_KeyboardManager(SCA_LogicManager* logicmgr,

source/gameengine/GameLogic/SCA_KeyboardSensor.cpp

@@ -36,7 +36,7 @@
 #include "SCA_KeyboardSensor.h"
 #include "SCA_KeyboardManager.h"
 #include "SCA_LogicManager.h"
-#include "StringValue.h"
+#include "EXP_StringValue.h"
 #include "SCA_IInputDevice.h"
 
 extern "C" {

source/gameengine/GameLogic/SCA_KeyboardSensor.h

@@ -34,7 +34,7 @@
 #define __SCA_KEYBOARDSENSOR_H__
 
 #include "SCA_ISensor.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 #include <list>
 
 /**

source/gameengine/GameLogic/SCA_LogicManager.cpp

@@ -30,7 +30,7 @@
  *  \ingroup gamelogic
  */
 
-#include "Value.h"
+#include "EXP_Value.h"
 #include "SCA_LogicManager.h"
 #include "SCA_ISensor.h"
 #include "SCA_IController.h"

source/gameengine/GameLogic/SCA_LogicManager.h

@@ -43,10 +43,10 @@
 
 #include "CTR_Map.h"
 #include "STR_HashedString.h"
-#include "Value.h"
+#include "EXP_Value.h"
 #include "SG_QList.h"
 
-#include "KX_HashedPtr.h"
+#include "EXP_HashedPtr.h"
 
 using namespace std;
 typedef std::list<class SCA_IController*> controllerlist;

source/gameengine/GameLogic/SCA_MouseManager.cpp

@@ -40,10 +40,10 @@
 #  pragma warning( disable:4786 )
 #endif
 
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 #include "SCA_MouseManager.h"
 #include "SCA_MouseSensor.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include "RAS_ICanvas.h"
 
 

source/gameengine/GameLogic/SCA_MouseSensor.cpp

@@ -41,7 +41,7 @@
 #include "SCA_MouseManager.h"
 #include "SCA_LogicManager.h"
 #include "SCA_IInputDevice.h"
-#include "ConstExpr.h"
+#include "EXP_ConstExpr.h"
 #include <iostream>
 
 /* ------------------------------------------------------------------------- */

source/gameengine/GameLogic/SCA_MouseSensor.h

@@ -34,7 +34,7 @@
 #define __SCA_MOUSESENSOR_H__
 
 #include "SCA_ISensor.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 #include "SCA_IInputDevice.h"
 
 class SCA_MouseSensor : public SCA_ISensor

source/gameengine/GameLogic/SCA_NANDController.cpp

@@ -36,7 +36,7 @@
 #include "SCA_NANDController.h"
 #include "SCA_ISensor.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */

source/gameengine/GameLogic/SCA_NORController.cpp

@@ -36,7 +36,7 @@
 #include "SCA_NORController.h"
 #include "SCA_ISensor.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */

source/gameengine/GameLogic/SCA_ORController.cpp

@@ -36,7 +36,7 @@
 #include "SCA_ORController.h"
 #include "SCA_ISensor.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */

source/gameengine/GameLogic/SCA_PropertyActuator.cpp

@@ -36,9 +36,9 @@
 #include <stddef.h>
 
 #include "SCA_PropertyActuator.h"
-#include "InputParser.h"
-#include "Operator2Expr.h"
-#include "ConstExpr.h"
+#include "EXP_InputParser.h"
+#include "EXP_Operator2Expr.h"
+#include "EXP_ConstExpr.h"
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */

source/gameengine/GameLogic/SCA_PropertySensor.cpp

@@ -37,14 +37,14 @@
 
 #include <iostream>
 #include "SCA_PropertySensor.h"
-#include "Operator2Expr.h"
-#include "ConstExpr.h"
-#include "InputParser.h"
-#include "StringValue.h"
+#include "EXP_Operator2Expr.h"
+#include "EXP_ConstExpr.h"
+#include "EXP_InputParser.h"
+#include "EXP_StringValue.h"
 #include "SCA_EventManager.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
-#include "FloatValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_FloatValue.h"
 #include <stdio.h>
 
 SCA_PropertySensor::SCA_PropertySensor(SCA_EventManager* eventmgr,

source/gameengine/GameLogic/SCA_PythonController.cpp

@@ -39,7 +39,7 @@
 #include "SCA_LogicManager.h"
 #include "SCA_ISensor.h"
 #include "SCA_IActuator.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #ifdef WITH_PYTHON
 #include "compile.h"

source/gameengine/GameLogic/SCA_PythonController.h

@@ -35,7 +35,7 @@
 
 #include "SCA_IController.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 #include <vector>
 

source/gameengine/GameLogic/SCA_PythonJoystick.h

@@ -27,7 +27,7 @@
 #ifndef __SCA_PYTHONJOYSTICK_H__
 #define __SCA_PYTHONJOYSTICK_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_PythonJoystick : public PyObjectPlus
 {

source/gameengine/GameLogic/SCA_PythonKeyboard.h

@@ -27,7 +27,7 @@
 #ifndef __SCA_PYTHONKEYBOARD_H__
 #define __SCA_PYTHONKEYBOARD_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_PythonKeyboard : public PyObjectPlus
 {

source/gameengine/GameLogic/SCA_PythonMouse.h

@@ -27,7 +27,7 @@
 #ifndef __SCA_PYTHONMOUSE_H__
 #define __SCA_PYTHONMOUSE_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_PythonMouse : public PyObjectPlus
 {

source/gameengine/GameLogic/SCA_RandomActuator.cpp

@@ -36,9 +36,9 @@
 #include <stddef.h>
 #include <math.h>
 
-#include "BoolValue.h"
-#include "IntValue.h"
-#include "FloatValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_FloatValue.h"
 #include "SCA_IActuator.h"
 #include "SCA_RandomActuator.h"
 #include "MT_Transform.h"

source/gameengine/GameLogic/SCA_RandomSensor.cpp

@@ -39,7 +39,7 @@
 #include "SCA_EventManager.h"
 #include "SCA_RandomEventManager.h"
 #include "SCA_LogicManager.h"
-#include "ConstExpr.h"
+#include "EXP_ConstExpr.h"
 #include <iostream>
 
 /* ------------------------------------------------------------------------- */

source/gameengine/GameLogic/SCA_RandomSensor.h

@@ -34,7 +34,7 @@
 #define __SCA_RANDOMSENSOR_H__
 
 #include "SCA_ISensor.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 #include "SCA_RandomNumberGenerator.h"
 
 class SCA_RandomSensor : public SCA_ISensor

source/gameengine/GameLogic/SCA_TimeEventManager.cpp

@@ -38,7 +38,7 @@
 #include "SCA_TimeEventManager.h"
 
 #include "SCA_LogicManager.h"
-#include "FloatValue.h"
+#include "EXP_FloatValue.h"
 
 SCA_TimeEventManager::SCA_TimeEventManager(SCA_LogicManager* logicmgr)
 : SCA_EventManager(NULL, TIME_EVENTMGR)

source/gameengine/GameLogic/SCA_TimeEventManager.h

@@ -33,7 +33,7 @@
 #define __SCA_TIMEEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
-#include "Value.h"
+#include "EXP_Value.h"
 #include <vector>
 
 using namespace std;

source/gameengine/GameLogic/SCA_XNORController.cpp

@@ -36,7 +36,7 @@
 #include "SCA_XNORController.h"
 #include "SCA_ISensor.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */

source/gameengine/GameLogic/SCA_XORController.cpp

@@ -36,7 +36,7 @@
 #include "SCA_XORController.h"
 #include "SCA_ISensor.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */

source/gameengine/Ketsji/BL_Shader.h

@@ -6,7 +6,7 @@
 #ifndef __BL_SHADER_H__
 #define __BL_SHADER_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include "BL_Material.h"
 #include "BL_Texture.h"
 // --

source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp

@@ -39,9 +39,9 @@
 #include "NG_NetworkScene.h"
 #include "NG_NetworkObject.h"
 #include "SCA_IObject.h"
-#include "InputParser.h"
-#include "ListValue.h"
-#include "StringValue.h"
+#include "EXP_InputParser.h"
+#include "EXP_ListValue.h"
+#include "EXP_StringValue.h"
 
 #ifdef NAN_NET_DEBUG
   #include <iostream>

source/gameengine/Ketsji/KX_BlenderMaterial.h

@@ -15,7 +15,7 @@
 #include "BL_Shader.h"
 #include "BL_BlenderShader.h"
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include "MT_Vector3.h"
 #include "MT_Vector4.h"

source/gameengine/Ketsji/KX_Camera.cpp

@@ -35,7 +35,7 @@
 #include "KX_Camera.h"
 #include "KX_Scene.h"
 #include "KX_PythonInit.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "KX_PyMath.h"
 
 #include "RAS_ICanvas.h"

source/gameengine/Ketsji/KX_Camera.h

@@ -40,7 +40,7 @@
 #include "MT_Vector3.h"
 #include "MT_Point3.h"
 #include "KX_GameObject.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include "RAS_CameraData.h"
 
 #ifdef WITH_PYTHON

source/gameengine/Ketsji/KX_CameraActuator.cpp

@@ -40,7 +40,7 @@
 #include <float.h>
 #include "KX_GameObject.h"
 
-#include "PyObjectPlus.h" 
+#include "EXP_PyObjectPlus.h" 
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */

source/gameengine/Ketsji/KX_CharacterWrapper.h

@@ -6,7 +6,7 @@
 #ifndef __KX_CHARACTERWRAPPER_H__
 #define __KX_CHARACTERWRAPPER_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 #include "PHY_DynamicTypes.h"
 class PHY_ICharacter;
 

source/gameengine/Ketsji/KX_ConstraintWrapper.cpp

@@ -30,7 +30,7 @@
  */
 
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include "KX_ConstraintWrapper.h"
 #include "PHY_IPhysicsEnvironment.h"