Commit f30434c8 authored by Mathieu Faverge's avatar Mathieu Faverge

merge config_file (correct some trouble I didn't notice during the merge)

parent f2956a20
......@@ -50,6 +50,7 @@
class stringstream;
class ostream;
class Interface;
class Message: public std::stringstream {
private:
......
......@@ -467,9 +467,6 @@ public:
* \fn get_trace() const
*\brief Accessor to the trace
*/
/*!
*\brief Return the current trace.
*/
Trace *get_trace() const;
/*!
......
......@@ -66,9 +66,6 @@ class Variable;
/* -- */
#include "ui_main_window.h" /* the main window graphical interface */
/* -- */
#include "ui_main_window.h" /* the main window graphical interface */
/* Global informations */
#include "interface/Interface.hpp"
#include "interface/Settings_window.hpp"
......@@ -94,21 +91,14 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
*/
void load_windows();
/*!
*\brief Drag and drop function
*\brief Drag and drop functions
*
*/
void dragEnterEvent(QDragEnterEvent *event);
/*!
*\brief Drag and drop function
*/
void dragMoveEvent(QDragMoveEvent *event);
/*!
*\brief Drag and drop function
*/
void dragLeaveEvent(QDragLeaveEvent *event);
/*!
*\brief Drag and drop function
*/
void dropEvent(QDropEvent *event);
/*!
......
......@@ -55,13 +55,7 @@
class Parser{
protected:
/*!
* Set to true if the parsing is finished.
*/
bool _is_finished;
/*!
* Set to true if the parsing is canceled.
*/
bool _is_canceled;
std::string _file_to_parse;
......
......@@ -123,35 +123,33 @@ private:
void leave_definition(const PajeLine_t *line);
/*!
* \fn add_field_to_definition(std::string& first_token, const PajeLine_t& line)
* \param first_token : the name of the file to parse
* \fn add_field_to_definition(const PajeLine_t *line)
* \param line : the structure of data to fill
*/
void add_field_to_definition(const PajeLine_t *line);
public:
/*!
* \fn enter_definition(const PajeLine_t *line)
* \param PajeLine line
* \brief Put the parser in definition mode
* \fn ParserDefinitionPaje
* \brief constructor
*/
ParserDefinitionPaje();
~ParserDefinitionPaje();
/*!
* \fn store_definition(const PajeLine_t &l)
* \param l the line to store.
* \fn store_definition(const PajeLine_t *line)
* \param line the line to store.
*/
void store_definition(const PajeLine_t *line);
public:
/*!
* \fn ParserDefinitionPaje
* \brief constructor
* \fn getDefFromTrid(int trid)
* \param i : the unsigned integer matching the definition we want
* \return : the i-th definition
*/
PajeDefinition *getDefFromTrid(int trid);
/*! \fn print_definitions() const
/*! \fn print_definitions()
* \brief Print all the definitions. Useful for debug.
*/
void print_definitions();
......
......@@ -54,8 +54,6 @@
#include <QResizeEvent>
#include <QSize>
/* -- */
#include "interface/Interface.hpp"
/* -- */
#include "common/common.hpp"
#include "common/Session.hpp"
#include "common/Message.hpp"
......
......@@ -53,7 +53,6 @@
#include "common/common.hpp"
#include "common/Info.hpp"
#include "common/Message.hpp"
#include "common/Message.hpp"
/* -- */
#include "render/Geometry.hpp"
#include "render/Render_template.hpp"
......
......@@ -54,13 +54,11 @@
#include <QKeyEvent>
#include <QGLWidget>
/* -- */
#include "interface/resource.hpp"
#include "interface/Interface.hpp"
/* -- */
#include "common/common.hpp"
#include "common/Info.hpp"
#include "common/Message.hpp"
#include "common/Message.hpp"
#include "interface/resource.hpp"
#include "interface/Interface.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityValue.hpp"
......
......@@ -67,11 +67,11 @@ class Stats_window;
/*!
* \enum stattype_t
* \enum stattype
* \brief Enumeration for the kind of chart to print stats.
*
*/
typedef enum {
typedef enum stattype {
_HDIAGRAM_INDEX,
_DIAGRAM_INDEX,
_COUNTER_INDEX
......
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