Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

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

diff --git a/src/HYDROGUI/HYDROGUI_SetColorOp.h b/src/HYDROGUI/HYDROGUI_SetColorOp.h
index 9fce5bd1baf625add529393719403cb1ea2dc9a7..cd9affd8b01c98dfbc0b424334f75a12c222d50d 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_SetColorOp.h
+++ b/src/HYDROGUI/HYDROGUI_SetColorOp.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
@@ -38,12 +34,14 @@ public:
   virtual ~HYDROGUI_SetColorOp();
 
 
-  static bool CanObjectBeColored( const Handle(HYDROData_Entity)& theObject );
+  static bool CanObjectBeColored( const Handle(HYDROData_Entity)& theObject,
+                                  HYDROGUI_Module* theModule );
 
 protected:
   virtual void startOperation();
 
-  virtual bool processApply( int& theUpdateFlags, QString& theErrorMsg );
+  virtual bool processApply( int& theUpdateFlags, QString& theErrorMsg,
+                             QStringList& theBrowseObjectsEntries );
 
 private:
   HYDROGUI_ColorDlg* myColorDlg;