From 1e39a8e4fd2c131eddabb9c2208a1b4313f6f775 Mon Sep 17 00:00:00 2001 From: asl Date: Mon, 15 Jun 2015 12:14:15 +0300 Subject: [PATCH] porting on Linux --- src/HYDROData/shapelib/shapefil.h | 2 +- src/HYDROGUI/HYDROGUI_CalculationOp.cxx | 6 ++++-- src/HYDROGUI/HYDROGUI_ImportPolylineOp.cxx | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) 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") { -- 2.39.2