X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCAM%2FCAM_Study.h;h=a6c02d736e7506382992394225d69a39825d6949;hb=257308ab92a2ecccb38294bf15b690580d6cbebc;hp=06544269e9918a1dfc30e46aad369baaaa746b8f;hpb=aa05f2a1b23a54321ea7248ae9ac3463652c734e;p=modules%2Fgui.git

diff --git a/src/CAM/CAM_Study.h b/src/CAM/CAM_Study.h
index 06544269e..a6c02d736 100755
--- a/src/CAM/CAM_Study.h
+++ b/src/CAM/CAM_Study.h
@@ -1,62 +1,55 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
+// Copyright (C) 2007-2015  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.
-// 
-// 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 
+// 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 
+// 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef CAM_STUDY_H
 #define CAM_STUDY_H
 
 #include "CAM.h"
 
-#include "CAM_DataModel.h"
-
 #include <SUIT_Study.h>
+#include <QList>
 
-#include <qptrlist.h>
+class CAM_DataModel;
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
 #endif
 
-/*!
-  \class CAM_Study
-  Represents study for using in CAM, contains list of
-  data model references from all modules. Provides
-  necessary functionality for data models management.
-*/
 class CAM_EXPORT CAM_Study : public SUIT_Study
 {
   Q_OBJECT
 
 public:
-  typedef QPtrList<CAM_DataModel>         ModelList;
-  typedef QPtrListIterator<CAM_DataModel> ModelListIterator;
+  typedef QList<CAM_DataModel*> ModelList;
 
 public:
   CAM_Study( SUIT_Application* );
   virtual ~CAM_Study();
 
-  virtual void closeDocument(bool permanently = true);
+  virtual void closeDocument( bool permanently = true );
 
-  /** @name Insert data model methods.*/
-  //@{
   bool         appendDataModel( const CAM_DataModel* );
   virtual bool insertDataModel( const CAM_DataModel*, const int = -1 );
   bool         insertDataModel( const CAM_DataModel*, const CAM_DataModel* );
-  //@}
 
   virtual bool removeDataModel( const CAM_DataModel* );
 
@@ -73,8 +66,7 @@ protected slots:
   virtual void updateModelRoot( const CAM_DataModel* );
 
 private:
-  //! Data model list
-  ModelList    myDataModels;
+  ModelList    myDataModels;   //!< data models list
 };
 
 #ifdef WIN32