From 877c946018944dbae9d307a784498e342dea797c Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 12 Nov 2015 11:02:37 +0300 Subject: [PATCH] porting on Linux --- src/HYDROData/HYDROData_Document.cxx | 3 +-- src/HYDROData/HYDROData_Document.h | 3 +-- src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx index 01180868..ae714b17 100644 --- a/src/HYDROData/HYDROData_Document.cxx +++ b/src/HYDROData/HYDROData_Document.cxx @@ -872,8 +872,7 @@ NCollection_Sequence HYDROData_Document::GetInterpolato return aNames; } -QColor HYDROData_Document::GetAssociatedColor(const QString& theStricklerType, - const Handle(HYDROData_StricklerTable)& theTable) +QColor HYDROData_Document::GetAssociatedColor( const QString& theStricklerType, const Handle(HYDROData_StricklerTable)& theTable ) const { if( !theTable.IsNull() && theTable->HasType( theStricklerType ) ) return theTable->GetColor( theStricklerType ); diff --git a/src/HYDROData/HYDROData_Document.h b/src/HYDROData/HYDROData_Document.h index 910e318f..3601a6b6 100644 --- a/src/HYDROData/HYDROData_Document.h +++ b/src/HYDROData/HYDROData_Document.h @@ -225,8 +225,7 @@ public: //! Sets default strickler coefficient HYDRODATA_EXPORT void SetDefaultStricklerCoefficient( double ) const; - HYDRODATA_EXPORT QColor HYDROData_Document::GetAssociatedColor(const QString& theStricklerType, - const Handle(HYDROData_StricklerTable)& theTable); + HYDRODATA_EXPORT QColor GetAssociatedColor( const QString& theStricklerType, const Handle(HYDROData_StricklerTable)& theTable ) const; protected: friend class HYDROData_Iterator; diff --git a/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx b/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx index 9cf8259f..d47a03a7 100644 --- a/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx @@ -266,7 +266,7 @@ void HYDROGUI_ImportLandCoverMapDlg::FillCorrespondenceTable(const QStringList& myCorrTableWidget->setHorizontalHeaderItem(0, aHeader_1); myCorrTableWidget->setHorizontalHeaderItem(1, aHeader_2); myCorrTableWidget->setHorizontalHeaderItem(2, aHeader_3); - myCorrTableWidget->horizontalHeader()->setResizeMode(QHeaderView::ResizeMode::ResizeToContents); + myCorrTableWidget->horizontalHeader()->setResizeMode( QHeaderView::ResizeToContents ); // for (int i = 0; i < aFCSize; i++) { -- 2.39.2