]> SALOME platform Git repositories - modules/smesh.git/commitdiff
Salome HOME
Fix compilation warnings
authorjfa <jfa@opencascade.com>
Thu, 11 Aug 2005 08:04:31 +0000 (08:04 +0000)
committerjfa <jfa@opencascade.com>
Thu, 11 Aug 2005 08:04:31 +0000 (08:04 +0000)
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
src/SMESHGUI/SMESHGUI_VTKUtils.cxx

index f040d82a14c2c26aac834714173a6aa1c7a12c60..8279690189978e54ab23682037eec908084f9c58 100755 (executable)
@@ -127,7 +127,7 @@ SMESHGUI_MeshPatternDlg::SMESHGUI_MeshPatternDlg( SMESHGUI*   theModule,
   myCreationDlg = 0;
 
   mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
-  
+
   Init();
 }
 
@@ -415,7 +415,6 @@ bool SMESHGUI_MeshPatternDlg::onApply()
     bool toCreatePolyedrs = myCreatePolyedrsChk->isChecked();
     if ( myPattern->MakeMesh( myMesh, toCreatePolygons, toCreatePolyedrs ) ) {
       mySelectionMgr->clearSelected();
-      SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI );
       bool autoUpdate = SMESHGUI::automaticUpdate();
       if (!isRefine() && autoUpdate) {
        _PTR(SObject) aSO = SMESH::FindSObject(myMesh.in());
@@ -429,7 +428,7 @@ bool SMESHGUI_MeshPatternDlg::onApply()
        }
       }
       SMESH::UpdateView();
-      
+
       mySMESHGUI->updateObjBrowser(true);
       return true;
     } else {
@@ -1265,9 +1264,9 @@ void SMESHGUI_MeshPatternDlg::onTextChanged (const QString& theNewText)
 
   if (aMesh) {
     QStringList aListId = QStringList::split(" ", theNewText, false);
-    
+
     TColStd_MapOfInteger newIndices;
-    
+
     for (int i = 0; i < aListId.count(); i++) {
       const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
       if (e && e->GetType() == (myType == Type_2d ? SMDSAbs_Face : SMDSAbs_Volume))
index ac064ec25a41bd753af8242a86d2464219513e69..c9141ec82f7b93eda661ae60c9d11522313002c1 100644 (file)
@@ -93,7 +93,7 @@ namespace SMESH{
              if(!aMesh->_is_nil()){
                aVisualObj.reset(new SMESH_MeshObj(aMesh));
                aVisualObj->Update();
-               TVisualObjCont::value_type aValue(aKey,aVisualObj); 
+               TVisualObjCont::value_type aValue(aKey,aVisualObj);
                VISUAL_OBJ_CONT.insert(aValue);
                return aVisualObj;
              }
@@ -145,8 +145,9 @@ namespace SMESH{
   SVTK_ViewWindow*
   GetViewWindow(const SalomeApp_Module* theModule)
   {
-    if(SalomeApp_Application* anApp = theModule->getApp())
+    if (SalomeApp_Application* anApp = theModule->getApp())
       return dynamic_cast<SVTK_ViewWindow*>(anApp->desktop()->activeWindow());
+    return NULL;
   }
 
   SVTK_ViewWindow* FindVtkViewWindow( SUIT_ViewManager* theMgr,
@@ -568,8 +569,8 @@ namespace SMESH{
 
 
   //----------------------------------------------------------------------------
-  int GetNameOfSelectedNodes(SVTK_Selector* theSelector, 
-                            const Handle(SALOME_InteractiveObject)& theIO, 
+  int GetNameOfSelectedNodes(SVTK_Selector* theSelector,
+                            const Handle(SALOME_InteractiveObject)& theIO,
                             QString& theName)
   {
     theName = "";
@@ -582,8 +583,8 @@ namespace SMESH{
     return aMapIndex.Extent();
   }
 
-  int GetNameOfSelectedElements(SVTK_Selector* theSelector, 
-                               const Handle(SALOME_InteractiveObject)& theIO, 
+  int GetNameOfSelectedElements(SVTK_Selector* theSelector,
+                               const Handle(SALOME_InteractiveObject)& theIO,
                                QString& theName)
   {
     theName = "";
@@ -603,12 +604,12 @@ namespace SMESH{
   }
 
 
-  int GetEdgeNodes(SVTK_Selector* theSelector, 
+  int GetEdgeNodes(SVTK_Selector* theSelector,
                   const TVisualObjPtr& theVisualObject,
-                  int& theId1, 
+                  int& theId1,
                   int& theId2)
   {
-    const SALOME_ListIO& selected = theSelector->StoredIObjects(); 
+    const SALOME_ListIO& selected = theSelector->StoredIObjects();
 
     if ( selected.Extent() != 1 )
       return -1;
@@ -665,7 +666,7 @@ namespace SMESH{
     }
     return -1;
   }
-  
+
 
   int GetNameOfSelectedElements(SalomeApp_SelectionMgr *theMgr,
                                const Handle(SALOME_InteractiveObject)& theIO,
@@ -763,7 +764,7 @@ namespace SMESH{
       vtkRenderer *aRenderer = aWnd->getRenderer();
       vtkActorCollection *aCollection = aRenderer->GetActors();
       aCollection->InitTraversal();
-      
+
       while ( vtkActor *anAct = aCollection->GetNextActor())
       {
         if ( SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>( anAct ) )