From: vsr <vsr@opencascade.com>
Date: Fri, 12 Feb 2016 08:20:58 +0000 (+0300)
Subject: Update from V7_dev branch
X-Git-Tag: V8_0_0rc2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0da03b33d7142046a7c60104d798a923ec7620b0;p=modules%2Fhomard.git

Update from V7_dev branch
---

diff --git a/src/HOMARDGUI/HOMARDGUI.h b/src/HOMARDGUI/HOMARDGUI.h
index 981bfbf2..4d224c3f 100644
--- 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 22c201b0..455fa991 100644
--- 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 3c4e4cce..9f40c2fa 100644
--- 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 ab297635..b62ef100 100644
--- 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();
 }