From c3f4af9cbff229fa417ac70b43fab368f9b52a20 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Fri, 13 Feb 2009 16:30:27 +0000 Subject: [PATCH] * ./hurricane/src/hviewer : - Bug: corrected memory leak in RedrawManager, events weren't freed. - Bug: various attributes reordering in constructors. --- hurricane/src/hurricane/hurricane/Commons.h | 2 +- hurricane/src/hviewer/CellWidget.cpp | 3 ++- hurricane/src/hviewer/hurricane/viewer/CellWidget.h | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hurricane/src/hurricane/hurricane/Commons.h b/hurricane/src/hurricane/hurricane/Commons.h index 423f3e4c..9570b213 100644 --- a/hurricane/src/hurricane/hurricane/Commons.h +++ b/hurricane/src/hurricane/hurricane/Commons.h @@ -114,7 +114,7 @@ namespace Hurricane { inline string _PName ( const string& s ) { return "Hurricane::" + s; } template - inline Type abs ( const Type& value ) { return (value<0) ? -value : value; } + inline Type abs ( const Type& value ) { return (value<0) ? -value : value; } string demangle ( const char* symbol ); inline string demangle ( const type_info& info ) { return demangle(info.name()); } diff --git a/hurricane/src/hviewer/CellWidget.cpp b/hurricane/src/hviewer/CellWidget.cpp index db6e84e1..749691d1 100644 --- a/hurricane/src/hviewer/CellWidget.cpp +++ b/hurricane/src/hviewer/CellWidget.cpp @@ -329,6 +329,7 @@ namespace Hurricane { _interrupted = false; } #else + delete _events.front (); _events.pop_front (); #endif } @@ -929,8 +930,8 @@ namespace Hurricane { , _cellChanged (true) , _selectionHasChanged (false) , _delaySelectionChanged(0) - , _enableRedrawInterrupt(false) , _cellModificated (true) + , _enableRedrawInterrupt(false) , _selectors () , _commands () , _redrawRectCount (0) diff --git a/hurricane/src/hviewer/hurricane/viewer/CellWidget.h b/hurricane/src/hviewer/hurricane/viewer/CellWidget.h index b6b5bc30..fb960c9f 100644 --- a/hurricane/src/hviewer/hurricane/viewer/CellWidget.h +++ b/hurricane/src/hviewer/hurricane/viewer/CellWidget.h @@ -778,13 +778,14 @@ namespace Hurricane { inline CellWidget::State::State ( Cell* cell ) : _cell (cell) + , _cellWidget (NULL) , _selection () + , _showBoundaries (true) + , _showSelection (false) , _queryFilter (~Query::DoTerminalCells) , _startLevel (0) , _stopLevel (99) , _rubberShape (CellWidget::Steiner) - , _showBoundaries (true) - , _showSelection (false) , _cumulativeSelection(false) , _scaleHistory () , _ihistory (0)