From 31500f5502df7fc9d0f6e47d58412967b252454c Mon Sep 17 00:00:00 2001 From: Yoann AUDOUIN Date: Tue, 3 Mar 2020 10:49:46 +0100 Subject: [PATCH] [fix] After merge with BR_PY3 --- src/HYDROData/HYDROData_Entity.cxx | 2 +- src/HYDROData/HYDROData_Entity.h | 2 +- src/HYDROData/HYDROData_LandCoverMap.h | 15 +++++++-------- src/HYDROGUI/CMakeLists.txt | 6 +----- src/HYDROGUI/HYDROGUI_DataBrowser.cxx | 1 - .../HYDROGUI_ImportLandCoverMapDlg.cxx | 1 - src/HYDROGUI/HYDROGUI_ListModel.cxx | 1 - src/HYDROGUI/HYDROGUI_ListModel.h | 5 ++--- src/HYDROGUI/HYDROGUI_PriorityWidget.cxx | 3 ++- src/HYDROGUI/HYDROGUI_Tool.cxx | 18 ------------------ src/HYDROGUI/HYDROGUI_Tool.h | 1 - src/HYDROPy/HYDROData_Entity.sip | 2 +- 12 files changed, 15 insertions(+), 42 deletions(-) diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx index da1e1e2e..1d6f67c5 100644 --- a/src/HYDROData/HYDROData_Entity.cxx +++ b/src/HYDROData/HYDROData_Entity.cxx @@ -406,7 +406,7 @@ bool HYDROData_Entity::GetZLevel( Standard_Integer& theLevel ) const return false; } -void HYDROData_Entity::SetZLevel( int theLevel ) +void HYDROData_Entity::SetZLevel( const Standard_Integer& theLevel ) { Handle(TDataStd_Integer) A = TDataStd_Integer::Set( myLab.FindChild( DataTag_ZLevel ), theLevel ); A->SetID(TDataStd_Integer::GetID()); diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h index 78c0d9e3..f5924f12 100644 --- a/src/HYDROData/HYDROData_Entity.h +++ b/src/HYDROData/HYDROData_Entity.h @@ -261,7 +261,7 @@ public: /** * Set the z-level for object presentation. */ - HYDRODATA_EXPORT virtual void SetZLevel( int theLevel ); + HYDRODATA_EXPORT virtual void SetZLevel( const Standard_Integer& theLevel ); /** * Remove the z-level of object presentation. diff --git a/src/HYDROData/HYDROData_LandCoverMap.h b/src/HYDROData/HYDROData_LandCoverMap.h index 5f82cd21..7ee8ff17 100644 --- a/src/HYDROData/HYDROData_LandCoverMap.h +++ b/src/HYDROData/HYDROData_LandCoverMap.h @@ -64,7 +64,7 @@ public: void Init( const HYDROData_LandCoverMap& ); HYDRODATA_EXPORT bool More() const; HYDRODATA_EXPORT void Next(); - + int Index() const; HYDRODATA_EXPORT TopoDS_Face Face() const; HYDRODATA_EXPORT QString StricklerType() const; @@ -92,17 +92,17 @@ public: HYDRODATA_EXPORT bool ImportSHP( const QString& theSHPFileName, const QList& theIndices = QList() ); - + HYDRODATA_EXPORT bool ExportSHP( const QString& theSHPFileName, bool bUseDiscr = false, double theDefl = 0.1) const; - HYDRODATA_EXPORT DBFStatus ImportDBF( const QString& theDBFFileName, - const QString& theFieldName, + HYDRODATA_EXPORT DBFStatus ImportDBF( const QString& theDBFFileName, + const QString& theFieldName, const QStringList& DBFValues, const QStringList& StricklerTypes, const QList& theIndices = QList() ); HYDRODATA_EXPORT void ExportDBF( const QString& theDBFFileName, - const QString& theFieldName, + const QString& theFieldName, const QStringList& theDBFValues, const QStringList& theStricklerTypes ) const; @@ -117,7 +117,6 @@ public: using HYDROData_Entity::Remove; HYDRODATA_EXPORT bool Remove( const TopoDS_Face& ); HYDRODATA_EXPORT bool Remove( const TopTools_ListOfShape& ); - using HYDROData_Entity::Remove; HYDRODATA_EXPORT bool Split( const Handle( HYDROData_PolylineXY )& ); HYDRODATA_EXPORT bool Split( const TopoDS_Shape& ); @@ -158,7 +157,7 @@ public: std::vector& theTypes ) const; HYDRODATA_EXPORT void ClassifyPoints( const std::vector& thePoints, - const Handle(HYDROData_StricklerTable)& theTable, + const Handle(HYDROData_StricklerTable)& theTable, std::vector& theCoeffs, double DefValue, bool UseMax ) const; protected: @@ -170,7 +169,7 @@ protected: static TopoDS_Shape MergeFaces(const TopTools_ListOfShape& theFaces, bool IsToUnify, - TopTools_IndexedDataMapOfShapeListOfShape* theShHistory = NULL, + TopTools_IndexedDataMapOfShapeListOfShape* theShHistory = NULL, double theTolerance = 1E-5 ); public: diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt index d767ede7..7972e4df 100755 --- a/src/HYDROGUI/CMakeLists.txt +++ b/src/HYDROGUI/CMakeLists.txt @@ -373,11 +373,7 @@ set(GUITS_SOURCES #include(../../CMake/CommonInstall.cmake) # resources -IF (SalomeGUI_VERSION VERSION_LESS "8.0.0") - QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${SALOME_HYDRO_INSTALL_RES_DATA}") -ELSE() - QT_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${SALOME_HYDRO_INSTALL_RES_DATA}") -ENDIF() +QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${SALOME_HYDRO_INSTALL_RES_DATA}") FILE(GLOB GUIPNG_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png") FILE(GLOB GUIXML_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.xml") diff --git a/src/HYDROGUI/HYDROGUI_DataBrowser.cxx b/src/HYDROGUI/HYDROGUI_DataBrowser.cxx index b5c0f630..e2c3da60 100644 --- a/src/HYDROGUI/HYDROGUI_DataBrowser.cxx +++ b/src/HYDROGUI/HYDROGUI_DataBrowser.cxx @@ -19,7 +19,6 @@ #include "HYDROGUI_DataBrowser.h" #include "HYDROGUI_Module.h" #include "HYDROGUI_DataObject.h" -#include "HYDROGUI_Tool.h" #include #include diff --git a/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx b/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx index 9efd47ae..571d9e1b 100644 --- a/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/src/HYDROGUI/HYDROGUI_ListModel.cxx b/src/HYDROGUI/HYDROGUI_ListModel.cxx index 280814ff..fbcdb1ae 100644 --- a/src/HYDROGUI/HYDROGUI_ListModel.cxx +++ b/src/HYDROGUI/HYDROGUI_ListModel.cxx @@ -190,7 +190,6 @@ void HYDROGUI_ListModel::addObject( const Object2Visible& theObject ) */ void HYDROGUI_ListModel::removeObjectByName( const QString& theObjectName ) { - beginResetModel(); Object2Visible anItem; foreach( anItem, myObjects ) { if ( anItem.first->GetName() == theObjectName ) { diff --git a/src/HYDROGUI/HYDROGUI_ListModel.h b/src/HYDROGUI/HYDROGUI_ListModel.h index 89b43870..9f4da812 100644 --- a/src/HYDROGUI/HYDROGUI_ListModel.h +++ b/src/HYDROGUI/HYDROGUI_ListModel.h @@ -29,7 +29,7 @@ const int HYDROGUI_VisibleRole = Qt::UserRole + 1; const int HYDROGUI_EntryRole = Qt::UserRole + 2; -/** +/** * \class HYDROGUI_ListModel * \brief The class representing custom list model for the Z levels */ @@ -46,7 +46,7 @@ public: HYDROGUI_ListModel( QObject* theParent = 0 ); virtual ~HYDROGUI_ListModel(); - virtual QVariant data( const QModelIndex &theIndex, int theRole = Qt::DisplayRole ) const; + virtual QVariant data( const QModelIndex &theIndex, int theRole = Qt::DisplayRole ) const; virtual int rowCount( const QModelIndex &theParent = QModelIndex() ) const; @@ -58,7 +58,6 @@ public: virtual QStringList mimeTypes() const; virtual bool dropMimeData( const QMimeData* theData, Qt::DropAction theAction, int theRow, int theColumn, const QModelIndex& theParent ); - virtual Qt::DropActions supportedDragActions() const; virtual Qt::DropActions supportedDropActions() const; virtual Qt::DropActions supportedDragActions() const; diff --git a/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx b/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx index 825cbc91..e2a5eb46 100644 --- a/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx +++ b/src/HYDROGUI/HYDROGUI_PriorityWidget.cxx @@ -17,8 +17,9 @@ // #include "HYDROGUI_PriorityWidget.h" + #include "HYDROGUI_PriorityTableModel.h" -#include "HYDROGUI_Tool.h" + #include "HYDROData_PriorityQueue.h" #include diff --git a/src/HYDROGUI/HYDROGUI_Tool.cxx b/src/HYDROGUI/HYDROGUI_Tool.cxx index 5ff2052c..cf7f4f36 100644 --- a/src/HYDROGUI/HYDROGUI_Tool.cxx +++ b/src/HYDROGUI/HYDROGUI_Tool.cxx @@ -32,7 +32,6 @@ #include #include #include -#include // Definition of this id allows to use 'latin1' (Qt alias for 'ISO-8859-1') // encoding instead of default 'System' @@ -340,20 +339,3 @@ Handle(Image_PixMap) HYDROGUI_Tool::Pixmap( const QImage& theImage ) return pix; } -void HYDROGUI_Tool::setResizeMode( QHeaderView* theHeader, int theSection, int theMode ) -{ -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - theHeader->setResizeMode( theSection, (QHeaderView::ResizeMode)theMode ); -#else - theHeader->setSectionResizeMode( theSection, (QHeaderView::ResizeMode)theMode ); -#endif -} - -void HYDROGUI_Tool::setResizeMode( QHeaderView* theHeader, int theMode ) -{ -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - theHeader->setResizeMode( (QHeaderView::ResizeMode)theMode ); -#else - theHeader->setSectionResizeMode( (QHeaderView::ResizeMode)theMode ); -#endif -} diff --git a/src/HYDROGUI/HYDROGUI_Tool.h b/src/HYDROGUI/HYDROGUI_Tool.h index 2fe2d9a3..7ff3767f 100644 --- a/src/HYDROGUI/HYDROGUI_Tool.h +++ b/src/HYDROGUI/HYDROGUI_Tool.h @@ -30,7 +30,6 @@ class TCollection_HExtendedString; class QDockWidget; class QImage; class QWidget; -class QHeaderView; namespace HYDROGUI_Tool { diff --git a/src/HYDROPy/HYDROData_Entity.sip b/src/HYDROPy/HYDROData_Entity.sip index 0833eb5e..2aedac54 100644 --- a/src/HYDROPy/HYDROData_Entity.sip +++ b/src/HYDROPy/HYDROData_Entity.sip @@ -254,7 +254,7 @@ public: /** * Set the z-level for object presentation. */ - virtual void SetZLevel( int theLevel ); + virtual void SetZLevel( const int& theLevel ) [void ( const Standard_Integer& )]; /** * Remove the z-level of object presentation. -- 2.39.2