From: asl <asl@opencascade.com>
Date: Sat, 21 Nov 2009 12:15:33 +0000 (+0000)
Subject: Method notebook() is removed; the wrapper SalomeApp_Notebook should be used instead
X-Git-Tag: PHASE_17_Part1_V1~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4a0db791e5c25f1883d196ec066a27004d518924;p=modules%2Fgui.git

Method notebook() is removed; the wrapper SalomeApp_Notebook should be used instead
---

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index ed23c52ec..07c2c424e 100644
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -80,24 +80,6 @@ _PTR(Study) SalomeApp_Study::studyDS() const
   return myStudyDS;
 }
 
-/*!
-  Return instance of notebook
-*/
-SALOME::Notebook_ptr SalomeApp_Study::notebook() const
-{
-  if( CORBA::is_nil( myNotebook ) )
-  {
-    SALOME::Notebook_var aRes;
-    SALOMEDS_Study* aStudy = dynamic_cast<SALOMEDS_Study*>( myStudyDS.operator->() );
-    if( aStudy )
-      aRes = aStudy->GetStudy()->GetNotebook();
-
-    const_cast<SalomeApp_Study*>( this )->myNotebook = aRes._retn();
-  }
-
-  return myNotebook;
-}
-
 /*!
   Create document.
 */
diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h
index a8d5b900b..ed24e9069 100644
--- a/src/SalomeApp/SalomeApp_Study.h
+++ b/src/SalomeApp/SalomeApp_Study.h
@@ -24,7 +24,6 @@
 
 #include "SalomeApp.h"
 #include <LightApp_Study.h>
-#include CORBA_CLIENT_HEADER( SALOME_Notebook )
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
@@ -79,8 +78,6 @@ public:
   virtual void        restoreState(int savePoint);
   void                markAsSavedIn(QString theFileName);
 
-  SALOME::Notebook_ptr notebook() const;
-
 protected:
   virtual void        saveModuleData ( QString theModuleName, QStringList theListOfFiles );
   virtual void        openModuleData ( QString theModuleName, QStringList& theListOfFiles );
@@ -104,8 +101,7 @@ private:
   QString             newStudyName() const;
 
 private:
-  _PTR(Study)          myStudyDS;
-  SALOME::Notebook_ptr myNotebook;
+  _PTR(Study)         myStudyDS;
 };
 
 #ifdef WIN32