Compilation warnings

diff --git a/src/OCCViewer/OCCViewer_ViewPort.h b/src/OCCViewer/OCCViewer_ViewPort.h
index 357dd8d0c0688274e3423d9f95ef21e20e83b12a..b4742b2930dcd7acfa8605f7a84e5759813478e3 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort.h
+++ b/src/OCCViewer/OCCViewer_ViewPort.h
@@ -35,6 +35,10 @@ class QPainter;
 class OCCViewer_ViewSketcher;
 class OCCViewer_ViewTransformer;
 
+#ifdef WIN32
+#pragma warning ( disable:4251 )
+#endif
+
 /*!
   \class OCCViewer_ViewPort
   Visualisation canvas of SUIT-based application
@@ -111,4 +115,8 @@ private:
        static int                               nCounter;                              /* objects counter */
 };
 
+#ifdef WIN32
+#pragma warning ( default:4251 )
+#endif
+
 #endif

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.h b/src/OCCViewer/OCCViewer_ViewPort3d.h
index 204b8eb995eb6be3cb5d5052ee7f3abcd4a97b6d..5f923003a59ef7f8de6fe9c1abd0f0b560ae5959 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.h
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.h
@@ -28,6 +28,10 @@
 
 class QRect;
 
+#ifdef WIN32
+#pragma warning ( disable:4251 )
+#endif
+
 class OCCVIEWER_EXPORT OCCViewer_ViewPort3d: public OCCViewer_ViewPort
 {
        Q_OBJECT
@@ -89,4 +93,8 @@ private:
        double  myScale;
 };
 
+#ifdef WIN32
+#pragma warning ( default:4251 )
+#endif
+
 #endif

diff --git a/src/SOCC/SOCC_ViewModel.cxx b/src/SOCC/SOCC_ViewModel.cxx
index 8d425a47c63d9d753e5dc20e575a0bd979a22b6e..999c2dd85d506c171a34e187c4d9f272f4da7f8f 100755 (executable)
--- a/src/SOCC/SOCC_ViewModel.cxx
+++ b/src/SOCC/SOCC_ViewModel.cxx
@@ -671,7 +671,7 @@ bool SOCC_Viewer::getTrihedronSize( double& theNewSize, double& theSize )
 
   float aSizeInPercents = SUIT_Session::session()->resourceMgr()->doubleValue("Viewer","TrihedronSize", 105.);
 
-  static float EPS = 5.0E-3;
+  static double EPS = 5.0E-3;
   theSize = getTrihedron()->Size();
   theNewSize = aMaxSide*aSizeInPercents / 100.0;
 

diff --git a/src/SPlot2d/SPlot2d_ViewModel.cxx b/src/SPlot2d/SPlot2d_ViewModel.cxx
index 4ac94388f3f518f1c2aa64a648a8beff54f72cd1..2c6de161191753345bca0fc92719a15356475be7 100644 (file)
--- a/src/SPlot2d/SPlot2d_ViewModel.cxx
+++ b/src/SPlot2d/SPlot2d_ViewModel.cxx
@@ -114,10 +114,10 @@ void SPlot2d_Viewer::rename( const Handle(SALOME_InteractiveObject)& IObject,
 void SPlot2d_Viewer::renameAll( const Handle(SALOME_InteractiveObject)& IObj, const QString& name )
 {
   SUIT_ViewManager* vm = getViewManager();
-  if( vm )
+  if ( vm )
   {
     const QPtrVector<SUIT_ViewWindow>& wnds = vm->getViews();
-    for( int i=0; i<wnds.size(); i++ )
+    for ( uint i = 0; i < wnds.size(); i++ )
     {
       Plot2d_ViewWindow* pwnd = dynamic_cast<Plot2d_ViewWindow*>( wnds.at( i ) );
       rename( IObj, name, pwnd->getViewFrame() );

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
index f2d336449e5fe089b82cc6f4e3be8d2db6b7485a..2a5e7f03b39dbbb410383c69ac6fb72fb6bda5fb 100755 (executable)
--- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
+++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
@@ -37,6 +37,10 @@
 
 #include <qaction.h>
 
+#ifdef WIN32
+#pragma warning ( disable:4251 )
+#endif
+
 class SUPERVGRAPH_EXPORT SUPERVGraph_View: public QWidget, public SUIT_PopupClient {
   Q_OBJECT;
  public:
@@ -127,5 +131,10 @@ class SUPERVGRAPH_EXPORT SUPERVGraph_ViewFrame : public SUIT_ViewWindow {
   QToolBar*        myToolBar;
 
   SUPERVGraph_View* myView;
-}; 
+};
+
+#ifdef WIN32
+#pragma warning ( default:4251 )
+#endif
+
 #endif

diff --git a/src/SVTK/SVTK_ViewModel.cxx b/src/SVTK/SVTK_ViewModel.cxx
index 61cde9d5bfc80bad611320c7689f643201eeb71e..e884edec78931017e594c0167a24c31ce2030051 100644 (file)
--- a/src/SVTK/SVTK_ViewModel.cxx
+++ b/src/SVTK/SVTK_ViewModel.cxx
@@ -152,10 +152,10 @@ void SVTK_Viewer::setTrihedronSize( const int theSize, const bool theRelative )
 
   if (SUIT_ViewManager* aViewManager = getViewManager()) {
     QPtrVector<SUIT_ViewWindow> aViews = aViewManager->getViews();
-    for (int i = 0; i < aViews.count(); i++) {
-      if (TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at(i))) {
-       aView->SetTrihedronSize(theSize, theRelative);
-      }
+    for ( uint i = 0; i < aViews.count(); i++ )
+    {
+      if ( TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i )) )
+             aView->SetTrihedronSize( theSize, theRelative );
     }
   }
 }