X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSalomeApp%2FSalomeApp_DataObject.h;h=9f385abc53993390d4292cbc065da3e79c22d2b1;hb=0b0bb0580ebbe9e045742e50c9efac1b99249456;hp=26ffdfeb4f100fe5bf828e0d92e330ea39558b84;hpb=26c42324c345edd513f45434137aac7a48acfa08;p=modules%2Fgui.git

diff --git a/src/SalomeApp/SalomeApp_DataObject.h b/src/SalomeApp/SalomeApp_DataObject.h
index 26ffdfeb4..9f385abc5 100644
--- a/src/SalomeApp/SalomeApp_DataObject.h
+++ b/src/SalomeApp/SalomeApp_DataObject.h
@@ -3,16 +3,15 @@
 
 #include "SalomeApp.h"
 
-#include "CAM_DataObject.h"
+#include "LightApp_DataObject.h"
 #include "CAM_RootObject.h"
 
 #include "SALOMEDSClient.hxx"
 
 class SalomeApp_Study;
 
-class SALOMEAPP_EXPORT SalomeApp_DataObject : public virtual CAM_DataObject
+class SALOMEAPP_EXPORT SalomeApp_DataObject : public LightApp_DataObject
 {
-  class Key;
 
 public:
   enum { CT_Value, CT_Entry, CT_IOR, CT_RefEntry };
@@ -24,22 +23,21 @@ public:
     
   virtual QString                 name() const;
   virtual QPixmap                 icon() const;
-  virtual QColor                  color() const;
   virtual QString                 toolTip() const;
 
   virtual QString                 text( const int ) const;
   virtual QColor                  color( const ColorRole ) const;
 
-  virtual SUIT_DataObjectKey*     key() const;
   virtual QString                 entry() const;
 
-  virtual _PTR(SObject)           object() const; // location of corresponding SALOMEDS::SObject  
+  /*! location of corresponding SALOMEDS::SObject  */
+  virtual _PTR(SObject)           object() const;
 
   bool                            isReference() const;
   _PTR(SObject)                   referencedObject() const;
 
-  SUIT_DataObject*                componentObject() const;
-  QString                         componentDataType() const; // GEOM, SMESH, VISU, etc.
+  /*! GEOM, SMESH, VISU, etc.*/
+  virtual QString                 componentDataType() const;
 
 private:
   QString                         ior( const _PTR(SObject)& ) const;
@@ -63,6 +61,8 @@ public:
   SalomeApp_ModuleObject( const _PTR(SObject)&, SUIT_DataObject* = 0 );
   SalomeApp_ModuleObject( CAM_DataModel*, const _PTR(SObject)&, SUIT_DataObject* = 0 );
   virtual ~SalomeApp_ModuleObject();
+
+  virtual QString        name() const;
 };
 
 #endif