From b8883968be6ee56471703a187865a8bae8225c8c Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 17 May 2010 14:40:36 +0000 Subject: [PATCH] * All tools: - Change: Correction to suppress all g++ warnings. Except thoses comming from bad Python system includes... --- hurricane/src/isobar/PyDbU.cpp | 2 +- hurricane/src/viewer/CellWidget.cpp | 4 ++-- hurricane/src/viewer/DisplayFilterWidget.cpp | 1 + hurricane/src/viewer/ExceptionWidget.cpp | 2 +- hurricane/src/viewer/GotoWidget.cpp | 2 +- hurricane/src/viewer/InspectorWidget.cpp | 6 +++--- hurricane/src/viewer/PaletteWidget.cpp | 2 +- hurricane/src/viewer/hurricane/viewer/CellWidget.h | 2 +- hurricane/src/viewer/hurricane/viewer/NetlistWidget.h | 1 - hurricane/tests/HTest.cpp | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hurricane/src/isobar/PyDbU.cpp b/hurricane/src/isobar/PyDbU.cpp index 147fde05..297a2169 100644 --- a/hurricane/src/isobar/PyDbU.cpp +++ b/hurricane/src/isobar/PyDbU.cpp @@ -283,7 +283,7 @@ extern "C" { PyObject* arg0; PyObject* arg1; - DbU::Unit result; + DbU::Unit result = 0; HTRY __cs.init ( "DbU.getOnPhysicalGrid" ); diff --git a/hurricane/src/viewer/CellWidget.cpp b/hurricane/src/viewer/CellWidget.cpp index 0357f900..fa7c5a9c 100644 --- a/hurricane/src/viewer/CellWidget.cpp +++ b/hurricane/src/viewer/CellWidget.cpp @@ -1286,7 +1286,7 @@ namespace Hurricane { } - void CellWidget::changeDbuMode ( int mode, DbU::UnitPower p ) + void CellWidget::changeDbuMode ( unsigned int mode, DbU::UnitPower p ) { if ( (_state->getDbuMode() != mode) or (_state->getUnitPower() != p) ) { _state->setDbuMode ( mode ); @@ -1670,7 +1670,7 @@ namespace Hurricane { QFontMetrics metrics = QFontMetrics(font); int width = metrics.width ( text ); - int height = metrics.height (); + //int height = metrics.height (); int angle = 0; if ( (width > box.width()) and (box.height() > 2*box.width()) ) diff --git a/hurricane/src/viewer/DisplayFilterWidget.cpp b/hurricane/src/viewer/DisplayFilterWidget.cpp index 9b89d28c..26a1fb97 100644 --- a/hurricane/src/viewer/DisplayFilterWidget.cpp +++ b/hurricane/src/viewer/DisplayFilterWidget.cpp @@ -236,6 +236,7 @@ namespace Hurricane { case DbU::Physical: switch ( _cellWidget->getUnitPower() ) { case DbU::Nano: _nanoMode ->setChecked(true); break; + default: case DbU::Micro: _microMode->setChecked(true); break; } break; diff --git a/hurricane/src/viewer/ExceptionWidget.cpp b/hurricane/src/viewer/ExceptionWidget.cpp index 153c2bd3..1d2fd50f 100644 --- a/hurricane/src/viewer/ExceptionWidget.cpp +++ b/hurricane/src/viewer/ExceptionWidget.cpp @@ -39,8 +39,8 @@ namespace Hurricane { ExceptionWidget::ExceptionWidget ( QWidget* parent ) : QDialog (parent) - , _message(new QLabel()) , _header (new QLabel()) + , _message(new QLabel()) { setAttribute ( Qt::WA_DeleteOnClose ); setModal ( true ); diff --git a/hurricane/src/viewer/GotoWidget.cpp b/hurricane/src/viewer/GotoWidget.cpp index 575666ea..805fe4ec 100644 --- a/hurricane/src/viewer/GotoWidget.cpp +++ b/hurricane/src/viewer/GotoWidget.cpp @@ -141,7 +141,7 @@ namespace Hurricane { if ( mode == DbU::Physical ) { switch ( p ) { case DbU::Nano: mode = Nanometer; break; - defult: + default: case DbU::Micro: mode = Micrometer; break; } } diff --git a/hurricane/src/viewer/InspectorWidget.cpp b/hurricane/src/viewer/InspectorWidget.cpp index ef5636f3..27498ff0 100644 --- a/hurricane/src/viewer/InspectorWidget.cpp +++ b/hurricane/src/viewer/InspectorWidget.cpp @@ -94,9 +94,9 @@ namespace Hurricane { void InspectorWidget::History::goTo ( int depth ) { - if ( ( depth < 0 ) || ( depth >= (int)_slots.size() ) ) return; - if ( depth != _depth ) { - _depth = depth; + if ( ( depth < 0 ) or ( (size_t)depth >= _slots.size() ) ) return; + if ( (size_t)depth != _depth ) { + _depth = (size_t)depth; _comboBox->setCurrentIndex ( _depth ); } } diff --git a/hurricane/src/viewer/PaletteWidget.cpp b/hurricane/src/viewer/PaletteWidget.cpp index 886cb2f5..9b9166bb 100644 --- a/hurricane/src/viewer/PaletteWidget.cpp +++ b/hurricane/src/viewer/PaletteWidget.cpp @@ -88,7 +88,7 @@ namespace { inline int GridBuffer::getRow () const { return _row; } inline int GridBuffer::getColumn () const { return _column; } inline int GridBuffer::getCurrentRow () const { return _widgets.size() + _row; } - inline bool GridBuffer::columnOverload () const { return getCurrentRow() > _rowMax; } + inline bool GridBuffer::columnOverload () const { return getCurrentRow() > (int)_rowMax; } void GridBuffer::flushWidgets () diff --git a/hurricane/src/viewer/hurricane/viewer/CellWidget.h b/hurricane/src/viewer/hurricane/viewer/CellWidget.h index 7f79afda..01ac9f6f 100644 --- a/hurricane/src/viewer/hurricane/viewer/CellWidget.h +++ b/hurricane/src/viewer/hurricane/viewer/CellWidget.h @@ -285,7 +285,7 @@ namespace Hurricane { inline void clearRulers (); void changeQueryFilter (); void rubberChange (); - void changeDbuMode ( int mode, DbU::UnitPower ); + void changeDbuMode ( unsigned int mode, DbU::UnitPower ); void setStyle ( int id ); void updatePalette (); void cellPreModificate (); diff --git a/hurricane/src/viewer/hurricane/viewer/NetlistWidget.h b/hurricane/src/viewer/hurricane/viewer/NetlistWidget.h index 5f185c44..a49d3a97 100644 --- a/hurricane/src/viewer/hurricane/viewer/NetlistWidget.h +++ b/hurricane/src/viewer/hurricane/viewer/NetlistWidget.h @@ -196,7 +196,6 @@ namespace Hurricane { string windowTitle = "Netlist" + getString(cell); setWindowTitle ( tr(windowTitle.c_str()) ); - int rows = _sortModel->rowCount (); _view->selectRow ( 0 ); _view->resizeColumnToContents ( 0 ); } diff --git a/hurricane/tests/HTest.cpp b/hurricane/tests/HTest.cpp index 1d62da24..ab182934 100644 --- a/hurricane/tests/HTest.cpp +++ b/hurricane/tests/HTest.cpp @@ -88,7 +88,7 @@ int main() { //// //Net net1 External and IN of Model1 creation - Net* net1 = Net::create(model1, Name("net1")); + //Net* net1 = Net::create(model1, Name("net1")); cout << "Testing net1 presence in cell model1" << endl; ///// //set net1 as External