porting on Linux

diff --git a/src/HYDROData/shapelib/shapefil.h b/src/HYDROData/shapelib/shapefil.h
index 454e1e8217d23f1c59fe09fb4c2d3da585d19c02..83aaf0d27ae0d2c2278653b4cb3d1e021d34ddc7 100644 (file)
--- a/src/HYDROData/shapelib/shapefil.h
+++ b/src/HYDROData/shapelib/shapefil.h
@@ -196,7 +196,7 @@ extern "C" {
 /*      __declspec(dllexport) must appear before them.                  */
 /* -------------------------------------------------------------------- */
 
-#define SHAPELIB_DLLEXPORT 1
+//#define SHAPELIB_DLLEXPORT 1
 
 #ifdef SHAPELIB_DLLEXPORT
 #  define SHPAPI_CALL __declspec(dllexport)

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index be424729bcabfd453be0b79ac0b5de76b01d7074..8ca26d1c48ff4c0df1caa6a6d667cfb72cb40d43 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -1213,8 +1213,10 @@ void HYDROGUI_CalculationOp::createPreview()
 {
   LightApp_Application* anApp = module()->getApp();
   HYDROData_SequenceOfObjects aSeq;
-  if ( myShowGeomObjects ) {
-    aSeq.Append( myEditedObject->GetGeometryObjects() );
+  if ( myShowGeomObjects )
+  {
+    HYDROData_SequenceOfObjects aGeomObj = myEditedObject->GetGeometryObjects();
+    aSeq.Append( aGeomObj );
   }
   Handle(HYDROData_Entity) anEntity;
 

diff --git a/src/HYDROGUI/HYDROGUI_ImportPolylineOp.cxx b/src/HYDROGUI/HYDROGUI_ImportPolylineOp.cxx
index 210ccf587af15d6c3465bcce95a49bd843a1a8cb..f343bbfc4e09931e16eaf1445b43451b07e29237 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportPolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportPolylineOp.cxx
@@ -84,7 +84,7 @@ void HYDROGUI_ImportPolylineOp::onApply()
     return;
   }
 
-  QString anExt = aFileName.split('.', QString::SplitBehavior::SkipEmptyParts).back();
+  QString anExt = aFileName.split('.', QString::SkipEmptyParts).back();
 
   if (anExt == "shp")
   {