X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshUtils.h;h=29338ece64a540cb954ebda7b2cd87540e319733;hb=cc935c7f604d28b6f9bb8f2e074fca925a608f36;hp=c7e93a0659ed8d1a0037d06cbb9492d703267167;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.h b/src/SMESHGUI/SMESHGUI_MeshUtils.h
index c7e93a065..29338ece6 100644
--- a/src/SMESHGUI/SMESHGUI_MeshUtils.h
+++ b/src/SMESHGUI/SMESHGUI_MeshUtils.h
@@ -1,42 +1,62 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
-#ifndef SMESHGUI_MeshUtils_HeaderFile
-#define SMESHGUI_MeshUtils_HeaderFile
+// SMESH SMESHGUI : GUI for SMESH component
+// File   : SMESHGUI_MeshUtils.h
+// Author : Open CASCADE S.A.S.
+//
+#ifndef SMESHGUI_MESHUTILS_H
+#define SMESHGUI_MESHUTILS_H
 
+// SMESH includes
 #include "SMESH_SMESHGUI.hxx"
 
-#include "SALOME_InteractiveObject.hxx"
+// Qt includes
+#include <QString>
 
-#include "SALOMEconfig.h"
-#include CORBA_SERVER_HEADER(SMESH_Mesh)
+// SALOME GUI includes
+#include <SALOME_InteractiveObject.hxx>
 
-#include <qstring.h>
+// SALOME KERNEL includes
+#include <SALOMEDSClient_definitions.hxx>
 
+// IDL includes
+#include <SALOMEconfig.h>
+#include CORBA_SERVER_HEADER(SMESH_Mesh)
+#include CORBA_SERVER_HEADER(SMESH_Measurements)
 
-namespace SMESH{
+class SALOMEDSClient_SObject;
 
-SMESHGUI_EXPORT
-  SMESH_Mesh_var GetMeshByIO(const Handle(SALOME_InteractiveObject)& theIO);
+namespace SMESH
+{
+  SMESHGUI_EXPORT
+    SMESH_Mesh_var GetMeshByIO( const Handle(SALOME_InteractiveObject)& );
+ 
+  SMESHGUI_EXPORT
+    QString        UniqueMeshName( const QString&, const QString& = QString() );
+  SMESHGUI_EXPORT
+    QString        UniqueName( const QString&, _PTR(SObject) = _PTR(SObject)(), const QString& = QString() );
 
-  QString UniqueMeshName(const char* theBaseName, const char* thePostfix);
+  SMESHGUI_EXPORT  SMESH::Measurements_var& GetMeasurements();
 }
 
-
-#endif
+#endif // SMESHGUI_MESHUTILS_H