Porting: ParaView 5.9, sip 5

diff --git a/src/GraphicsView/GraphicsView_ViewFrame.h b/src/GraphicsView/GraphicsView_ViewFrame.h
index a8507d3bf54e4affd6e479113426c711065462f4..ca26bbb0c0a34a64c13e03edeb406b865a40f0e7 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewFrame.h
+++ b/src/GraphicsView/GraphicsView_ViewFrame.h
@@ -23,6 +23,7 @@
 #include "GraphicsView.h"
 
 #include <SUIT_ViewWindow.h>
+#include <QPainterPath>
 
 class QGraphicsSceneContextMenuEvent;
 class QGraphicsSceneMouseEvent;

diff --git a/src/GraphicsView/GraphicsView_ViewPort.h b/src/GraphicsView/GraphicsView_ViewPort.h
index 42e45895da11a1e8e8f26d3b83aacbfbbb455451..74bf6946dd2b8699a5c54c1b14345f9cd1b3d123 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewPort.h
+++ b/src/GraphicsView/GraphicsView_ViewPort.h
@@ -25,6 +25,7 @@
 #include "GraphicsView_Defs.h"
 
 #include <QGraphicsView>
+#include <QPainterPath>
 
 class QGridLayout;
 class QRubberBand;

diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
index 384d362393e56a3497ceb10e9f07ae2965de6ca3..506a7b6369b7f22b4a40157d911c9cb69b2a07ed 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -143,7 +143,7 @@ void PVViewer_GUIElements::buildPVWidgets()
     // Catalyst Menu
     if (!catalystMenu) {
       catalystMenu = new QMenu(0);
-#if PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR>=6
+#if PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR<9
       pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu, myDesktop);
 #else
       pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu);

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
index bc30e3450af4aaf21e452ef6d5553917388bbccd..05dff3e05e2d0d6ab377756432cc33252888256b 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
@@ -130,9 +130,9 @@ class QtxAction : QWidgetAction
 
 %ConvertToSubClassCode
     if ( qobject_cast<QtxAction*>( sipCpp ) )
-      sipClass = sipClass_QtxAction;
+      sipType = sipType_QtxAction;
     else
-      sipClass = NULL;
+      sipType = NULL;
 %End
 
 public:
@@ -153,9 +153,9 @@ class QtxActionSet : QtxAction
 
 %ConvertToSubClassCode
     if ( qobject_cast<QtxActionSet*>( sipCpp ) )
-      sipClass = sipClass_QtxActionSet;
+      sipType = sipType_QtxActionSet;
     else
-      sipClass = NULL;
+      sipType = NULL;
 %End
 
 public:
@@ -192,9 +192,9 @@ class QtxActionGroup : QtxActionSet
 
 %ConvertToSubClassCode
     if ( qobject_cast<QtxActionGroup*>( sipCpp ) )
-      sipClass = sipClass_QtxActionGroup;
+      sipType = sipType_QtxActionGroup;
     else
-      sipClass = NULL;
+      sipType = NULL;
 %End
 
 public:
@@ -226,9 +226,9 @@ class QtxTreeView : public QTreeView
 
 %ConvertToSubClassCode
     if ( qobject_cast<QtxTreeView*>( sipCpp ) )
-      sipClass = sipClass_QtxTreeView;
+      sipType = sipType_QtxTreeView;
     else
-      sipClass = NULL;
+      sipType = NULL;
 %End
 
 public:
@@ -252,9 +252,9 @@ class UserDefinedContent : public QWidget
 
 %ConvertToSubClassCode
     if ( qobject_cast<UserDefinedContent*>( sipCpp ) )
-      sipClass = sipClass_UserDefinedContent;
+      sipType = sipType_UserDefinedContent;
     else
-      sipClass = NULL;
+      sipType = NULL;
 %End
 
 public:

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip
index 66e2af5992d422f97061c4beb10d6076a8fc9c8f..eb0962e3675728e3f8c939b392b55d66f878e37d 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip
@@ -55,9 +55,9 @@ class Plot2d_Curve
 
 %ConvertToSubClassCode
     if ( dynamic_cast<Plot2d_Curve*>( sipCpp ) )
-      sipClass = sipClass_Plot2d_Curve;
+      sipType = sipType_Plot2d_Curve;
     else
-      sipClass = NULL;
+      sipType = NULL;
 %End
 
 public: