X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPluginUtils%2FGeomSelectionTools.h;h=6228f3492654f442c510898f8ca16132ca6a2698;hb=ea6d39162cc87522ef869b97a6b4be8bd41776d5;hp=3704861a0d4d54720fa469454c5e896a3d801f16;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git

diff --git a/src/PluginUtils/GeomSelectionTools.h b/src/PluginUtils/GeomSelectionTools.h
index 3704861a0..6228f3492 100644
--- a/src/PluginUtils/GeomSelectionTools.h
+++ b/src/PluginUtils/GeomSelectionTools.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,18 +25,10 @@
 #ifndef _GEOMSELECTIONTOOLS_H_
 #define _GEOMSELECTIONTOOLS_H_
 
-#ifdef WIN32
-#  ifdef GeomSelectionTools_EXPORTS
-#    define GEOMSELECTIONTOOLS_EXPORT __declspec( dllexport )
-#  else
-#    define GEOMSELECTIONTOOLS_EXPORT __declspec( dllimport )
-#  endif
-#else
-#  define GEOMSELECTIONTOOLS_EXPORT
-#endif
+#include "SMESH_PluginUtils.h"
 
-#include "SALOMEDSClient.hxx"
-#include "SALOME_InteractiveObject.hxx"
+#include <SALOMEDSClient.hxx>
+#include <SALOME_InteractiveObject.hxx>
 #include <SALOME_ListIO.hxx>
 #include <SalomeApp_Application.h>
 
@@ -54,28 +46,23 @@ class LightApp_SelectionMgr;
  *
  */
 
-class GEOMSELECTIONTOOLS_EXPORT GeomSelectionTools
+class PLUGINUTILS_EXPORT GeomSelectionTools
 {
 
-private:
-
-  _PTR(Study) myStudy;
-
 public:
 
-  GeomSelectionTools(_PTR(Study));
+  GeomSelectionTools();
   static SalomeApp_Application*  GetSalomeApplication();
   static LightApp_SelectionMgr* selectionMgr();
   SALOME_ListIO* getSelectedSalomeObjects();
   Handle(SALOME_InteractiveObject) getFirstSelectedSalomeObject();
   std::string getFirstSelectedEntry();
   std::string getEntryOfObject(Handle(SALOME_InteractiveObject));
-  std::string getNameFromEntry(std::string);
+  std::string getNameFromEntry(const std::string& );
   std::string getFirstSelectedComponentDataType();
   TopAbs_ShapeEnum getFirstSelectedShapeType();
-  TopAbs_ShapeEnum entryToShapeType(std::string );
+  TopAbs_ShapeEnum entryToShapeType(const std::string& );
   GeomAbs_SurfaceType getFaceInformation(TopoDS_Shape);
-  _PTR(Study) getMyStudy();
 };
 
 //////////////////////////////////////////
@@ -84,7 +71,7 @@ public:
 
 namespace PluginUtils
 {
-  GEOMSELECTIONTOOLS_EXPORT QString PrintDoubleValue( double, int = 16 );
+  PLUGINUTILS_EXPORT QString PrintDoubleValue( double, int = 16 );
 };
 
 #endif // _GEOMSELECTIONTOOLS_H_