From 57d95706ee564926104b659adc8fd54efd94a3c6 Mon Sep 17 00:00:00 2001 From: asl Date: Mon, 3 Apr 2006 10:15:04 +0000 Subject: [PATCH] virtual inheritance is removed --- src/LightApp/LightApp_DataObject.cxx | 8 ++++---- src/LightApp/LightApp_DataObject.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/LightApp/LightApp_DataObject.cxx b/src/LightApp/LightApp_DataObject.cxx index 831385908..b02757d53 100644 --- a/src/LightApp/LightApp_DataObject.cxx +++ b/src/LightApp/LightApp_DataObject.cxx @@ -149,15 +149,15 @@ QString LightApp_DataObject::componentDataType() const /*!Constructor.Initialize by \a parent.*/ LightApp_ModuleObject::LightApp_ModuleObject( SUIT_DataObject* parent ) -: CAM_RootObject( parent ), - CAM_DataObject( parent ) +: CAM_RootObject( parent )//, + //CAM_DataObject( parent ) { } /*!Constructor.Initialize by \a module and parent.*/ LightApp_ModuleObject::LightApp_ModuleObject( CAM_DataModel* dm, SUIT_DataObject* parent ) -: CAM_RootObject( dm, parent ), - CAM_DataObject( parent ) +: CAM_RootObject( dm, parent )//, + //CAM_DataObject( parent ) { } diff --git a/src/LightApp/LightApp_DataObject.h b/src/LightApp/LightApp_DataObject.h index 1f194ffc2..6c64ea49d 100644 --- a/src/LightApp/LightApp_DataObject.h +++ b/src/LightApp/LightApp_DataObject.h @@ -22,14 +22,14 @@ #include "LightApp.h" #include "CAM_DataObject.h" -#include "CAM_DataModel.h" #include "CAM_RootObject.h" class LightApp_Study; +class CAM_DataModel; /*!Description : Data Object has empty entry so it's children must redefine metod entry() and return some unique string*/ // to do : decomment virtual inheritance -class LIGHTAPP_EXPORT LightApp_DataObject : public virtual CAM_DataObject +class LIGHTAPP_EXPORT LightApp_DataObject : public CAM_DataObject { class Key; -- 2.39.2