Commit 716228b4 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

End (Enjoy the merge :))

parent bf8b37b5
......@@ -42,13 +42,11 @@
#
SET(VITE_HDRS
message/Message.hpp
message/Errors.hpp
main_resource.hpp
# Info header
info/info.hpp
# General headers
general/Tools.hpp
common/common.hpp
common/Message.hpp
common/Errors.hpp
common/Tools.hpp
common/info.hpp
# Data structure headers
trace/values/Color.hpp
trace/values/Date.hpp
......@@ -73,7 +71,6 @@ SET(VITE_HDRS
trace/Container.hpp
trace/Entity.hpp
trace/Event.hpp
trace/resource.hpp
trace/State.hpp
trace/StateChange.hpp
trace/Link.hpp
......@@ -126,12 +123,10 @@ SET(VITE_UIS
SET(VITE_SRCS
# Messages & Errors
message/Message.cpp
message/Errors.cpp
# General code files
general/Tools.cpp
# Info code file
info/info.cpp
common/Message.cpp
common/Errors.cpp
common/Tools.cpp
common/info.cpp
# Data structure code files
trace/values/Color.cpp
trace/values/Date.cpp
......@@ -229,16 +224,6 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
general/
info/
interface/
message/
parser/
render/
statistics/
trace/
trace/values/
trace/tree
)
ADD_EXECUTABLE(vite ${VITE_SRCS} ${VITE_MOC} ${VITE_RCC_SRCS})
......
......@@ -53,8 +53,8 @@
# include "interface/interface.hpp"
#endif
/* -- */
#include "message/Message.hpp"
#include "message/Errors.hpp"
#include "common/Message.hpp"
#include "common/Errors.hpp"
/* -- */
using namespace std;
......
......@@ -73,7 +73,7 @@ public:
#include "interface/interface.hpp"
#endif
/* -- */
#include "message/Message.hpp"
#include "common/Message.hpp"
Message *Message::_message = NULL;
Interface *Message::_interface = NULL;
......
......@@ -41,20 +41,28 @@
**
*/
/*!
*\file main_resource.hpp
*\file common.hpp
*\brief This file gives some common header files for the interface classes.
*/
#ifndef MAIN_RESOURCE_HPP
#define MAIN_RESOURCE_HPP
#ifndef COMMON_HPP
#define COMMON_HPP
#include <iostream>/* to use the C standard library input output functions */
#include <string>
#include <cstdlib> /* for macros EXIT_SUCCESS and EXIT_FAILURE */
#include <math.h> /* for min and max functions */
#include <math.h> /* for min and max functions */
#include <sstream>
/* -- */
/* -- */
#include "common/Errors.hpp" /* Message management */
#include "common/Message.hpp" /* Message management */
/* Example:
* *Message::get_instance() << "Test:" << 45 << " and " << true << Message::endi;
* -> display as an informative message.
*/
/*!
* \def VITE_VERSION
......@@ -75,7 +83,7 @@
/*!
* \brief Unity for count elements such as number of states or events... NOT USED YET
*/
typedef long Element_count ;
typedef long Element_count;
/*!
* \brief Unity for variables of position of a element in the display such as height, abscissa...
......@@ -92,16 +100,4 @@ typedef double Element_col;
*/
typedef double Times;
/* Message management */
#include <sstream>
#include "Message.hpp"
/* Example:
* *Message::get_instance() << "Test:" << 45 << " and " << true << Message::endi;
* -> display as an informative message.
*/
#endif
#endif /* COMMON_H */
......@@ -44,8 +44,8 @@
*\file info.cpp
*/
#include "main_resource.hpp"
#include "info/info.hpp"
#include "common/common.hpp"
#include "common/info.hpp"
// void (Interface_console:: *Info::Core::launch_action)(int, void*) = NULL;
// const int Info::Core::_STATE_UNKNOWN = -1;
......
......@@ -56,10 +56,10 @@
/* -- */
#include <QObject>
/* -- */
#include "main_resource.hpp"
#include "info/info.hpp"
#include "message/Errors.hpp"
#include "general/Tools.hpp"
#include "common/common.hpp"
#include "common/info.hpp"
#include "common/Errors.hpp"
#include "common/Tools.hpp"
/* -- */
#include "render/render.hpp"
#include "render/render_svg.hpp"
......
......@@ -52,9 +52,9 @@
/* -- */
#include <QObject>
/* -- */
#include "main_resource.hpp"
#include "info/info.hpp"
#include "general/Tools.hpp"
#include "common/common.hpp"
#include "common/info.hpp"
#include "common/Tools.hpp"
/* -- */
#include "trace/values/Values.hpp"
/* -- */
......
......@@ -51,7 +51,7 @@
#define INTERFACE_RESOURCE_HPP
#include "main_resource.hpp"
#include "common/common.hpp"
/*
......
......@@ -64,15 +64,15 @@
#include <QApplication>
/* Global informations */
#include "main_resource.hpp"
#include "common/common.hpp"
/* -- */
#include "info/info.hpp"
#include "common/info.hpp"
#include "render/Render_opengl.hpp"
#include "interface.hpp"
#include "interface_graphic.hpp"
#include "interface_console.hpp"
#include "interface/interface.hpp"
#include "interface/interface_graphic.hpp"
#include "interface/interface_console.hpp"
/*!
*\brief The main function of ViTE.
......
......@@ -47,7 +47,7 @@
#include <set>
#include <queue>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "parser/Line.hpp"
#include "parser/Definition.hpp"
......
......@@ -50,7 +50,7 @@
/* -- */
#include <otf.h>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityValue.hpp"
......
......@@ -47,7 +47,7 @@
#include <queue>
#include <list>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityValue.hpp"
......
......@@ -49,7 +49,7 @@
#include <queue>
#include <list>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/Trace.hpp"
......
......@@ -55,7 +55,7 @@
#include <QFileInfo>
#include <QStringList>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityTypes.hpp"
......
......@@ -44,9 +44,9 @@
*\file Render_area.cpp
*/
#include "main_resource.hpp"
#include "common/common.hpp"
/* -- */
#include "info/info.hpp"
#include "common/info.hpp"
/* -- */
#include "render/render.hpp"
#include "render/Render_area.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