Merge from BR_V5_DEV 17Feb09

[samples/light.git] / src / LIGHTGUI / LIGHTGUI_DataObject.h

diff --git a/src/LIGHTGUI/LIGHTGUI_DataObject.h b/src/LIGHTGUI/LIGHTGUI_DataObject.h
index c44778db614896b278a165006db0598e470911dc..77eac986e48d9719c18c0efc9fdf6cc25f39bd29 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataObject.h
+++ b/src/LIGHTGUI/LIGHTGUI_DataObject.h
@@ -1,7 +1,4 @@
-//  LIGHT : sample (no-corba-engine) SALOME module
-//
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2005-2008  OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -17,57 +14,38 @@
 //  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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// LIGHT : sample (no-corba-engine) SALOME module
+// File   : LIGHTGUI_DataObject.h
+// Author : Julia DOROVSKIKH
 //
-//  Author : Julia DOROVSKIKH
-//  Date   : 01/01/2005
-//  $Header$
-
 #ifndef LIGHTGUI_DATAOBJECT_H
 #define LIGHTGUI_DATAOBJECT_H
 
 #include <LightApp_DataObject.h>
-#include <LightApp_RootObject.h>
+#include <QString>
 
-#include <qstring.h>
-
-/*!
- * LIGHTGUI_DataObject - LIGHT module's data object class
- */
 class LIGHTGUI_DataObject : public virtual LightApp_DataObject
 {
 public:
-  LIGHTGUI_DataObject ( SUIT_DataObject* = 0 );
-  LIGHTGUI_DataObject ( const QString&, SUIT_DataObject* = 0 );
+  LIGHTGUI_DataObject( const int, const QString&, SUIT_DataObject* = 0 );
   virtual ~LIGHTGUI_DataObject();
     
-  virtual QString entry() const;
+  QString    name() const;
+  QString    entry() const;
 
-  QString    name()    const;
-  QPixmap    icon()    const;
-  QString    toolTip() const;
+  QPixmap    icon( const int = NameId ) const;
+  QString    toolTip( const int = NameId ) const;
 
   QString    lineText() const;
   void       setLineText( const QString& );
   int        lineNb() const;
+  int        id() const;
 
 private:
+  int        myId;
   QString    myLineTxt;
 };
 
-/*!
- * LIGHTGUI_ModuleObject - LIGHT module's root data object class
- */
-
-class LIGHTGUI_ModuleObject :  public LIGHTGUI_DataObject,
-                               public LightApp_ModuleObject
-{
-public:
-  LIGHTGUI_ModuleObject ( CAM_DataModel*, SUIT_DataObject* = 0 );
-
-  virtual QString name()    const;
-  QPixmap         icon()    const;
-  QString         toolTip() const;
-};
-
 #endif // LIGHTGUI_DATAOBJECT_H