[fix] After merge with BR_PY3

diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx
index da1e1e2ed50a9d86e28ba7191deb70886732471e..1d6f67c5146b8d95197d00f3adcf6550cbfbd8a2 100644 (file)
--- 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 78c0d9e32a6c8601e89a761e1b97b19007d7b694..f5924f129e6fc89a90984b65876ff4e3b55d9297 100644 (file)
--- 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 5f82cd21fc80a271bd8639cf9c1581f7f7986de5..7ee8ff1767747e19793e8b697461cbc1b3a2f475 100644 (file)
--- 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<int>& theIndices = QList<int>() );
- 
+
   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<int>& theIndices = QList<int>() );
 
   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<int>& theTypes ) const;
 
   HYDRODATA_EXPORT void ClassifyPoints( const std::vector<gp_XY>& thePoints,
-                                        const Handle(HYDROData_StricklerTable)& theTable, 
+                                        const Handle(HYDROData_StricklerTable)& theTable,
                                         std::vector<double>& 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 d767ede7954c277b68a48578bff0091fc81551c1..7972e4df4781ba34252e76f100e468bd93a9f374 100755 (executable)
--- 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 b5c0f6303cf6acf052ddd53ebf0f00e26f2a27ac..e2c3da60fd229dcb47ebf3bb0fceee3e00ee8c81 100644 (file)
--- 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 <LightApp_Application.h>
 #include <LightApp_OBSelector.h>

diff --git a/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx b/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx
index 9efd47aef09a2324998384e2651eb5b5655369b5..571d9e1b0c373d418b93aaa0ea67c01b052d68ec 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportLandCoverMapDlg.cxx
@@ -29,7 +29,6 @@
 #include <SUIT_Session.h>
 #include <SUIT_FileDlg.h>
 #include <HYDROGUI_Module.h>
-#include <HYDROGUI_Tool.h>
 #include <SUIT_MessageBox.h>
 #include <LightApp_Application.h>
 #include <QTableWidget>

diff --git a/src/HYDROGUI/HYDROGUI_ListModel.cxx b/src/HYDROGUI/HYDROGUI_ListModel.cxx
index 280814ffe3639994c6c28b74c776f560fc4d1b6a..fbcdb1aeaad256375022baf3bac970332d9343e9 100644 (file)
--- 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 89b43870cbb229278095cc16252fac39171cafa7..9f4da8129c2a038d20fd8a284bc3faee10373c70 100644 (file)
--- 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 825cbc91cb55d0ba006251584ff5aac59ab4f6b8..e2a5eb46f9a56bb4f132ef0ce58257154f833f3e 100644 (file)
--- 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 <SUIT_MessageBox.h>

diff --git a/src/HYDROGUI/HYDROGUI_Tool.cxx b/src/HYDROGUI/HYDROGUI_Tool.cxx
index 5ff2052c8d0540c70cc62583d42cf1d1b047b871..cf7f4f36325a408998104bf647fa83a929a57eff 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Tool.cxx
+++ b/src/HYDROGUI/HYDROGUI_Tool.cxx
@@ -32,7 +32,6 @@
 #include <QStringList>
 #include <QTextCodec>
 #include <QWidget>
-#include <QHeaderView>
 
 // 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 2fe2d9a3daac22b8c1ca39be30d6ef4b7aaaa5ac..7ff3767fe4aa90bcd83353ec1e6352aa5c78a000 100644 (file)
--- 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 0833eb5eddc067ebf305864b393183df5a1fa086..2aedac541dd36ceb3d6e087e28ef6618fbe9ef29 100644 (file)
--- 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.