[colobot] 231/377: Fix colobot-lint warnings
Didier Raboud
odyx at moszumanska.debian.org
Wed Mar 30 13:34:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit b96305060b72eb878ecf7d917d2d600b89d9eb1f
Author: krzys-h <krzys_h at interia.pl>
Date: Sat Jan 23 21:59:02 2016 +0100
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 5d9c161..390737c 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 e751088..7fce814 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 cbb759f..c26c71e 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 <algorithm>
#include <iomanip>
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 50c1b9a..e2268e0 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 ff75182..8d00512 100644
--- a/test/unit/CBot/CBot_test.cpp
+++ b/test/unit/CBot/CBot_test.cpp
@@ -20,6 +20,7 @@
#include "CBot/CBot.h"
#include <gtest/gtest.h>
+#include <stdexcept>
using namespace CBot;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list