Commit 5b9f2979 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

A quoi ca sert que Ducros se décarcasse a enlever les ../ si tu les remets derrières :D

parent b83efa93
......@@ -94,31 +94,7 @@
#include "interface/Interface_graphic.hpp"
#include "core/Core.hpp"
#include "interface/parsing_thread.hpp"
/*
#include "Core.hpp"
#include "../interface/Interface_graphic.hpp"
#include "../render/Render_opengl_dl.hpp"
#include "../render/render_svg.hpp"
#include "../trace/Trace.hpp"
#include "../trace/DrawTrace.hpp"
#include "../parser/ParserPaje.hpp"
#include "../parser/ParserOTF.hpp"
#include "resource.hpp"
#include "../general/Tools.hpp"
#include "parsing_thread.hpp"
*/
/* -- */
using namespace std;
#define message *Message::get_instance() << "(" << __FILE__ << " l." << __LINE__ << "): "
......
......@@ -47,23 +47,12 @@
#ifndef CORE_HPP
#define CORE_HPP
class Core;
class Interface_graphic;
class Render_opengl;
class Trace;
#include "../interface/Interface.hpp"
/*
* render_opengl.hpp includes render_area.hpp.
* So do not include it twice.
*/
//#ifndef RENDER_AREA_HPP
//#endif
#include "interface/Interface.hpp"
/*!
*\brief This class is an terminal interface, it inherited from the Interface interface.
......
......@@ -52,8 +52,7 @@
class Interface;
#include "resource.hpp"
#include "interface/resource.hpp"
/*!
*\brief This is an interface, used by the terminal and graphical interfaces.
......
......@@ -65,11 +65,11 @@
#include "interface/resource.hpp"
//#include "interface/help.hpp"
//#include "interface/interface.hpp"
#include "../core/Core.hpp"
#include "Interface_graphic.hpp"
#include "core/Core.hpp"
#include "interface/Interface_graphic.hpp"
//#include "resource.hpp"
#include "../plugin/Command_window.hpp"
#include "plugin/Command_window.hpp"
using namespace std;
......
......@@ -55,10 +55,10 @@ class Command_window;
class Svg;
#include "../ui_main_window.h"/* the main window graphical interface */
#include "ui_main_window.h"/* the main window graphical interface */
/* Global informations */
#include "Interface.hpp"
#include "interface/Interface.hpp"
/*!
*\brief This class is a graphical interface which creates a window, it inherited from the Interface interface.
......
......@@ -51,7 +51,7 @@
/* -- */
#include "interface/Interface_graphic.hpp"
/* -- */
#include "../core/Core.hpp"
#include "core/Core.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/tree/Interval.hpp"
......
......@@ -43,16 +43,17 @@
/*!
*\file Hook_event.cpp
*/
#include "../common/common.hpp"
#include "Hook_event.hpp"
#include "../common/info.hpp"
#include "Render_opengl.hpp"
#include <stack>
/* -- */
#include "common/common.hpp"
#include "common/info.hpp"
/* -- */
#include "render/render.hpp"
#include "render/Render_opengl.hpp"
#include "render/Hook_event.hpp"
/* -- */
using namespace std;
#define message *Message::get_instance() << "(" << __FILE__ << " l." << __LINE__ << "): "
......
......@@ -48,17 +48,12 @@
#ifndef HOOK_EVENT_HPP
#define HOOK_EVENT_HPP
#include "../core/Core.hpp"
#include "core/Core.hpp"
class Hook_event;
class Core;
class Render_opengl;
/*!
* \brief Structure used to store event information.
*/
......
......@@ -51,9 +51,9 @@
#include "render/Hook_event.hpp"
#include "render/Render_opengl.hpp"
/* -- */
#include "../interface/resource.hpp"
//#include "../interface/interface.hpp"
#include "../core/Core.hpp"
#include "interface/resource.hpp"
//#include "interface/interface.hpp"
#include "core/Core.hpp"
/* -- */
using namespace std;
......
......@@ -48,9 +48,10 @@
#define RENDER_OPENGL_HPP
#include <QGLWidget>
#include "common/common.hpp"
#include "render.hpp"
#include "Hook_event.hpp"
#include "core/Core.hpp"
#include "render/render.hpp"
#include "render/Hook_event.hpp"
class Render_opengl;
class Interface_console;
......
......@@ -48,15 +48,6 @@
#ifndef DRAW_TRACE_HPP
#define DRAW_TRACE_HPP
#include <string>
//#include "resource.hpp"
//#include "../render/render_opengl.hpp"
#include "common/Message.hpp"
#include "DrawTree.hpp"
/*
* Theses constants can not be put as static const float because it is a template and there binary representation is not normed by the C++ langage.
*/
......
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