bos #41647 [CEA][Windows] bos #38044 breaks GEOM compilation

[modules/geom.git] / src / GEOMGUI / GeometryGUI.h

diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index 78a067a672c5620f859df1b4b765e2ede18fe955..65e44c08b61ac7ffd75cda9d0192affcc3b2ef93 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -29,8 +29,6 @@
 
 #include "GEOM_GEOMGUI.hxx"
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <SalomeApp_Module.h>
 
 #include <GEOM_Client.hxx>
@@ -74,7 +72,7 @@ class GEOMGUI_AnnotationMgr;
 //=================================================================================
 class  GEOMGUI_EXPORT GeometryGUI : public SalomeApp_Module
 {
-  Q_OBJECT;
+  Q_OBJECT
 
 public:
   // Constructor
@@ -87,14 +85,15 @@ public:
   virtual void                initialize( CAM_Application* );
   virtual QString             engineIOR() const;
 
-  static Handle(TColStd_HArray1OfByte) getTexture (SalomeApp_Study*, int, int&, int&);
+  static Handle(TColStd_HArray1OfByte) getTexture (int, int&, int&);
 
   static bool                 InitGeomGen();
 
-  static  GEOM::GEOM_Gen_var  GetGeomGen();
+  static GEOM::GEOM_Gen_var   GetGeomGen();
 
   static CORBA::Object_var    ClientSObjectToObject (_PTR(SObject) theSObject);
-  static SALOMEDS::Study_var  ClientStudyToStudy (_PTR(Study) theStudy);
+  static bool                 IsInGeomComponent( _PTR(SObject) theSObject );
+  static SALOMEDS::Study_var  getStudyServant();
 
   static void                 Modified( bool = true );
 
@@ -213,34 +212,30 @@ public:
 
 private:  
 
-  typedef QMap<long, Handle(TColStd_HArray1OfByte)> TextureMap;
-
-  typedef QMap<long, TextureMap> StudyTextureMap;
   typedef QMap<QString, GEOMGUI*> GUIMap;
 
   typedef QPair<QString, QString> PluginAction;
 
-  GUIMap                      myGUIMap;          // GUI libraries map
-  QDialog*                    myActiveDialogBox; // active dialog box
-  gp_Ax3                      myWorkingPlane;
-  //QMap<int,QString>           myRules;           // popup rules
-  static StudyTextureMap      myTextureMap;      // texture map
+  GUIMap                       myGUIMap;          // GUI libraries map
+  QDialog*                     myActiveDialogBox; // active dialog box
+  gp_Ax3                       myWorkingPlane;
+  //QMap<int,QString>          myRules;           // popup rules
 
-  QMap<int, PluginAction>      myPluginActions; // plugin actions
-  QMap<QString, QString>       myPluginLibs;    // plugin name to plugin client library
+  QMap<int, PluginAction>      myPluginActions;   // plugin actions
+  QMap<QString, QString>       myPluginLibs;      // plugin name to plugin client library
 
   QList<GEOMGUI_OCCSelector*>  myOCCSelectors;
   QList<LightApp_VTKSelector*> myVTKSelectors;
 
-  LightApp_Displayer*         myDisplayer;
-  int                         myLocalSelectionMode; //Select Only
+  LightApp_Displayer*          myDisplayer;
+  int                          myLocalSelectionMode; //Select Only
 
-  GEOMGUI_CreationInfoWdg*    myCreationInfoWdg;
+  GEOMGUI_CreationInfoWdg*     myCreationInfoWdg;
   
   GEOMGUI_TextTreeWdg*        myTextTreeWdg;
   GEOMGUI_AnnotationMgr*      myAnnotationMgr;
   
-  SALOME_ListIO               myTopLevelIOList;               
+  SALOME_ListIO                myTopLevelIOList;
 
   friend class DisplayGUI;
 };