X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FCAF%2FCAF_Study.h;h=40e57995c649d3d07e7851ea4650885762b82ec4;hb=fc676e994a081937f71d310aeef85f9a301c0125;hp=fe47c5b0b9909b4c5538e955433c2ea9d707d38a;hpb=232b55569765049c7d1cceb5096a45f8584c9369;p=modules%2Fgui.git

diff --git a/src/CAF/CAF_Study.h b/src/CAF/CAF_Study.h
index fe47c5b0b..40e57995c 100755
--- a/src/CAF/CAF_Study.h
+++ b/src/CAF/CAF_Study.h
@@ -1,21 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
+// 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.
-// 
-// 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 CAF_STUDY_H
 #define CAF_STUDY_H
 
@@ -23,14 +27,12 @@
 
 #include "SUIT_Study.h"
 
-#include <qobject.h>
-
 #include <TDocStd_Document.hxx>
 #include <TDocStd_Application.hxx>
 
 class CAF_Application;
 
-#if defined WNT
+#if defined WIN32
 #pragma warning ( disable: 4251 )
 #endif
 
@@ -39,29 +41,29 @@ class CAF_EXPORT CAF_Study : public SUIT_Study
   Q_OBJECT
 
 public:
-	CAF_Study( SUIT_Application* theApp );
-	CAF_Study( SUIT_Application* theApp, Handle(TDocStd_Document)& aStdDoc );
-	virtual ~CAF_Study();
+  CAF_Study( SUIT_Application* theApp );
+  CAF_Study( SUIT_Application* theApp, Handle(TDocStd_Document)& aStdDoc );
+  virtual ~CAF_Study();
 
-  virtual void                createDocument();
+  virtual bool                createDocument( const QString& );
   virtual void                closeDocument( bool = true );
   virtual bool                openDocument( const QString& );
 
   virtual bool                saveDocumentAs( const QString& );
 
   bool                        isSaved() const;
-	bool                        isModified() const;
-	void                        doModified( bool = true );
-	void                        undoModified();
-	void                        clearModified();
-
+  bool                        isModified() const;
+  void                        doModified( bool = true );
+  void                        undoModified();
+  void                        clearModified();
+  
   bool                        undo();
-	bool                        redo();
-	bool                        canUndo() const;
-	bool                        canRedo() const;
-	QStringList                 undoNames() const;
-	QStringList                 redoNames() const;
-
+  bool                        redo();
+  bool                        canUndo() const;
+  bool                        canRedo() const;
+  QStringList                 undoNames() const;
+  QStringList                 redoNames() const;
+  
   Handle(TDocStd_Document)    stdDoc() const;
 
 protected:
@@ -71,18 +73,18 @@ protected:
   virtual bool                openTransaction();
   virtual bool                abortTransaction();
   virtual bool                hasTransaction() const;
-  virtual bool                commitTransaction( const QString& = QString::null );
+  virtual bool                commitTransaction( const QString& = QString() );
 
   virtual void                setStdDoc( Handle(TDocStd_Document)& );
 
 private:
-	Handle(TDocStd_Document)    myStdDoc;
-	int                         myModifiedCnt;
+  Handle(TDocStd_Document)    myStdDoc;
+  int                         myModifiedCnt;
 
   friend class CAF_Operation;
 };
 
-#if defined WNT
+#if defined WIN32
 #pragma warning ( default: 4251 )
 #endif