Updated copyright comment

[modules/hexablock.git] / src / HEXABLOCKGUI / HEXABLOCKGUI.hxx

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
old mode 100755 (executable)
new mode 100644 (file)
index e0c6e37..54fe883
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -26,6 +26,7 @@
 #include <map>
 #include <set>
 
+#include <QPointer>
 #include <QTreeView>
 #include <QModelIndex>
 #include <QDockWidget>
@@ -45,6 +46,7 @@
 #include "HEXABLOCKGUI_OCCSelector.h"
 #include "hexa_base.hxx"
 
+class QDir;
 
 // #include CORBA_CLIENT_HEADER(HEXABLOCK_Gen)  // Abu Juin 2013
 
@@ -135,7 +137,7 @@ public:
 
   // static HEXABLOCK_ORB::HEXABLOCK_Gen_ptr InitHEXABLOCKGen( SalomeApp_Application* );
   static LightApp_SelectionMgr*   selectionMgr();
-  static SALOMEDS::Study_var  ClientStudyToStudy (_PTR(Study) theStudy);
+  static SALOMEDS::Study_var  getStudyServant();
   static ViewType getActiveViewType();
   static HEXABLOCKGUI*  getInstance();
 
@@ -160,7 +162,6 @@ public:
   virtual void setResource(SUIT_ResourceMgr* r);
   virtual void createPreferences();
   virtual void preferencesChanged( const QString& sect, const QString& name );
-  virtual void studyActivated();
 
   ///Returns a new HEXA_NS::Document and it's entry in the study
   std::pair <QString, HEXA_NS::Document*> newHexaDocument();
@@ -246,7 +247,6 @@ protected:
   HEXABLOCK::GUI::VtkDocumentGraphicView* lastVtkDocGView;
 
   HEXABLOCKGUI_Resource* _myresource;
-  static int _oldStudyId;
   // static HEXABLOCK_ORB::HEXABLOCK_Gen_var _hexaEngine;  // Hexa6 TODo
 private slots:
 
@@ -343,7 +343,7 @@ private:
   QDockWidget *_dwAssociation;   // Hexablock association edition
   QDockWidget *_dwGroups;        // Hexablock groups edition
   QDockWidget *_dwMesh;          // Hexablock meshing edtion
-  QDockWidget *_dwObjectBrowser; // Salome study
+  QPointer<QDockWidget> _dwObjectBrowser; // Salome study
   QDockWidget *_dwInputPanel;    // user Input