Merge from V6_main 01/04/2013

[modules/gui.git] / src / LightApp / LightApp_DataSubOwner.h

diff --git a/src/LightApp/LightApp_DataSubOwner.h b/src/LightApp/LightApp_DataSubOwner.h
index 507684d5fd57427da29f3dc0fcd250a9f71a65ce..13622eac3d6dc13c52626a3d4546010f7ac5acb7 100644 (file)
--- a/src/LightApp/LightApp_DataSubOwner.h
+++ b/src/LightApp/LightApp_DataSubOwner.h
@@ -1,27 +1,30 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
+// 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
+//
 // 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 
+// 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 
+//
+// 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef LIGHTAPP_DATASUBOWNER_H
 #define LIGHTAPP_DATASUBOWNER_H
 
-#include <LightApp.h>
-#include <LightApp_DataOwner.h>
+#include "LightApp.h"
+#include "LightApp_DataOwner.h"
 
 /*!
   Class provide sub owner.
@@ -32,8 +35,10 @@ public:
     LightApp_DataSubOwner( const QString&, const int );
     virtual ~LightApp_DataSubOwner();
 
-    virtual bool isEqual( const SUIT_DataOwner& ) const;
-    int          index() 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;
+    int             index() const;
 
 private:
     int          myIndex;