Update from V7_dev branch

diff --git a/src/HOMARDGUI/HOMARDGUI.h b/src/HOMARDGUI/HOMARDGUI.h
index 981bfbf25eb912d26a53554b246280684c3a5fb9..4d224c3f39b104c96f61a6d12e5d16db7bd2eac0 100644 (file)
--- a/src/HOMARDGUI/HOMARDGUI.h
+++ b/src/HOMARDGUI/HOMARDGUI.h
@@ -34,7 +34,7 @@
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 #include CORBA_CLIENT_HEADER(HOMARD_Hypothesis)
 
-#include <QtCore/QString>
+#include <QString>
 
 class SalomeApp_Application;
 

diff --git a/src/HOMARDGUI/MonCreateBoundaryDi.cxx b/src/HOMARDGUI/MonCreateBoundaryDi.cxx
index 22c201b01cf886a38ef5bd0494f4a743a96a62ea..455fa99103e4ad11076a94fc7ad08fbcda81ba33 100644 (file)
--- a/src/HOMARDGUI/MonCreateBoundaryDi.cxx
+++ b/src/HOMARDGUI/MonCreateBoundaryDi.cxx
@@ -204,7 +204,7 @@ void MonCreateBoundaryDi::SetFiltrage()
     return;
   }
 
-  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL,this,  true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
+  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }

diff --git a/src/HOMARDGUI/MonCreateIteration.cxx b/src/HOMARDGUI/MonCreateIteration.cxx
index 3c4e4cce8296d922ebdf7e018d48d7be59a90195..9f40c2fa66c85daa3e9cd1a4990d3f5524a7ab7b 100644 (file)
--- a/src/HOMARDGUI/MonCreateIteration.cxx
+++ b/src/HOMARDGUI/MonCreateIteration.cxx
@@ -249,7 +249,7 @@ void MonCreateIteration::PushHypoEdit()
     return;
   }
   QString aFieldFile=LEFieldFile->text().trimmed();
-  MonEditHypothesis *HypoDlg = new MonEditHypothesis(this,true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
+  MonEditHypothesis *HypoDlg = new MonEditHypothesis(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 
@@ -277,7 +277,7 @@ void MonCreateIteration::PushHypoNew()
     _CaseName = aIterParent->GetCaseName();
   }
   QString aFieldFile=LEFieldFile->text().trimmed();
-  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this,true,HOMARD::HOMARD_Gen::_duplicate(myHomardGen),QString(""),_CaseName, aFieldFile) ;
+  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), QString(""), _CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 // ------------------------------------------------------------------------

diff --git a/src/HOMARDGUI/MonEditBoundaryDi.cxx b/src/HOMARDGUI/MonEditBoundaryDi.cxx
index ab29763502e071184925985aaa7a4d7803d2c222..b62ef1004509c22334d39d0638d8d212cea0f655 100644 (file)
--- a/src/HOMARDGUI/MonEditBoundaryDi.cxx
+++ b/src/HOMARDGUI/MonEditBoundaryDi.cxx
@@ -98,7 +98,7 @@ void MonEditBoundaryDi::SetFiltrage()
   HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
   HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
 
-  MonEditListGroup *aDlg = new MonEditListGroup(NULL,this,  true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
+  MonEditListGroup *aDlg = new MonEditListGroup(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }