fix warning "mismatch signed unsigned", "conversion variables", add commit struct...

diff --git a/src/CAM/CAM_Module.cxx b/src/CAM/CAM_Module.cxx
index e68b56ac26f01e127024eb1c301f54c6544fd263..c4adb647632a317624793d8c70fe564aa7b61963 100644 (file)
--- a/src/CAM/CAM_Module.cxx
+++ b/src/CAM/CAM_Module.cxx
@@ -1146,6 +1146,7 @@ void CAM_Module::updateModuleVisibilityState() {
 */
 bool CAM_Module::activateOperation( int actionId )
 {
+  //GUI_UNUSED(actionId);
   return false;
 }
 
@@ -1156,6 +1157,7 @@ bool CAM_Module::activateOperation( int actionId )
 */
 bool CAM_Module::activateOperation( const QString& actionId )
 {
+  //GUI_UNUSED(actionId);
   return false;
 }
 
@@ -1167,6 +1169,7 @@ bool CAM_Module::activateOperation( const QString& actionId )
 */
 bool CAM_Module::activateOperation( const QString& actionId, const QString& pluginName )
 {
+  //GUI_UNUSED(actionId);
   return false;
 }
 

diff --git a/src/GLViewer/GLViewer_BaseObjects.cxx b/src/GLViewer/GLViewer_BaseObjects.cxx
index db2c3875af96ef5cdf59b3377f384e8f96338ad0..fa66857f6bc06e963aa3a439aefceaabcd6bcb30 100644 (file)
--- a/src/GLViewer/GLViewer_BaseObjects.cxx
+++ b/src/GLViewer/GLViewer_BaseObjects.cxx
@@ -425,6 +425,8 @@ GLboolean GLViewer_MarkerSet::unhighlight()
 GLboolean GLViewer_MarkerSet::select( GLfloat x, GLfloat y, GLfloat tol, GLViewer_Rect rect, GLboolean isFull,
                                       GLboolean isCircle, GLboolean isShift )
 {
+       //GUI_UNUSED(isFull);
+       //GUI_UNUSED(rect);
     if( !myIsVisible )
         return false;
 //  cout << "GLViewer_MarkerSet::select " << x << " " << y << endl;
@@ -820,6 +822,7 @@ GLViewer_Polyline::GLViewer_Polyline( int number, float size, const QString& too
   myXCoord( 0 ),
   myYCoord( 0 )       
 {
+       //GUI_UNUSED(size);
   myHighFlag = GL_TRUE;
 
   myHNumbers.clear();
@@ -1006,6 +1009,8 @@ GLViewer_Drawer* GLViewer_Polyline::createDrawer()
 */
 GLboolean GLViewer_Polyline::highlight( GLfloat x, GLfloat y, GLfloat tol, GLboolean isCircle )
 {
+       //GUI_UNUSED(isCircle);
+       //GUI_UNUSED(tol);
     if( !myIsVisible )
         return false;
     GLfloat xa, xb, ya, yb, l;
@@ -1091,6 +1096,11 @@ GLboolean GLViewer_Polyline::unhighlight()
 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;
@@ -1624,6 +1634,9 @@ GLboolean GLViewer_TextObject::unhighlight()
 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_Drawer.cxx b/src/GLViewer/GLViewer_Drawer.cxx
index d46b9182a2ab412c61426f29264f9971e5a7a0e2..f8b57c27e7afa2ba964745c1f54fc3652cd727f8 100644 (file)
--- a/src/GLViewer/GLViewer_Drawer.cxx
+++ b/src/GLViewer/GLViewer_Drawer.cxx
@@ -161,7 +161,7 @@ bool GLViewer_TexFont::generateTexture()
     aFindFont.myIsItal = myQFont.italic();
     aFindFont.myIsUndl = myQFont.underline();
     aFindFont.myPointSize = myQFont.pointSize();
-    aFindFont.myViewPortId = size_t(QGLContext::currentContext());
+    aFindFont.myViewPortId = long(QGLContext::currentContext()); //!<TODO: conversion from "size_t" to "long"
         
     if( TexFontBase.contains( aFindFont ) )
     {
@@ -384,7 +384,7 @@ static GLuint displayListBase( QFont* theFont )
   if ( !ctx )
     return aList;  
   
-  aFindFont.myViewPortId = (int)ctx;
+  aFindFont.myViewPortId = (LONG_PTR)ctx;
 
   if ( GLViewer_TexFont::BitmapFontCache.contains( aFindFont ) )
     aList = GLViewer_TexFont::BitmapFontCache[aFindFont];
@@ -394,7 +394,7 @@ static GLuint displayListBase( QFont* theFont )
     QMap<GLViewer_TexFindId, GLuint>::iterator it = GLViewer_TexFont::BitmapFontCache.begin();
     for ( ; it != GLViewer_TexFont::BitmapFontCache.end(); ++it )
     {
-      if ( it.key().myViewPortId == (int)ctx && it.value() > listBase )
+      if ( it.key().myViewPortId == (LONG_PTR)ctx && it.value() > listBase )
         listBase = it.value();
     }
     listBase += 256;

diff --git a/src/GLViewer/GLViewer_Grid.cxx b/src/GLViewer/GLViewer_Grid.cxx
index f8c8c4994606267f2b8916ca56aa735359a265b9..b46bf62d66fab06a9afc2afd82d3e7c236c3aef8 100644 (file)
--- a/src/GLViewer/GLViewer_Grid.cxx
+++ b/src/GLViewer/GLViewer_Grid.cxx
@@ -67,6 +67,16 @@ GLViewer_Grid::GLViewer_Grid( GLfloat width, GLfloat height,
        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/GLViewer/GLViewer_Group.cxx b/src/GLViewer/GLViewer_Group.cxx
index 53e862876dd86656bbaaa3d089d239b76edcd5df..38bfe4cbb6aecd898b5dace42ab641090cc88df3 100644 (file)
--- a/src/GLViewer/GLViewer_Group.cxx
+++ b/src/GLViewer/GLViewer_Group.cxx
@@ -56,7 +56,7 @@ bool GLViewer_Group::isEmpty()
 */
 int GLViewer_Group::count()
 {
-  return myList.size();
+  return (size_t)myList.size(); //!< TODO: conversion from size_t to int
 }
 
 /*!

diff --git a/src/GLViewer/GLViewer_Selector2d.cxx b/src/GLViewer/GLViewer_Selector2d.cxx
index e69441e5b6e13e8eb88bc9bd95bc30c75358b660..ea1c8405a9d135beb66adaee3e3f97c6e99c59a2 100644 (file)
--- a/src/GLViewer/GLViewer_Selector2d.cxx
+++ b/src/GLViewer/GLViewer_Selector2d.cxx
@@ -172,6 +172,7 @@ void GLViewer_Selector2d::unselectAll()
 */
 void GLViewer_Selector2d::checkSelection( int selBefore, bool append, int aStatus )
 {
+       //GUI_UNUSED(append);
     int selAfter = numSelected();
     if ( selBefore > 0 && selAfter < 1 )     
         emit selSelectionCancel();

diff --git a/src/GLViewer/GLViewer_Text.cxx b/src/GLViewer/GLViewer_Text.cxx
index e589e5a378b9fe56d58bd4c4fef5273d0761e894..23c5359d9172eaf4f86deba7eca2f30ee7980fcb 100644 (file)
--- a/src/GLViewer/GLViewer_Text.cxx
+++ b/src/GLViewer/GLViewer_Text.cxx
@@ -70,7 +70,7 @@ int GLViewer_Text::getWidth()
 {
     int aResult = 0;
     QFontMetrics aFM( myQFont );
-    for( uint i = 0; i < myText.length(); i++ )
+    for( uint i = 0; i < (uint)myText.length(); i++ )
         aResult += aFM.width( myText.at(i) ) + mySeparator;
     return aResult;
 }

diff --git a/src/GLViewer/GLViewer_ToolTip.cxx b/src/GLViewer/GLViewer_ToolTip.cxx
index a16897493630be235133c88b0e92d5e52a2d0f13..6b2491403d5be0cefd2337bfc0ed4054f523a00f 100644 (file)
--- a/src/GLViewer/GLViewer_ToolTip.cxx
+++ b/src/GLViewer/GLViewer_ToolTip.cxx
@@ -89,7 +89,7 @@ GLViewer_ObjectTip::~GLViewer_ObjectTip()
 */
 bool GLViewer_ObjectTip::maybeTip( const QPoint &p )
 {
-
+       //GUI_UNUSED(p);
 
   GLViewer_Context* aContext = ((GLViewer_Viewer2d*)mypViewPort->getViewFrame()->getViewer())->getGLContext();
 

diff --git a/src/GLViewer/GLViewer_Tools.cxx b/src/GLViewer/GLViewer_Tools.cxx
index 6fe7c717ff1613930c550cb680d80bf4277b7b5c..fb47ce48638e3d24008984f9584083bfd13e06a5 100644 (file)
--- a/src/GLViewer/GLViewer_Tools.cxx
+++ b/src/GLViewer/GLViewer_Tools.cxx
@@ -516,6 +516,7 @@ GLViewer_LineField::~GLViewer_LineField()
 */
 void GLViewer_LineField::addLine( FieldDim theDim, GLViewer_LineList* )
 {
+       //GUI_UNUSED(theDim);
   //not implemented
 }
 

diff --git a/src/GLViewer/GLViewer_ViewPort2d.cxx b/src/GLViewer/GLViewer_ViewPort2d.cxx
index 4a120be982476022b406cd81548880464305773a..c601b1fd97b8149cd70bd4344f43f24aaab7eda0 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.cxx
+++ b/src/GLViewer/GLViewer_ViewPort2d.cxx
@@ -826,6 +826,7 @@ void GLViewer_ViewPort2d::fitSelect()
 */
 void GLViewer_ViewPort2d::fitAll( bool keepScale, bool withZ )
 {
+       //GUI_UNUSED(withZ);
     //cout << "GLViewer_ViewPort2d::fitAll" << endl;
 
     float xa, xb, ya, yb;

diff --git a/src/GLViewer/GLViewer_Viewer.cxx b/src/GLViewer/GLViewer_Viewer.cxx
index 5d0ee87435f5391c3459507bf4bda20daf7d3931..cfb5d5c2d7b21ab486255e4c2279be5c0ce33b85 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer.cxx
+++ b/src/GLViewer/GLViewer_Viewer.cxx
@@ -55,6 +55,7 @@ mySketcher( 0 ),
 myTransformer( 0 ),
 mySelMode( NoSelection )
 {
+       //GUI_UNUSED(title);
 }
 
 /*!
@@ -335,6 +336,7 @@ bool GLViewer_Viewer::eventFilter( QObject* o, QEvent* e )
 */
 void GLViewer_Viewer::onSelectionDone( bool bAdded, SelectionChangeStatus status  )
 {
+       //GUI_UNUSED(bAdded);
     emit selectionChanged( status );
 }
 

diff --git a/src/GLViewer/GLViewer_Viewer2d.cxx b/src/GLViewer/GLViewer_Viewer2d.cxx
index 8cfad13b55587dd694e72747375340e4f5cff99b..539a7a7acf27e291b2c10afbfef1209b5dba570e 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer2d.cxx
+++ b/src/GLViewer/GLViewer_Viewer2d.cxx
@@ -115,6 +115,8 @@ void GLViewer_Viewer2d::onChangeBgColor()
 */
 void GLViewer_Viewer2d::updateColors( QColor colorH, QColor colorS )
 {
+       //GUI_UNUSED(colorH);
+       //GUI_UNUSED(colorS);
 //  cout << "GLViewer_Viewer2d::updateColors" << endl;
 
 /*
@@ -217,6 +219,8 @@ void GLViewer_Viewer2d::updateAll()
 */
 void GLViewer_Viewer2d::updateDrawers( GLboolean update, GLfloat scX, GLfloat scY )
 {
+       //GUI_UNUSED(scX);
+       //GUI_UNUSED(scY);
 //  cout << "GLViewer_Viewer2d::updateDrawers" << endl;
 
     //myGLContext->updateScales( scX, scY );

diff --git a/src/GLViewer/GLViewer_Widget.cxx b/src/GLViewer/GLViewer_Widget.cxx
index ed455c711b53a62b3d4e098829db15de8cb0c013..c2b3bc49483085bb18d13b6a2b26f48ee5dcf561 100644 (file)
--- a/src/GLViewer/GLViewer_Widget.cxx
+++ b/src/GLViewer/GLViewer_Widget.cxx
@@ -44,6 +44,7 @@
 GLViewer_Widget::GLViewer_Widget( QWidget* parent, const char* name ):
 QGLWidget( parent, 0/*, WRepaintNoErase | WResizeNoErase*/ )
 {
+       //GUI_UNUSED(name);
   myViewPort = ( GLViewer_ViewPort2d* )parent;
 
   myXPan = 0.0;
@@ -401,7 +402,7 @@ void GLViewer_Widget::mouseReleaseEvent( QMouseEvent* e )
 /*!
   Custom enter event handler
 */
-void GLViewer_Widget::enterEvent( QEvent* e )
+void GLViewer_Widget::enterEvent( QEvent* /*e*/ )
 {
   updateGL();
 }
@@ -409,7 +410,7 @@ void GLViewer_Widget::enterEvent( QEvent* e )
 /*!
   Custom leave event handler
 */
-void GLViewer_Widget::leaveEvent( QEvent* e )
+void GLViewer_Widget::leaveEvent( QEvent* /*e*/ )
 {
   updateGL();
 }

diff --git a/src/HelpBrowser/HelpBrowser.cxx b/src/HelpBrowser/HelpBrowser.cxx
index 3a86c257a4c55a9d65150367a0a2aae8bdcbaacf..120ce8a3f85c0daeab18ceaa6427a06cd7e3b07d 100644 (file)
--- a/src/HelpBrowser/HelpBrowser.cxx
+++ b/src/HelpBrowser/HelpBrowser.cxx
@@ -162,7 +162,6 @@ int main( int argc, char **argv )
 #if defined(WIN32) && defined(UNICODE)                   
   LPWSTR *szArglist = NULL;
   int nArgs;
-  int i;
   szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);         
   helpfile = QString::fromWCharArray(szArglist[nArgs-1]);
   // Free memory allocated for CommandLineToArgvW arguments.

diff --git a/src/Prs/SALOME_Prs.h b/src/Prs/SALOME_Prs.h
index 1161e08c077eeeb804322c4112f1d9fe980e34bf..dba9132b26a60eec9d519b75a28c9adb7a84ef31 100644 (file)
--- 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 ) {}
+  virtual void GetVisible( SALOME_ListIO& theList ) {/*GUI_UNUSED(theList);*/}
 };
 
 /*!

diff --git a/src/QDS/QDS_ComboBox.cxx b/src/QDS/QDS_ComboBox.cxx
index 33ef748bb00f56a53c6e7fed1c1fd2804c1b3f34..a5eeafa25531f35a80c2c514d83fe94a3b75aac1 100644 (file)
--- a/src/QDS/QDS_ComboBox.cxx
+++ b/src/QDS/QDS_ComboBox.cxx
@@ -260,7 +260,7 @@ void QDS_ComboBox::setState( const bool on, const QList<int>& ids, const bool ap
   bool changed = false;
 
   QMap<int, int> aMap;
-  for ( uint i = 0; i < ids.count(); i++ )
+  for ( uint i = 0; i < (uint)ids.count(); i++ )
     aMap.insert( ids.at( i ), 0 );
 
   for ( IdStateMap::Iterator it = myState.begin(); it != myState.end(); ++it )

diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index b69d720ce70391daa0cf578fe9842c234ab0ac19..002b322c1421858237fc1f415381145246e60938 100644 (file)
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.cxx
@@ -1424,6 +1424,7 @@ void QDS_Datum::initialize()
 */
 void QDS_Datum::unitSystemChanged( const QString& unitSystem )
 {
+       //GUI_UNUSED(initSystem);
   QString labText = label();
   QString unitText = unitsToText( units() );
 
@@ -1883,7 +1884,7 @@ QString QDS_Datum::removeAccel( const QString& src )
 {
   QString trg = src;
 
-  for ( uint i = 0; i < trg.length(); )
+  for ( uint i = 0; i < (uint)trg.length(); )
   {
     if ( trg.mid( i, 2 ) == QString( "&&" ) )
       i += 2;

diff --git a/src/QDS/QDS_RadioBox.cxx b/src/QDS/QDS_RadioBox.cxx
index beaae1168bfc98842028abbb70450f5689dcf622..7b56d676bbe298a17ca28271e14f8fc22923436d 100644 (file)
--- a/src/QDS/QDS_RadioBox.cxx
+++ b/src/QDS/QDS_RadioBox.cxx
@@ -161,7 +161,7 @@ void QDS_RadioBox::setState( const bool on, const QList<int>& ids, const bool ap
   bool changed = false;
 
   QMap<int, int> aMap;
-  for ( uint i = 0; i < ids.count(); i++ )
+  for ( uint i = 0; i < (uint)ids.count(); i++ )
     aMap.insert( ids.at( i ), 0 );
 
   for ( IdStateMap::Iterator it = myState.begin(); it != myState.end(); ++it )

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index 6a3d61c33c1e7923e49ee1cd74c0d0719d0d74bb..66944d3307adf70d5aff3a15dd6c48b6362aed90 100644 (file)
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -589,7 +589,7 @@ bool Qtx::dos2unix( const QString& absName )
     char inbuf[512], outbuf[512];
 
     /* convert buffer */
-    int nbread = ::fread( inbuf, 1, sizeof( inbuf ), src );
+    int nbread = (int)::fread( inbuf, 1, sizeof( inbuf ), src ); //!< TODO: conversion from 'size_t' to 'int'
     for ( int incnt = 0; incnt < nbread; incnt++  )
     {
       if ( waitingLF )
@@ -610,7 +610,7 @@ bool Qtx::dos2unix( const QString& absName )
     waitingLF = ( inbuf[nbread - 1] == CR );
 
     /* write converted buffer to temp file */
-    int nbwri = ::fwrite( outbuf, 1, outcnt, tgt );
+    int nbwri = (int)::fwrite( outbuf, 1, outcnt, tgt ); //!< TODO: conversion from 'size_t' to 'int'
     if ( nbwri != outcnt )
     {
       ::fclose( src );
@@ -2143,7 +2143,7 @@ QString Qtx::qtDir( const QString& context )
 
   QStringList vars = { "QT5_ROOT_DIR", "QT_ROOT_DIR", "QTDIR" };
   QString qtPath;
-  for (uint i = 0; i < vars.length() && qtPath.isEmpty(); i++ ) {
+  for (uint i = 0; i < (uint)vars.length() && qtPath.isEmpty(); i++ ) { //!< TODO: mismatch signed/unsigned
     qtPath = getenv(vars[i]);
   }
   if ( !qtPath.isEmpty() && !context.isEmpty() )

diff --git a/src/Qtx/QtxDoubleSpinBox.cxx b/src/Qtx/QtxDoubleSpinBox.cxx
index 7c8102ad8f0ae51e89f58c90810546647d46ec6a..6c3cb164de4edec31efbe5afc68abe349fc4b6c0 100644 (file)
--- a/src/Qtx/QtxDoubleSpinBox.cxx
+++ b/src/Qtx/QtxDoubleSpinBox.cxx
@@ -326,7 +326,7 @@ QValidator::State QtxDoubleSpinBox::validate( QString& str, int& pos ) const
     state = v.validate( str, pos );
   else
     {
-      if ( str.length() >= overhead && str.startsWith( pref ) &&
+      if ( (uint)str.length() >= overhead && str.startsWith( pref ) && //!< TODO: mismatch signed/unsigned
            str.right( suff.length() ) == suff )
         {
           QString core = str.mid( pref.length(), str.length() - overhead );

diff --git a/src/SUIT/SUIT_DataBrowser.cxx b/src/SUIT/SUIT_DataBrowser.cxx
index d79c13c75d454206d9d2590b23d66a1888aacf57..def245c6ceab0f2905e790f18d38b41c6ad464db 100644 (file)
--- a/src/SUIT/SUIT_DataBrowser.cxx
+++ b/src/SUIT/SUIT_DataBrowser.cxx
@@ -145,6 +145,7 @@ void SUIT_DataBrowser::setUpdateModified( const bool on )
 */
 void SUIT_DataBrowser::updateTree( SUIT_DataObject* obj, const bool autoOpen )
 {
+  //GUI_UNUSED(autoOpen);
   SUIT_ProxyModel* m = qobject_cast<SUIT_ProxyModel*>( model() );
   if ( m ) {
     m->updateTree( obj );
@@ -472,6 +473,7 @@ void SUIT_DataBrowser::onDblClicked( const QModelIndex& index )
 */
 void SUIT_DataBrowser::onExpanded( const QModelIndex& index )
 {
+  //GUI_UNUSED(index);
   if (myResizeOnExpandItem) {
     adjustFirstColumnWidth();
     adjustColumnsWidth();

diff --git a/src/SUIT/SUIT_TreeModel.cxx b/src/SUIT/SUIT_TreeModel.cxx
index 4af8769d5bd04bf95308275dcd62071c85d298be..effb255ddffe6ae11d27ec081a123d66f67dbe11 100644 (file)
--- a/src/SUIT/SUIT_TreeModel.cxx
+++ b/src/SUIT/SUIT_TreeModel.cxx
@@ -1730,6 +1730,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 )
 {
+  //GUI_UNUSED(column);
   if ( action == Qt::IgnoreAction )
     // do nothing with data
     return false;

diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx
index 22c20b4c1f22453c34fcbca08334d2ee46818314..991926b98597df97428d54e4dcd87afe8bd8c27f 100644 (file)
--- a/src/SUIT/SUIT_ViewWindow.cxx
+++ b/src/SUIT/SUIT_ViewWindow.cxx
@@ -334,7 +334,7 @@ bool SUIT_ViewWindow::dropDownButtons() const
 */
 int SUIT_ViewWindow::getId() const
 {
-  return int(long(this));
+  return int(LONG_PTR(this));
 }
 
 /*!
@@ -456,6 +456,7 @@ void SUIT_ViewWindow::updateSyncViews()
 */
 void SUIT_ViewWindow::onSynchronizeView( bool checked )
 {
+  //GUI_UNUSED(checked);
   QAction* a = qobject_cast<QAction*>( sender() );
   if ( a ) {
     synchronizeView( this, a->data().toInt() );

diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index cd2cb35108ea889c93edc4686b023b68c180ef6e..59f60eab7bd06f0ad7ba78aebb3aae77a0081ae3 100644 (file)
--- a/src/SVTK/SALOME_Actor.cxx
+++ b/src/SVTK/SALOME_Actor.cxx
@@ -712,7 +712,7 @@ SALOME_Actor
       TColStd_MapOfInteger anIndexes;
       if(aMapIter != aVectorIdsMap.end()){
         const SVTK_AreaPicker::TVectorIds& aVectorIds = aMapIter->second;
-        vtkIdType anEnd = aVectorIds.size();
+        vtkIdType anEnd = (int)aVectorIds.size(); //!< TODO: conversion from size_t to int
         for(vtkIdType anId = 0; anId < anEnd; anId++ ) {
           int aPointId = aVectorIds[anId];
           if( aPointId >= 0 && mySelector->IsValid( this, aPointId, true ) ) {
@@ -788,7 +788,7 @@ SALOME_Actor
       TColStd_MapOfInteger anIndexes;
       if(aMapIter != aVectorIdsMap.end()){
         const SVTK_AreaPicker::TVectorIds& aVectorIds = aMapIter->second;
-        vtkIdType anEnd = aVectorIds.size();
+        vtkIdType anEnd = (int)aVectorIds.size(); //!< TODO: conversion from size_t to int
         for(vtkIdType anId = 0; anId < anEnd; anId++ ) {
           int aCellId = aVectorIds[anId];
           if ( !mySelector->IsValid( this, aCellId ) )
@@ -826,7 +826,7 @@ SALOME_Actor
       SVTK_IndexedMapOfIds anIndexes;
       if(aMapIter != aVectorIdsMap.end()){
         const SVTK_AreaPicker::TVectorIds& aVectorIds = aMapIter->second;
-        vtkIdType anEnd = aVectorIds.size();
+        vtkIdType anEnd = (int)aVectorIds.size(); //!< TODO: conversion from size_t to int
         for(vtkIdType anId = 0; anId < anEnd; anId++ ) {
           int aCellId = aVectorIds[anId];
           if ( !mySelector->IsValid( this, aCellId ) )

diff --git a/src/SVTK/SVTK_DeviceActor.cxx b/src/SVTK/SVTK_DeviceActor.cxx
index a0c576e21ed69d4b5422503a1f486ff1194662a3..a9b1d1679bb0113d911f5d335cac87b4e9e83f5f 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.cxx
+++ b/src/SVTK/SVTK_DeviceActor.cxx
@@ -97,7 +97,7 @@ SVTK_DeviceActor
 
   myFeatureEdges->Delete();
 
-  for(int i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
+  for(size_t i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
     myPassFilter[i]->Delete();
 }
 
@@ -205,7 +205,7 @@ SVTK_DeviceActor
   if(myIsFeatureEdgesEnabled)
     mTime = std::max(mTime,myFeatureEdges->GetMTime());
 
-  for(int i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
+  for(size_t i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
     std::max(mTime,myPassFilter[i]->GetMTime());
 
   return mTime;

diff --git a/src/SVTK/SVTK_Hash.h b/src/SVTK/SVTK_Hash.h
index 7f5b1d1fa69ad2c9e522c8b002724e320fa1d360..992756033a9510ac75baf4d458d871408424c8dc 100644 (file)
--- a/src/SVTK/SVTK_Hash.h
+++ b/src/SVTK/SVTK_Hash.h
@@ -38,7 +38,7 @@ class SVTK_Hasher {
 public:
     static Standard_Integer HashCode(const std::vector<Standard_Integer> ids,
                                     const Standard_Integer upper) {
-        Standard_Integer seed = ids.size();
+        Standard_Integer seed = (int)ids.size(); //!< TODO: conversion from size_t to int
         for( Standard_Integer i = 0; i <  (Standard_Integer) ids.size(); i++ ) {
             Standard_Integer v = ids[i];
             seed ^= v + 0x9e3779b9 + ( seed << 6 ) + ( seed >> 2 );

diff --git a/src/SVTK/SVTK_ImageWriterMgr.cxx b/src/SVTK/SVTK_ImageWriterMgr.cxx
index 9c255d52decbe5b2a9dbffcffb296532c9f7b35e..21058129d8d7d932832a387bfd429302db400da4 100644 (file)
--- a/src/SVTK/SVTK_ImageWriterMgr.cxx
+++ b/src/SVTK/SVTK_ImageWriterMgr.cxx
@@ -88,7 +88,7 @@ SVTK_ImageWriterMgr
                 //"- total = "<<mySemaphore->total()<<
                 "; available = "<<mySemaphore->available()<<endl;
   if(MYDEBUG) cout<<"SVTK_ImageWriterMgr::Stop - *mySemaphore += "<<myThreads.size()<<endl;
-  mySemaphore->acquire( myThreads.size() );
+  mySemaphore->acquire( (int)myThreads.size() ); //!< TODO: conversion from size_t to int
 
   for(size_t anId = 0, anEnd = myThreads.size(); anId < anEnd; anId++){
     SVTK_ImageWriter* anImageWriter = myThreads[anId];

diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index 88d61b8c396a5ee9e5ad7c916d7823063a25afca..f1bbfd6406759991c394e44ec2d76502ce2636e0 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.cxx
@@ -1706,7 +1706,7 @@ bool isValid( const QPolygon* thePoints, const QPoint& theCurrent )
     return true;
 
   bool res = true;
-  for ( uint i = 0; i < thePoints->count() - 1 && res; i++ )
+  for ( uint i = 0; i < (uint)thePoints->count() - 1 && res; i++ )
   {
     const QPoint& aStart = thePoints->point( i );
     const QPoint& anEnd  = thePoints->point( i + 1 );

diff --git a/src/SVTK/SVTK_Selector.cxx b/src/SVTK/SVTK_Selector.cxx
index 58b8e7d9ab8b8075d2a0344ea4ea1718a3b776e0..dae45cfeb7049afc5636cec84be5c018b0d5845b 100644 (file)
--- a/src/SVTK/SVTK_Selector.cxx
+++ b/src/SVTK/SVTK_Selector.cxx
@@ -252,7 +252,7 @@ int
 SVTK_SelectorDef
 ::IObjectCount() const
 {
-  return myIObjects.size();
+  return (int)myIObjects.size(); //!< TODO: conversion from size_t to int
 }
 
 /*!

diff --git a/src/SVTK/SVTK_ViewModel.cxx b/src/SVTK/SVTK_ViewModel.cxx
index cf8f11a7bd95c6cdbf94b44df0356ec4c3e36718..6eaec64d9272b525c3d205f448ccfeb2631edc2d 100644 (file)
--- a/src/SVTK/SVTK_ViewModel.cxx
+++ b/src/SVTK/SVTK_ViewModel.cxx
@@ -218,7 +218,7 @@ void SVTK_Viewer::setTrihedronSize( const double theSize, const bool theRelative
 
   if (SUIT_ViewManager* aViewManager = getViewManager()) {
     QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-    for ( uint i = 0; i < aViews.count(); i++ )
+    for ( uint i = 0; i < (uint)aViews.count(); i++ )
     {
       if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
               aView->SetTrihedronSize( theSize, theRelative );
@@ -244,7 +244,7 @@ void SVTK_Viewer::setStaticTrihedronVisible( const bool theIsVisible )
 
   if (SUIT_ViewManager* aViewManager = getViewManager()) {
     QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-    for ( uint i = 0; i < aViews.count(); i++ )
+    for ( uint i = 0; i < (uint)aViews.count(); i++ )
     {
       if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
         aView->SetStaticTrihedronVisible( theIsVisible );
@@ -272,7 +272,7 @@ void SVTK_Viewer::setProjectionMode( const int theMode )
       myProjMode = theMode;
     if (SUIT_ViewManager* aViewManager = getViewManager()) {
       QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-      for ( uint i = 0; i < aViews.count(); i++ )
+      for ( uint i = 0; i < (uint)aViews.count(); i++ )
       {
         if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
           aView->SetProjectionMode( theMode );
@@ -300,7 +300,7 @@ void SVTK_Viewer::setStereoType( const int theType )
 
     if (SUIT_ViewManager* aViewManager = getViewManager()) {
       QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-      for ( uint i = 0; i < aViews.count(); i++ )
+      for ( uint i = 0; i < (uint)aViews.count(); i++ )
       {
         if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
           aView->SetStereoType( theType );
@@ -328,7 +328,7 @@ void SVTK_Viewer::setAnaglyphFilter( const int theFilter )
 
     if (SUIT_ViewManager* aViewManager = getViewManager()) {
       QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-      for ( uint i = 0; i < aViews.count(); i++ )
+      for ( uint i = 0; i < (uint)aViews.count(); i++ )
       {
         if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
           aView->SetAnaglyphFilter( theFilter );
@@ -356,7 +356,7 @@ void SVTK_Viewer::setQuadBufferSupport( const bool theEnable )
 
     if (SUIT_ViewManager* aViewManager = getViewManager()) {
       QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-      for ( uint i = 0; i < aViews.count(); i++ )
+      for ( uint i = 0; i < (uint)aViews.count(); i++ )
       {
         if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
           aView->SetQuadBufferSupport( theEnable );
@@ -382,7 +382,7 @@ void SVTK_Viewer::setInteractionStyle( const int theStyle )
   
   if (SUIT_ViewManager* aViewManager = getViewManager()) {
     QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-    for ( uint i = 0; i < aViews.count(); i++ )
+    for ( uint i = 0; i < (uint)aViews.count(); i++ )
     {
       if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
         aView->SetInteractionStyle( theStyle );
@@ -408,7 +408,7 @@ void SVTK_Viewer::setZoomingStyle( const int theStyle )
   
   if (SUIT_ViewManager* aViewManager = getViewManager()) {
     QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-    for ( uint i = 0; i < aViews.count(); i++ )
+    for ( uint i = 0; i < (uint)aViews.count(); i++ )
     {
       if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
         aView->SetZoomingStyle( theStyle );
@@ -434,7 +434,7 @@ void SVTK_Viewer::setPreSelectionMode( Preselection_Mode theMode )
   
   if (SUIT_ViewManager* aViewManager = getViewManager()) {
     QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-    for ( uint i = 0; i < aViews.count(); i++ )
+    for ( uint i = 0; i < (uint)aViews.count(); i++ )
     {
       if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
         aView->SetPreSelectionMode( theMode );
@@ -470,7 +470,7 @@ void SVTK_Viewer::setIncrementalSpeed( const int theValue, const int theMode )
 
   if (SUIT_ViewManager* aViewManager = getViewManager()) {
     QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-    for ( uint i = 0; i < aViews.count(); i++ )
+    for ( uint i = 0; i < (uint)aViews.count(); i++ )
     {
       if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
         aView->SetIncrementalSpeed( theValue, theMode );
@@ -501,7 +501,7 @@ void SVTK_Viewer::setSpacemouseButtons( const int theBtn1, const int theBtn2, co
 
   if (SUIT_ViewManager* aViewManager = getViewManager()) {
     QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-    for ( uint i = 0; i < aViews.count(); i++ )
+    for ( uint i = 0; i < (uint)aViews.count(); i++ )
     {
       if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
         aView->SetSpacemouseButtons( theBtn1, theBtn2, theBtn3 );
@@ -579,7 +579,7 @@ void SVTK_Viewer::enableSelection(bool isEnabled)
    
   if (SUIT_ViewManager* aViewManager = getViewManager()) {
     QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-    for ( uint i = 0; i < aViews.count(); i++ )
+    for ( uint i = 0; i < (uint)aViews.count(); i++ )
     {
       if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
         aView->SetSelectionEnabled( isEnabled );

diff --git a/src/Style/Style_Tools.cxx b/src/Style/Style_Tools.cxx
index 242a7815ee34ccb7ea2e19e6049f12be4117cd9b..d628548dcc1a0dda35f71dbc9f80942d4ff01fd9 100644 (file)
--- a/src/Style/Style_Tools.cxx
+++ b/src/Style/Style_Tools.cxx
@@ -696,6 +696,7 @@ void Style_Tools::drawSlider( QPainter* p, const QRect& r, const double rad,
                               SliderType type, const QColor& light, const QColor& dark,
                               const QColor& border_top, const QColor& border_bot )
 {
+  //GUI_UNUSED(border_top)
   p->save();
   QPainterPath path, bottomPath;
   if ( rad == 0 )

diff --git a/src/VTKViewer/VTKViewer_Actor.cxx b/src/VTKViewer/VTKViewer_Actor.cxx
index 309fc81013c75009c5c60cf84eba25a4e4aaff2d..389596de381e20b775ca2263f9f01731841b4fc9 100644 (file)
--- a/src/VTKViewer/VTKViewer_Actor.cxx
+++ b/src/VTKViewer/VTKViewer_Actor.cxx
@@ -93,7 +93,7 @@ VTKViewer_Actor
 
   myTransformFilter->Delete();
 
-  for(int i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
+  for(size_t i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
     if(myPassFilter[i])
       myPassFilter[i]->Delete();
   

diff --git a/src/VTKViewer/VTKViewer_AppendFilter.cxx b/src/VTKViewer/VTKViewer_AppendFilter.cxx
index 4011302e15908af1f0309da971a0decd359f7ae8..78249ba624a7fc60a6c025631f1917e1ec2d6648 100644 (file)
--- a/src/VTKViewer/VTKViewer_AppendFilter.cxx
+++ b/src/VTKViewer/VTKViewer_AppendFilter.cxx
@@ -149,7 +149,7 @@ namespace
   {
     theInputID = theInputDataSetID = -1;
 
-    vtkIdType aNbInputs = theRanges.size();
+    vtkIdType aNbInputs = (int)theRanges.size(); //!< TODO: conversion from size_t to int
     if(theInputDataSetID < 0 || theInputDataSetID >= aNbInputs)
       return -1;
     
@@ -201,7 +201,7 @@ namespace
       return;
 
     vtkIdType aStartId = 0;
-    vtkIdType aNbInputs = theRanges.size();
+    vtkIdType aNbInputs = (int)theRanges.size(); //!< TODO: conversion from size_t to int
     for(vtkIdType aDataSetId = 0; aDataSetId < aNbInputs; ++aDataSetId){
       vtkIdType aRange = theRanges[aDataSetId];
       if(aRange > theOutputID){

diff --git a/src/VTKViewer/VTKViewer_ArcBuilder.cxx b/src/VTKViewer/VTKViewer_ArcBuilder.cxx
index 0f84d9056fed010af1ce0fd0c9c55e42c3aa40d4..ab3a880da47e9a0c48761fd108cd4895d0612d9c 100644 (file)
--- a/src/VTKViewer/VTKViewer_ArcBuilder.cxx
+++ b/src/VTKViewer/VTKViewer_ArcBuilder.cxx
@@ -357,7 +357,7 @@ VTKViewer_ArcBuilder::~VTKViewer_ArcBuilder()
  */
 vtkUnstructuredGrid* VTKViewer_ArcBuilder::BuildGrid(const PntList& theList) const
 {
-  int aListsize = theList.size();  
+  int aListsize = (int)theList.size(); //!< TODO: conversion from size_t to int
   vtkUnstructuredGrid* aGrid = NULL;
   
   if(aListsize != 0) {

diff --git a/src/VTKViewer/VTKViewer_ConvexTool.cxx b/src/VTKViewer/VTKViewer_ConvexTool.cxx
index e8cd08c572a4680782520f36fd2e7f8ba5e0d420..ef39a661dcb1988e934987b242aec2037a4f7beb 100644 (file)
--- a/src/VTKViewer/VTKViewer_ConvexTool.cxx
+++ b/src/VTKViewer/VTKViewer_ConvexTool.cxx
@@ -405,7 +405,7 @@ VTKViewer_Triangulator
             if(DEBUG_TRIA_EXECUTE) cout  << "; Added = FALSE" << endl;
           }
         }
-        int aNbPoints = aPointIds.size();
+        int aNbPoints = (int)aPointIds.size(); //!< TODO: conversion from size_t to int
         aCenter[0] /= aNbPoints;
         aCenter[1] /= aNbPoints;
         aCenter[2] /= aNbPoints;
@@ -523,7 +523,7 @@ VTKViewer_Triangulator
         }
 
         if(!aSortedPointIds.empty()){
-          int aNumFacePts = aSortedPointIds.size();
+          int aNumFacePts = (int)aSortedPointIds.size(); //!< TODO: conversion from size_t to int
           ::TConnectivities aConnectivities(aNumFacePts);
           TSortedPointIds::const_iterator anIter = aSortedPointIds.begin();
           TSortedPointIds::const_iterator anEndIter = aSortedPointIds.end();
@@ -544,7 +544,7 @@ VTKViewer_Triangulator
 
   // To check, whether the polygons give a convex polyhedron or not
   if(theIsCheckConvex){
-    int aNbPolygons = aPolygons.size();
+    int aNbPolygons = (int)aPolygons.size(); //!< TODO: conversion from size_t to int
     for (int aPolygonId = 0; aPolygonId < aNbPolygons; aPolygonId++) {
       ::TPolygon& aPolygon = aPolygons[aPolygonId];
       double* aNormal = aPolygon.myNormal;
@@ -569,7 +569,7 @@ VTKViewer_Triangulator
 
   // To pass resulting set of the polygons to the output
   {
-    int aNbPolygons = aPolygons.size();
+    int aNbPolygons = (int)aPolygons.size(); //!< TODO: conversion from size_t to int
     for (int aPolygonId = 0; aPolygonId < aNbPolygons; aPolygonId++) {
       ::TPolygon& aPolygon = aPolygons[aPolygonId];
       if(DEBUG_TRIA_EXECUTE) cout << "PoilygonId="<<aPolygonId<<" | ";
@@ -579,7 +579,7 @@ VTKViewer_Triangulator
           cout << aConnectivities[i] << ",";
         cout << endl;
       }
-      int aNbPoints = aConnectivities.size();
+      int aNbPoints = (int)aConnectivities.size(); //!< TODO: conversion from size_t to int
       vtkIdType aNewCellId = theOutput->InsertNextCell(VTK_POLYGON,aNbPoints,&aConnectivities[0]);
       if(theStoreMapping)
         VTKViewer_GeometryFilter::InsertId( theCellId, VTK_POLYGON, theVTK2ObjIds, theDimension2VTK2ObjIds );

diff --git a/src/VTKViewer/VTKViewer_OpenGLHelper.cxx b/src/VTKViewer/VTKViewer_OpenGLHelper.cxx
index b40aeb7ba9f5d2876c7b22ed703e160e2539523d..696daedae516ba5c4b427661e9312575bb91e11c 100644 (file)
--- a/src/VTKViewer/VTKViewer_OpenGLHelper.cxx
+++ b/src/VTKViewer/VTKViewer_OpenGLHelper.cxx
@@ -238,7 +238,7 @@ namespace GUI_OPENGL
                if( count > 0 )
                {
                  content = ( char* )malloc( sizeof( char ) * ( count + 1 ) );
-                 count = fread( content, sizeof( char ), count, file );
+                 count = (int)fread( content, sizeof( char ), count, file ); //!< TODO: conversion from size_t to int
                  content[ count ] = '\0';
                }
                fclose( file );

diff --git a/src/ViewerTools/ViewerTools_FontWidgetBase.cxx b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx
index 598171467b4f93223143f7a96a43820faba20c2c..f3559b4151b491fe87fd1eaf45ef6568fdcc9731 100644 (file)
--- a/src/ViewerTools/ViewerTools_FontWidgetBase.cxx
+++ b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx
@@ -107,6 +107,7 @@ void ViewerTools_FontWidgetBase::SetData( const QColor& theColor,
                                           const bool theItalic,
                                           const bool theShadow )
 {
+  //GUI_UNUSED(theFamily);
   SetColor( theColor );
 
   myBold->setChecked( theBold );
@@ -120,6 +121,7 @@ void ViewerTools_FontWidgetBase::GetData( QColor& theColor,
                                           bool& theItalic,
                                           bool& theShadow ) const
 {
+  //GUI_UNUSED(theFamily);
   theColor = GetColor();
 
   theBold = myBold->isChecked();