0020105: EDF 862 SMESH : Creation of the skin elements (2D) of a 3D Mesh

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_HypothesesUtils.cxx

diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
index 50de8b76221e7167081dca22032f0f8089b0b77a..6bfb02b6f523c2df2ad4f30fb3a33aba3d31cb62 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
@@ -186,6 +186,7 @@ namespace SMESH
                                      QObject::tr("INF_PARSE_ERROR"),
                                      QObject::tr(aXmlHandler->errorProtocol().toLatin1().data()));
          }
+    delete aXmlHandler;
        }
        else {
          if (aNoAccessFiles.isEmpty())
@@ -250,8 +251,8 @@ namespace SMESH
          hypoSet != myListOfHypothesesSets.end();
          ++hypoSet ) {
       HypothesesSet* aSet = *hypoSet;
-      if ( aSet && aSet->AlgoList.count() ) {
-       aSetNameList.append( aSet->HypoSetName );
+      if ( aSet && aSet->count( true ) ) {
+       aSetNameList.append( aSet->name() );
       }
     }
     
@@ -265,7 +266,7 @@ namespace SMESH
          hypoSet != myListOfHypothesesSets.end();
          ++hypoSet ) {
       HypothesesSet* aSet = *hypoSet;
-      if ( aSet && aSet->HypoSetName == theSetName )
+      if ( aSet && aSet->name() == theSetName )
        return aSet;
     }
     return 0;
@@ -320,7 +321,7 @@ namespace SMESH
     return false;
   }
 
-  HypothesisCreatorPtr GetHypothesisCreator(const QString& aHypType)
+  SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator(const QString& aHypType)
   {
     if(MYDEBUG) MESSAGE("Get HypothesisCreator for " << aHypType.toLatin1().data());
 
@@ -339,7 +340,8 @@ namespace SMESH
       // 2. Get names of plugin libraries
       HypothesisData* aHypData = GetHypothesisData(aHypType);
       if (!aHypData) 
-        return HypothesisCreatorPtr(aCreator);
+        return aCreator;
+
       QString aClientLibName = aHypData->ClientLibName;
       QString aServerLibName = aHypData->ServerLibName;
 
@@ -390,7 +392,7 @@ namespace SMESH
       }
     }
 
-    return HypothesisCreatorPtr(aCreator);
+    return aCreator;
   }