Compilation under Windows.

[modules/gui.git] / src / SalomeApp / SalomeApp_NoteBook.h

diff --git a/src/SalomeApp/SalomeApp_NoteBook.h b/src/SalomeApp/SalomeApp_NoteBook.h
index 68878cfdc9fc64f579b3657bc782c42a5c540621..aad9bd2381b246f80fe4d693ca04af2a2903bcc9 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBook.h
+++ b/src/SalomeApp/SalomeApp_NoteBook.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // 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.
+// 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
@@ -52,7 +52,7 @@ struct NoteBoox_Variable
 
 typedef QMap< int, NoteBoox_Variable > VariableMap;
 
-class SALOMEAPP_EXPORT NoteBook_TableRow : public QWidget
+class SALOMEAPPIMPL_EXPORT NoteBook_TableRow : public QWidget
 {
  public:
   NoteBook_TableRow(int, NoteBook_Table* parentTable, QWidget* parent=0 );
@@ -88,16 +88,15 @@ class SALOMEAPP_EXPORT NoteBook_TableRow : public QWidget
   QTableWidgetItem* myVariableValue;
 };
 
-class SALOMEAPP_EXPORT NoteBook_Table : public QTableWidget
+class SALOMEAPPIMPL_EXPORT NoteBook_Table : public QTableWidget
 {
   Q_OBJECT
  public:
   NoteBook_Table(QWidget * parent = 0);
   virtual ~NoteBook_Table();
 
-  void Init(_PTR(Study) theStudy);
-  static QString Variable2String(const std::string& theVarName,
-                                 _PTR(Study) theStudy);
+  void Init();
+  static QString Variable2String(const std::string& theVarName);
 
   bool IsValid() const;
 
@@ -114,7 +113,7 @@ class SALOMEAPP_EXPORT NoteBook_Table : public QTableWidget
   bool IsUniqueName(const NoteBook_TableRow* theRow) const;
   QList<NoteBook_TableRow*> GetRows() const;
 
-  const bool         IsModified() const { return myIsModified; }
+  bool IsModified() const { return myIsModified; }
   const QList<int>&  GetRemovedRows() const { return myRemovedRows; }
   const VariableMap& GetVariableMap() const { return myVariableMap; }
   const VariableMap& GetVariableMapRef() const { return myVariableMapRef; }
@@ -137,18 +136,16 @@ class SALOMEAPP_EXPORT NoteBook_Table : public QTableWidget
   QList<int>  myRemovedRows;
   VariableMap myVariableMapRef;
   VariableMap myVariableMap;
-
-  _PTR(Study)      myStudy;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_NoteBook : public QWidget 
+class SALOMEAPPIMPL_EXPORT SalomeApp_NoteBook : public QWidget 
 {
   Q_OBJECT
  public:
-  SalomeApp_NoteBook(QWidget * parent , _PTR(Study) theStudy);
+  SalomeApp_NoteBook(QWidget * parent);
   virtual ~SalomeApp_NoteBook();
 
-  void Init(_PTR(Study) theStudy);
+  void Init();
 
   QString getDumpedStudyName() { return myDumpedStudyName; }
   void setDumpedStudyName(QString theName) { myDumpedStudyName = theName; }
@@ -170,7 +167,6 @@ class SALOMEAPP_EXPORT SalomeApp_NoteBook : public QWidget
   QPushButton*     myRemoveButton;
   QPushButton*     myUpdateStudyBtn;
   
-  _PTR(Study)      myStudy;
   QString          myDumpedStudyScript; // path to script of dumped study
   QString          myDumpedStudyName;
   bool             myIsDumpedStudySaved;