Merge branch 'BR_LAND_COVER_MAP' of ssh://gitolite3@git.salome-platform.org/modules...

diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx
index 011808682c7ee7ac9010546e52b7a91ca4acfe71..ae714b1711df2aa8bfe97d4eaa02558813e14098 100644 (file)
--- a/src/HYDROData/HYDROData_Document.cxx
+++ b/src/HYDROData/HYDROData_Document.cxx
@@ -872,8 +872,7 @@ NCollection_Sequence<TCollection_AsciiString> 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 910e318fdacc4622e9e8fb555bb1290a58e00134..3601a6b6a0bc9860f52c41034303974c1c381a18 100644 (file)
--- 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 9cf8259fd27839c2040c0bfa73879988fe82d0c2..d47a03a71c63f57c52a1eec0f3cef162819d27f8 100644 (file)
--- 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++)
   {