From: SALOME Date: Mon, 24 Aug 2020 11:28:55 +0000 (+0300) Subject: fight warnings, fix minor warnings. Build GUI finished X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cdbaa8a5d5d5bbad69c00ea6d15f3ccf55b96b9c;p=modules%2Fgui.git fight warnings, fix minor warnings. Build GUI finished --- diff --git a/src/GLViewer/GLViewer_BaseObjects.cxx b/src/GLViewer/GLViewer_BaseObjects.cxx index fa66857f6..39a46a0e6 100644 --- a/src/GLViewer/GLViewer_BaseObjects.cxx +++ b/src/GLViewer/GLViewer_BaseObjects.cxx @@ -422,7 +422,7 @@ GLboolean GLViewer_MarkerSet::unhighlight() \param isCircle - true if sensitive area of detection is round \param isShift - true if selection exec with append option */ -GLboolean GLViewer_MarkerSet::select( GLfloat x, GLfloat y, GLfloat tol, GLViewer_Rect rect, GLboolean isFull, +GLboolean GLViewer_MarkerSet::select( GLfloat x, GLfloat y, GLfloat tol, GLViewer_Rect /*rect*/, GLboolean /*isFull*/, GLboolean isCircle, GLboolean isShift ) { //GUI_UNUSED(isFull); @@ -816,7 +816,7 @@ bool GLViewer_MarkerSet::initializeFromByteCopy( QByteArray theArray ) \param size - size of polyline \param toolTip - tool tip of polyline */ -GLViewer_Polyline::GLViewer_Polyline( int number, float size, const QString& toolTip ): +GLViewer_Polyline::GLViewer_Polyline( int number, float /*size*/, const QString& toolTip ): GLViewer_Object(), myNumber( 0 ), myXCoord( 0 ), @@ -1007,7 +1007,7 @@ GLViewer_Drawer* GLViewer_Polyline::createDrawer() \param isCircle - true if sensitive area of detection is round \return true if highlight status is changed */ -GLboolean GLViewer_Polyline::highlight( GLfloat x, GLfloat y, GLfloat tol, GLboolean isCircle ) +GLboolean GLViewer_Polyline::highlight( GLfloat x, GLfloat y, GLfloat /*tol*/, GLboolean /*isCircle*/ ) { //GUI_UNUSED(isCircle); //GUI_UNUSED(tol); @@ -1093,14 +1093,9 @@ GLboolean GLViewer_Polyline::unhighlight() \param isCircle - true if sensitive area of detection is round \param isShift - true if selection exec with append option */ -GLboolean GLViewer_Polyline::select( GLfloat x, GLfloat y, GLfloat tol, GLViewer_Rect rect, GLboolean isFull, - GLboolean isCircle, GLboolean isShift ) +GLboolean GLViewer_Polyline::select( GLfloat x, GLfloat y, GLfloat /*tol*/, GLViewer_Rect /*rect*/, GLboolean /*isFull*/, + GLboolean /*isCircle*/, GLboolean /*isShift*/ ) { - //GUI_UNUSED(isCircle); - //GUI_UNUSED(isFull); - //GUI_UNUSED(isShift); - //GUI_UNUSED(rect); - //GUI_UNUSED(tol); if( !myIsVisible ) return false; GLfloat xa, xb, ya, yb, l; @@ -1631,12 +1626,9 @@ GLboolean GLViewer_TextObject::unhighlight() \param isCircle - true if sensitive area of detection is round \param isShift - true if selection exec with append option */ -GLboolean GLViewer_TextObject::select( GLfloat theX, GLfloat theY, GLfloat theTol, GLViewer_Rect rect, - GLboolean isFull, GLboolean isCircle, GLboolean isShift ) +GLboolean GLViewer_TextObject::select( GLfloat theX, GLfloat theY, GLfloat theTol, GLViewer_Rect /*rect*/, + GLboolean /*isFull*/, GLboolean isCircle, GLboolean /*isShift*/ ) { - //GUI_UNUSED(isFull); - //GUI_UNUSED(isShift); - //GUI_UNUSED(rect); if( !myIsVisible ) return false; diff --git a/src/GLViewer/GLViewer_Grid.cxx b/src/GLViewer/GLViewer_Grid.cxx index b46bf62d6..79538241e 100644 --- a/src/GLViewer/GLViewer_Grid.cxx +++ b/src/GLViewer/GLViewer_Grid.cxx @@ -56,27 +56,17 @@ GLViewer_Grid::GLViewer_Grid() : \param xPan and \param yPan - offsets along x and y direction \param xScale and \param yScal - scale factors along x and y direction */ -GLViewer_Grid::GLViewer_Grid( GLfloat width, GLfloat height, - GLfloat winW, GLfloat winH, - GLfloat xSize, GLfloat ySize, - GLfloat xPan, GLfloat yPan, - GLfloat xScale, GLfloat yScale ) : +GLViewer_Grid::GLViewer_Grid( GLfloat /*width*/, GLfloat /*height*/, + GLfloat /*winW*/, GLfloat /*winH*/, + GLfloat /*xSize*/, GLfloat /*ySize*/, + GLfloat /*xPan*/, GLfloat /*yPan*/, + GLfloat /*xScale*/, GLfloat /*yScale*/ ) : myGridList( 0 ), myGridHeight( (GLfloat)0.0 ), myGridWidth( (GLfloat)0.0 ), myWinW( (GLfloat)0.0 ), myWinH( (GLfloat)0.0 ), myXSize( (GLfloat)0.0 ), myYSize( (GLfloat)0.0 ), myXPan( (GLfloat)0.0 ), myYPan( (GLfloat)0.0 ), myXScale( (GLfloat)1.0 ), myYScale( (GLfloat)1.0 ), myLineWidth( (GLfloat)0.05 ), myCenterWidth( (GLfloat)1.5 ), myCenterRadius( (GLfloat)5.0 ), myScaleFactor( 10 ), myIsUpdate( GL_FALSE ) { - //GUI_UNUSED(height); - //GUI_UNUSED(width); - //GUI_UNUSED(winH); - //GUI_UNUSED(winW); - //GUI_UNUSED(xPan); - //GUI_UNUSED(xScale); - //GUI_UNUSED(xSize); - //GUI_UNUSED(yPan); - //GUI_UNUSED(yScale); - //GUI_UNUSED(ySize); myGridColor[0] = 0.5; myGridColor[1] = 0.5; myGridColor[2] = 0.5; diff --git a/src/GraphicsView/GraphicsView_Object.h b/src/GraphicsView/GraphicsView_Object.h index 4c5796186..a0900b28f 100644 --- a/src/GraphicsView/GraphicsView_Object.h +++ b/src/GraphicsView/GraphicsView_Object.h @@ -74,10 +74,10 @@ public: virtual void move( double theDX, double theDY, bool theIsAtOnce = false ); virtual bool finishMove( bool theStatus ); virtual bool isMoving() const { return myIsMoving; } - virtual bool isMovingByXAllowed( double theDX ) {/*GUI_UNUSED(theDX);*/ return true; } - virtual bool isMovingByYAllowed( double theDY ) {/*GUI_UNUSED(theDY);*/ return true; } + virtual bool isMovingByXAllowed( double /*theDX*/ ) { return true; } + virtual bool isMovingByYAllowed( double /*theDY*/ ) { return true; } - virtual bool updateScale( bool theIsScaleUp, bool theIsCtrl ) {/*GUI_UNUSED(theIsScaleUp);GUI_UNUSED(theIsCtrl);*/ return false; } + virtual bool updateScale( bool /*theIsScaleUp*/, bool /*theIsCtrl*/ ) { return false; } virtual QRectF getPullingRect() const { return getRect(); } virtual bool portContains( const QPointF& ) { return false; } diff --git a/src/GraphicsView/GraphicsView_Selector.cxx b/src/GraphicsView/GraphicsView_Selector.cxx index 8bc9ae194..fd57e5c4a 100644 --- a/src/GraphicsView/GraphicsView_Selector.cxx +++ b/src/GraphicsView/GraphicsView_Selector.cxx @@ -103,9 +103,8 @@ void GraphicsView_Selector::unselectAll() // Function : checkSelection // Purpose : //================================================================ -void GraphicsView_Selector::checkSelection( int selBefore, bool append, int theStatus ) +void GraphicsView_Selector::checkSelection( int selBefore, bool /*append*/, int theStatus ) { - //GUI_UNUSED(append); int selAfter = numSelected(); if ( selBefore > 0 && selAfter < 1 ) emit selSelectionCancel(); diff --git a/src/OCCViewer/OCCViewer.h b/src/OCCViewer/OCCViewer.h index 173a7a1c8..f227a1fb3 100644 --- a/src/OCCViewer/OCCViewer.h +++ b/src/OCCViewer/OCCViewer.h @@ -45,6 +45,6 @@ namespace OCCViewer { OCCVIEWER_EXPORT Quantity_Color color( const QColor& ); OCCVIEWER_EXPORT QColor color( const Quantity_Color& ); -}; +} #endif //OCCVIEWER_H diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx index 1bf2cf18d..5d535ec96 100644 --- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx +++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx @@ -905,7 +905,7 @@ void OCCViewer_ClippingDlg::updatePreview() { gp_Pnt aBasePnt; gp_Dir aNormal; clipPlaneParams(aClipPlane, ic, aSize, aBasePnt, aNormal, myModel->trihedronSize()); - if(myPreviewPlaneVector.size() < clipPlanesCount()) { + if(myPreviewPlaneVector.size() < (size_t)clipPlanesCount()) { //TODO: mismatch signed/unsigned myPreviewPlaneVector.resize(clipPlanesCount()); } myPreviewPlane = myPreviewPlaneVector[aCurPlaneIndex]; @@ -939,7 +939,7 @@ void OCCViewer_ClippingDlg::updatePreview() { myPreviewPlaneVector[aCurPlaneIndex].Nullify(); } } - for(int i = 0; i < myPreviewPlaneVector.size(); i++) { + for(int i = 0; i < (int)myPreviewPlaneVector.size(); i++) {//TODO: mismatch signed/unsigned if( i == aCurPlaneIndex ) continue; if(!myPreviewPlaneVector[i].IsNull()) ic->SetColor( myPreviewPlaneVector[i], Quantity_Color( 85 / 255., 85 / 255., 255 / 255., Quantity_TOC_RGB ), false ); @@ -969,7 +969,7 @@ void OCCViewer_ClippingDlg::erasePreview() Handle(AIS_InteractiveContext) ic = myModel->getAISContext(); - for ( int i=0; i < myPreviewPlaneVector.size(); i++ ) { + for ( int i=0; i < (int)myPreviewPlaneVector.size(); i++ ) {//TODO: mismatch signed/unsigned Handle(AIS_Plane) myPreviewPlane = myPreviewPlaneVector[i]; if ( !myPreviewPlane.IsNull() && ic->IsDisplayed( myPreviewPlane ) ) { ic->Erase( myPreviewPlane, false ); diff --git a/src/OCCViewer/OCCViewer_ViewFrame.h b/src/OCCViewer/OCCViewer_ViewFrame.h index 9c5ec78e9..f5684a1fd 100644 --- a/src/OCCViewer/OCCViewer_ViewFrame.h +++ b/src/OCCViewer/OCCViewer_ViewFrame.h @@ -145,15 +145,15 @@ public slots: virtual void activateRotation() {} virtual void activatePanning() {} virtual void activateGlobalPanning() {} - virtual void onSetRotationPoint( bool on ) {/*GUI_UNUSED(on);*/} + virtual void onSetRotationPoint( bool /*on*/ ) {} virtual void onAxialScale() {} virtual void onAmbientToogle() {} virtual void onMemorizeView() {} virtual void onRestoreView() {} - virtual void onSwitchInteractionStyle( bool on ) {/*GUI_UNUSED(on);*/ } + virtual void onSwitchInteractionStyle( bool /*on*/ ) {} virtual void activateSetRotationGravity() {} - virtual void activateSetRotationSelected( double theX, double theY, double theZ ) {/*GUI_UNUSED(theX);GUI_UNUSED(theY);GUI_UNUSED(theZ);*/} + virtual void activateSetRotationSelected( double /*theX*/, double /*theY*/, double /*theZ*/ ) {} virtual void activateStartPointSelection( TopAbs_ShapeEnum ) {} virtual void updateGravityCoords() {} diff --git a/src/Plot2d/Plot2d_PlotItems.cxx b/src/Plot2d/Plot2d_PlotItems.cxx index e0a78895c..3754e1190 100644 --- a/src/Plot2d/Plot2d_PlotItems.cxx +++ b/src/Plot2d/Plot2d_PlotItems.cxx @@ -984,7 +984,7 @@ bool Plot2d_HistogramItem::isCrossItems() const Draws bar of histogram and on it bars of histograms with lower height. */ void Plot2d_HistogramItem::drawRectAndLowers( QPainter* thePainter, - Qt::Orientation theOr, + Qt::Orientation /*theOr*/, const QRect& theRect ) const { QRect aRect = theRect; @@ -1042,7 +1042,7 @@ int Plot2d_HistogramItem::getCrossedTop( const QRect& theRect ) const return aRes; } -QwtGraphic Plot2d_HistogramItem::legendIcon( int index, const QSizeF &size ) const +QwtGraphic Plot2d_HistogramItem::legendIcon( int /*index*/, const QSizeF &size ) const { return defaultIcon( color(), size ); } diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx index 90d0eda45..c435a71ef 100644 --- a/src/Plot2d/Plot2d_ViewFrame.cxx +++ b/src/Plot2d/Plot2d_ViewFrame.cxx @@ -2850,7 +2850,7 @@ bool Plot2d_ViewFrame::hasPlotObject( Plot2d_Object* object ) const /*! Sets curve type */ -void Plot2d_ViewFrame::setCurveType( QwtPlotCurve* curve, int curveType ) +void Plot2d_ViewFrame::setCurveType( QwtPlotCurve* curve, int /*curveType*/ ) { if ( !curve ) return; @@ -3176,7 +3176,7 @@ QwtPlotMarker* Plot2d_Plot2d::createMarkerAndTooltip( QwtSymbol* symbol, QwtPlotGrid* Plot2d_Plot2d::grid() const { return myGrid; -}; +} QwtPlotZoomer* Plot2d_Plot2d::zoomer() const { diff --git a/src/Prs/SALOME_Prs.h b/src/Prs/SALOME_Prs.h index dba9132b2..df32bda40 100644 --- a/src/Prs/SALOME_Prs.h +++ b/src/Prs/SALOME_Prs.h @@ -307,7 +307,7 @@ public: //! \retval Return false. virtual bool isVisible( const Handle(SALOME_InteractiveObject)& ){ return false; } virtual void Repaint() {} //!< Null body here. - virtual void GetVisible( SALOME_ListIO& theList ) {/*GUI_UNUSED(theList);*/} + virtual void GetVisible( SALOME_ListIO& /*theList*/ ) {/*GUI_UNUSED(theList);*/} }; /*! diff --git a/src/Qtx/QtxBiColorTool.cxx b/src/Qtx/QtxBiColorTool.cxx index 7517685ca..616a80f97 100644 --- a/src/Qtx/QtxBiColorTool.cxx +++ b/src/Qtx/QtxBiColorTool.cxx @@ -61,7 +61,7 @@ public: } return mySizeHint; } - void paintEvent( QPaintEvent* e ) + void paintEvent( QPaintEvent* /*e*/ ) { QStylePainter sp(this); QStyleOptionButton option; diff --git a/src/Qtx/QtxColorScale.cxx b/src/Qtx/QtxColorScale.cxx index 6ef8d823f..d7c2cd3a9 100644 --- a/src/Qtx/QtxColorScale.cxx +++ b/src/Qtx/QtxColorScale.cxx @@ -706,7 +706,7 @@ void QtxColorScale::hide() \brief Paint widget \param e paint event */ -void QtxColorScale::paintEvent( QPaintEvent* e ) +void QtxColorScale::paintEvent( QPaintEvent* /*e*/ ) { QPainter p( this ); drawFrame( &p ); diff --git a/src/Qtx/QtxMainWindow.cxx b/src/Qtx/QtxMainWindow.cxx index fcfe0fe1e..df152aa74 100644 --- a/src/Qtx/QtxMainWindow.cxx +++ b/src/Qtx/QtxMainWindow.cxx @@ -69,7 +69,7 @@ QtxMainWindow::Filter::Filter( QWidget* wid, QtxMainWindow* mw, QObject* parent myWidget( wid ) { QApplication::instance()->installEventFilter( this ); -}; +} /*! \brief Destructor. @@ -142,7 +142,7 @@ QtxMainWindow::Resizer::Resizer( const QPoint& p, const Qt::Orientation o, QtxMa setPosition( p ); myRubber->hide(); -}; +} /*! \brief Destructor. diff --git a/src/Qtx/QtxPagePrefMgr.cxx b/src/Qtx/QtxPagePrefMgr.cxx index d11413755..7f7e51936 100644 --- a/src/Qtx/QtxPagePrefMgr.cxx +++ b/src/Qtx/QtxPagePrefMgr.cxx @@ -4475,7 +4475,7 @@ void QtxPagePrefShortcutBtnsItem::retrieve() \param param resource file parameter associated with the preference item */ QtxPagePrefShortcutTreeItem::QtxPagePrefShortcutTreeItem( const QString& title, QtxPreferenceItem* parent, const QString& sect, - const QString& param ): QtxPageNamedPrefItem( title, parent, sect, "" ) + const QString& /*param*/ ): QtxPageNamedPrefItem( title, parent, sect, "" ) { mySection = sect; diff --git a/src/Qtx/QtxPathListEdit.cxx b/src/Qtx/QtxPathListEdit.cxx index 31ce3002b..f3860e006 100644 --- a/src/Qtx/QtxPathListEdit.cxx +++ b/src/Qtx/QtxPathListEdit.cxx @@ -207,8 +207,8 @@ QtxPathListEdit::Delegate::~Delegate() \param option style option \param index data model index */ -QWidget* QtxPathListEdit::Delegate::createEditor( QWidget* parent, const QStyleOptionViewItem& option, - const QModelIndex& index ) const +QWidget* QtxPathListEdit::Delegate::createEditor( QWidget* parent, const QStyleOptionViewItem& /*option*/, + const QModelIndex& /*index*/ ) const { return myPathEdit->createEditor( parent ); } @@ -220,7 +220,7 @@ QWidget* QtxPathListEdit::Delegate::createEditor( QWidget* parent, const QStyleO \param model data model \param index data model index */ -void QtxPathListEdit::Delegate::setModelData( QWidget* editor, QAbstractItemModel* model, +void QtxPathListEdit::Delegate::setModelData( QWidget* editor, QAbstractItemModel* /*model*/, const QModelIndex& index ) const { myPathEdit->setModelData( editor, index ); @@ -270,7 +270,7 @@ void QtxPathListEdit::Delegate::paint( QPainter* painter, const QStyleOptionView \param rect selection rectangle */ void QtxPathListEdit::Delegate::drawFocus( QPainter* painter, const QStyleOptionViewItem& option, - const QRect& rect ) const + const QRect& /*rect*/ ) const { QItemDelegate::drawFocus( painter, option, option.rect ); } diff --git a/src/Qtx/QtxShortcutEdit.cxx b/src/Qtx/QtxShortcutEdit.cxx index 415cf9484..798caf254 100644 --- a/src/Qtx/QtxShortcutEdit.cxx +++ b/src/Qtx/QtxShortcutEdit.cxx @@ -242,7 +242,7 @@ QtxShortcutTree::~QtxShortcutTree(){} \param event event \return \c true if further event processing should be stopped */ -bool QtxShortcutTree::eventFilter(QObject* obj, QEvent* event) +bool QtxShortcutTree::eventFilter(QObject* /*obj*/, QEvent* event) { if ( currentItem() && currentItem()->isSelected() ) { @@ -273,7 +273,7 @@ bool QtxShortcutTree::eventFilter(QObject* obj, QEvent* event) \param cur the current item \param prev the previous current item */ -void QtxShortcutTree::onCurrentItemChanged( QTreeWidgetItem* cur, QTreeWidgetItem* prev ) +void QtxShortcutTree::onCurrentItemChanged( QTreeWidgetItem* /*cur*/, QTreeWidgetItem* prev ) { if ( prev && prev->text( 1 ).endsWith( "+" ) ) prev->setText( 1, myPrevBindings[ prev->parent()->text( 0 ) ][ prev->text( 0 ) ] ); diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx index 18b10df00..0438d7905 100644 --- a/src/Qtx/QtxWorkstack.cxx +++ b/src/Qtx/QtxWorkstack.cxx @@ -1080,7 +1080,7 @@ void QtxWorkstackArea::onChildDestroyed( QObject* obj ) \brief Called when child widget container is shown. \param c child widget container being shown */ -void QtxWorkstackArea::onChildShown( QtxWorkstackChild* c ) +void QtxWorkstackArea::onChildShown( QtxWorkstackChild* /*c*/ ) { updateState(); } @@ -1089,7 +1089,7 @@ void QtxWorkstackArea::onChildShown( QtxWorkstackChild* c ) \brief Called when child widget container is hidden. \param c child widget container being hidden */ -void QtxWorkstackArea::onChildHidden( QtxWorkstackChild* c ) +void QtxWorkstackArea::onChildHidden( QtxWorkstackChild* /*c*/ ) { updateState(); } @@ -1469,7 +1469,7 @@ bool QtxWorkstackChild::eventFilter( QObject* o, QEvent* e ) \brief Called when child widget is destroyed. \param obj child widget being destroyed */ -void QtxWorkstackChild::onDestroyed( QObject* obj ) +void QtxWorkstackChild::onDestroyed( QObject* /*obj*/ ) { deleteLater(); } diff --git a/src/Qtx/QtxWorkstackAction.cxx b/src/Qtx/QtxWorkstackAction.cxx index c0611c145..c8cb06723 100644 --- a/src/Qtx/QtxWorkstackAction.cxx +++ b/src/Qtx/QtxWorkstackAction.cxx @@ -297,7 +297,7 @@ void QtxWorkstackAction::setStatusTip( const int id, const QString& txt ) \brief Process action activated by the user. \param type action ID */ -void QtxWorkstackAction::perform( const int type ) +void QtxWorkstackAction::perform( const int /*type*/ ) { /* switch ( type ) diff --git a/src/QxScene/QxScene_ViewWindow.cxx b/src/QxScene/QxScene_ViewWindow.cxx index 5eb9bbf5d..8802adb34 100644 --- a/src/QxScene/QxScene_ViewWindow.cxx +++ b/src/QxScene/QxScene_ViewWindow.cxx @@ -235,9 +235,8 @@ void QxScene_ViewWindow::onViewFitAll() /*! Set background of the viewport */ -void QxScene_ViewWindow::setBackgroundColor( const QColor& color ) +void QxScene_ViewWindow::setBackgroundColor( const QColor& /*color*/ ) { - //GUI_UNUSED(color); DEBTRACE("QxScene_ViewWindow::setBackgroundColor"); } @@ -254,9 +253,8 @@ QColor QxScene_ViewWindow::backgroundColor() const /*! Custom resize event handler */ -void QxScene_ViewWindow::resizeEvent( QResizeEvent* theEvent ) +void QxScene_ViewWindow::resizeEvent( QResizeEvent* /*theEvent*/ ) { - //GUI_UNUSED(theEvent); DEBTRACE("QxScene_ViewWindow::resizeEvent"); } diff --git a/src/QxScene/QxScene_ViewWindow.h b/src/QxScene/QxScene_ViewWindow.h index 05fbd7495..7b6794056 100644 --- a/src/QxScene/QxScene_ViewWindow.h +++ b/src/QxScene/QxScene_ViewWindow.h @@ -82,7 +82,7 @@ class QXSCENE_EXPORT QxScene_ViewWindow : public SUIT_ViewWindow { void onViewReset(); protected: - void resizeEvent( QResizeEvent* theEvent ); + void resizeEvent( QResizeEvent* /*theEvent*/ ); QGraphicsScene* _scene; QGraphicsView* _sceneView; diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx index 8aa52f100..4a391e348 100644 --- a/src/STD/STD_Application.cxx +++ b/src/STD/STD_Application.cxx @@ -472,7 +472,7 @@ bool STD_Application::isPossibleToClose( bool& closePermanently ) return true; } -int STD_Application::closeChoice( const QString& docName ) +int STD_Application::closeChoice( const QString& /*docName*/ ) { int answer = SUIT_MessageBox::question( desktop(), tr( "CLOSE_STUDY" ), tr( "CLOSE_QUESTION" ), SUIT_MessageBox::Save | SUIT_MessageBox::Discard | SUIT_MessageBox::Cancel, @@ -487,7 +487,7 @@ int STD_Application::closeChoice( const QString& docName ) return res; } -bool STD_Application::closeAction( const int choice, bool& closePermanently ) +bool STD_Application::closeAction( const int choice, bool& /*closePermanently*/ ) { bool res = true; switch( choice ) diff --git a/src/SUIT/SUIT_DataBrowser.cxx b/src/SUIT/SUIT_DataBrowser.cxx index def245c6c..4431d324c 100644 --- a/src/SUIT/SUIT_DataBrowser.cxx +++ b/src/SUIT/SUIT_DataBrowser.cxx @@ -143,7 +143,7 @@ void SUIT_DataBrowser::setUpdateModified( const bool on ) \param obj starting object for updating \param autoOpen if \c true automatically open branches */ -void SUIT_DataBrowser::updateTree( SUIT_DataObject* obj, const bool autoOpen ) +void SUIT_DataBrowser::updateTree( SUIT_DataObject* obj, const bool /*autoOpen*/ ) { //GUI_UNUSED(autoOpen); SUIT_ProxyModel* m = qobject_cast( model() ); @@ -471,7 +471,7 @@ void SUIT_DataBrowser::onDblClicked( const QModelIndex& index ) \brief Called when item specified by index is expanded. \internal */ -void SUIT_DataBrowser::onExpanded( const QModelIndex& index ) +void SUIT_DataBrowser::onExpanded( const QModelIndex& /*index*/ ) { //GUI_UNUSED(index); if (myResizeOnExpandItem) { diff --git a/src/SUIT/SUIT_TreeModel.cxx b/src/SUIT/SUIT_TreeModel.cxx index effb255dd..9c7970b4b 100644 --- a/src/SUIT/SUIT_TreeModel.cxx +++ b/src/SUIT/SUIT_TreeModel.cxx @@ -1728,7 +1728,7 @@ QMimeData* SUIT_TreeModel::mimeData( const QModelIndexList& indexes ) const } bool SUIT_TreeModel::dropMimeData( const QMimeData* data, Qt::DropAction action, - int row, int column, const QModelIndex& parent ) + int row, int /*column*/, const QModelIndex& parent ) { //GUI_UNUSED(column); if ( action == Qt::IgnoreAction ) diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx index 4f6330817..057e7ac94 100644 --- a/src/SUIT/SUIT_ViewWindow.cxx +++ b/src/SUIT/SUIT_ViewWindow.cxx @@ -454,7 +454,7 @@ void SUIT_ViewWindow::updateSyncViews() /*! "Synchronize View" action slot. */ -void SUIT_ViewWindow::onSynchronizeView( bool checked ) +void SUIT_ViewWindow::onSynchronizeView( bool /*checked*/ ) { //GUI_UNUSED(checked); QAction* a = qobject_cast( sender() ); diff --git a/src/VTKViewer/VTKViewer_Actor.cxx b/src/VTKViewer/VTKViewer_Actor.cxx index 389596de3..49e98cbac 100644 --- a/src/VTKViewer/VTKViewer_Actor.cxx +++ b/src/VTKViewer/VTKViewer_Actor.cxx @@ -54,7 +54,7 @@ int VTKViewer_POINT_SIZE = 5; int VTKViewer_LINE_WIDTH = 3; -vtkStandardNewMacro(VTKViewer_Actor); +vtkStandardNewMacro(VTKViewer_Actor) /*! Constructor @@ -637,7 +637,7 @@ VTKViewer_Actor */ void VTKViewer_Actor -::SetMaterial(std::vector theProps) +::SetMaterial(std::vector /*theProps*/) { } @@ -770,4 +770,4 @@ vtkDataSet* VTKViewer_Actor::GetHighlightedDataSet() { -vtkCxxSetObjectMacro(VTKViewer_Actor,PreviewProperty,vtkProperty); +vtkCxxSetObjectMacro(VTKViewer_Actor,PreviewProperty,vtkProperty) diff --git a/src/VTKViewer/VTKViewer_Actor.h b/src/VTKViewer/VTKViewer_Actor.h index fe6d2f0c1..805eaca23 100644 --- a/src/VTKViewer/VTKViewer_Actor.h +++ b/src/VTKViewer/VTKViewer_Actor.h @@ -76,7 +76,7 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor public: static VTKViewer_Actor* New(); - vtkTypeMacro(VTKViewer_Actor,vtkLODActor); + vtkTypeMacro(VTKViewer_Actor,vtkLODActor) //---------------------------------------------------------------------------- //! Get its name @@ -319,7 +319,7 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor //! Is notified on enabling/disabling selection virtual void - EnableSelection( bool enable ) {} + EnableSelection( bool /*enable*/ ) {} //! Ask, if the descendant of the VTKViewer_Actor will implement its own highlight or not virtual diff --git a/src/VTKViewer/VTKViewer_AppendFilter.h b/src/VTKViewer/VTKViewer_AppendFilter.h index 25eb9e81d..449f25d31 100644 --- a/src/VTKViewer/VTKViewer_AppendFilter.h +++ b/src/VTKViewer/VTKViewer_AppendFilter.h @@ -49,7 +49,7 @@ public: /*! \fn vtkTypeMacro(VTKViewer_AppendFilter, vtkAppendFilter) * \brief VTK type revision macros. */ - vtkTypeMacro(VTKViewer_AppendFilter, vtkAppendFilter); + vtkTypeMacro(VTKViewer_AppendFilter, vtkAppendFilter) void SetDoMappingFlag(const bool theFlag); diff --git a/src/VTKViewer/VTKViewer_CellCenters.cxx b/src/VTKViewer/VTKViewer_CellCenters.cxx index b497d52ed..f6058d000 100644 --- a/src/VTKViewer/VTKViewer_CellCenters.cxx +++ b/src/VTKViewer/VTKViewer_CellCenters.cxx @@ -33,7 +33,7 @@ #include #include -vtkStandardNewMacro(VTKViewer_CellCenters); +vtkStandardNewMacro(VTKViewer_CellCenters) /*! * Class : VTKViewer_CellCenters diff --git a/src/VTKViewer/VTKViewer_CellCenters.h b/src/VTKViewer/VTKViewer_CellCenters.h index 05d0e010a..b0b0ec848 100644 --- a/src/VTKViewer/VTKViewer_CellCenters.h +++ b/src/VTKViewer/VTKViewer_CellCenters.h @@ -39,7 +39,7 @@ class VTKVIEWER_EXPORT VTKViewer_CellCenters : public vtkCellCenters { public: - vtkTypeMacro(VTKViewer_CellCenters,vtkCellCenters); + vtkTypeMacro(VTKViewer_CellCenters,vtkCellCenters) static VTKViewer_CellCenters *New(); diff --git a/src/VTKViewer/VTKViewer_CellLocationsArray.cxx b/src/VTKViewer/VTKViewer_CellLocationsArray.cxx index 315c60e67..c95060832 100644 --- a/src/VTKViewer/VTKViewer_CellLocationsArray.cxx +++ b/src/VTKViewer/VTKViewer_CellLocationsArray.cxx @@ -28,4 +28,4 @@ #include -vtkStandardNewMacro(VTKViewer_CellLocationsArray); +vtkStandardNewMacro(VTKViewer_CellLocationsArray) diff --git a/src/VTKViewer/VTKViewer_CellLocationsArray.h b/src/VTKViewer/VTKViewer_CellLocationsArray.h index d7869ed18..e3db50ac3 100644 --- a/src/VTKViewer/VTKViewer_CellLocationsArray.h +++ b/src/VTKViewer/VTKViewer_CellLocationsArray.h @@ -39,7 +39,7 @@ struct VTKVIEWER_EXPORT VTKViewer_CellLocationsArray : TCellLocationsArray { static VTKViewer_CellLocationsArray* New(); - vtkTypeMacro(VTKViewer_CellLocationsArray,TCellLocationsArray); + vtkTypeMacro(VTKViewer_CellLocationsArray,TCellLocationsArray) }; #undef TCellLocationsArray diff --git a/src/VTKViewer/VTKViewer_DataSetMapper.cxx b/src/VTKViewer/VTKViewer_DataSetMapper.cxx index 45878797e..e5862952d 100644 --- a/src/VTKViewer/VTKViewer_DataSetMapper.cxx +++ b/src/VTKViewer/VTKViewer_DataSetMapper.cxx @@ -23,7 +23,7 @@ #include #include -vtkStandardNewMacro(VTKViewer_DataSetMapper); +vtkStandardNewMacro(VTKViewer_DataSetMapper) //---------------------------------------------------------------------------- VTKViewer_DataSetMapper::VTKViewer_DataSetMapper() diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx index 5cd12e23f..0b392acaa 100644 --- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx +++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx @@ -47,7 +47,7 @@ #define VTK_XVERSION (VTK_MAJOR_VERSION*10000+VTK_MINOR_VERSION*100+VTK_BUILD_VERSION) -vtkStandardNewMacro(VTKViewer_ExtractUnstructuredGrid); +vtkStandardNewMacro(VTKViewer_ExtractUnstructuredGrid) VTKViewer_ExtractUnstructuredGrid::VTKViewer_ExtractUnstructuredGrid(): @@ -287,9 +287,9 @@ inline int InsertCell(vtkUnstructuredGrid *theInput, vtkIdTypeArray*& theFaces, vtkIdTypeArray*& theFaceLocations, vtkIdType theCellId, - vtkIdList *theIdList, + vtkIdList* /*theIdList*/, bool theStoreMapping, - vtkIdType theOutId, + vtkIdType /*theOutId*/, VTKViewer_ExtractUnstructuredGrid::TVectorId& theOut2InId/*, VTKViewer_ExtractUnstructuredGrid::TMapId& theIn2OutId*/) { @@ -346,7 +346,7 @@ inline void InsertPointCell(vtkCellArray *theConnectivity, vtkIdType theCellId, vtkIdList *theIdList, bool theStoreMapping, - vtkIdType theOutId, + vtkIdType /*theOutId*/, VTKViewer_ExtractUnstructuredGrid::TVectorId& theOut2InId/*, VTKViewer_ExtractUnstructuredGrid::TMapId& theIn2OutId*/) { diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h index c64e28d70..64ff52fa0 100644 --- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h +++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h @@ -45,7 +45,7 @@ class VTKVIEWER_EXPORT VTKViewer_ExtractUnstructuredGrid : public vtkUnstructure { public: //! VTK type macros. - vtkTypeMacro( VTKViewer_ExtractUnstructuredGrid, vtkUnstructuredGridAlgorithm ); + vtkTypeMacro( VTKViewer_ExtractUnstructuredGrid, vtkUnstructuredGridAlgorithm ) //! \brief Construct with all types of clipping turned off. static VTKViewer_ExtractUnstructuredGrid *New(); diff --git a/src/VTKViewer/VTKViewer_Filter.h b/src/VTKViewer/VTKViewer_Filter.h index c7aa3ba36..4dd15b106 100644 --- a/src/VTKViewer/VTKViewer_Filter.h +++ b/src/VTKViewer/VTKViewer_Filter.h @@ -35,7 +35,7 @@ class VTKViewer_Actor; -DEFINE_STANDARD_HANDLE(VTKViewer_Filter, Standard_Transient); +DEFINE_STANDARD_HANDLE(VTKViewer_Filter, Standard_Transient) /* Class : VTKViewer_Filter diff --git a/src/VTKViewer/VTKViewer_FramedTextActor.cxx b/src/VTKViewer/VTKViewer_FramedTextActor.cxx index d810958ce..4b4ac0d63 100644 --- a/src/VTKViewer/VTKViewer_FramedTextActor.cxx +++ b/src/VTKViewer/VTKViewer_FramedTextActor.cxx @@ -63,7 +63,7 @@ namespace } //================================================================== -vtkStandardNewMacro(VTKViewer_FramedTextActor); +vtkStandardNewMacro(VTKViewer_FramedTextActor) //================================================================== // function : VTKViewer_FramedTextActor diff --git a/src/VTKViewer/VTKViewer_FramedTextActor.h b/src/VTKViewer/VTKViewer_FramedTextActor.h index 1999c5c77..0035441a0 100644 --- a/src/VTKViewer/VTKViewer_FramedTextActor.h +++ b/src/VTKViewer/VTKViewer_FramedTextActor.h @@ -41,7 +41,7 @@ public: enum LayoutType { Vertical = 0, Horizontal }; public: - vtkTypeMacro(VTKViewer_FramedTextActor,vtkActor2D); + vtkTypeMacro(VTKViewer_FramedTextActor,vtkActor2D) static VTKViewer_FramedTextActor *New(); virtual int RenderOpaqueGeometry(vtkViewport*); diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.cxx b/src/VTKViewer/VTKViewer_GeometryFilter.cxx index c273927ac..996f443a3 100644 --- a/src/VTKViewer/VTKViewer_GeometryFilter.cxx +++ b/src/VTKViewer/VTKViewer_GeometryFilter.cxx @@ -92,7 +92,7 @@ #endif /////////////////////////////////////////////////////////////////////////////////////////////// -vtkStandardNewMacro(VTKViewer_GeometryFilter); +vtkStandardNewMacro(VTKViewer_GeometryFilter) VTKViewer_GeometryFilter ::VTKViewer_GeometryFilter(): @@ -1229,7 +1229,7 @@ void VTKViewer_GeometryFilter ::InsertId( const vtkIdType theCellId, const vtkIdType theCellType, - TVectorId& theVTK2ObjIds, + TVectorId& /*theVTK2ObjIds*/, TMapOfVectorId& theDimension2VTK2ObjIds ) { //theVTK2ObjIds.push_back( theCellId ); diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.h b/src/VTKViewer/VTKViewer_GeometryFilter.h index 7f60f5fab..9a641896f 100644 --- a/src/VTKViewer/VTKViewer_GeometryFilter.h +++ b/src/VTKViewer/VTKViewer_GeometryFilter.h @@ -48,7 +48,7 @@ public: /*! \fn vtkTypeMacro(VTKViewer_GeometryFilter, vtkGeometryFilter) * \brief VTK type revision macros. */ - vtkTypeMacro(VTKViewer_GeometryFilter, vtkGeometryFilter); + vtkTypeMacro(VTKViewer_GeometryFilter, vtkGeometryFilter) /*! \fn void SetInside(int theShowInside) * \brief Sets \a myShowInside flag. \a myShowInside is changed, call this->Modified(). * \param theShowInside - used for changing value of \a myShowInside variable. @@ -112,7 +112,7 @@ public: static void InsertId( const vtkIdType theCellId, const vtkIdType theCellType, - TVectorId& theVTK2ObjIds, + TVectorId& /*theVTK2ObjIds*/, TMapOfVectorId& theDimension2VTK2ObjIds ); protected: diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.cxx b/src/VTKViewer/VTKViewer_InteractorStyle.cxx index cd67ed70c..bdc3eaf14 100644 --- a/src/VTKViewer/VTKViewer_InteractorStyle.cxx +++ b/src/VTKViewer/VTKViewer_InteractorStyle.cxx @@ -74,7 +74,7 @@ static int GetEdgeId(vtkPicker *thePicker, SALOME_Actor *theActor, int theObjId) } */ -vtkStandardNewMacro(VTKViewer_InteractorStyle); +vtkStandardNewMacro(VTKViewer_InteractorStyle) /*!Constructor.*/ @@ -1221,7 +1221,7 @@ void VTKViewer_InteractorStyle::OnSelectionModeChanged() /*! called when user moves mouse inside viewer window and there is no active viewer operation \n * (!put necessary processing here!) */ -void VTKViewer_InteractorStyle::onCursorMove(QPoint mousePos) { +void VTKViewer_InteractorStyle::onCursorMove(QPoint /*mousePos*/) { // processing highlighting // SUIT_Study* anActiveStudy = SUIT_Application::getDesktop()->getActiveStudy(); // SALOME_Selection* Sel = SALOME_Selection::Selection( anActiveStudy->getSelection() ); diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.h b/src/VTKViewer/VTKViewer_InteractorStyle.h index 5ecd8f23b..d6111f78e 100644 --- a/src/VTKViewer/VTKViewer_InteractorStyle.h +++ b/src/VTKViewer/VTKViewer_InteractorStyle.h @@ -72,7 +72,7 @@ class VTKVIEWER_EXPORT VTKViewer_InteractorStyle : public QObject, public vtkInt { public: static VTKViewer_InteractorStyle *New(); - vtkTypeMacro(VTKViewer_InteractorStyle, vtkInteractorStyle); + vtkTypeMacro(VTKViewer_InteractorStyle, vtkInteractorStyle) virtual void SetInteractor(vtkRenderWindowInteractor *theInteractor); void setViewWnd(VTKViewer_ViewWindow* theViewWnd); @@ -152,7 +152,7 @@ class VTKVIEWER_EXPORT VTKViewer_InteractorStyle : public QObject, public vtkInt void startRotate(); void startFitArea(); void startSpin(); - void SetTDxStyle(vtkTDxInteractorStyle *tdxStyle) {} + void SetTDxStyle(vtkTDxInteractorStyle* /*tdxStyle*/) {} bool needsRedrawing(); protected: @@ -161,7 +161,7 @@ class VTKVIEWER_EXPORT VTKViewer_InteractorStyle : public QObject, public vtkInt virtual void onStartOperation(); virtual void onFinishOperation(); virtual void onOperation(QPoint mousePos); - virtual void onCursorMove(QPoint mousePos); + virtual void onCursorMove(QPoint /*mousePos*/); virtual void setCursor(const int operation); void drawRect(); diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.h b/src/VTKViewer/VTKViewer_PolyDataMapper.h index c8661cdbe..76272dbd4 100644 --- a/src/VTKViewer/VTKViewer_PolyDataMapper.h +++ b/src/VTKViewer/VTKViewer_PolyDataMapper.h @@ -66,7 +66,7 @@ public: public: static VTKViewer_PolyDataMapper* New(); - vtkTypeMacro( VTKViewer_PolyDataMapper, MAPPER_SUPERCLASS ); + vtkTypeMacro( VTKViewer_PolyDataMapper, MAPPER_SUPERCLASS ) //! Set point marker enabled void SetMarkerEnabled( bool ); diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.h b/src/VTKViewer/VTKViewer_RenderWindowInteractor.h index 63e9985dd..5dd07295d 100644 --- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.h +++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.h @@ -163,16 +163,16 @@ public: void setViewWindow( VTKViewer_ViewWindow* theViewWnd ); - void setCellData(const int& theIndex, - VTKViewer_Actor* theMapActor, - VTKViewer_Actor* theActor) {} - void setEdgeData(const int& theCellIndex, - VTKViewer_Actor* theMapActor, - const int& theEdgeIndex, - VTKViewer_Actor* theActor ) {} //NB - void setPointData(const int& theIndex, - VTKViewer_Actor* theMapActor, - VTKViewer_Actor* theActor) {} + void setCellData(const int& /*theIndex*/, + VTKViewer_Actor* /*theMapActor*/, + VTKViewer_Actor* /*theActor*/) {} + void setEdgeData(const int& /*theCellIndex*/, + VTKViewer_Actor* /*theMapActor*/, + const int& /*theEdgeIndex*/, + VTKViewer_Actor* /*theActor*/ ) {} //NB + void setPointData(const int& /*theIndex*/, + VTKViewer_Actor* /*theMapActor*/, + VTKViewer_Actor* /*theActor*/) {} typedef void (*TUpdateActor)(const TColStd_IndexedMapOfInteger& theMapIndex, VTKViewer_Actor* theMapActor, diff --git a/src/VTKViewer/VTKViewer_Transform.h b/src/VTKViewer/VTKViewer_Transform.h index 798114598..f2d60c43f 100644 --- a/src/VTKViewer/VTKViewer_Transform.h +++ b/src/VTKViewer/VTKViewer_Transform.h @@ -35,7 +35,7 @@ class VTKVIEWER_EXPORT VTKViewer_Transform : public vtkTransform public: /*!Create new instance of VTKViewer_Transform.*/ static VTKViewer_Transform *New(); - vtkTypeMacro( VTKViewer_Transform, vtkTransform ); + vtkTypeMacro( VTKViewer_Transform, vtkTransform ) int IsIdentity(); //merge with V2_2_0_VISU_improvements:void SetScale( float theScaleX, float theScaleY, float theScaleZ ); diff --git a/src/VTKViewer/VTKViewer_TransformFilter.h b/src/VTKViewer/VTKViewer_TransformFilter.h index 916b4b138..c2fc87112 100644 --- a/src/VTKViewer/VTKViewer_TransformFilter.h +++ b/src/VTKViewer/VTKViewer_TransformFilter.h @@ -35,7 +35,7 @@ class VTKVIEWER_EXPORT VTKViewer_TransformFilter : public vtkTransformFilter public: /*!Create new instance of VTKViewer_TransformFilter.*/ static VTKViewer_TransformFilter *New(); - vtkTypeMacro(VTKViewer_TransformFilter,vtkTransformFilter); + vtkTypeMacro(VTKViewer_TransformFilter,vtkTransformFilter) protected: /*!Constructor.*/ diff --git a/src/VTKViewer/VTKViewer_Trihedron.h b/src/VTKViewer/VTKViewer_Trihedron.h index e2fe380d6..98718ac8c 100644 --- a/src/VTKViewer/VTKViewer_Trihedron.h +++ b/src/VTKViewer/VTKViewer_Trihedron.h @@ -65,7 +65,7 @@ class VTKVIEWER_EXPORT VTKViewer_UnScaledActor: public vtkFollower public: - vtkTypeMacro(VTKViewer_UnScaledActor,vtkFollower); + vtkTypeMacro(VTKViewer_UnScaledActor,vtkFollower) /*!Create new instance of VTKViewer_UnScaledActor.*/ static VTKViewer_UnScaledActor *New(); @@ -91,7 +91,7 @@ class VTKVIEWER_EXPORT VTKViewer_LineActor: public vtkFollower public: /*!vtk type macros.*/ - vtkTypeMacro(VTKViewer_LineActor,vtkFollower); + vtkTypeMacro(VTKViewer_LineActor,vtkFollower) /*!Create new instance of VTKViewer_LineActor.*/ static VTKViewer_LineActor *New(); @@ -155,7 +155,7 @@ protected: public: /*!vtk type macros.*/ - vtkTypeMacro(VTKViewer_Trihedron,vtkObject); + vtkTypeMacro(VTKViewer_Trihedron,vtkObject) /*!Create new instance of VTKViewer_Trihedron.*/ static VTKViewer_Trihedron *New(); @@ -232,7 +232,7 @@ protected: public: /*!vtk type macros.*/ - vtkTypeMacro(VTKViewer_Axis,vtkObject); + vtkTypeMacro(VTKViewer_Axis,vtkObject) /*! Add to \a theRenderer actors: myLineActor,myLabelActor,myArrowActor */ diff --git a/src/ViewerTools/ViewerTools_FontWidgetBase.cxx b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx index f3559b415..d911195e3 100644 --- a/src/ViewerTools/ViewerTools_FontWidgetBase.cxx +++ b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx @@ -102,7 +102,7 @@ void ViewerTools_FontWidgetBase::onColor() } void ViewerTools_FontWidgetBase::SetData( const QColor& theColor, - const int theFamily, + const int /*theFamily*/, const bool theBold, const bool theItalic, const bool theShadow ) @@ -116,7 +116,7 @@ void ViewerTools_FontWidgetBase::SetData( const QColor& theColor, } void ViewerTools_FontWidgetBase::GetData( QColor& theColor, - int& theFamily, + int& /*theFamily*/, bool& theBold, bool& theItalic, bool& theShadow ) const diff --git a/tools/CurvePlot/src/cpp/CurvePlot.cxx b/tools/CurvePlot/src/cpp/CurvePlot.cxx index dfea9083f..b63a69e35 100644 --- a/tools/CurvePlot/src/cpp/CurvePlot.cxx +++ b/tools/CurvePlot/src/cpp/CurvePlot.cxx @@ -47,7 +47,7 @@ namespace throw CURVEPLOT::Exception(msg); } } -}; +} namespace CURVEPLOT {