Commit 0e9d8bdd authored by Mathieu Faverge's avatar Mathieu Faverge

Apply patch 1 from issue #13

parent bc373d0b
...@@ -81,8 +81,8 @@ public: ...@@ -81,8 +81,8 @@ public:
#undef interface // Stupid windows :) #undef interface // Stupid windows :)
#endif #endif
Message *Message::_message = NULL; Message *Message::_message = nullptr;
Interface *Message::_interface = NULL; Interface *Message::_interface = nullptr;
#ifdef _MSC_VER // TODO : Check if needed for icc #ifdef _MSC_VER // TODO : Check if needed for icc
const Message::end_error_t Message::ende; const Message::end_error_t Message::ende;
...@@ -105,7 +105,7 @@ Message *Message::get_instance() { ...@@ -105,7 +105,7 @@ Message *Message::get_instance() {
void Message::kill() { void Message::kill() {
if (_message) if (_message)
delete _message; delete _message;
_message = NULL; _message = nullptr;
} }
void Message::set_interface(Interface *interface) { void Message::set_interface(Interface *interface) {
......
...@@ -25,7 +25,7 @@ Color *Palette::get_color(const std::string &state_name) { ...@@ -25,7 +25,7 @@ Color *Palette::get_color(const std::string &state_name) {
if(_pairs.find(state_name) != _pairs.end()) if(_pairs.find(state_name) != _pairs.end())
return _pairs[state_name]; return _pairs[state_name];
else{ else{
return NULL; return nullptr;
} }
} }
......
...@@ -146,15 +146,15 @@ bool ExportSettings::is_default() { ...@@ -146,15 +146,15 @@ bool ExportSettings::is_default() {
*/ */
//QSettings *Session::_settings = NULL; //QSettings *Session::_settings = NULL;
Session *Session::S = NULL; Session *Session::S = nullptr;
Palette *Session::_palettes_state = NULL; Palette *Session::_palettes_state = nullptr;
Palette *Session::_palettes_link = NULL; Palette *Session::_palettes_link = nullptr;
Palette *Session::_palettes_event = NULL; Palette *Session::_palettes_event = nullptr;
bool Session::_use_palettes = false; bool Session::_use_palettes = false;
bool Session::_use_palettes_is_set = false; bool Session::_use_palettes_is_set = false;
MinimapSettings *Session::_mmSettings = NULL; MinimapSettings *Session::_mmSettings = nullptr;
ExportSettings *Session::_exportSettings = NULL; ExportSettings *Session::_exportSettings = nullptr;
Session::Session() : QSettings( VITE_ORGANISATION_NAME, VITE_APPLICATION_NAME ) { Session::Session() : QSettings( VITE_ORGANISATION_NAME, VITE_APPLICATION_NAME ) {
QCoreApplication::setOrganizationName(VITE_ORGANISATION_NAME); QCoreApplication::setOrganizationName(VITE_ORGANISATION_NAME);
......
...@@ -167,7 +167,7 @@ protected: ...@@ -167,7 +167,7 @@ protected:
public: public:
static Session &getSession() { static Session &getSession() {
if (S == NULL) { if (S == nullptr) {
S = new Session(); S = new Session();
init(); init();
} }
......
...@@ -73,15 +73,15 @@ bool convert_to_double(const std::string &arg, double *val) { ...@@ -73,15 +73,15 @@ bool convert_to_double(const std::string &arg, double *val) {
// We had dots initially, we need to have the english system // We had dots initially, we need to have the english system
if(is_english_system_needed) { if(is_english_system_needed) {
if((setlocale(LC_NUMERIC, "C") == NULL) && if((setlocale(LC_NUMERIC, "C") == nullptr) &&
(setlocale(LC_NUMERIC, "en_GB.UTF-8") == NULL)){ (setlocale(LC_NUMERIC, "en_GB.UTF-8") == nullptr)){
vite_warning("The locale en_GB.UTF-8 is unavailable so the decimal pointed will not be printed"); vite_warning("The locale en_GB.UTF-8 is unavailable so the decimal pointed will not be printed");
} }
} }
else { // It is comma separated else { // It is comma separated
if ((setlocale(LC_NUMERIC, "fr_FR.UTF-8") == NULL) && if ((setlocale(LC_NUMERIC, "fr_FR.UTF-8") == nullptr) &&
(setlocale(LC_NUMERIC, "French") == NULL)){ (setlocale(LC_NUMERIC, "French") == nullptr)){
vite_warning("The locale fr_FR.UTF-8 is unavailable so the decimal with comma will not be printed"); vite_warning("The locale fr_FR.UTF-8 is unavailable so the decimal with comma will not be printed");
} }
......
...@@ -156,8 +156,8 @@ Core::Core(int &argc, char ** argv) ...@@ -156,8 +156,8 @@ Core::Core(int &argc, char ** argv)
* graphic_app is used if a graphical interface is used * graphic_app is used if a graphical interface is used
* console_app is used if we only care about the console interface * console_app is used if we only care about the console interface
*/ */
graphic_app = NULL; graphic_app = nullptr;
console_app = NULL; console_app = nullptr;
/* Qt uses the default system encoding for QString (used when opening a file) */ /* Qt uses the default system encoding for QString (used when opening a file) */
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
...@@ -170,9 +170,9 @@ Core::Core(int &argc, char ** argv) ...@@ -170,9 +170,9 @@ Core::Core(int &argc, char ** argv)
_run_env[1] = new QString(argv[0]); _run_env[1] = new QString(argv[0]);
/* Initialize global variable */ /* Initialize global variable */
_main_window = NULL; _main_window = nullptr;
_render_opengl = NULL; _render_opengl = nullptr;
_trace = NULL; _trace = nullptr;
_is_window_displayed = false; _is_window_displayed = false;
_is_trace_loaded = false; _is_trace_loaded = false;
...@@ -207,30 +207,30 @@ Core::Core(int &argc, char ** argv) ...@@ -207,30 +207,30 @@ Core::Core(int &argc, char ** argv)
QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar); QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
/* Start to launch actions */ /* Start to launch actions */
launch_action(_state, NULL); launch_action(_state, nullptr);
} }
Core::~Core(){ Core::~Core(){
if( _trace != NULL ) if( _trace != nullptr )
delete _trace; delete _trace;
if ( _run_env[0] != NULL ) if ( _run_env[0] != nullptr )
delete _run_env[0]; delete _run_env[0];
if ( _run_env[1] != NULL ) if ( _run_env[1] != nullptr )
delete _run_env[1]; delete _run_env[1];
if ( _render_opengl != NULL ) { if ( _render_opengl != nullptr ) {
_render_opengl->release(); _render_opengl->release();
delete _render_opengl; delete _render_opengl;
} }
/* Qt desallocates _main_window and _render_opengl automatically */ /* Qt desallocates _main_window and _render_opengl automatically */
Message::kill(); Message::kill();
if ( console_app != NULL ) delete console_app; if ( console_app != nullptr ) delete console_app;
if ( graphic_app != NULL ) delete graphic_app; if ( graphic_app != nullptr ) delete graphic_app;
} }
/*********************************** /***********************************
...@@ -366,7 +366,7 @@ int Core::get_options(int &argc, char **argv) ...@@ -366,7 +366,7 @@ int Core::get_options(int &argc, char **argv)
**********************************/ **********************************/
bool Core::draw_trace(const string & filename, const int format) { bool Core::draw_trace(const string & filename, const int format) {
parser = NULL; parser = nullptr;
DrawTrace drawing_ogl; DrawTrace drawing_ogl;
bool killed=false; bool killed=false;
...@@ -392,7 +392,7 @@ bool Core::draw_trace(const string & filename, const int format) { ...@@ -392,7 +392,7 @@ bool Core::draw_trace(const string & filename, const int format) {
_main_window->update_recent_files_menu(); _main_window->update_recent_files_menu();
} }
if (NULL == _trace) { /* no trace is loaded, parse the file */ if (nullptr == _trace) { /* no trace is loaded, parse the file */
/* Init data */ /* Init data */
Info::Entity::x_min = 0; Info::Entity::x_min = 0;
...@@ -428,7 +428,7 @@ bool Core::draw_trace(const string & filename, const int format) { ...@@ -428,7 +428,7 @@ bool Core::draw_trace(const string & filename, const int format) {
int loaded = 0; int loaded = 0;
float loaded_f = 0.0f;/* floating value of the loading file state. (between 0 and 1) */ float loaded_f = 0.0f;/* floating value of the loading file state. (between 0 and 1) */
if(_main_window != NULL) { // If we have a window we show a progress bar if(_main_window != nullptr) { // If we have a window we show a progress bar
_main_window->init_parsing(filename); _main_window->init_parsing(filename);
} }
...@@ -515,7 +515,7 @@ bool Core::draw_trace(const string & filename, const int format) { ...@@ -515,7 +515,7 @@ bool Core::draw_trace(const string & filename, const int format) {
if(parser->is_end_of_parsing() && !killed){ if(parser->is_end_of_parsing() && !killed){
if(!_xml_config_file.empty() && _trace->get_view_root_containers()->empty()){//if we have a partial loading, process it here, but only once if(!_xml_config_file.empty() && _trace->get_view_root_containers()->empty()){//if we have a partial loading, process it here, but only once
launch_action(_DRAW_OPENGL_PARTIAL,NULL); launch_action(_DRAW_OPENGL_PARTIAL,nullptr);
} }
QMutexLocker locker(_mutex); QMutexLocker locker(_mutex);
...@@ -562,7 +562,7 @@ bool Core::draw_trace(const string & filename, const int format) { ...@@ -562,7 +562,7 @@ bool Core::draw_trace(const string & filename, const int format) {
cout << endl; cout << endl;
if(_main_window != NULL) { // If we have a window we show a progress bar if(_main_window != nullptr) { // If we have a window we show a progress bar
_main_window->update_progress_bar(QString(buf_txt.str().c_str()), loaded); _main_window->update_progress_bar(QString(buf_txt.str().c_str()), loaded);
QApplication::processEvents(); QApplication::processEvents();
...@@ -580,7 +580,7 @@ bool Core::draw_trace(const string & filename, const int format) { ...@@ -580,7 +580,7 @@ bool Core::draw_trace(const string & filename, const int format) {
} }
} }
delete parser; delete parser;
parser=NULL; parser=nullptr;
thread.quit(); thread.quit();
thread.wait(); thread.wait();
...@@ -591,17 +591,17 @@ bool Core::draw_trace(const string & filename, const int format) { ...@@ -591,17 +591,17 @@ bool Core::draw_trace(const string & filename, const int format) {
//while(!thread.wait()) { //while(!thread.wait()) {
//} //}
if(_main_window != NULL) { // If we have a window we show a progress bar if(_main_window != nullptr) { // If we have a window we show a progress bar
_main_window->end_parsing(); _main_window->end_parsing();
} }
delete parser; delete parser;
parser=NULL; parser=nullptr;
} }
else if ( _file_opened != filename) {/* just check if execution is normal */ else if ( _file_opened != filename) {/* just check if execution is normal */
*Message::get_instance() << "Try to use file: " << filename << " instead of a previous parsed file: " << _file_opened << Message::ende; *Message::get_instance() << "Try to use file: " << filename << " instead of a previous parsed file: " << _file_opened << Message::ende;
} }
if(_trace!=NULL && !killed){ if(_trace!=nullptr && !killed){
if (Info::Render::_x_min_visible == Info::Render::_x_max_visible){ // first time if (Info::Render::_x_min_visible == Info::Render::_x_max_visible){ // first time
_trace->set_interval_constrained(new Interval(0,_trace->get_max_date())); _trace->set_interval_constrained(new Interval(0,_trace->get_max_date()));
}else{ }else{
...@@ -609,7 +609,7 @@ bool Core::draw_trace(const string & filename, const int format) { ...@@ -609,7 +609,7 @@ bool Core::draw_trace(const string & filename, const int format) {
} }
if(!_xml_config_file.empty() && _trace->get_view_root_containers()->empty()){//if we have a partial loading, process it here, but only once if(!_xml_config_file.empty() && _trace->get_view_root_containers()->empty()){//if we have a partial loading, process it here, but only once
launch_action(_DRAW_OPENGL_PARTIAL,NULL); launch_action(_DRAW_OPENGL_PARTIAL,nullptr);
} }
if (_DRAW_OPENGL == format) { if (_DRAW_OPENGL == format) {
GanttDiagram render(_render_opengl); GanttDiagram render(_render_opengl);
...@@ -729,13 +729,13 @@ void Core::launch_action(int state, void* arg) { ...@@ -729,13 +729,13 @@ void Core::launch_action(int state, void* arg) {
_render_opengl = new Render_opengl (this, _main_window, format); _render_opengl = new Render_opengl (this, _main_window, format);
#endif #endif
if ( NULL == _render_opengl){ if ( nullptr == _render_opengl){
message << QObject::tr("Cannot allocate memory for an OpengGL instance").toStdString () message << QObject::tr("Cannot allocate memory for an OpengGL instance").toStdString ()
<< Message::ende; << Message::ende;
break; break;
} }
if (NULL == _render_opengl->context()){ if (nullptr == _render_opengl->context()){
message << QObject::tr("Cannot allocate an OpengGL context").toStdString () message << QObject::tr("Cannot allocate an OpengGL context").toStdString ()
<< Message::ende; << Message::ende;
break; break;
...@@ -785,7 +785,7 @@ void Core::launch_action(int state, void* arg) { ...@@ -785,7 +785,7 @@ void Core::launch_action(int state, void* arg) {
case _STATE_OPEN_FILE_IN_AN_INTERVAL: case _STATE_OPEN_FILE_IN_AN_INTERVAL:
launch_action(_STATE_OPEN_FILE, NULL); launch_action(_STATE_OPEN_FILE, nullptr);
break; break;
case _STATE_RELEASE_RENDER_AREA: case _STATE_RELEASE_RENDER_AREA:
...@@ -811,11 +811,11 @@ void Core::launch_action(int state, void* arg) { ...@@ -811,11 +811,11 @@ void Core::launch_action(int state, void* arg) {
_is_trace_loaded = false; _is_trace_loaded = false;
} }
if (NULL == _trace) { if (nullptr == _trace) {
*Message::get_instance() << "Try to release a render area whereas no trace is loaded" << Message::ende; *Message::get_instance() << "Try to release a render area whereas no trace is loaded" << Message::ende;
} else { } else {
delete _trace; delete _trace;
_trace = NULL; _trace = nullptr;
} }
_render_opengl->updateGL(); _render_opengl->updateGL();
...@@ -897,7 +897,7 @@ void Core::launch_action(int state, void* arg) { ...@@ -897,7 +897,7 @@ void Core::launch_action(int state, void* arg) {
break; break;
case _STATE_RENDER_DISPLAY_INFORMATION: case _STATE_RENDER_DISPLAY_INFORMATION:
if(_trace != NULL){ if(_trace != nullptr){
buf.display_information(_trace, Info::Render::_info_x, Info::Render::_info_y, Info::Render::_info_accurate); buf.display_information(_trace, Info::Render::_info_x, Info::Render::_info_y, Info::Render::_info_accurate);
} }
break; break;
...@@ -925,8 +925,8 @@ void Core::launch_action(int state, void* arg) { ...@@ -925,8 +925,8 @@ void Core::launch_action(int state, void* arg) {
{ {
Element_pos yr = ((Element_pos*)arg)[0]; Element_pos yr = ((Element_pos*)arg)[0];
Element_pos yr2 = ((Element_pos*)arg)[1]; Element_pos yr2 = ((Element_pos*)arg)[1];
const Container* container=NULL; const Container* container=nullptr;
const Container* container2=NULL; const Container* container2=nullptr;
const Container::Vector *root_containers = _trace->get_view_root_containers(); const Container::Vector *root_containers = _trace->get_view_root_containers();
if(root_containers->empty())root_containers= _trace->get_root_containers(); if(root_containers->empty())root_containers= _trace->get_root_containers();
if (!root_containers->empty()){ if (!root_containers->empty()){
...@@ -976,9 +976,9 @@ void Core::launch_action(int state, void* arg) { ...@@ -976,9 +976,9 @@ void Core::launch_action(int state, void* arg) {
//printf("we ask to switch %s and %s \n", container->get_name().to_string().c_str(), container2->get_name().to_string().c_str()); //printf("we ask to switch %s and %s \n", container->get_name().to_string().c_str(), container2->get_name().to_string().c_str());
const std::list<Container*>* children=NULL; const std::list<Container*>* children=nullptr;
if(parent==NULL){//we switch top level containers if(parent==nullptr){//we switch top level containers
children = _trace->get_view_root_containers(); children = _trace->get_view_root_containers();
if(children->empty()) children = _trace->get_root_containers(); if(children->empty()) children = _trace->get_root_containers();
}else{ }else{
...@@ -988,7 +988,7 @@ void Core::launch_action(int state, void* arg) { ...@@ -988,7 +988,7 @@ void Core::launch_action(int state, void* arg) {
std::list<Container*>::const_iterator it= children->begin(); std::list<Container*>::const_iterator it= children->begin();
const std::list<Container*>::const_iterator it_end= children->end(); const std::list<Container*>::const_iterator it_end= children->end();
if(parent!=NULL){ if(parent!=nullptr){
parent->clear_view_children(); parent->clear_view_children();
for(; it!=it_end; it++){ for(; it!=it_end; it++){
if((*it)==container) parent->add_view_child(const_cast<Container*>(container2)); if((*it)==container) parent->add_view_child(const_cast<Container*>(container2));
...@@ -1043,7 +1043,7 @@ void Core::launch_action(int state, void* arg) { ...@@ -1043,7 +1043,7 @@ void Core::launch_action(int state, void* arg) {
case _STATE_UPDATE_VARVALUES: case _STATE_UPDATE_VARVALUES:
{ {
if( NULL != _trace ) { if( nullptr != _trace ) {
std::map<long int, double> var_map = _trace->update_text_variable_values(((Element_pos*)arg)[0]); std::map<long int, double> var_map = _trace->update_text_variable_values(((Element_pos*)arg)[0]);
buf.draw_text_variable_values(_render_opengl,&var_map,((Element_pos*)arg)[0]); buf.draw_text_variable_values(_render_opengl,&var_map,((Element_pos*)arg)[0]);
} }
......
...@@ -248,7 +248,7 @@ class Core : public QObject, public Interface { ...@@ -248,7 +248,7 @@ class Core : public QObject, public Interface {
* of the warning or error messages will be displayed in dialog boxes.</li> * of the warning or error messages will be displayed in dialog boxes.</li>
* </ul> * </ul>
*/ */
void launch_action(int state, void* arg = NULL); void launch_action(int state, void* arg = nullptr);
QEventLoop *waitGUIInit; QEventLoop *waitGUIInit;
......
...@@ -119,11 +119,11 @@ Interface_graphic::Interface_graphic(Core* core, QWidget *parent):QMainWindow(pa ...@@ -119,11 +119,11 @@ Interface_graphic::Interface_graphic(Core* core, QWidget *parent):QMainWindow(pa
setMouseTracking (true);/* to catch mouse events */ setMouseTracking (true);/* to catch mouse events */
_progress_dialog = NULL; _progress_dialog = nullptr;
_plugin_window = NULL; _plugin_window = nullptr;
_ui_settings = NULL; _ui_settings = nullptr;
_ui_node_selection=NULL; _ui_node_selection=nullptr;
_ui_interval_selection=NULL; _ui_interval_selection=nullptr;
_cmd_window = new Command_window(this,this); _cmd_window = new Command_window(this,this);
// For drag and drop operations // For drag and drop operations
...@@ -134,10 +134,10 @@ Interface_graphic::~Interface_graphic(){ ...@@ -134,10 +134,10 @@ Interface_graphic::~Interface_graphic(){
/* Qt desallocates this, _ui_info_window and _render_area automatically */ /* Qt desallocates this, _ui_info_window and _render_area automatically */
delete _plugin_window; delete _plugin_window;
_plugin_window = NULL; _plugin_window = nullptr;
delete _cmd_window; delete _cmd_window;
_cmd_window = NULL; _cmd_window = nullptr;
} }
...@@ -236,7 +236,7 @@ void Interface_graphic::load_windows(){ ...@@ -236,7 +236,7 @@ void Interface_graphic::load_windows(){
// For the recent files menu // For the recent files menu
for (int i = 0 ; i < Session::_MAX_NB_RECENT_FILES ; ++ i) { for (int i = 0 ; i < Session::_MAX_NB_RECENT_FILES ; ++ i) {
_recent_file_actions[i] = NULL; _recent_file_actions[i] = nullptr;
} }
update_recent_files_menu(); update_recent_files_menu();
...@@ -246,7 +246,7 @@ void Interface_graphic::load_windows(){ ...@@ -246,7 +246,7 @@ void Interface_graphic::load_windows(){
the signal corresponding to 'action'. the signal corresponding to 'action'.
/!\ -> use NULL as argument, else messages will be duplicated! /!\ -> use NULL as argument, else messages will be duplicated!
*/ */
QMetaObject::connectSlotsByName(NULL); QMetaObject::connectSlotsByName(nullptr);
_ui_x_scroll->setMaximum(_REAL_X_SCROLL_LENGTH); _ui_x_scroll->setMaximum(_REAL_X_SCROLL_LENGTH);
_ui_y_scroll->setMaximum(_REAL_Y_SCROLL_LENGTH); _ui_y_scroll->setMaximum(_REAL_Y_SCROLL_LENGTH);
...@@ -408,7 +408,7 @@ void Interface_graphic::change_zoom_box_value(int new_value){ ...@@ -408,7 +408,7 @@ void Interface_graphic::change_zoom_box_value(int new_value){
} }
//update the interval selection display //update the interval selection display
if(_ui_interval_selection!=NULL)_ui_interval_selection->update_values(); if(_ui_interval_selection!=nullptr)_ui_interval_selection->update_values();
} }
/*********************************** /***********************************
...@@ -561,7 +561,7 @@ void Interface_graphic::on_reload_triggered() { ...@@ -561,7 +561,7 @@ void Interface_graphic::on_reload_triggered() {
if(_is_rendering_trace) { if(_is_rendering_trace) {
Element_pos zoom[2] = { Info::Splitter::_x_min, Element_pos zoom[2] = { Info::Splitter::_x_min,
Info::Splitter::_x_max }; Info::Splitter::_x_max };
if( _ui_settings != NULL ) { if( _ui_settings != nullptr ) {
_ui_settings->refresh(); _ui_settings->refresh();
} }
// if(_ui_node_selection!=NULL) // if(_ui_node_selection!=NULL)
...@@ -586,7 +586,7 @@ void Interface_graphic::on_reload_triggered() { ...@@ -586,7 +586,7 @@ void Interface_graphic::on_reload_triggered() {
scale_container_state->setValue(20); scale_container_state->setValue(20);
//update the interval selection display //update the interval selection display
if( _ui_interval_selection != NULL ) { if( _ui_interval_selection != nullptr ) {
_ui_interval_selection->update_values(); _ui_interval_selection->update_values();
} }
} }
...@@ -602,7 +602,7 @@ void Interface_graphic::on_clear_recent_files_triggered() { ...@@ -602,7 +602,7 @@ void Interface_graphic::on_clear_recent_files_triggered() {
Session::clear_recent_files(); Session::clear_recent_files();
// We remove the elements from the menu // We remove the elements from the menu
for(int i = 0 ; i < Session::_MAX_NB_RECENT_FILES ; ++ i) { for(int i = 0 ; i < Session::_MAX_NB_RECENT_FILES ; ++ i) {
if(_recent_file_actions[i] != NULL) { if(_recent_file_actions[i] != nullptr) {
_ui_recent_files_menu->removeAction(_recent_file_actions[i]); _ui_recent_files_menu->removeAction(_recent_file_actions[i]);
} }
} }
...@@ -683,7 +683,7 @@ void Interface_graphic::on_close_triggered(){ ...@@ -683,7 +683,7 @@ void Interface_graphic::on_close_triggered(){
_ui_settings->hide(); _ui_settings->hide();
} }
if(_plugin_window != NULL) { if(_plugin_window != nullptr) {
_plugin_window->hide(); _plugin_window->hide();
//_plugin_window->clear_plugins(); //_plugin_window->clear_plugins();
} }
...@@ -691,7 +691,7 @@ void Interface_graphic::on_close_triggered(){ ...@@ -691,7 +691,7 @@ void Interface_graphic::on_close_triggered(){
_core->launch_action(Core::_STATE_RELEASE_RENDER_AREA); _core->launch_action(Core::_STATE_RELEASE_RENDER_AREA);
if (_cmd_window){ if (_cmd_window){
delete _cmd_window; delete _cmd_window;
_cmd_window = NULL; _cmd_window = nullptr;
} }
_is_rendering_trace = false; _is_rendering_trace = false;
...@@ -704,13 +704,13 @@ void Interface_graphic::on_close_triggered(){ ...@@ -704,13 +704,13 @@ void Interface_graphic::on_close_triggered(){
void Interface_graphic::on_quit_triggered(){ void Interface_graphic::on_quit_triggered(){
if( NULL != _ui_node_selection) if( nullptr != _ui_node_selection)
((QWidget*)_ui_node_selection)->close(); ((QWidget*)_ui_node_selection)->close();
if( NULL != _ui_interval_selection) if( nullptr != _ui_interval_selection)
((QWidget*)_ui_interval_selection)->close(); ((QWidget*)_ui_interval_selection)->close