Merge from V6_main_20120808 08Aug12

[modules/geom.git] / src / TransformationGUI / TransformationGUI_PositionDlg.h

diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.h b/src/TransformationGUI/TransformationGUI_PositionDlg.h
index a48959b929dd39a20ca8fb60de961bbf1afb84f9..1cfa81705115c103bf0a5a1254201ce2f2a9edb0 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_PositionDlg.h
+++ b/src/TransformationGUI/TransformationGUI_PositionDlg.h
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// 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 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : TransformationGUI_PositionDlg.h
 // Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
@@ -26,7 +27,8 @@
 #ifndef TRANSFORMATIONGUI_POSITIONDLG_H
 #define TRANSFORMATIONGUI_POSITIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
+#include "GEOM_GenericObjPtr.h"
 
 class DlgRef_4Sel1Spin3Check;
 
@@ -40,7 +42,7 @@ class TransformationGUI_PositionDlg : public GEOMBase_Skeleton
 
 public:
   TransformationGUI_PositionDlg( GeometryGUI*, QWidget* = 0,
-                                bool = false, Qt::WindowFlags = 0 );
+                                 bool = false, Qt::WindowFlags = 0 );
   ~TransformationGUI_PositionDlg();
   
 protected:
@@ -56,10 +58,10 @@ private:
   void                               enterEvent( QEvent* );
     
 private:
-  GEOM::GEOM_Object_var              myStartLCS;
-  GEOM::GEOM_Object_var              myEndLCS;
-  GEOM::ListOfGO                     myObjects;
-  GEOM::GEOM_Object_var              myPath;
+  GEOM::GeomObjPtr                   myStartLCS;
+  GEOM::GeomObjPtr                   myEndLCS;
+  QList<GEOM::GeomObjPtr>            myObjects;
+  GEOM::GeomObjPtr                   myPath;
 
   // to initialize the first selection field with a selected object on the dialog creation
   bool                               myInitial;
@@ -70,11 +72,10 @@ private slots:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
-  void                               LineEditReturnPressed();
   void                               SelectionIntoArgument();
   void                               SetEditCurrentArgument();
   void                               ConstructorsClicked( int );
-  void                               CreateCopyModeChanged( bool );
+  void                               CreateCopyModeChanged();
   void                               ValueChangedInSpinBox();
   void                               SelectionTypeButtonClicked();
 };