Merge from V6_main 11/02/2013

[modules/gui.git] / src / CAF / CAF_Application.h

diff --git a/src/CAF/CAF_Application.h b/src/CAF/CAF_Application.h
index 8f73004598e8e55ac4a00dd3931ecda82d9c401f..c0264d4236fa4665f86bafc3926e836d52862fb2 100755 (executable)
--- a/src/CAF/CAF_Application.h
+++ b/src/CAF/CAF_Application.h
@@ -1,3 +1,25 @@
+// 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
+//
+// 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
+//
+
 #ifndef CAF_APPLICATION_H
 #define CAF_APPLICATION_H
 
@@ -5,10 +27,8 @@
 
 #include "STD_Application.h"
 
-#include <qmap.h>
-#include <qptrlist.h>
+#include <TDocStd_Application.hxx>
 
-class QtxAction;
 class CAF_Study;
 
 #if defined WIN32
@@ -21,28 +41,38 @@ class CAF_EXPORT CAF_Application : public STD_Application
 
 public:
   CAF_Application();
+  CAF_Application( const Handle(TDocStd_Application)& );
   virtual ~CAF_Application();
 
-  virtual QString     applicationName() const;
+  virtual QString             applicationName() const;
+
+  Handle(TDocStd_Application) stdApp() const;
+
+  virtual QString             getFileFilter() const;
 
 public slots:  
-  virtual void        onHelpAbout();
+  virtual void                onHelpAbout();
 
 protected slots:
-  virtual bool        onUndo( int );
-  virtual bool        onRedo( int );
+  virtual bool                onUndo( int );
+  virtual bool                onRedo( int );
   
 protected:
   enum {  EditUndoId = STD_Application::UserID, EditRedoId, UserID };
 
 protected:
-  virtual void        createActions();
-  virtual void        updateCommandsStatus();
+  virtual void                createActions();
+  virtual void                updateCommandsStatus();
+
+  virtual SUIT_Study*         createNewStudy();
+
+  bool                        undo( CAF_Study* doc );
+  bool                        redo( CAF_Study* doc );
 
-  virtual SUIT_Study* createNewStudy();
+  virtual void                setStdApp( const Handle(TDocStd_Application)& );
 
-  bool                                 undo( CAF_Study* doc );
-  bool                                 redo( CAF_Study* doc );
+private:
+  Handle(TDocStd_Application) myStdApp;
 };
 
 #if defined WIN32