From b96305060b72eb878ecf7d917d2d600b89d9eb1f Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 23 Jan 2016 21:59:02 +0100 Subject: [PATCH] Fix colobot-lint warnings --- src/CBot/CBotEnums.h | 2 +- src/level/robotmain.h | 1 - src/object/implementation/programmable_impl.cpp | 4 ++-- src/script/script.cpp | 4 ++-- test/unit/CBot/CBot_test.cpp | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CBot/CBotEnums.h b/src/CBot/CBotEnums.h index 5d9c161c..390737cb 100644 --- a/src/CBot/CBotEnums.h +++ b/src/CBot/CBotEnums.h @@ -23,7 +23,7 @@ * \file CBotEnums.h * \brief Some enum values used across the CBot engine */ - + namespace CBot { diff --git a/src/level/robotmain.h b/src/level/robotmain.h index e751088b..7fce8142 100644 --- a/src/level/robotmain.h +++ b/src/level/robotmain.h @@ -79,7 +79,6 @@ bool IsPhaseWithWorld(Phase phase); bool IsMainMenuPhase(Phase phase); -class CController; class CEventQueue; class CSoundInterface; class CLevelParserLine; diff --git a/src/object/implementation/programmable_impl.cpp b/src/object/implementation/programmable_impl.cpp index cbb759fa..c26c71e3 100644 --- a/src/object/implementation/programmable_impl.cpp +++ b/src/object/implementation/programmable_impl.cpp @@ -19,6 +19,8 @@ #include "object/implementation/programmable_impl.h" +#include "CBot/CBot.h" + #include "common/global.h" #include "level/robotmain.h" @@ -40,8 +42,6 @@ #include "ui/controls/edit.h" -#include "CBot/CBot.h" - #include #include diff --git a/src/script/script.cpp b/src/script/script.cpp index 50c1b9a0..e2268e08 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -20,6 +20,8 @@ #include "script/script.h" +#include "CBot/CBot.h" + #include "common/restext.h" #include "common/stringutils.h" @@ -42,8 +44,6 @@ #include "ui/controls/interface.h" #include "ui/controls/list.h" -#include "CBot/CBot.h" - const int CBOT_IPF = 100; // CBOT: default number of instructions / frame diff --git a/test/unit/CBot/CBot_test.cpp b/test/unit/CBot/CBot_test.cpp index ff751821..8d00512a 100644 --- a/test/unit/CBot/CBot_test.cpp +++ b/test/unit/CBot/CBot_test.cpp @@ -20,6 +20,7 @@ #include "CBot/CBot.h" #include +#include using namespace CBot;