Merge branch 'master' into gni/adaptation

[modules/smesh.git] / src / ADAPTGUI / MonCreateBoundaryCAO.cxx

diff --git a/src/ADAPTGUI/MonCreateBoundaryCAO.cxx b/src/ADAPTGUI/MonCreateBoundaryCAO.cxx
index da07e84a5047298350b4862a8d51a6a9e0922ccf..aa3246e43b8d5a16cf4cb3ce6ba0b5f5a7b2e57a 100644 (file)
--- a/src/ADAPTGUI/MonCreateBoundaryCAO.cxx
+++ b/src/ADAPTGUI/MonCreateBoundaryCAO.cxx
@@ -33,14 +33,14 @@ using namespace std;
 
 // -------------------------------------------------------------------------------
 MonCreateBoundaryCAO::MonCreateBoundaryCAO(MonCreateCase* parent, bool modal,
-                                         HOMARD::HOMARD_Gen_var myHomardGen0,
+                                         ADAPT::ADAPT_Gen_var myAdaptGen0,
                                          QString caseName, QString aName)
 // ---------------------------------------------------------------------------------
 /* Constructs a MonCreateBoundaryCAO */
     :
     QDialog(0), Ui_CreateBoundaryCAO(),
     _parent(parent), _aName(aName),
-    myHomardGen(HOMARD::HOMARD_Gen::_duplicate(myHomardGen0)),
+    myAdaptGen(ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0)),
     _aCaseName(caseName)
     {
       MESSAGE("Constructeur") ;
@@ -99,7 +99,7 @@ bool MonCreateBoundaryCAO::PushOnApply()
    try
    {
      _aName=aName;
-     aBoundary=myHomardGen->CreateBoundaryCAO(CORBA::string_dup(_aName.toStdString().c_str()), aCAOFile.toStdString().c_str());
+     aBoundary=myAdaptGen->CreateBoundaryCAO(CORBA::string_dup(_aName.toStdString().c_str()), aCAOFile.toStdString().c_str());
      _parent->AddBoundaryCAO(_aName);
      aBoundary->SetCaseCreation(_aCaseName.toStdString().c_str());
    }
@@ -130,14 +130,14 @@ void MonCreateBoundaryCAO::PushOnOK()
 void MonCreateBoundaryCAO::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("CAO"), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------
 void MonCreateBoundaryCAO::AssocieLesGroupes()
 // ------------------------------------------------------------------------
 {
-  HOMARD::ListGroupType_var aSeqGroupe = new HOMARD::ListGroupType;
+  ADAPT::ListGroupType_var aSeqGroupe = new ADAPT::ListGroupType;
   aSeqGroupe->length(_listeGroupesBoundary.size());
   QStringList::const_iterator it;
   int i=0;
@@ -152,7 +152,7 @@ void MonCreateBoundaryCAO::SetNewName()
 // --------------------------------------------------
 {
 
-  HOMARD::listeBoundarys_var  MyObjects = myHomardGen->GetAllBoundarysName();
+  ADAPT::listeBoundarys_var  MyObjects = myAdaptGen->GetAllBoundarysName();
   int num = 0; QString aName="";
   while (aName == QString("") )
   {
@@ -195,7 +195,7 @@ void MonCreateBoundaryCAO::SetFiltrage()
     return;
   }
 
-  MonCreateListGroupCAO *aDlg = new MonCreateListGroupCAO(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
+  MonCreateListGroupCAO *aDlg = new MonCreateListGroupCAO(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }