From 5b9f29794e9fc90dcf11ded3fe270b00e23afa18 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Wed, 5 Aug 2009 10:32:47 +0000
Subject: [PATCH] =?UTF-8?q?A=20quoi=20ca=20sert=20que=20Ducros=20se=20d?=
=?UTF-8?q?=C3=A9carcasse=20a=20enlever=20les=20../=20si=20tu=20les=20reme?=
=?UTF-8?q?ts=20derri=C3=A8res=20:D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/core/Core.cpp | 26 +-------------------------
src/core/Core.hpp | 13 +------------
src/interface/Interface.hpp | 3 +--
src/interface/Interface_graphic.cpp | 6 +++---
src/interface/Interface_graphic.hpp | 4 ++--
src/plugin/Command_window.cpp | 2 +-
src/render/Hook_event.cpp | 17 +++++++++--------
src/render/Hook_event.hpp | 7 +------
src/render/Render_opengl.cpp | 6 +++---
src/render/Render_opengl.hpp | 7 ++++---
src/trace/DrawTrace.hpp | 9 ---------
11 files changed, 26 insertions(+), 74 deletions(-)
diff --git a/src/core/Core.cpp b/src/core/Core.cpp
index 28e80a03..ab0d62ca 100644
--- a/src/core/Core.cpp
+++ b/src/core/Core.cpp
@@ -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__ << "): "
diff --git a/src/core/Core.hpp b/src/core/Core.hpp
index 4971e72c..9c477572 100644
--- a/src/core/Core.hpp
+++ b/src/core/Core.hpp
@@ -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.
diff --git a/src/interface/Interface.hpp b/src/interface/Interface.hpp
index 3a0c07e3..a6c197e1 100644
--- a/src/interface/Interface.hpp
+++ b/src/interface/Interface.hpp
@@ -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.
diff --git a/src/interface/Interface_graphic.cpp b/src/interface/Interface_graphic.cpp
index 6bb5a3e7..f3725a97 100644
--- a/src/interface/Interface_graphic.cpp
+++ b/src/interface/Interface_graphic.cpp
@@ -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;
diff --git a/src/interface/Interface_graphic.hpp b/src/interface/Interface_graphic.hpp
index a127b22b..4bc577d4 100644
--- a/src/interface/Interface_graphic.hpp
+++ b/src/interface/Interface_graphic.hpp
@@ -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.
diff --git a/src/plugin/Command_window.cpp b/src/plugin/Command_window.cpp
index c44a3b94..b9572532 100644
--- a/src/plugin/Command_window.cpp
+++ b/src/plugin/Command_window.cpp
@@ -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"
diff --git a/src/render/Hook_event.cpp b/src/render/Hook_event.cpp
index 5987965b..8350b589 100644
--- a/src/render/Hook_event.cpp
+++ b/src/render/Hook_event.cpp
@@ -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__ << "): "
diff --git a/src/render/Hook_event.hpp b/src/render/Hook_event.hpp
index aefae7b6..1c6974cd 100644
--- a/src/render/Hook_event.hpp
+++ b/src/render/Hook_event.hpp
@@ -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.
*/
diff --git a/src/render/Render_opengl.cpp b/src/render/Render_opengl.cpp
index 13a4021e..31641f6a 100644
--- a/src/render/Render_opengl.cpp
+++ b/src/render/Render_opengl.cpp
@@ -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;
diff --git a/src/render/Render_opengl.hpp b/src/render/Render_opengl.hpp
index 5f410c34..312399e7 100644
--- a/src/render/Render_opengl.hpp
+++ b/src/render/Render_opengl.hpp
@@ -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;
diff --git a/src/trace/DrawTrace.hpp b/src/trace/DrawTrace.hpp
index f3ed81a5..cbdf9b78 100644
--- a/src/trace/DrawTrace.hpp
+++ b/src/trace/DrawTrace.hpp
@@ -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.
*/
--
GitLab