Merge branch 'BR_H2018_3' into BR_2018_V8_5

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_DigueOp.h

diff --git a/src/HYDROGUI/HYDROGUI_DigueOp.h b/src/HYDROGUI/HYDROGUI_DigueOp.h
index 429baf62c57b0e8ce64c881be8afa0a0cfff87b5..c08d1b7375551efdc093e208779ebc3653b485c7 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DigueOp.h
+++ b/src/HYDROGUI/HYDROGUI_DigueOp.h
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // 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
@@ -20,6 +16,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #ifndef HYDROGUI_DigueOp_H
 #define HYDROGUI_DigueOp_H
 
@@ -37,13 +34,14 @@ protected:
 
   virtual void                 startOperation();
 
-  virtual bool                 processApply( int& theUpdateFlags, QString& theErrorMsg );
+  virtual bool                 processApply( int& theUpdateFlags, QString& theErrorMsg,
+                                             QStringList& theBrowseObjectsEntries );
 
   virtual HYDROGUI_InputPanel* createInputPanel() const;
 
 protected:
 
-  virtual Handle(HYDROData_Channel) getObjectToEdit() const;
+  virtual Handle(HYDROData_Channel) createNewObject() const;
 
 private: