Porting HOMARD SALOME module on WIN32 platform.

[modules/homard.git] / src / HOMARDGUI / MonEditHypothesis.cxx

diff --git a/src/HOMARDGUI/MonEditHypothesis.cxx b/src/HOMARDGUI/MonEditHypothesis.cxx
index 19478b3d014f49044b99bc049743fbb7dd3a413f..6f28eab49e017918ecdcd25430f39841b8a13537 100644 (file)
--- a/src/HOMARDGUI/MonEditHypothesis.cxx
+++ b/src/HOMARDGUI/MonEditHypothesis.cxx
@@ -17,8 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-using namespace std;
-
 #include "MonEditHypothesis.h"
 #include "MonEditListGroup.h"
 
@@ -27,6 +25,9 @@ using namespace std;
 #include "HomardQtCommun.h"
 #include "HOMARD.hxx"
 #include <utilities.h>
+
+using namespace std;
+
 // ----------------------------------------------------------------------------
 MonEditHypothesis::MonEditHypothesis( MonCreateIteration* parent, bool modal,
                                       HOMARD::HOMARD_Gen_var myHomardGen,
@@ -83,7 +84,7 @@ void MonEditHypothesis::InitValEdit()
 
   InitFieldInterp();
 
-  if (_aTypeAdap == 1 or _TypeFieldInterp >= 1 )
+  if (_aTypeAdap == 1 || _TypeFieldInterp >= 1 )
   {
     if (_aFieldFile == QString("")) { GBFieldFile->setVisible(0); }
     else
@@ -103,7 +104,7 @@ void MonEditHypothesis::InitValEdit()
   double DiamMin = aHypothesis->GetDiamMin();
   int AdapInit = aHypothesis->GetAdapInit();
   int LevelOutput = aHypothesis->GetLevelOutput();
-  if ( NivMax > 0 or DiamMin > 0 or AdapInit != 0 or LevelOutput != 0 )
+  if ( NivMax > 0 || DiamMin > 0 || AdapInit != 0 || LevelOutput != 0 )
   { GBAdvancedOptions->setVisible(1);
     if ( NivMax > 0 )
     { spinBoxNivMax->setValue(NivMax);