Commit 77957994 authored by louiz’'s avatar louiz’

Move all #include <logging/logging.hpp> into the cpp

Compilation is much faster now.
fixed #94
parent c0e175bd
#include <logging/logging.hpp>
#include <game/action.hpp>
Action::Action(t_action_callback callback,
......
......@@ -14,7 +14,6 @@
#include <vector>
#include <boost/function.hpp>
#include <logging/logging.hpp>
#include <game/event.hpp>
namespace actions
......
#include <logging/logging.hpp>
#include <game/replay.hpp>
Replay::Replay()
......
#include <logging/logging.hpp>
#include <game/turn.hpp>
Turn::Turn():
......
#include <game/turn_handler.hpp>
#include <logging/logging.hpp>
TurnHandler::TurnHandler(Replay* replay):
current_turn(0),
......
......@@ -13,7 +13,6 @@
#ifndef __TURN_HANDLER_HPP__
# define __TURN_HANDLER_HPP__
#include <logging/logging.hpp>
#include <game/turn.hpp>
#include <game/action.hpp>
#include <game/replay.hpp>
......
#include <logging/logging.hpp>
#include <gui/camera/camera.hpp>
#include <gui/screen/screen.hpp>
#include <world/layer.hpp>
......
......@@ -17,7 +17,6 @@
#include <SFML/System.hpp>
#include <boost/function.hpp>
#include <logging/logging.hpp>
#include <world/client_world.hpp>
#include <world/time.hpp>
#include <gui/camera/map.hpp>
......
#include <logging/logging.hpp>
#include <gui/camera/map.hpp>
#include <utils/string.hpp>
#include <boost/utility.hpp>
......
......@@ -15,7 +15,6 @@
#define MINIMAPS_DIRECTORY "./data/minimaps/"
#define TILESETS_DIRECTORY "./data/tilesets/"
#include <logging/logging.hpp>
#include <gui/camera/tile.hpp>
#include <world/map.hpp>
......
#include <logging/logging.hpp>
#include <gui/hud/minimap.hpp>
Minimap::Minimap(sf::RenderWindow* win, GraphMap* map, Camera* camera):
......
......@@ -21,7 +21,6 @@
#include <gui/camera/map.hpp>
#include <gui/camera/camera.hpp>
#include <logging/logging.hpp>
class Minimap
{
......
#include <logging/logging.hpp>
#include <gui/hud/selection_panel.hpp>
#include <world/client_world.hpp>
......
#include <logging/logging.hpp>
#include <gui/screen/screen.hpp>
#include <gui/common.hpp>
......
......@@ -20,7 +20,6 @@
#include <gui/camera/camera.hpp>
#include <gui/hud/hud.hpp>
#include <world/client_world.hpp>
#include <logging/logging.hpp>
#include <gui/cursor.hpp>
#include <mod/client_mod.hpp>
......
#include <boost/bind.hpp>
#include <logging/logging.hpp>
#include <gui/screen/screen.hpp>
#include <mod/client_mod.hpp>
#include <world/client_world.hpp>
......
#include <logging/logging.hpp>
#include <network/client.hpp>
#include <boost/algorithm/string.hpp>
......
......@@ -33,8 +33,6 @@
#ifndef __COMMAND_HPP__
# define __COMMAND_HPP__
#include <logging/logging.hpp>
class Command
{
public:
......
#include <logging/logging.hpp>
#include <network/command_handler.hpp>
#include <network/command.hpp>
......
......@@ -9,6 +9,7 @@
* @class CommandHandler
*/
#include <deque>
#include <map>
#include <boost/function.hpp>
#include <boost/asio.hpp>
......@@ -17,7 +18,6 @@
#ifndef __COMMAND_HANDLER_HPP__
# define __COMMAND_HANDLER_HPP__
#include <logging/logging.hpp>
#include <network/transfer_sender.hpp>
#include <network/command.hpp>
......
#include <logging/logging.hpp>
#include <network/game_client.hpp>
GameClient::GameClient()
......
#include <logging/logging.hpp>
#include <network/interface_client.hpp>
#include <boost/algorithm/string.hpp>
#if defined(_WIN32) || defined(_WIN64)
......
#include <logging/logging.hpp>
#include <network/interface_remote_client.hpp>
#include <database/database.hpp>
#include <database/db_object.hpp>
......
#include <logging/logging.hpp>
#include <network/timed_event.hpp>
#include <network/timed_event_handler.hpp>
......
#include <logging/logging.hpp>
#include <network/timed_event_handler.hpp>
TimedEventHandler::TimedEventHandler()
......
......@@ -13,7 +13,6 @@
# define __TIMED_EVENT_HANDLER_HPP__
#include <network/timed_event.hpp>
#include <logging/logging.hpp>
class TimedEventHandler
{
......
#include <logging/logging.hpp>
#include <network/transfer_receiver.hpp>
#include <network/client.hpp>
......
......@@ -16,7 +16,6 @@
#define FILES_TO_RECEIVE_DIRECTORY std::string("./receive/")
#include <logging/logging.hpp>
#include <network/command.hpp>
class Client;
......
#include <logging/logging.hpp>
#include <network/transfer_sender.hpp>
#include <network/remote_client.hpp>
......
......@@ -24,8 +24,6 @@
#define FILES_TO_SEND_DIRECTORY std::string("./send/")
#include <logging/logging.hpp>
class RemoteClient;
class TransferSender
......
......@@ -9,6 +9,6 @@ Player::Player()
{
}
Player::~Player()
Player::~Player()
{
}
\ No newline at end of file
}
......@@ -10,10 +10,9 @@
#ifndef __PLAYER_HPP__
# define __PLAYER_HPP__
#include <logging/logging.hpp>
#include <serialization/serializable.hpp>
class Player: public Serializable
class Player: public Serializable
{
public:
Player();
......@@ -32,7 +31,7 @@ public:
std::string id;
std::string login;
std::string race;
private:
Player(const Player&);
Player& operator=(const Player&);
......
......@@ -5,10 +5,10 @@ Team::Team()
{
}
Team::Team(const std::string& id, const std::string& mode,
Team::Team(const std::string& id, const std::string& mode,
const std::string& ladder, const std::string& season,
const std::string& win, const std::string& loss,
const std::vector<Player*>& mates):
const std::string& win, const std::string& loss,
const std::vector<Player*>& mates):
id(id), mode(mode), ladder(ladder), season(season), win(win), loss(loss),
mates(mates)
{
......
......@@ -10,16 +10,15 @@
#ifndef __TEAM_HPP__
# define __TEAM_HPP__
#include <logging/logging.hpp>
#include <serialization/serializable.hpp>
#include <network_objects/player.hpp>
#include <database/db_object.hpp>
class Team: public Serializable
class Team: public Serializable
{
public:
Team();
Team(const std::string&, const std::string&, const std::string&,
Team(const std::string&, const std::string&, const std::string&,
const std::string&, const std::string&, const std::string&,
const std::vector<Player*>&);
virtual ~Team();
......@@ -38,9 +37,9 @@ public:
std::string ladder;
std::string season;
std::string win;
std::string loss;
std::string loss;
std::vector<Player*> mates;
private:
Team(const Team&);
Team& operator=(const Team&);
......
#include <logging/logging.hpp>
#include <network_objects/team_serial.hpp>
#include <database/db_object.hpp>
......@@ -31,15 +32,15 @@ TeamSerial::TeamSerial(const std::vector<DbObject*>& teams)
team->ladder = (*it)->get("ladder");
log_error((*it)->get("season"));
team->season = (*it)->get("season");
log_error((*it)->get("win"));
log_error((*it)->get("win"));
team->win = (*it)->get("win");
log_error((*it)->get("loss"));
log_error((*it)->get("loss"));
team->loss = (*it)->get("loss");
log_error("TEAM id : " << team->id);
this->teams.push_back(team);
team = new Team();
}
}
}
}
TeamSerial::TeamSerial()
......
......@@ -10,12 +10,11 @@
#ifndef __TEAM_SERIAL_HPP__
# define __TEAM_SERIAL_HPP__
#include <logging/logging.hpp>
#include <serialization/serializable.hpp>
#include <network_objects/team.hpp>
#include <database/db_object.hpp>
class TeamSerial: public Serializable
class TeamSerial: public Serializable
{
public:
TeamSerial(const std::vector<DbObject*>&);
......
#include <logging/logging.hpp>
#include <world/building.hpp>
#include <world/world.hpp>
......
#include <logging/logging.hpp>
#include <world/client_world.hpp>
ClientWorld::ClientWorld(Map* map, Mod& mod):
......
#include <world/entity.hpp>
#include <cmath>
#include <logging/logging.hpp>
#include <world/entity.hpp>
#include <world/world.hpp>
#include <world/work.hpp>
......
......@@ -3,7 +3,6 @@
#include <queue>
#include <logging/logging.hpp>
#include <serialization/serializable.hpp>
#include <world/position.hpp>
......
......@@ -25,7 +25,7 @@ void Layer::set_level(const unsigned int level)
this->level = level;
}
uint Layer::get_level() const
unsigned int Layer::get_level() const
{
return this->level;
}
......
......@@ -3,9 +3,6 @@
#ifndef __GUI_LAYER_HPP__
# define __GUI_LAYER_HPP__
#include <config/config.hpp>
#include <logging/logging.hpp>
class Camera;
class GraphMap;
......@@ -18,7 +15,7 @@ public:
~Layer();
void set_size(unsigned int width, unsigned int height);
void set_level(unsigned int level);
uint get_level() const;
unsigned int get_level() const;
void set_cell(unsigned int cell, const unsigned int value);
unsigned int get_cell(const unsigned int cell) const;
......
#include <world/map.hpp>
#include <map>
#include <climits>
#include <boost/utility.hpp>
#include <boost/foreach.hpp>
#include <boost/algorithm/string/trim_all.hpp>
#include <logging/logging.hpp>
#include <world/map.hpp>
#include <utils/base64.hpp>
#include <utils/zlib.hpp>
#include <boost/utility.hpp>
#include <boost/foreach.hpp>
#include <map>
#include <climits>
Map::Map():
width(0),
......
......@@ -6,7 +6,6 @@
#ifndef __MAP_HPP__
# define __MAP_HPP__
#include <logging/logging.hpp>
#include <world/layer.hpp>
#include <world/position.hpp>
......
......@@ -11,7 +11,6 @@
#ifndef __OCCUPANT_HPP__
# define __OCCUPANT_HPP__
#include <logging/logging.hpp>
#include <serialization/serializable.hpp>
class Occupant: public Serializable
......
#include <logging/logging.hpp>
#include <world/selection.hpp>
Selection::Selection()
......
#include <logging/logging.hpp>
#include <world/server_world.hpp>
ServerWorld::ServerWorld(Mod& mod):
......
......@@ -3,8 +3,6 @@
#ifndef __TIME_HPP__
# define __TIME_HPP__
#include <logging/logging.hpp>
/**
* The number of microseconds for each world update.
* a lower number makes everything more "fluid" (to a certain
......
#include <logging/logging.hpp>
#include <world/unit.hpp>
#include <world/world.hpp>
#include <world/work.hpp>
......
#include <logging/logging.hpp>
#ifndef __VEC2_HPP__
# define __VEC2_HPP__
......
#include <logging/logging.hpp>
#include <world/world.hpp>
#include <world/path.hpp>
#include <world/work.hpp>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment