X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FLightApp%2FLightApp_DataOwner.h;h=a42ce6757b4092f4a9c00d23d5f1c37179658fa1;hb=f1343b39ab73a30415d2d909a4887f6536278e2e;hp=7fd43eedceb14560da1c81f0194f6efd13f5ef07;hpb=399155730966dfc225fbb24f66204b05664385f2;p=modules%2Fgui.git diff --git a/src/LightApp/LightApp_DataOwner.h b/src/LightApp/LightApp_DataOwner.h index 7fd43eedc..a42ce6757 100644 --- a/src/LightApp/LightApp_DataOwner.h +++ b/src/LightApp/LightApp_DataOwner.h @@ -1,17 +1,20 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -// +// Copyright (C) 2007-2014 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 +// License as published by the Free Software Foundation; either +// 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 +// 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 +// 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 @@ -27,6 +30,7 @@ #include "SALOME_InteractiveObject.hxx" #endif + /*! This class provide data owner objects. */ @@ -39,8 +43,9 @@ public: LightApp_DataOwner( const QString& ); virtual ~LightApp_DataOwner(); - virtual bool isEqual( const SUIT_DataOwner& ) const; - virtual bool operator<( const SUIT_DataOwner& ) const; + // *** jfa: The below line has been put here 14.02.2007. + // *** It cancels modifications from branch BR_Dev_For_4_0 + virtual QString keyString() const; #ifndef DISABLE_SALOMEOBJECT const Handle(SALOME_InteractiveObject)& IO() const;