CBot namespace

src/CBot/CBotCStack.cpp

@@ -18,21 +18,17 @@
  */
 
 
-// Modules inlcude
 #include "CBot/CBotCStack.h"
 
 #include "CBot/CBotToken.h"
-#include "CBotExternalCall.h"
+#include "CBot/CBotExternalCall.h"
 
 #include "CBot/CBotVar/CBotVar.h"
 
 #include "CBot/CBotInstr/CBotFunction.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotProgram* CBotCStack::m_prog    = nullptr;            // init the static variable
@@ -397,3 +393,5 @@ bool CBotCStack::CheckCall(CBotToken* &pToken, CBotDefParam* pParam)
 
     return false;
 }
+
+}

src/CBot/CBotCStack.h

@@ -19,13 +19,12 @@
 
 #pragma once
 
-// Modules inlcude
+#include "CBot/CBotVar/CBotVar.h"
-#include <CBot/CBotVar/CBotVar.h>
 #include "CBot/CBotProgram.h"
 
-// Local include
+namespace CBot
+{
 
-// Global include
 class CBotInstr;
 class CBotDefParam;
 class CBotToken;
@@ -266,3 +265,5 @@ private:
     static CBotProgram* m_prog;
     static CBotTypResult m_retTyp;
 };
+
+} // namespace CBot

src/CBot/CBotCallMethode.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotCallMethode.h"
 
 #include "CBot/CBotUtils.h"
@@ -26,9 +25,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -111,3 +109,5 @@ int CBotCallMethode::DoCall(const std::string& name, CBotVar* pThis, CBotVar** p
 
     return -1;
 }
+
+} // namespace CBot

src/CBot/CBotCallMethode.h

@@ -22,6 +22,9 @@
 #include "CBot/CBotTypResult.h"
 #include "CBot/CBotUtils.h"
 
+namespace CBot
+{
+
 class CBotVar;
 class CBotCStack;
 class CBotStack;
@@ -82,3 +85,4 @@ private:
     friend class CBotClass;
 };
 
+} // namespace CBot

src/CBot/CBotClass.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotClass.h"
 
 #include "CBot/CBotInstr/CBotNew.h"
@@ -37,10 +36,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotClass* CBotClass::m_ExClass = nullptr;
@@ -826,3 +823,5 @@ CBotClass* CBotClass::Compile(CBotToken* &p, CBotCStack* pStack)
     pStack->SetError(CBotErrNoTerminator, p);
     return nullptr;
 }
+
+} // namespace CBot

src/CBot/CBotClass.h

@@ -25,6 +25,9 @@
 
 #include <string>
 
+namespace CBot
+{
+
 class CBotCallMethode;
 class CBotFunction;
 class CBotProgram;
@@ -386,4 +389,6 @@ private:
     int m_cptOne;
     //! Processes waiting for sync.
     CBotProgram* m_ProgInLock[5];
-};
+};
+
+} // namespace CBot

src/CBot/CBotDefParam.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotDefParam.h"
 
 #include "CBot/CBotUtils.h"
@@ -25,11 +24,11 @@
 
 #include "CBot/CBotVar/CBotVarClass.h"
 
-// Local include
-
-// Global include
 #include <cassert>
 
+namespace CBot
+{
+
 ////////////////////////////////////////////////////////////////////////////////
 CBotDefParam::CBotDefParam()
 {
@@ -189,3 +188,5 @@ std::string CBotDefParam::GetParamString()
     param += m_token.GetString();
     return param;
 }
+
+} // namespace CBot

src/CBot/CBotDefParam.h

@@ -23,6 +23,9 @@
 #include "CBot/CBotStack.h"
 #include "CBot/CBotUtils.h"
 
+namespace CBot
+{
+
 class CBotCStack;
 class CBotStack;
 class CBotVar;
@@ -94,3 +97,5 @@ private:
     CBotTypResult m_type;
     long m_nIdent;
 };
+
+} // namespace CBot

src/CBot/CBotEnums.h

@@ -23,9 +23,11 @@
  * \file CBotEnums.h
  * \brief Some enum values used across the CBot engine
  */
+ 
+namespace CBot
+{
 
 /**
- * \enum CBotType
  * \brief Defines known types. This types are modeled on Java types.
  *
  * Do not change the order of elements.
@@ -55,7 +57,6 @@ enum CBotType
 };
 
 /**
- * \enum CBotGet
  * \brief Different modes for CBotProgram::GetPosition
  */
 enum CBotGet
@@ -67,7 +68,6 @@ enum CBotGet
 };
 
 /**
- * \enum TokenId
  * \brief This enum contains possible token types
  */
 enum TokenId
@@ -168,7 +168,6 @@ enum TokenId
 };
 
 /**
- * \enum TokenType
  * \brief Types of tokens
  */
 enum TokenType {
@@ -181,7 +180,6 @@ enum TokenType {
 };
 
 /**
- * \enum CBotError
  * \brief This enum contains possible CBot error values. Values in range 5000-5999 are compile errors, 6000-6999 are runtime errors
  *
  * Note that other values ​​may be returned, for example exceptions for user-defined builtin functions, or "throw" instruction
@@ -255,5 +253,7 @@ enum CBotError : int
     CBotErrRead          = 6014, //!< error while reading
     CBotErrWrite         = 6015, //!< writing error
 
-    TX_MAX, //!< Max errors
+    CBotErrMAX, //!< Max errors
 };
+
+} // namespace CBot

src/CBot/CBotExternalCall.cpp

@@ -26,6 +26,9 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
+namespace CBot
+{
+
 void CBotExternalCallList::Clear()
 {
     m_list.clear();
@@ -206,4 +209,6 @@ bool CBotExternalCallDefaultClass::Run(CBotVar* thisVar, CBotStack* pStack)
     }
 
     return true;
-}
+}
+
+} // namespace CBot

src/CBot/CBotExternalCall.h

@@ -27,6 +27,9 @@
 #include <map>
 #include <memory>
 
+namespace CBot
+{
+
 class CBotStack;
 class CBotCStack;
 class CBotVar;
@@ -211,4 +214,6 @@ public:
 private:
     std::map<std::string, std::unique_ptr<CBotExternalCall>> m_list{};
     void* m_user = nullptr;
-};
+};
+
+} // namespace CBot

src/CBot/CBotFileUtils.cpp

@@ -17,17 +17,14 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotFileUtils.h"
 
 #include "CBot/CBotClass.h"
 #include "CBot/CBotEnums.h"
 #include "CBot/CBotUtils.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 
 // file management
@@ -172,3 +169,5 @@ bool ReadType(FILE* pf, CBotTypResult &type)
     }
     return true;
 }
+
+} // namespace CBot

src/CBot/CBotFileUtils.h

@@ -19,15 +19,12 @@
 
 #pragma once
 
-// Modules inlcude
-
-// Local include
-
-// Global include
 #include <cstdio>
 #include <string>
 
-// Forward declaration
+namespace CBot
+{
+
 class CBotVar;
 class CBotTypResult;
 
@@ -154,3 +151,5 @@ bool WriteType(FILE* pf, const CBotTypResult &type);
  * \return
  */
 bool ReadType(FILE* pf, CBotTypResult &type);
+
+} // namespace CBot

src/CBot/CBotInstr/CBotBlock.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotBlock.h"
 
 #include "CBot/CBotCStack.h"
@@ -25,10 +24,8 @@
 
 #include "CBot/CBotDefines.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotInstr* CBotBlock::Compile(CBotToken* &p, CBotCStack* pStack, bool bLocal)
@@ -71,3 +68,5 @@ CBotInstr* CBotBlock::CompileBlkOrInst(CBotToken* &p, CBotCStack* pStack, bool b
 // (*) is the case in the following statement
 // if (1 == 1) int x = 0;
 // where the variable x is known only in the block following the if
+
+} // namespace CBot

src/CBot/CBotInstr/CBotBlock.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotBlock class An instruction block { .... }.
@@ -62,3 +59,5 @@ private:
     CBotBlock() = delete;
     CBotBlock(const CBotBlock &) = delete;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotBoolExpr.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotBoolExpr.h"
 #include "CBot/CBotInstr/CBotTwoOpExpr.h"
 
@@ -25,11 +24,8 @@
 
 #include "CBot/CBotDefines.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotInstr* CBotBoolExpr::Compile(CBotToken* &p, CBotCStack* pStack)
@@ -50,3 +46,5 @@ CBotInstr* CBotBoolExpr::Compile(CBotToken* &p, CBotCStack* pStack)
     delete inst;
     return nullptr;
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotBoolExpr.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotBoolExpr class Compile a statement such as "(condition)"
@@ -45,3 +42,5 @@ public:
      */
     static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack);
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotBoolean.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotBoolean.h"
 #include "CBot/CBotInstr/CBotLeftExprVar.h"
 #include "CBot/CBotInstr/CBotTwoOpExpr.h"
@@ -28,10 +27,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotBoolean::CBotBoolean()
@@ -176,3 +173,5 @@ void CBotBoolean::RestoreState(CBotStack* &pj, bool bMain)
     if (m_next2b)
          m_next2b->RestoreState(pile, bMain);                // other(s) definition(s)
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotBoolean.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotBoolean class Defining a boolean variable int a, b = false;
@@ -74,3 +71,5 @@ private:
     //! A value to put, if there is.
     CBotInstr* m_expr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotBreak.cpp

@@ -17,15 +17,13 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotBreak.h"
 
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotBreak::CBotBreak()
@@ -94,3 +92,5 @@ void CBotBreak :: RestoreState(CBotStack* &pj, bool bMain)
 {
     if ( bMain ) pj->RestoreStack(this);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotBreak.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotBreak class Compiles instruction "break" or "continu".
@@ -73,3 +70,5 @@ private:
     std::string m_label;
 
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotCase.cpp

@@ -17,16 +17,14 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotCase.h"
 #include "CBot/CBotInstr/CBotExprNum.h"
 
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotCase::CBotCase()
@@ -90,3 +88,5 @@ bool CBotCase::CompCase(CBotStack* &pile, int val)
     while (!m_Value->Execute(pile));            // puts the value on the correspondent stack (without interruption)
     return (pile->GetVal() == val);             // compared with the given value
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotCase.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotCase class Compiles instruction "case" we are bound to the
@@ -81,3 +78,5 @@ private:
     //! Value to compare.
     CBotInstr*    m_Value;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotCatch.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotCatch.h"
 #include "CBot/CBotInstr/CBotBlock.h"
 #include "CBot/CBotInstr/CBotExpression.h"
@@ -27,9 +26,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotCatch::CBotCatch()
@@ -112,3 +110,5 @@ bool CBotCatch :: TestCatch(CBotStack* &pile, int val)
 
     return true;
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotCatch.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotCatch class. Compiles instruction "catch".
@@ -91,3 +89,5 @@ private:
 
     friend class CBotTry;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotClassInst.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBotClassInst.h"
 
 #include "CBot/CBotInstr/CBotInstrUtils.h"
@@ -33,10 +32,8 @@
 #include "CBot/CBotVar/CBotVarPointer.h"
 #include "CBot/CBotVar/CBotVarClass.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotClassInst::CBotClassInst()
@@ -439,3 +436,5 @@ void CBotClassInst::RestoreState(CBotStack* &pj, bool bMain)
     if ( m_next2b != nullptr )
          m_next2b->RestoreState(pile, bMain);                   // other(s) definition(s)
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotClassInst.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotClassInst class Definition of an element of any class.
@@ -83,3 +81,5 @@ private:
     long m_nMethodeIdent;
 
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotCondition.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotCondition.h"
 #include "CBot/CBotInstr/CBotBoolExpr.h"
 
@@ -25,10 +24,8 @@
 
 #include "CBot/CBotDefines.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotInstr* CBotCondition::Compile(CBotToken* &p, CBotCStack* pStack)
@@ -52,3 +49,5 @@ CBotInstr* CBotCondition::Compile(CBotToken* &p, CBotCStack* pStack)
 
     return nullptr;
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotCondition.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotCondition class This class has no constructor, because there
@@ -44,3 +42,5 @@ public:
      */
     static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack);
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotDo.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotDo.h"
 #include "CBot/CBotInstr/CBotBlock.h"
 #include "CBot/CBotInstr/CBotCondition.h"
@@ -25,10 +24,8 @@
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotDo::CBotDo()
@@ -157,3 +154,5 @@ void CBotDo :: RestoreState(CBotStack* &pj, bool bMain)
         return;
     }
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotDo.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 class CBotDo : public CBotInstr
 {
@@ -71,3 +68,5 @@ private:
     //! A label if there is
     std::string m_label;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotEmpty.cpp

@@ -17,17 +17,14 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotEmpty.h"
 
 #include "CBot/CBotStack.h"
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 bool CBotEmpty::Execute(CBotStack* &pj)
@@ -42,3 +39,5 @@ bool CBotEmpty::Execute(CBotStack* &pj)
 void CBotEmpty::RestoreState(CBotStack* &pj, bool bMain)
 {
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotEmpty.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotEmpty class
@@ -45,3 +43,5 @@ class CBotEmpty : public CBotInstr
      */
     void RestoreState(CBotStack* &pj, bool bMain) override;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprAlpha.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotExprAlpha.h"
 
 #include "CBot/CBotStack.h"
@@ -25,9 +24,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotExprAlpha::CBotExprAlpha()
@@ -80,3 +78,5 @@ void CBotExprAlpha::RestoreState(CBotStack* &pj, bool bMain)
 {
     if (bMain) pj->RestoreStack(this);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprAlpha.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotExprAlpha class Expression representing a string.
@@ -65,3 +63,5 @@ public:
      */
     void RestoreState(CBotStack* &pj, bool bMain) override;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprBool.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotExprBool.h"
 
 #include "CBot/CBotStack.h"
@@ -25,10 +24,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotExprBool::CBotExprBool()
@@ -82,3 +79,5 @@ void CBotExprBool::RestoreState(CBotStack* &pj, bool bMain)
 {
     if (bMain) pj->RestoreStack(this);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprBool.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotExprBool class Compile a token representing true or false.
@@ -66,3 +63,5 @@ public:
      */
     void RestoreState(CBotStack* &pj, bool bMain) override;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprNan.cpp

@@ -17,17 +17,14 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotExprNan.h"
 
 #include "CBot/CBotStack.h"
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotExprNan::CBotExprNan()
@@ -57,3 +54,5 @@ void CBotExprNan::RestoreState(CBotStack* &pj, bool bMain)
 {
     if (bMain) pj->RestoreStack(this);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprNan.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotExprNan class Management of the operand "nan".
@@ -57,3 +55,5 @@ public:
      */
     void RestoreState(CBotStack* &pj, bool bMain) override;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprNull.cpp

@@ -17,17 +17,14 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotExprNull.h"
 
 #include "CBot/CBotStack.h"
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotExprNull::CBotExprNull()
@@ -58,3 +55,5 @@ void CBotExprNull::RestoreState(CBotStack* &pj, bool bMain)
 {
     if (bMain) pj->RestoreStack(this);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprNull.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotExprNull class Management of the operand "null".
@@ -58,3 +55,5 @@ public:
      */
     void RestoreState(CBotStack* &pj, bool bMain) override;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprNum.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotExprNum.h"
 
 #include "CBot/CBotStack.h"
@@ -27,9 +26,8 @@
 
 #include "CBot/CBotUtils.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotExprNum::CBotExprNum()
@@ -117,3 +115,4 @@ void CBotExprNum::RestoreState(CBotStack* &pj, bool bMain)
     if (bMain) pj->RestoreStack(this);
 }
 
+} // namespace CBot

src/CBot/CBotInstr/CBotExprNum.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotExprNum class Expression representing a number.
@@ -76,3 +74,5 @@ private:
     float m_valfloat;
 
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprUnaire.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotExprUnaire.h"
 #include "CBot/CBotInstr/CBotParExpr.h"
 
@@ -26,10 +25,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotExprUnaire::CBotExprUnaire()
@@ -122,3 +119,5 @@ void CBotExprUnaire::RestoreState(CBotStack* &pj, bool bMain)
         return;
     }
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprUnaire.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotExprUnaire class Unary expression. Compile an unary expression
@@ -71,3 +68,5 @@ private:
     //! Expression to be evaluated.
     CBotInstr* m_Expr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprVar.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotExprVar.h"
 #include "CBot/CBotInstr/CBotInstrMethode.h"
 #include "CBot/CBotInstr/CBotExpression.h"
@@ -29,9 +28,8 @@
 
 #include "CBot/CBotVar/CBotVarArray.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotExprVar::CBotExprVar()
@@ -305,3 +303,5 @@ void CBotExprVar::RestoreStateVar(CBotStack* &pj, bool bMain)
     if (m_next3 != nullptr)
          m_next3->RestoreStateVar(pj, bMain);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExprVar.h

@@ -19,16 +19,13 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotDefines.h"
 
 #include "CBot/CBotInstr/CBotInstr.h"
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotExprVar class Expression for the variable name. Compile a
@@ -103,3 +100,5 @@ private:
     friend class CBotPreIncExpr;
 
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExpression.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotExpression.h"
 
 #include "CBot/CBotInstr/CBotInstrUtils.h"
@@ -29,11 +28,10 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
-
-// Global include
 #include <cassert>
 
+namespace CBot
+{
 
 //////////////////////////////////////////////////////////////////////////////////////
 CBotExpression::CBotExpression()
@@ -297,3 +295,5 @@ void CBotExpression::RestoreState(CBotStack* &pj, bool bMain)
         }
     }
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotExpression.h

@@ -19,15 +19,12 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotLeftExpr.h"
 
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotExpression class Compiles a statement with or without
@@ -85,3 +82,5 @@ private:
     //! Right operand
     CBotInstr* m_rightop;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotFieldExpr.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotFieldExpr.h"
 
 #include "CBot/CBotStack.h"
@@ -26,11 +25,11 @@
 
 #include "CBot/CBotVar/CBotVarClass.h"
 
-// Local include
-
-// Global include
 #include <cassert>
 
+namespace CBot
+{
+
 ////////////////////////////////////////////////////////////////////////////////
 CBotFieldExpr::CBotFieldExpr()
 {
@@ -128,3 +127,5 @@ void CBotFieldExpr::RestoreStateVar(CBotStack* &pj, bool bMain)
     if (m_next3 != nullptr)
          m_next3->RestoreStateVar(pj, bMain);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotFieldExpr.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotFieldExpr class Management of the fields of an instance
@@ -81,3 +78,5 @@ private:
     friend class CBotExpression;
     int m_nIdent;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotFloat.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotFloat.h"
 #include "CBot/CBotInstr/CBotLeftExprVar.h"
 #include "CBot/CBotInstr/CBotTwoOpExpr.h"
@@ -28,10 +27,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotFloat::CBotFloat()
@@ -174,3 +171,5 @@ void CBotFloat::RestoreState(CBotStack* &pj, bool bMain)
     if (m_next2b)
          m_next2b->RestoreState(pile, bMain);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotFloat.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotFloat class Definition of a real/float variable int a, b = 12.4;
@@ -74,3 +71,5 @@ private:
     //! A value to put, if there is.
     CBotInstr* m_expr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotFor.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotFor.h"
 #include "CBot/CBotInstr/CBotListExpression.h"
 #include "CBot/CBotInstr/CBotBlock.h"
@@ -26,9 +25,8 @@
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotFor::CBotFor()
@@ -212,3 +210,5 @@ void CBotFor :: RestoreState(CBotStack* &pj, bool bMain)
         return;
     }
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotFor.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotFor class
@@ -79,3 +76,5 @@ private:
     //! A label if there is
     std::string    m_label;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotFunction.cpp

@@ -17,8 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-
-// Modules inlcude
 #include "CBot/CBotInstr/CBotFunction.h"
 
 #include "CBot/CBotInstr/CBotInstrUtils.h"
@@ -37,11 +35,10 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
-
-// Global include
 #include <cassert>
 
+namespace CBot
+{
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotFunction::CBotFunction()
@@ -887,3 +884,5 @@ void CBotFunction::AddPublic(CBotFunction* func)
 {
     m_publicFunctions.insert(func);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotFunction.h

@@ -19,14 +19,12 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
-
-// Global include
 #include <set>
 
+namespace CBot
+{
 
 /*!
  * \brief The CBotFunction class A function declaration. Compilation of various
@@ -281,3 +279,5 @@ private:
     friend class CBotCStack;
 
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotIString.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotIString.h"
 #include "CBot/CBotInstr/CBotLeftExprVar.h"
 #include "CBot/CBotInstr/CBotTwoOpExpr.h"
@@ -27,10 +26,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotIString::CBotIString()
@@ -159,3 +156,5 @@ void CBotIString::RestoreState(CBotStack* &pj, bool bMain)
     if (m_next2b)
          m_next2b->RestoreState(pile, bMain);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotIString.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotIString class Define a string variable eg : int a, b = "salut";
@@ -74,3 +71,5 @@ private:
     //! A value to put, if there is.
     CBotInstr* m_expr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotIf.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotIf.h"
 #include "CBot/CBotInstr/CBotBlock.h"
 #include "CBot/CBotInstr/CBotCondition.h"
@@ -25,10 +24,8 @@
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotIf::CBotIf()
@@ -167,3 +164,4 @@ void CBotIf :: RestoreState(CBotStack* &pj, bool bMain)
     }
 }
 
+} // namespace CBot

src/CBot/CBotInstr/CBotIf.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotIf class Instruction if (condition) operation1 else operation2;
@@ -75,3 +72,5 @@ private:
     //! Instruction
     CBotInstr*    m_BlockElse;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotIndexExpr.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotIndexExpr.h"
 
 #include "CBot/CBotStack.h"
@@ -25,11 +24,11 @@
 
 #include "CBot/CBotVar/CBotVarArray.h"
 
-// Local include
-
-// Global include
 #include <cassert>
 
+namespace CBot
+{
+
 ////////////////////////////////////////////////////////////////////////////////
 CBotIndexExpr::CBotIndexExpr()
 {
@@ -118,3 +117,5 @@ void CBotIndexExpr::RestoreStateVar(CBotStack* &pile, bool bMain)
     if (m_next3)
          m_next3->RestoreStateVar(pile, bMain);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotIndexExpr.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotIndexExpr class Index management for arrays
@@ -79,3 +77,5 @@ private:
     friend class CBotLeftExpr;
     friend class CBotExprVar;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstArray.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstArray.h"
 
 #include "CBot/CBotInstr/CBotLeftExprVar.h"
@@ -32,10 +31,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotInstArray::CBotInstArray()
@@ -229,3 +226,5 @@ void CBotInstArray::RestoreState(CBotStack* &pj, bool bMain)
 
     if (m_next2b ) m_next2b->RestoreState( pile1, bMain);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstArray.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotInstArray class Definition of an array.
@@ -80,3 +77,5 @@ private:
     CBotTypResult m_typevar;
 
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstr.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
 #include "CBot/CBotInstr/CBotFor.h"
@@ -42,12 +41,11 @@
 #include "CBot/CBotClass.h"
 #include "CBot/CBotStack.h"
 
-
-// Local include
-
-// Global include
 #include <cassert>
 
+namespace CBot
+{
+
 ////////////////////////////////////////////////////////////////////////////////
 int CBotInstr::m_LoopLvl = 0;
 std::vector<std::string> CBotInstr::m_labelLvl = std::vector<std::string>();
@@ -361,3 +359,5 @@ CBotInstr* CBotInstr::CompileArray(CBotToken* &p, CBotCStack* pStack, CBotTypRes
     pStack->SetError(CBotErrNoTerminator, p->GetStart());
     return nullptr;
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstr.h

@@ -24,6 +24,9 @@
 
 #include <vector>
 
+namespace CBot
+{
+
 /*
     for example, the following program
     int        x[]; x[1] = 4;
@@ -269,3 +272,5 @@ private:
     //! List of labels used.
     static std::vector<std::string> m_labelLvl;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstrCall.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBotInstrCall.h"
 #include "CBot/CBotInstr/CBotExpression.h"
 
@@ -26,10 +25,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotInstrCall::CBotInstrCall()
@@ -205,3 +202,5 @@ void CBotInstrCall::RestoreState(CBotStack* &pj, bool bMain)
 
     pile2->RestoreCall(m_nFuncIdent, GetToken(), ppVars);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstrCall.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotInstrCall class Calls of these functions.
@@ -74,3 +71,5 @@ private:
     //! Id of a function.
     long m_nFuncIdent;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstrMethode.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstrMethode.h"
 
 #include "CBot/CBotInstr/CBotInstrUtils.h"
@@ -28,10 +27,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotInstrMethode::CBotInstrMethode()
@@ -279,3 +276,5 @@ bool CBotInstrMethode::Execute(CBotStack* &pj)
 
     return pj->Return(pile2);    // release the entire stack
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstrMethode.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotInstrMethode class A call of method. Compile a method call.
@@ -90,3 +87,5 @@ private:
     //! Name of the class.
     std::string m_ClassName;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstrUtils.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstrUtils.h"
 
 #include "CBot/CBotToken.h"
@@ -28,9 +27,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotInstr* CompileParams(CBotToken* &p, CBotCStack* pStack, CBotVar** ppVars)
@@ -163,3 +161,5 @@ bool TypesCompatibles(const CBotTypResult& type1, const CBotTypResult& type2)
     }
     return true;
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInstrUtils.h

@@ -19,13 +19,9 @@
 
 #pragma once
 
-// Modules inlcude
+namespace CBot
+{
 
-// Local include
-
-// Global include
-
-// Forward declaration
 class CBotInstr;
 class CBotToken;
 class CBotCStack;
@@ -59,3 +55,5 @@ bool TypeCompatible(CBotTypResult& type1, CBotTypResult& type2, int op = 0);
  * \return
  */
 bool TypesCompatibles(const CBotTypResult& type1, const CBotTypResult& type2);
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInt.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInt.h"
 
 #include "CBot/CBotInstr/CBotLeftExprVar.h"
@@ -29,10 +28,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotInt::CBotInt()
@@ -188,3 +185,5 @@ void CBotInt::RestoreState(CBotStack* &pj, bool bMain)
 
     if (m_next2b) m_next2b->RestoreState(pile, bMain);            // other(s) definition(s)
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotInt.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotInt class Definition of an integer variable
@@ -76,3 +73,5 @@ private:
     //! A value to put, if there is.
     CBotInstr* m_expr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotLeftExpr.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotLeftExpr.h"
 #include "CBot/CBotInstr/CBotFieldExpr.h"
 #include "CBot/CBotInstr/CBotIndexExpr.h"
@@ -29,10 +28,8 @@
 
 #include "CBot/CBotVar/CBotVarArray.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 //////////////////////////////////////////////////////////////////////////////////////
 CBotLeftExpr::CBotLeftExpr()
@@ -243,3 +240,5 @@ void CBotLeftExpr::RestoreStateVar(CBotStack* &pile, bool bMain)
     if (m_next3 != nullptr)
          m_next3->RestoreStateVar(pile, bMain);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotLeftExpr.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotLeftExpr class Accept the expressions that be to the left of
@@ -99,3 +96,5 @@ public:
 private:
     long m_nIdent;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotLeftExprVar.cpp

@@ -26,6 +26,9 @@
 
 #include <cassert>
 
+namespace CBot
+{
+
 CBotLeftExprVar::CBotLeftExprVar()
 {
     name = "CBotLeftExprVar";
@@ -76,3 +79,5 @@ void CBotLeftExprVar::RestoreState(CBotStack* &pj, bool bMain)
 
     var1->SetUniqNum(m_nIdent); // Restore the identifier
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotLeftExprVar.h

@@ -21,6 +21,8 @@
 
 #include "CBot/CBotInstr/CBotInstr.h"
 
+namespace CBot
+{
 
 /**
  * \brief Expression on the left side of an assignment
@@ -55,3 +57,5 @@ public:
     //! Unique identifier of that variable
     long m_nIdent = 0;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotListArray.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotListArray.h"
 
 #include "CBot/CBotInstr/CBotInstrUtils.h"
@@ -30,9 +29,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotListArray::CBotListArray()
@@ -180,3 +178,5 @@ void CBotListArray::RestoreState(CBotStack* &pj, bool bMain)
         p->RestoreState(pile, bMain);                    // size calculation //interrupted!
     }
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotListArray.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotListArray class Definition of a assignment list for a table
@@ -74,3 +71,5 @@ private:
     //! An expression for an element others are linked with CBotInstr :: m_next3;
     CBotInstr* m_expr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotListExpression.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotListExpression.h"
 #include "CBot/CBotInstr/CBotExpression.h"
 #include "CBot/CBotInstr/CBotIString.h"
@@ -28,9 +27,8 @@
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Seeks a declaration of variable or expression
@@ -129,3 +127,5 @@ void CBotListExpression::RestoreState(CBotStack* &pj, bool bMain)
         p->RestoreState(pile, bMain);
     }
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotListExpression.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotListExpression class. Compiles a list of expressions is used
@@ -70,3 +68,5 @@ private:
     //! The first expression to be evaluated
     CBotInstr* m_Expr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotListInstr.cpp

@@ -17,16 +17,14 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotListInstr.h"
 #include "CBot/CBotInstr/CBotBlock.h"
 
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotListInstr::CBotListInstr()
@@ -119,3 +117,5 @@ void CBotListInstr::RestoreState(CBotStack* &pj, bool bMain)
 
     if (p != nullptr) p->RestoreState(pile, true);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotListInstr.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotListInstr class Compiles a list of instructions separated by
@@ -72,3 +69,5 @@ private:
     //! Instructions to do.
     CBotInstr*    m_Instr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotLogicExpr.cpp

@@ -17,14 +17,12 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotLogicExpr.h"
 
 #include "CBot/CBotStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotLogicExpr::CBotLogicExpr()
@@ -92,3 +90,4 @@ void CBotLogicExpr::RestoreState(CBotStack* &pStack, bool bMain)
     }
 }
 
+} // namespace CBot

src/CBot/CBotInstr/CBotLogicExpr.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotLogicExpr class
@@ -68,3 +65,5 @@ private:
     CBotInstr*    m_op2;
     friend class CBotTwoOpExpr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotNew.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotNew.h"
 
 #include "CBot/CBotStack.h"
@@ -28,11 +27,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotNew::CBotNew()
@@ -247,3 +243,5 @@ void CBotNew::RestoreState(CBotStack* &pj, bool bMain)
                                ppVars, pile2)    ;        // interrupt here!
     }
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotNew.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotNew class Compile an instruction "new".
@@ -73,3 +70,5 @@ private:
     CBotToken m_vartoken;
 
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotParExpr.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotParExpr.h"
 #include "CBot/CBotInstr/CBotExprUnaire.h"
 #include "CBot/CBotInstr/CBotExprVar.h"
@@ -36,10 +35,8 @@
 
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotInstr* CBotParExpr::Compile(CBotToken* &p, CBotCStack* pStack)
@@ -191,3 +188,5 @@ CBotInstr* CBotParExpr::Compile(CBotToken* &p, CBotCStack* pStack)
 
     return pStack->Return(nullptr, pStk);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotParExpr.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 // possibly an expression in parentheses ( ... )
@@ -60,3 +57,5 @@ public:
      */
     static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack);
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotPostIncExpr.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotPostIncExpr.h"
 #include "CBot/CBotInstr/CBotExprVar.h"
 
@@ -25,10 +24,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotPostIncExpr::CBotPostIncExpr()
@@ -88,3 +85,5 @@ void CBotPostIncExpr::RestoreState(CBotStack* &pj, bool bMain)
 
     if (pile1 != nullptr) pile1->RestoreStack(this);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotPostIncExpr.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 //////////////////////////////////////////////////////////////////////////////////////
 // Management of pre-and post increment / decrement
@@ -67,3 +65,5 @@ private:
     CBotInstr*    m_Instr;
     friend class CBotParExpr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotPreIncExpr.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotPreIncExpr.h"
 #include "CBot/CBotInstr/CBotExprVar.h"
 
@@ -25,9 +24,8 @@
 
 #include "CBot/CBotVar/CBotVar.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotPreIncExpr::CBotPreIncExpr()
@@ -95,3 +93,5 @@ void CBotPreIncExpr::RestoreState(CBotStack* &pj, bool bMain)
 
     m_Instr->RestoreState(pile, bMain);
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotPreIncExpr.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotPreIncExpr class Management of pre increment. There is no
@@ -63,3 +60,5 @@ private:
     CBotInstr* m_Instr;
     friend class CBotParExpr;
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotReturn.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotReturn.h"
 
 #include "CBot/CBotInstr/CBotInstrUtils.h"
@@ -27,10 +26,8 @@
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotReturn::CBotReturn()
@@ -114,3 +111,5 @@ void CBotReturn::RestoreState(CBotStack* &pj, bool bMain)
         return;
     }
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotReturn.h

@@ -19,12 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
 
 /*!
  * \brief The CBotReturn class. Return parameters
@@ -70,3 +68,5 @@ private:
     CBotInstr *m_Instr;
 
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotSwitch.cpp

@@ -1,5 +1,3 @@
-
-
 /*
  * This file is part of the Colobot: Gold Edition source code
  * Copyright (C) 2001-2015, Daniel Roux, EPSITEC SA & TerranovaTeam
@@ -19,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotSwitch.h"
 #include "CBot/CBotInstr/CBotCase.h"
 #include "CBot/CBotInstr/CBotBlock.h"
@@ -28,10 +25,8 @@
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotSwitch::CBotSwitch()
@@ -218,3 +213,5 @@ void CBotSwitch :: RestoreState(CBotStack* &pj, bool bMain)
         return;
     }
 }
+
+} // namespace CBot

src/CBot/CBotInstr/CBotSwitch.h

@@ -19,13 +19,10 @@
 
 #pragma once
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotInstr.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 /*!
  * \brief The CBotSwitch class. Compiles instruction "switch"
@@ -74,3 +71,5 @@ private:
     CBotInstr* m_Block;
 
 };
+
+} // namespace CBot

src/CBot/CBotInstr/CBotThrow.cpp

@@ -17,17 +17,14 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-// Modules inlcude
 #include "CBot/CBotInstr/CBotThrow.h"
 #include "CBot/CBotInstr/CBotExpression.h"
 
 #include "CBot/CBotStack.h"
 #include "CBot/CBotCStack.h"
 
-// Local include
+namespace CBot
-
+{
-// Global include
-
 
 ////////////////////////////////////////////////////////////////////////////////
 CBotThrow::CBotThrow()
@@ -101,3 +98,5 @@ void CBotThrow::RestoreState(CBotStack* &pj, bool bMain)
         return;
     }
 }
+
+} // namespace CBot