Commit 89555b80 authored by Mathieu Faverge's avatar Mathieu Faverge

Suppression des sous-rep d'inclusion (Attention ca ne compile plus)

parent 00bb3d1b
......@@ -48,7 +48,7 @@
#define INFO_HPP
#include "../main_resource.hpp"
#include "main_resource.hpp"
class Interface_console;
/*!
......
......@@ -159,9 +159,11 @@ bool Interface_console::draw_trace(const string & filename, const int format){
if(filename.substr(position_of_dot) == ".trace") {
parser = new ParserPaje();
}
#ifdef WITH_OTF
else if(filename.substr(position_of_dot) == ".otf") {
parser = new ParserOTF();
}
#endif
else if(filename.substr(position_of_dot) == ".ept") {
parser = new ParserVite();
}
......
......@@ -59,20 +59,20 @@ class Interface_console;
* So do not include it twice.
*/
//#ifndef RENDER_AREA_HPP
#include "../render/Render_opengl_dl.hpp"
#include "Render_opengl_dl.hpp"
//#endif
#include "../render/render_svg.hpp"
#include "render_svg.hpp"
#include "../trace/Trace.hpp"
#include "../trace/DrawTrace.hpp"
#include "../parser/ParserPaje.hpp"
#include "../parser/ParserOTF.hpp"
#include "../parser/ParserVite.hpp"
#include "Trace.hpp"
#include "DrawTrace.hpp"
#include "ParserPaje.hpp"
#include "ParserOTF.hpp"
#include "ParserVite.hpp"
#include "resource.hpp"
#include "../general/Tools.hpp"
#include "Tools.hpp"
#include "parsing_thread.hpp"
......
......@@ -52,10 +52,10 @@ class Interface_graphic;
#include "../ui_main_window.h"/* the main window graphical interface */
#include "ui_main_window.h"/* the main window graphical interface */
/* Global informations */
#include "../info/info.hpp"
#include "info.hpp"
#include "interface.hpp"
#include "interface_console.hpp"
......@@ -63,7 +63,7 @@ class Interface_graphic;
#include "resource.hpp"
#include "help.hpp"
#include "../statistics/Stats_window.hpp"
#include "Stats_window.hpp"
/*!
*\brief This class is a graphical interface which creates a window, it inherited from the Interface interface.
......
......@@ -44,8 +44,8 @@
#define PARSING_THREAD_HPP
#include <QThread>
#include "../parser/ParserPaje.hpp"
#include "../trace/Trace.hpp"
#include "ParserPaje.hpp"
#include "Trace.hpp"
#include <iostream>
/*!
......
......@@ -51,7 +51,7 @@
#define INTERFACE_RESOURCE_HPP
#include "../main_resource.hpp"
#include "main_resource.hpp"
/*
......
......@@ -64,9 +64,9 @@
#include <QApplication>
/* Global informations */
#include "info/info.hpp"
#include "info.hpp"
#include "interface/interface_console.hpp"
#include "interface_console.hpp"
/*!
*\brief The main function of ViTE.
......
......@@ -94,7 +94,7 @@ typedef double Times;
/* Message management */
#include "message/Message.hpp"
#include "Message.hpp"
/* Example:
......
......@@ -47,7 +47,7 @@
#ifndef VITE_DEBUG
/* Release mode */
#include "../interface/interface.hpp"
#include "interface.hpp"
#else
/* Test mode */
......
......@@ -49,13 +49,13 @@
#define PARSER_HPP
#include <string>
#include "../trace/Trace.hpp"
#include "Trace.hpp"
#ifndef VITE_DEBUG
#include "../message/Errors.hpp"
#include "Errors.hpp"
#else
// For debugging
#include "../../tests/stubs/Errors.hpp"
#include "Errors.hpp"
#endif
/*!
......
......@@ -42,8 +42,8 @@
*/
#include "ParserDefinitionOTF.hpp"
#include "../trace/Trace.hpp"
#include "../trace/values/Color.hpp"
#include "Trace.hpp"
#include "Color.hpp"
using namespace std;
......
......@@ -52,10 +52,10 @@
#include <map>
#ifndef VITE_DEBUG
#include "../message/Errors.hpp"
#include "Errors.hpp"
#else
// For debugging
#include "../../tests/stubs/Errors.hpp"
#include "Errors.hpp"
#endif
......
......@@ -41,7 +41,7 @@
**
*/
#include "ParserEventOTF.hpp"
#include "../trace/Trace.hpp"
#include "Trace.hpp"
#include "ParserDefinitionOTF.hpp"
using namespace std;
......
......@@ -51,7 +51,7 @@
#include <iostream>
#include <map>
#include "otf.h"
#include "../message/Errors.hpp"
#include "Errors.hpp"
class ParserDefinitionOTF;
class Trace;
......
......@@ -44,8 +44,8 @@
#include "Definition.hpp"
#include "Line.hpp"
#include "../trace/Trace.hpp"
#include "../message/Errors.hpp"
#include "Trace.hpp"
#include "Errors.hpp"
using namespace std;
......
......@@ -87,8 +87,12 @@ void ParserPaje::parse(string filename, Trace &trace, bool finish_trace_after_pa
while(!(_file.is_eof() || _is_canceled)) {
_file.get_line(line);
try {
_file.get_line(line);
}
catch(char *){
continue;
}
if(line.starts_with(PERCENT)) {
parserdefinition->store_definition(line);
......
......@@ -59,12 +59,12 @@ class ParserEventPaje;
class Definition;
#ifndef VITE_DEBUG
#include "../trace/Trace.hpp"
#include "../message/Errors.hpp"
#include "Trace.hpp"
#include "Errors.hpp"
#else
// For debugging
#include "../../tests/stubs/Trace.hpp"
#include "../../tests/stubs/Errors.hpp"
#include "Trace.hpp"
#include "Errors.hpp"
#endif
......
......@@ -56,12 +56,12 @@
#include "Parser.hpp"
#ifndef VITE_DEBUG
#include "../trace/Trace.hpp"
#include "../message/Errors.hpp"
#include "Trace.hpp"
#include "Errors.hpp"
#else
// For debugging
#include "../../tests/stubs/Trace.hpp"
#include "../../tests/stubs/Errors.hpp"
#include "Trace.hpp"
#include "Errors.hpp"
#endif
class ParserPaje;
......
......@@ -46,7 +46,7 @@
#include "Render_area.hpp"
#include "../interface/interface_console.hpp"
#include "interface_console.hpp"
#include "Render_opengl.hpp"
......
......@@ -56,7 +56,7 @@ class Interface_console;
class Render_opengl;
/* Global informations */
#include "../info/info.hpp"
#include "info.hpp"
#include "resource.hpp"
......
......@@ -46,7 +46,7 @@
#include "Render_area.hpp"
#include "Render_opengl.hpp"
#include "../interface/interface_console.hpp"
#include "interface_console.hpp"
using namespace std;
......
......@@ -50,7 +50,7 @@
class Render_opengl_dl;
#include "Render_area.hpp"
#include "../interface/interface_console.hpp"
#include "interface_console.hpp"
#include "Render_opengl.hpp"
/*!
......
......@@ -50,8 +50,8 @@
class Render_stats_opengl;
/* Global informations */
#include "../info/info.hpp"
#include "../interface/interface_console.hpp"
#include "info.hpp"
#include "interface_console.hpp"
#include "render_stats.hpp"
#include <QGLWidget>
#include "resource.hpp"
......
......@@ -41,7 +41,7 @@
**
*/
#include "render_svg.hpp"
#include "../message/Message.hpp"
#include "Message.hpp"
using namespace std;
......
......@@ -53,7 +53,7 @@
#include "render.hpp"
#include "../message/Message.hpp"
#include "Message.hpp"
#include "resource.hpp"
/*!
......
......@@ -53,7 +53,7 @@
#include "../main_resource.hpp"
#include "main_resource.hpp"
......
......@@ -51,8 +51,8 @@
#include <vector>
#include <set>
#include "../trace/Trace.hpp"
#include "../trace/tree/Interval.hpp"
#include "Trace.hpp"
#include "Interval.hpp"
#include "Statistic.hpp"
#include "DrawStats.hpp"
......
......@@ -52,9 +52,9 @@
#include <map>
#include <set>
//#include "../message/Message.hpp"
#include "../trace/Trace.hpp"
#include "../trace/tree/Interval.hpp"
//#include "Message.hpp"
#include "Trace.hpp"
#include "Interval.hpp"
#include "Statistic.hpp"
#include "DrawStats.hpp"
......
......@@ -51,9 +51,9 @@
#include <vector>
#include <map>
//#include "../message/Message.hpp"
#include "../trace/Trace.hpp"
#include "../trace/tree/Interval.hpp"
//#include "Message.hpp"
#include "Trace.hpp"
#include "Interval.hpp"
#include "Statistic.hpp"
/*!
......
......@@ -51,9 +51,9 @@
#include <vector>
#include <map>
#include "../message/Message.hpp"
#include "../trace/Trace.hpp"
#include "../trace/tree/Interval.hpp"
#include "Message.hpp"
#include "Trace.hpp"
#include "Interval.hpp"
#include "Statistic.hpp"
#include "DrawStats.hpp"
......
......@@ -51,8 +51,8 @@
class Statistic;
#include "../trace/EntityValue.hpp"
#include "../trace/Container.hpp"
#include "EntityValue.hpp"
#include "Container.hpp"
/*!
* \struct stats
......
......@@ -50,19 +50,19 @@
class Stats_window;
#include <iostream>
#include "../trace/Trace.hpp"
#include "../trace/Container.hpp"
#include "../trace/ContainerType.hpp"
#include "Trace.hpp"
#include "Container.hpp"
#include "ContainerType.hpp"
#include "Statistic.hpp"
#include <QGLWidget>
#include <map>
#include "../ui_stats_viewer.h"
#include "../interface/interface_console.hpp"
#include "../interface/resource.hpp"
#include "../info/info.hpp"
#include "../message/Message.hpp"
#include "../render/render_stats_opengl.hpp"
#include "../render/render_stats_svg.hpp"
#include "ui_stats_viewer.h"
#include "interface_console.hpp"
#include "resource.hpp"
#include "info.hpp"
#include "Message.hpp"
#include "render_stats_opengl.hpp"
#include "render_stats_svg.hpp"
#include "DrawStats.hpp"
#include "DrawVDiagram.hpp"
#include "DrawHDiagram.hpp"
......
......@@ -53,9 +53,9 @@ using std::list;
using std::map;
#include <stack>
using std::stack;
#include "tree/BinaryTree.hpp"
#include "BinaryTree.hpp"
#include "values/Values.hpp"
#include "Values.hpp"
#include "ContainerType.hpp"
......@@ -68,7 +68,7 @@ class Container;
#include "VariableType.hpp"
#include "Variable.hpp"
#include "../statistics/Statistic.hpp"
#include "Statistic.hpp"
/*!
* \class Container
......
......@@ -50,7 +50,7 @@
#include <list>
using std::list;
#include "values/Name.hpp"
#include "Name.hpp"
/*!
* \class ContainerType
......
......@@ -52,8 +52,8 @@
#include "resource.hpp"
//#include "../render/render_opengl.hpp"
#include "../message/Message.hpp"
//#include "render_opengl.hpp"
#include "Message.hpp"
#include "DrawTree.hpp"
......
......@@ -47,7 +47,7 @@
#ifndef DRAWTREE_HPP
#define DRAWTREE_HPP
#include "tree/BinaryTree.hpp"
#include "BinaryTree.hpp"
#include "Event.hpp"
#include <iostream>
......
......@@ -52,7 +52,7 @@ class Container;
#include <map>
using std::map;
#include <string>
#include "values/Value.hpp"
#include "Value.hpp"
/*!
* \class Entity
......
......@@ -47,7 +47,7 @@
* \file EntityValue.hpp
*/
#include "values/Value.hpp"
#include "Value.hpp"
#include <map>
using std::map;
......
......@@ -51,7 +51,7 @@ class Event;
#include "EventType.hpp"
#include "EntityValue.hpp"
#include "values/Date.hpp"
#include "Date.hpp"
#include "Entity.hpp"
/*!
......
......@@ -51,7 +51,7 @@ class EventType;
#include "EntityType.hpp"
#include "values/Name.hpp"
#include "Name.hpp"
#include "ContainerType.hpp"
/*!
......
......@@ -49,7 +49,7 @@
class Link;
#include "values/Date.hpp"
#include "Date.hpp"
#include "LinkType.hpp"
#include "EntityValue.hpp"
......
......@@ -51,7 +51,7 @@ class LinkType;
#include "EntityType.hpp"
#include "values/Name.hpp"
#include "Name.hpp"
#include "ContainerType.hpp"
/*!
......
......@@ -49,7 +49,7 @@
class State;
#include "values/Date.hpp"
#include "Date.hpp"
#include "StateType.hpp"
#include "EntityValue.hpp"
......
......@@ -46,7 +46,7 @@
class StateChange;
#include "State.hpp"
#include "values/Date.hpp"
#include "Date.hpp"
/*!
* \class StateChange
......
......@@ -42,7 +42,7 @@
*/
#include "Trace.hpp"
#include "../message/Message.hpp"
#include "Message.hpp"
Trace::Trace(): _max_date(0.0) {
......
......@@ -57,14 +57,14 @@
using std::list;
using std::vector;
#include "values/Value.hpp"
#include "values/Date.hpp"
#include "values/String.hpp"
#include "values/Name.hpp"
#include "values/Integer.hpp"
#include "values/Hex.hpp"
#include "values/Double.hpp"
#include "values/Color.hpp"
#include "Value.hpp"
#include "Date.hpp"
#include "String.hpp"
#include "Name.hpp"
#include "Integer.hpp"
#include "Hex.hpp"
#include "Double.hpp"
#include "Color.hpp"
#include "ContainerType.hpp"
#include "Container.hpp"
......
......@@ -51,8 +51,8 @@ class Variable;
#include "Entity.hpp"
#include "VariableType.hpp"
#include "values/Date.hpp"
#include "values/Double.hpp"
#include "Date.hpp"
#include "Double.hpp"
#include <list>
using std::list;
using std::pair;
......
......@@ -52,7 +52,7 @@
#include "../main_resource.hpp"
#include "main_resource.hpp"
#endif
......@@ -50,7 +50,7 @@
#ifndef INTERVAL_HPP
#define INTERVAL_HPP
#include "../values/Date.hpp"
#include "Date.hpp"
/*!
* \class Interval
......
......@@ -51,7 +51,7 @@
#include <sstream>
#include "Value.hpp"
#include "../../general/Tools.hpp"
#include "Tools.hpp"
/*!
*
* \class Color
......
......@@ -50,7 +50,7 @@
*/
#include "Value.hpp"
#include "../../general/Tools.hpp"
#include "Tools.hpp"
#include <sstream>
#include <cstdio>
......
......@@ -50,7 +50,7 @@
*/
#include "Value.hpp"
#include "../../general/Tools.hpp"
#include "Tools.hpp"
#include <sstream>
#include <cstdio>
......
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