Win32 compilation.

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx
index 2caf2b33fdfe1abceb4355af41b52e3113476338..c32684521425595de68ccc858e4ed6fc24b5fca6 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx
@@ -69,7 +69,7 @@
 #include <GProp_GProps.hxx>
 #include <BRepGProp.hxx>
 
-#ifndef WNT
+#ifndef WIN32
 #include <fenv.h>
 #endif
 

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 8cdd6ee262df3e52af00be1f9dc7e85561bf2e7d..a8abc9bfc9dc5138aef0ecd1ee809939176efe95 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -91,7 +91,7 @@ extern "C"{
 #include <gp_XY.hxx>
 #include <gp_XYZ.hxx>
 
-#ifndef WNT
+#ifndef WIN32
 #include <fenv.h>
 #endif
 
@@ -853,7 +853,7 @@ void BLSURFPlugin_BLSURF::createEdgesPeriodicity(TopoDS_Shape theGeomShape, BLSU
   TListOfIDs theEdge1_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomEdge1, TopAbs_EDGE);
   TListOfIDs theEdge2_ids = _getSubShapeIDsInMainShape(theGeomShape, GeomEdge2, TopAbs_EDGE);
 
-  if (edge_orientation == 0 and GeomEdge1.Closed())
+  if (edge_orientation == 0 && GeomEdge1.Closed())
     {
       // if edge is closed, we have to set its orientation
       MESSAGE("GeomEdge1.Orientation() = " << GeomEdge1.Orientation());
@@ -1444,7 +1444,7 @@ void BLSURFPlugin_BLSURF::SetParameters(
   }
   MESSAGE("_preCadEdgesIDsPeriodicityVector.size() = " << _preCadEdgesIDsPeriodicityVector.size());
 
-  if ( _preCadFacesIDsPeriodicityVector.size() > 0 or _preCadEdgesIDsPeriodicityVector.size() > 0 )
+  if ( _preCadFacesIDsPeriodicityVector.size() > 0 || _preCadEdgesIDsPeriodicityVector.size() > 0 )
     {
       MESSAGE("USING PRECAD FOR PERIODICITY")
       *use_precad = true;
@@ -1948,7 +1948,7 @@ bool BLSURFPlugin_BLSURF::compute(SMESH_Mesh&         aMesh,
   TopTools_IndexedMapOfShape pmap;
 
   // Issue 0019864. On DebianSarge, FE signals do not obey to OSD::SetSignal(false)
-#ifndef WNT
+#ifndef WIN32
   feclearexcept( FE_ALL_EXCEPT );
   int oldFEFlags = fedisableexcept( FE_ALL_EXCEPT );
 #endif
@@ -3075,7 +3075,7 @@ bool BLSURFPlugin_BLSURF::compute(SMESH_Mesh&         aMesh,
   }
 
   // Issue 0019864. On DebianSarge, FE signals do not obey to OSD::SetSignal(false)
-#ifndef WNT
+#ifndef WIN32
   if ( oldFEFlags > 0 )
     feenableexcept( oldFEFlags );
   feclearexcept( FE_ALL_EXCEPT );

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
index a142f949f2668e4e84cb8fac6ad5db9cae5f1221..444429ed99cf9ff1349188a960be968aec5c7204 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
@@ -1512,7 +1512,7 @@ void BLSURFPlugin_Hypothesis::SaveEdgesPeriodicity(std::ostream & save){
     for (; it_edges_periodicity != _edgesPeriodicityVector.end(); ++it_edges_periodicity) {
       TEdgePeriodicity periodicity_i = (*it_edges_periodicity);
       save << " " << "__BEGIN_PERIODICITY_DESCRIPTION__";
-      if (not periodicity_i.theFace1Entry.empty()){
+      if (! periodicity_i.theFace1Entry.empty()){
         save << " " << "__BEGIN_FACE1__";
         save << " " << periodicity_i.theFace1Entry;
         save << " " << "__END_FACE1__";
@@ -1520,7 +1520,7 @@ void BLSURFPlugin_Hypothesis::SaveEdgesPeriodicity(std::ostream & save){
       save << " " << "__BEGIN_EDGE1__";
       save << " " << periodicity_i.theEdge1Entry;
       save << " " << "__END_EDGE1__";
-      if (not periodicity_i.theFace2Entry.empty()){
+      if (! periodicity_i.theFace2Entry.empty()){
         save << " " << "__BEGIN_FACE2__";
         save << " " << periodicity_i.theFace2Entry;
         save << " " << "__END_FACE2__";

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
index ffb5b15c250b8e33ddacc9da692bb49b15bb412c..e3c0d79f5063ed0043ad5445c318653875ced973 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
@@ -2739,7 +2739,7 @@ BLSURFPlugin::TPeriodicityList* BLSURFPlugin_Hypothesis_i::PreCadVectorToSequenc
         myPreCadPeriodicity->shape2Entry = CORBA::string_dup(preCadPeriodicityVector_i.shape2Entry.c_str());
 
         BLSURFPlugin::TEntryList_var sourceVertices = new BLSURFPlugin::TEntryList();
-        if (not preCadPeriodicityVector_i.theSourceVerticesEntries.empty())
+        if (! preCadPeriodicityVector_i.theSourceVerticesEntries.empty())
           {
             sourceVertices->length(preCadPeriodicityVector_i.theSourceVerticesEntries.size());
             for (size_t j=0; j<preCadPeriodicityVector_i.theSourceVerticesEntries.size(); j++)
@@ -2749,7 +2749,7 @@ BLSURFPlugin::TPeriodicityList* BLSURFPlugin_Hypothesis_i::PreCadVectorToSequenc
         myPreCadPeriodicity->theSourceVerticesEntries = sourceVertices;
 
         BLSURFPlugin::TEntryList_var targetVertices = new BLSURFPlugin::TEntryList();
-        if (not preCadPeriodicityVector_i.theTargetVerticesEntries.empty())
+        if (! preCadPeriodicityVector_i.theTargetVerticesEntries.empty())
            {
             targetVertices->length(preCadPeriodicityVector_i.theTargetVerticesEntries.size());
              for (size_t j=0; j<preCadPeriodicityVector_i.theTargetVerticesEntries.size(); j++)

diff --git a/src/GUI/BLSURFPluginGUI.cxx b/src/GUI/BLSURFPluginGUI.cxx
index efbd62007b5ea716cc3e6fe56ff4f968717c2c67..eef88176ca6eabcba8701d75c7be71be8a7d4f59 100755 (executable)
--- a/src/GUI/BLSURFPluginGUI.cxx
+++ b/src/GUI/BLSURFPluginGUI.cxx
@@ -22,7 +22,7 @@
 // Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA)
 // ---
 //
-#ifdef WNT
+#ifdef WIN32
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index f4d0d3be993ea055e57ecd596ed03fb4fd850890..f79901e8155adebfcfebbb2575c5f921d0bfb88b 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -356,7 +356,7 @@ void EnforcedTreeWidgetDelegate::setModelData(QWidget *editor, QAbstractItemMode
   } else if (index.column() == ENF_VER_ENTRY_COLUMN) {
     QLineEdit *lineEdit = static_cast<QLineEdit*>(editor);
     QString value = lineEdit->text();
-    if (! vertexExists(model, index, value))
+    if (!vertexExists(model, index, value))
       model->setData(index, value, Qt::EditRole);
   } else if (index.column() == ENF_VER_GROUP_COLUMN) {
     QLineEdit *lineEdit = static_cast<QLineEdit*>(editor);
@@ -1569,7 +1569,7 @@ void BLSURFPluginGUI_HypothesisCreator::onAddPeriodicity() {
   int selSource = myPeriodicitySourceFaceWdg->NbObjects();
   int selTarget = myPeriodicityTargetFaceWdg->NbObjects();
 
-  if (selSource == 0 or selTarget == 0)
+  if (selSource == 0 || selTarget == 0)
     return;
 
   // Vertices selection
@@ -1582,7 +1582,7 @@ void BLSURFPluginGUI_HypothesisCreator::onAddPeriodicity() {
       int P2Tsel = myPeriodicityP2TargetWdg->NbObjects();
       int P3Tsel = myPeriodicityP3TargetWdg->NbObjects();
 
-      if (P1Ssel!=1 or P2Ssel!=1 or P3Ssel!=1 or P1Tsel!=1 or P3Tsel!=1 or P3Tsel!=1)
+      if (P1Ssel!=1 || P2Ssel!=1 || P3Ssel!=1 || P1Tsel!=1 || P3Tsel!=1 || P3Tsel!=1)
         {
           QString msg = tr("BLSURF_PERIODICITY_WRONG_NUMBER_OF_VERTICES");
           SUIT_MessageBox::critical( dlg(),"Error" , msg );
@@ -1610,7 +1610,7 @@ void BLSURFPluginGUI_HypothesisCreator::onAddPeriodicity() {
       shapeEntry = shape->GetStudyEntry();
       item->setData(k, Qt::EditRole, shapeName.c_str() );
       item->setData(k, Qt::UserRole, shapeEntry.c_str() );
-      if (not myPeriodicityGroupBox2->isChecked() and k==1)
+      if (! myPeriodicityGroupBox2->isChecked() && k==1)
         break;
     }
 
@@ -1651,7 +1651,7 @@ This method enable clears the field for periodicity by vertices
 */
 void BLSURFPluginGUI_HypothesisCreator::onPeriodicityByVerticesChecked(bool checked)
 {
-  if (not checked)
+  if (! checked)
     {
       for (size_t k=2; k<myPeriodicitySelectionWidgets.size(); k++)
         {
@@ -1697,7 +1697,7 @@ void BLSURFPluginGUI_HypothesisCreator::onPeriodicityTreeClicked(QTreeWidgetItem
 
       shapeName = item->data(k, Qt::EditRole).toString();
       shapeEntry = item->data(k, Qt::UserRole).toString();
-      if (not shapeEntry.isEmpty())
+      if (! shapeEntry.isEmpty())
         {
           shape = entryToObject(shapeEntry);
           w1->SetObject(shape);
@@ -1730,10 +1730,10 @@ void BLSURFPluginGUI_HypothesisCreator::onPeriodicityContentModified()
   for (; anIt != myPeriodicitySelectionWidgets.end(); anIt++, k++)
     {
       StdMeshersGUI_ObjectReferenceParamWdg * w1 = ( StdMeshersGUI_ObjectReferenceParamWdg* ) ( *anIt );
-      if (w1->IsSelectionActivated() and k<(myPeriodicitySelectionWidgets.size()-1))
+      if (w1->IsSelectionActivated() && k<(myPeriodicitySelectionWidgets.size()-1))
         {
           // don't activate vertex selection if the group box is not checked
-          if (k==1 and not myPeriodicityGroupBox2->isChecked())
+          if (k==1 && !myPeriodicityGroupBox2->isChecked())
             break;
           // clear the selection, to avoid to put the same object in the other widget
           that->getGeomSelectionTool()->selectionMgr()->clearSelected();
@@ -2394,7 +2394,7 @@ bool BLSURFPluginGUI_HypothesisCreator::storeParamsToHypo( const BlsurfHypothesi
       h->SetInternalEnforcedVertexAllFacesGroup( h_data.myInternalEnforcedVerticesAllFacesGroup.c_str() );
 
     // Periodicity
-    if ( h->GetPreCadFacesPeriodicityVector()->length() > 0 or h->GetPreCadEdgesPeriodicityVector()->length() > 0 )
+    if ( h->GetPreCadFacesPeriodicityVector()->length() > 0 || h->GetPreCadEdgesPeriodicityVector()->length() > 0 )
           h->ClearPreCadPeriodicityVectors();
 
     MESSAGE("h_data.preCadPeriodicityVector.size(): " << h_data.preCadPeriodicityVector.size());
@@ -2413,7 +2413,7 @@ bool BLSURFPluginGUI_HypothesisCreator::storeParamsToHypo( const BlsurfHypothesi
         bool onFace = (periodicity_i[PERIODICITY_SHAPE_TYPE]=="1") ? true : false;
 
         BLSURFPlugin::TEntryList_var sourceVertices = new BLSURFPlugin::TEntryList();
-        if (not p1Source.empty())
+        if (! p1Source.empty())
           {
             sourceVertices->length(3);
             sourceVertices[0]=CORBA::string_dup(p1Source.c_str());
@@ -2423,7 +2423,7 @@ bool BLSURFPluginGUI_HypothesisCreator::storeParamsToHypo( const BlsurfHypothesi
 
 
         BLSURFPlugin::TEntryList_var targetVertices = new BLSURFPlugin::TEntryList();
-        if (not p1Target.empty())
+        if (! p1Target.empty())
           {
             targetVertices->length(3);
             targetVertices[0]=CORBA::string_dup(p1Target.c_str());

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
index 6c6a407bececdd9391a12f78f58600f5cfdde6f3..743d0b5d6716b65dccd6c42dbb3f58b5acd95d2d 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
@@ -46,7 +46,7 @@
   #define BLSURFPLUGIN_GUI_EXPORT
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...