From 98b126b2780a3b88301e678e0fca531c1de63424 Mon Sep 17 00:00:00 2001
From: DUC ANH HOANG <duc-anh-externe.hoang@edf.fr>
Date: Wed, 10 Mar 2021 13:26:29 +0100
Subject: [PATCH] Porting: ParaView 5.9, sip 5

---
 src/GraphicsView/GraphicsView_ViewFrame.h     |  1 +
 src/GraphicsView/GraphicsView_ViewPort.h      |  1 +
 src/PVViewer/PVViewer_GUIElements.cxx         |  2 +-
 src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip     | 20 +++++++++----------
 .../SalomePyQt/SalomePyQt_Plot2d.sip          |  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/GraphicsView/GraphicsView_ViewFrame.h b/src/GraphicsView/GraphicsView_ViewFrame.h
index a8507d3bf..ca26bbb0c 100644
--- 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 42e45895d..74bf6946d 100644
--- 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 384d36239..506a7b636 100644
--- 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 bc30e3450..05dff3e05 100644
--- 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 66e2af599..eb0962e36 100644
--- 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:
-- 
2.39.2