code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

20 files changed, 30 insertions, 59 deletions

diff --git a/source/gameengine/Expressions/BoolValue.h b/source/gameengine/Expressions/BoolValue.h
index 64ac0266baf..b88c839a58e 100644
--- a/source/gameengine/Expressions/BoolValue.h
+++ b/source/gameengine/Expressions/BoolValue.h
@@ -61,5 +61,4 @@ private:
 #endif
 };
 
-#endif // !defined __BOOLVALUE_H__
-
+#endif  /* __BOOLVALUE_H__ */
diff --git a/source/gameengine/Expressions/ConstExpr.h b/source/gameengine/Expressions/ConstExpr.h
index 86d411cef26..768f2bbd10e 100644
--- a/source/gameengine/Expressions/ConstExpr.h
+++ b/source/gameengine/Expressions/ConstExpr.h
@@ -51,5 +51,4 @@ private:
 #endif
 };
 
-#endif // !defined(AFX_CONSTEXPR_H__061ECFC3_BE87_11D1_A51C_00A02472FC58__INCLUDED_)
-
+#endif  /* __CONSTEXPR_H__ */
diff --git a/source/gameengine/Expressions/EXP_C-Api.h b/source/gameengine/Expressions/EXP_C-Api.h
index 4d43695f9b9..d73b0a209d4 100644
--- a/source/gameengine/Expressions/EXP_C-Api.h
+++ b/source/gameengine/Expressions/EXP_C-Api.h
@@ -64,5 +64,4 @@ const char*					EXP_GetText(EXP_ValueHandle);
 }
 #endif
 
-#endif //__EXP_C_API_H__
-
+#endif  /* __EXP_C_API_H__ */
diff --git a/source/gameengine/Expressions/EmptyValue.h b/source/gameengine/Expressions/EmptyValue.h
index 54920359f3f..8eccb97e0f5 100644
--- a/source/gameengine/Expressions/EmptyValue.h
+++ b/source/gameengine/Expressions/EmptyValue.h
@@ -45,5 +45,4 @@ public:
 #endif
 };
 
-#endif // !defined __EMPTYVALUE_H__
-
+#endif  /* __EMPTYVALUE_H__ */
diff --git a/source/gameengine/Expressions/ErrorValue.h b/source/gameengine/Expressions/ErrorValue.h
index 12bc7c7ffcb..0095528254e 100644
--- a/source/gameengine/Expressions/ErrorValue.h
+++ b/source/gameengine/Expressions/ErrorValue.h
@@ -43,5 +43,4 @@ private:
 #endif
 };
 
-#endif // !defined __ERRORVALUE_H__
-
+#endif  /* __ERRORVALUE_H__ */
diff --git a/source/gameengine/Expressions/Expression.h b/source/gameengine/Expressions/Expression.h
index 5f5db505331..d1b7eda43f0 100644
--- a/source/gameengine/Expressions/Expression.h
+++ b/source/gameengine/Expressions/Expression.h
@@ -146,5 +146,4 @@ protected:
 #endif
 };
 
-#endif // !defined __EXPRESSION_H__
-
+#endif  /* __EXPRESSION_H__ */
diff --git a/source/gameengine/Expressions/FloatValue.h b/source/gameengine/Expressions/FloatValue.h
index 59311e5d373..bc6a2d052d4 100644
--- a/source/gameengine/Expressions/FloatValue.h
+++ b/source/gameengine/Expressions/FloatValue.h
@@ -54,5 +54,4 @@ protected:
 #endif
 };
 
-#endif // !defined __FLOATVALUE_H__
-
+#endif  /* __FLOATVALUE_H__ */
diff --git a/source/gameengine/Expressions/IdentifierExpr.h b/source/gameengine/Expressions/IdentifierExpr.h
index 58e75c4b02e..26eb3691378 100644
--- a/source/gameengine/Expressions/IdentifierExpr.h
+++ b/source/gameengine/Expressions/IdentifierExpr.h
@@ -56,5 +56,4 @@ public:
 #endif
 };
 
-#endif //__IDENTIFIEREXPR_H__
-
+#endif  /* __IDENTIFIEREXPR_H__ */
diff --git a/source/gameengine/Expressions/IfExpr.h b/source/gameengine/Expressions/IfExpr.h
index f8ed81168d0..80e35471d82 100644
--- a/source/gameengine/Expressions/IfExpr.h
+++ b/source/gameengine/Expressions/IfExpr.h
@@ -16,12 +16,8 @@
  *  \ingroup expressions
  */
 
-#if !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_)
-#define AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_
-
-#if defined(_MSC_VER) && _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
+#ifndef __IFEXPR_H__
+#define __IFEXPR_H__
 
 #include "Expression.h"
 
@@ -55,5 +51,4 @@ public:
 #endif
 };
 
-#endif // !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_)
-
+#endif  /* __IFEXPR_H__ */
diff --git a/source/gameengine/Expressions/IntValue.h b/source/gameengine/Expressions/IntValue.h
index e728467cc4e..8411b09693c 100644
--- a/source/gameengine/Expressions/IntValue.h
+++ b/source/gameengine/Expressions/IntValue.h
@@ -69,5 +69,4 @@ private:
 #endif
 };
 
-#endif // !defined __INTVALUE_H__
-
+#endif  /* __INTVALUE_H__ */
diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/KX_HashedPtr.h
index 866689ed203..d822af38c44 100644
--- a/source/gameengine/Expressions/KX_HashedPtr.h
+++ b/source/gameengine/Expressions/KX_HashedPtr.h
@@ -58,5 +58,4 @@ public:
 #endif
 };
 
-#endif //__KX_HASHEDPTR_H__
-
+#endif  /* __KX_HASHEDPTR_H__ */
diff --git a/source/gameengine/Expressions/KX_Python.h b/source/gameengine/Expressions/KX_Python.h
index 4a7ce4d3fb7..62dd9a13dd4 100644
--- a/source/gameengine/Expressions/KX_Python.h
+++ b/source/gameengine/Expressions/KX_Python.h
@@ -79,5 +79,4 @@
 #undef toupper
 #endif
 
-#endif // __KX_PYTHON_H__
-
+#endif  /* __KX_PYTHON_H__ */
diff --git a/source/gameengine/Expressions/ListValue.h b/source/gameengine/Expressions/ListValue.h
index 20005088310..5240c54ae4e 100644
--- a/source/gameengine/Expressions/ListValue.h
+++ b/source/gameengine/Expressions/ListValue.h
@@ -87,5 +87,5 @@ private:
 	bool	m_bReleaseContents;
 };
 
-#endif // !defined __LISTVALUE_H__
+#endif  /* __LISTVALUE_H__ */
 
diff --git a/source/gameengine/Expressions/Operator1Expr.h b/source/gameengine/Expressions/Operator1Expr.h
index 13a1b16500a..3dd76f773f2 100644
--- a/source/gameengine/Expressions/Operator1Expr.h
+++ b/source/gameengine/Expressions/Operator1Expr.h
@@ -16,8 +16,8 @@
  *  \ingroup expressions
  */
 
-#if !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_)
-#define AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_
+#ifndef __OPERATOR1EXPR_H__
+#define __OPERATOR1EXPR_H__
 
 #include "Expression.h"
 
@@ -56,5 +56,4 @@ private:
 #endif
 };
 
-#endif // !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_)
-
+#endif  /* __OPERATOR1EXPR_H__ */
diff --git a/source/gameengine/Expressions/Operator2Expr.h b/source/gameengine/Expressions/Operator2Expr.h
index 23272930131..8c30b7cd634 100644
--- a/source/gameengine/Expressions/Operator2Expr.h
+++ b/source/gameengine/Expressions/Operator2Expr.h
@@ -62,5 +62,5 @@ private:
 #endif
 };
 
-#endif // !defined __OPERATOR2EXPR_H__
+#endif  /* __OPERATOR2EXPR_H__ */
 
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index 005bf2f6cb2..83b7c8c8771 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -548,7 +548,7 @@ public: \
 #define Py_HeaderPtr \
 public: \
 
-#endif // WITH_CXX_GUARDEDALLOC
+#endif  /* WITH_CXX_GUARDEDALLOC */
 
 #endif
 
@@ -633,4 +633,4 @@ public:
 PyObject *PyUnicode_From_STR_String(const STR_String& str);
 #endif
 
-#endif //  __PYOBJECTPLUS_H__
+#endif  /* __PYOBJECTPLUS_H__ */
diff --git a/source/gameengine/Expressions/StringValue.h b/source/gameengine/Expressions/StringValue.h
index bc102c6e203..22d433455ec 100644
--- a/source/gameengine/Expressions/StringValue.h
+++ b/source/gameengine/Expressions/StringValue.h
@@ -45,7 +45,7 @@ public:
 	virtual PyObject*	ConvertValueToPython() {
 		return PyUnicode_From_STR_String(m_strString);
 	}
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 private:
 	// data member
@@ -57,5 +57,4 @@ private:
 #endif
 };
 
-#endif
-
+#endif  /* __STRINGVALUE_H__ */
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h
index e0c4daeccd0..92b5e20543c 100644
--- a/source/gameengine/Expressions/Value.h
+++ b/source/gameengine/Expressions/Value.h
@@ -16,13 +16,13 @@
  *  \ingroup expressions
  */
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
-#endif //WIN32
-
 #ifndef __VALUE_H__
 #define __VALUE_H__
 
+#if defined(WIN32) && !defined(FREE_WINDOWS)
+#pragma warning (disable:4786)
+#endif  /* WIN32 */
+
 #include <map>		// array functionality for the propertylist
 #include "STR_String.h"	// STR_String class
 
@@ -53,14 +53,6 @@ using namespace std;
 #define	assertd(exp)			((void)NULL)
 #endif
 
-
-#ifndef USE_PRAGMA_ONCE
-#ifdef WIN32
-	#pragma once
-
-#endif //WIN32
-#endif
-
 enum VALUE_OPERATOR {
 	
 	VALUE_MOD_OPERATOR,			// %
@@ -233,7 +225,7 @@ public:
 	static PyObject *pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
 	
 	virtual PyObject *ConvertKeysToPython( void );
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 	
 	
@@ -439,5 +431,4 @@ protected:
 #endif
 };
 
-#endif // !defined _VALUEBASECLASS_H
-
+#endif  /* __VALUE_H__ */
diff --git a/source/gameengine/Expressions/VectorValue.h b/source/gameengine/Expressions/VectorValue.h
index b7afa61d4dd..9b9f9612810 100644
--- a/source/gameengine/Expressions/VectorValue.h
+++ b/source/gameengine/Expressions/VectorValue.h
@@ -90,5 +90,4 @@ protected:
 #endif
 };
 
-#endif // !defined __VECTORVALUE_H__
-
+#endif  /* __VECTORVALUE_H__ */
diff --git a/source/gameengine/Expressions/VoidValue.h b/source/gameengine/Expressions/VoidValue.h
index a1a82f8aa65..e97278b3142 100644
--- a/source/gameengine/Expressions/VoidValue.h
+++ b/source/gameengine/Expressions/VoidValue.h
@@ -78,4 +78,3 @@ public:
 };
 
 #endif  /* __VOIDVALUE_H__ */
-