From: asl <asl@opencascade.com>
Date: Mon, 15 Jun 2015 09:14:15 +0000 (+0300)
Subject: porting on Linux
X-Git-Tag: v1.4.1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1e39a8e4fd2c131eddabb9c2208a1b4313f6f775;p=modules%2Fhydro.git

porting on Linux
---

diff --git a/src/HYDROData/shapelib/shapefil.h b/src/HYDROData/shapelib/shapefil.h
index 454e1e82..83aaf0d2 100644
--- 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 be424729..8ca26d1c 100644
--- 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 210ccf58..f343bbfc 100644
--- 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")
   {