Create new file CBot.h. Included only useful interfaces.

src/CBot/CBot.h

@@ -18,6 +18,14 @@
  */
 
 // Modules inlcude
+#include "CBot/resource.h"
+#include "CBot/CBotFileUtils.h"
+#include "CBot/CBotClass.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotProgram.h"
+#include "CBot/CBotTypResult.h"
+
+#include "CBot/CBotVar/CBotVar.h"
 
 // Local include
 

src/common/restext.cpp

@@ -22,7 +22,7 @@
 
 #include "common/config.h"
 
-#include "CBot/resource.h"
+#include "CBot/CBot.h"
 
 #include "app/input.h"
 

src/level/robotmain.cpp

@@ -19,9 +19,7 @@
 
 #include "level/robotmain.h"
 
-#include "CBot/CBotFileUtils.h"
-// TODO must be replaced by CBot.h
-#include "CBot/CBotClass.h"
+#include "CBot/CBot.h"
 
 #include "app/app.h"
 #include "app/input.h"

src/object/implementation/programmable_impl.cpp

@@ -40,7 +40,7 @@
 
 #include "ui/controls/edit.h"
 
-#include "CBot/CBotFileUtils.h"
+#include "CBot/CBot.h"
 
 #include <algorithm>
 #include <iomanip>

src/script/script.cpp

@@ -42,9 +42,7 @@
 #include "ui/controls/interface.h"
 #include "ui/controls/list.h"
 
-#include "CBot/CBotToken.h"
-#include "CBot/CBotVar/CBotVar.h"
-#include "CBot/CBotFileUtils.h"
+#include "CBot/CBot.h"
 
 
 const int CBOT_IPF = 100;       // CBOT: default number of instructions / frame

src/script/script.h

@@ -24,8 +24,7 @@
 
 #pragma once
 
-// TODO replace by CBot.h
-#include "CBot/CBotProgram.h"
+#include "CBot/CBot.h"
 
 #include <memory>
 #include <string>

src/script/scriptfunc.cpp

@@ -19,9 +19,7 @@
 
 #include "script/scriptfunc.h"
 
-// TODO must be replaced by CBot.h
-#include "CBot/CBotClass.h"
-#include "CBot/CBotVar/CBotVar.h"
+#include "CBot/CBot.h"
 
 #include "app/app.h"
 

src/script/scriptfunc.h

@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "CBot/CBotTypResult.h"
+#include "CBot/CBot.h"
 
 #include "common/error.h"