From: vsr <vsr@opencascade.com>
Date: Thu, 3 Nov 2011 09:53:32 +0000 (+0000)
Subject: Fix compilation warnings
X-Git-Tag: V6_4_0b1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a72a7d6be782b12e41c888bd6b570df2fa12f81c;p=modules%2Fvisu.git

Fix compilation warnings
---

diff --git a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
index 98adfe21..ab8ae239 100644
--- a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
+++ b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
@@ -263,7 +263,7 @@ void VisuGUI_BuildProgressDlg::onStart()
     if( aBuildAtOnce )
     {
       QApplication::setOverrideCursor( Qt::WaitCursor );
-      myCurrentTime = vtkTimerLog::GetCurrentTime();
+      myCurrentTime = vtkTimerLog::GetUniversalTime();
     }
 
     myTime.setHMS( 0, 0, 0 );
@@ -358,7 +358,7 @@ void VisuGUI_BuildProgressDlg::onTimer()
         QApplication::restoreOverrideCursor();
 
         QTime aTime;
-        int mSecs = ( int )( 1000 * ( vtkTimerLog::GetCurrentTime() - myCurrentTime ) );
+        int mSecs = ( int )( 1000 * ( vtkTimerLog::GetUniversalTime() - myCurrentTime ) );
         aTime = aTime.addMSecs( mSecs );
         if( aTime.minute() > 9 )
           myTimeLCDNumber->setNumDigits( 9 );
diff --git a/src/VISUGUI/VisuGUI_Sweep.cxx b/src/VISUGUI/VisuGUI_Sweep.cxx
index 74ea0207..f44a1e44 100644
--- a/src/VISUGUI/VisuGUI_Sweep.cxx
+++ b/src/VISUGUI/VisuGUI_Sweep.cxx
@@ -363,8 +363,7 @@ void VisuGUI_Sweep::onSelectionChanged()
 //----------------------------------------------------------------------------
 void VisuGUI_Sweep::onValueChanged( int value )
 {
-  bool anIsValidSelection = ( myColoredPrs3d != NULL )
-                          && (myActor != NULL );
+  bool anIsValidSelection = ( myColoredPrs3d != 0 ) && ( myActor != 0 );
 
   if ( !anIsValidSelection )
     return;
diff --git a/src/VISU_SWIG/VISU_Gen_s.cc b/src/VISU_SWIG/VISU_Gen_s.cc
index 7055cb62..c4f8b258 100644
--- a/src/VISU_SWIG/VISU_Gen_s.cc
+++ b/src/VISU_SWIG/VISU_Gen_s.cc
@@ -84,7 +84,7 @@ void View3D::Display(ScalarMap* theScalarMap){
   if(VISU_ScalarMapPL* aScalarMap = theScalarMap->GetImpl()){
     aScalarMap->Update();
     
-    myRen->RemoveAllProps();
+    myRen->RemoveAllViewProps();
     vtkActor* anActor = vtkActor::New();
     anActor->SetMapper(aScalarMap->GetMapper());