X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMeasureGUI%2FMeasureGUI_DistanceDlg.h;h=f679ac8080eed49e88ca5ca375942a040d88acc4;hb=21f352b21b086421921499bbc9b92e7c7e23ab70;hp=98d382f6f62dc6dee288ae0b48d35a2b652ecb28;hpb=a994aaae9fdb6be17cd155fb34058e401825d620;p=modules%2Fgeom.git

diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.h b/src/MeasureGUI/MeasureGUI_DistanceDlg.h
index 98d382f6f..f679ac808 100644
--- a/src/MeasureGUI/MeasureGUI_DistanceDlg.h
+++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.h
@@ -1,82 +1,71 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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.
 //
+// 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
 //
-//  File   : MeasureGUI_DistanceDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
 
-#ifndef DIALOGBOX_DISTANCE_H
-#define DIALOGBOX_DISTANCE_H
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_DistanceDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+//
+#ifndef MEASUREGUI_DISTANCEDLG_H
+#define MEASUREGUI_DISTANCEDLG_H
 
 #include "MeasureGUI_Skeleton.h"
 
-class MeasureGUI_2Sel1LineEdit_QTD;
+class MeasureGUI_2Sel4LineEdit;
 class gp_Pnt;
 
-#if defined WNT && defined MEASUREGUI_EXPORTS
-#define MEASUREGUI_EXPORT __declspec( dllexport )
-#else
-#define MEASUREGUI_EXPORT
-#endif
-
 //=================================================================================
 // class    : MeasureGUI_DistanceDlg
 // purpose  :
 //=================================================================================
-class MEASUREGUI_EXPORT MeasureGUI_DistanceDlg : public MeasureGUI_Skeleton
-{ 
-    Q_OBJECT
 
+class MeasureGUI_DistanceDlg : public MeasureGUI_Skeleton
+{ 
+  Q_OBJECT
+    
 public:
-                                        MeasureGUI_DistanceDlg( GeometryGUI* GUI,
-								QWidget*     parent );
-                                        ~MeasureGUI_DistanceDlg();
-protected:
+  MeasureGUI_DistanceDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_DistanceDlg();
 
-    // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
-    virtual void                        processObject();
-    virtual SALOME_Prs*                 buildPrs();
-    virtual void                        SelectionIntoArgument();
-    virtual void                        LineEditReturnPressed();
-    virtual void                        SetEditCurrentArgument();
-    virtual bool                        isValid( QString& msg );
+protected:
+  // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
+  virtual void                        processObject();
+  virtual SALOME_Prs*                 buildPrs();
+  virtual void                        SelectionIntoArgument();
+  virtual void                        LineEditReturnPressed();
+  virtual void                        SetEditCurrentArgument();
+  virtual bool                        isValid( QString& );
 
 private:
-
-    void                                Init();
-    bool                                getParameters( double& theDistance,
-                                                       gp_Pnt& thePnt1,
-                                                       gp_Pnt& thePnt2  );
+  void                                Init();
+  bool                                getParameters( double&,
+                                                     gp_Pnt&,
+                                                     gp_Pnt& );
 private:
-
-    QLineEdit*                          myEditCurrentArgument;
-    QLineEdit*                          mySelEdit2;
-    QPushButton*                        mySelBtn2;
-
-    MeasureGUI_2Sel1LineEdit_QTD*       myGrp;
-    GEOM::GEOM_Object_var               myObj2;
-
+  QLineEdit*                          myEditCurrentArgument;
+  QLineEdit*                          mySelEdit2;
+  QPushButton*                        mySelBtn2;
+  
+  MeasureGUI_2Sel4LineEdit*           myGrp;
+  GEOM::GEOM_Object_var               myObj2;
 };
 
-#endif // DIALOGBOX_DISTANCE_H
+#endif // MEASUREGUI_DISTANCEDLG_H