Copyright update 2022

[modules/paravis.git] / src / PVGUI / PVGUI_Module.h

diff --git a/src/PVGUI/PVGUI_Module.h b/src/PVGUI/PVGUI_Module.h
index fec7261981b6167685f2ca14a63ccf1096675327..4715c0a9e1b1cb61782a834fd6a05493c0cbd20c 100644 (file)
--- a/src/PVGUI/PVGUI_Module.h
+++ b/src/PVGUI/PVGUI_Module.h
@@ -1,6 +1,6 @@
 // PARAVIS : ParaView wrapper SALOME module
 //
-// Copyright (C) 2010-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2010-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@ class pqServer;
 class pqPythonScriptEditor;
 class pqPVApplicationCore;
 class PVViewer_GUIElements;
-class PVViewer_EngineWrapper;
+class PVServer_ServiceWrapper;
 class SUIT_ViewWindow;
 
 class PVGUI_Module: public LightApp_Module
@@ -102,7 +102,6 @@ class PVGUI_Module: public LightApp_Module
     MaxWindowSizeId,
     CustomWindowSizeId,
     TimerLogId,
-    OutputWindowId,
     PythonShellId,
     ShowTraceId,
     RestartTraceId,
@@ -122,8 +121,9 @@ public:
 
   void openFile( const char* );                   // not used inside PARAVIS
   void executeScript( const char* );              // not used inside PARAVIS
-  void saveParaviewState( const char* );          // not used inside PARAVIS
-  void loadParaviewState( const char* );          // not used inside PARAVIS
+
+  void saveParaviewState( const QString& );
+  void loadParaviewState( const QString& );
   void clearParaviewState();
 
   QString getTraceString();
@@ -135,7 +135,7 @@ public:
 
   virtual void createPreferences();
 
-  inline static PVViewer_EngineWrapper* GetEngine();
+  inline static PVServer_ServiceWrapper* GetEngine();
   inline static pqPVApplicationCore* GetPVApplication(); // not used inside PARAVIS
 
   virtual CAM_DataModel* createDataModel();
@@ -187,6 +187,7 @@ private slots:
   void onEndProgress();
   void onShowTrace();
   void onRestartTrace();
+  void onStopTrace();
 
 public slots:
   virtual bool           activateModule( SUIT_Study* );
@@ -206,6 +207,7 @@ private:
   int                    myFiltersMenuId;
   int                    myMacrosMenuId;
   int                    myRecentMenuId;
+  int                    myCatalystMenuId;
   
   typedef QMap<QWidget*, bool> WgMap;
   WgMap                  myDockWidgets;
@@ -215,8 +217,7 @@ private:
 
   typedef QMap<int, bool> DockWindowMap;         
   DockWindowMap           myCommonMap; 
-
-  QtMsgHandler            myOldMsgHandler;
+  QtMessageHandler        myOldMsgHandler;
 
   vtkEventQtSlotConnect*  VTKConnect;