From 983e8b5d2ea16337e84d932b212f72f6c6f314e8 Mon Sep 17 00:00:00 2001 From: nds Date: Thu, 6 Sep 2018 17:00:07 +0300 Subject: [PATCH] Corrections after rebasing on IR --- src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx | 4 ++-- src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.hxx | 4 ++-- src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.cxx | 4 ++-- src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.hxx | 4 ++-- src/XCAFDoc/XCAFDoc.cxx | 11 ----------- src/XCAFDoc/XCAFDoc.hxx | 1 - src/XCAFDoc/XCAFDoc_ViewTool.hxx | 3 --- src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.cxx | 4 ++-- src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.hxx | 4 ++-- src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.cxx | 4 ++-- src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.hxx | 4 ++-- 11 files changed, 16 insertions(+), 31 deletions(-) diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx index 492f3e07b7..93074ecf2c 100644 --- a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx +++ b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include @@ -56,7 +56,7 @@ static void putByteArray(BinObjMgt_Persistent& theTarget, const Handle(TColStd_H //purpose : //======================================================================= BinMXCAFDoc_AnimationDriver::BinMXCAFDoc_AnimationDriver - (const Handle(CDM_MessageDriver)& theMsgDriver) + (const Handle(Message_Messenger)& theMsgDriver) : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Animation)->Name()) { } diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.hxx index 0c3bd4cee4..669bdf444f 100644 --- a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.hxx +++ b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.hxx @@ -23,7 +23,7 @@ #include #include #include -class CDM_MessageDriver; +class Message_Messenger; class TDF_Attribute; class BinObjMgt_Persistent; @@ -38,7 +38,7 @@ class BinMXCAFDoc_AnimationDriver : public BinMDF_ADriver public: - Standard_EXPORT BinMXCAFDoc_AnimationDriver(const Handle(CDM_MessageDriver)& theMsgDriver); + Standard_EXPORT BinMXCAFDoc_AnimationDriver(const Handle(Message_Messenger)& theMsgDriver); Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.cxx index 00afab34e5..7417545321 100644 --- a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.cxx +++ b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.cxx @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include @@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_AnimationToolDriver, BinMDF_ADriver) //purpose : //======================================================================= BinMXCAFDoc_AnimationToolDriver::BinMXCAFDoc_AnimationToolDriver - (const Handle(CDM_MessageDriver)& theMsgDriver) + (const Handle(Message_Messenger)& theMsgDriver) : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_AnimationTool)->Name()) { } diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.hxx index 313955b303..8a533011a3 100644 --- a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.hxx +++ b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.hxx @@ -23,7 +23,7 @@ #include #include #include -class CDM_MessageDriver; +class Message_Messenger; class TDF_Attribute; class BinObjMgt_Persistent; @@ -36,7 +36,7 @@ class BinMXCAFDoc_AnimationToolDriver : public BinMDF_ADriver { public: - Standard_EXPORT BinMXCAFDoc_AnimationToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver); + Standard_EXPORT BinMXCAFDoc_AnimationToolDriver(const Handle(Message_Messenger)& theMsgDriver); Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; diff --git a/src/XCAFDoc/XCAFDoc.cxx b/src/XCAFDoc/XCAFDoc.cxx index 009b7e26e8..8c772203f2 100644 --- a/src/XCAFDoc/XCAFDoc.cxx +++ b/src/XCAFDoc/XCAFDoc.cxx @@ -289,17 +289,6 @@ Standard_GUID XCAFDoc::ViewRefEnabledShapesGUID() //purpose : //======================================================================= -Standard_GUID XCAFDoc::ViewRefNoteGUID() -{ - static Standard_GUID ID("C814ACC6-43AC-4812-9B2A-4E9A2A549354"); - return ID; -} - -//======================================================================= -//function : ViewRefPlaneGUID -//purpose : -//======================================================================= - Standard_GUID XCAFDoc::ViewRefAnnotationGUID() { static Standard_GUID ID("A2B5BA42-DD00-43f5-8882-4B5F8E76B9D2"); diff --git a/src/XCAFDoc/XCAFDoc.hxx b/src/XCAFDoc/XCAFDoc.hxx index 42c0475d04..b96694e2b6 100644 --- a/src/XCAFDoc/XCAFDoc.hxx +++ b/src/XCAFDoc/XCAFDoc.hxx @@ -136,7 +136,6 @@ public: Standard_EXPORT static Standard_GUID ClipPlaneVisibleRefGUID(); //! Return GUIDs for GraphNode representing specified types of View - Standard_EXPORT static Standard_GUID ViewRefNoteGUID(); Standard_EXPORT static Standard_GUID ViewRefAnnotationGUID(); //! Returns GUID for UAttribute identifying lock flag diff --git a/src/XCAFDoc/XCAFDoc_ViewTool.hxx b/src/XCAFDoc/XCAFDoc_ViewTool.hxx index e1c952651f..78c3be2a14 100644 --- a/src/XCAFDoc/XCAFDoc_ViewTool.hxx +++ b/src/XCAFDoc/XCAFDoc_ViewTool.hxx @@ -114,9 +114,6 @@ public: //! Returns all View labels defined for label Shapes transparency Standard_EXPORT Standard_Boolean GetViewLabelsForEnabledShapesLabel(const TDF_Label& theShapesTransparencyL, TDF_LabelSequence& theViews) const; - //! Returns all View labels defined for label NotesL - Standard_EXPORT Standard_Boolean GetViewLabelsForNote(const TDF_Label& theNoteL, TDF_LabelSequence& theViews) const; - //! Adds a view definition to a View table and returns its label Standard_EXPORT TDF_Label AddView() ; diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.cxx index 99ba3fc242..64c8dcf5bb 100644 --- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.cxx +++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.cxx @@ -14,7 +14,7 @@ // commercial license or contractual agreement. -#include +#include #include #include #include @@ -37,7 +37,7 @@ IMPLEMENT_DOMSTRING(AnimationLastIdx, "animation_last_idx") //purpose : Constructor //======================================================================= XmlMXCAFDoc_AnimationDriver::XmlMXCAFDoc_AnimationDriver - (const Handle(CDM_MessageDriver)& theMsgDriver) + (const Handle(Message_Messenger)& theMsgDriver) : XmlMDF_ADriver (theMsgDriver, "xcaf", "Animation") {} diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.hxx index 1cdf3685e8..7c23181c87 100644 --- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.hxx +++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.hxx @@ -23,7 +23,7 @@ #include #include #include -class CDM_MessageDriver; +class Message_Messenger; class TDF_Attribute; class XmlObjMgt_Persistent; @@ -38,7 +38,7 @@ class XmlMXCAFDoc_AnimationDriver : public XmlMDF_ADriver public: - Standard_EXPORT XmlMXCAFDoc_AnimationDriver(const Handle(CDM_MessageDriver)& theMessageDriver); + Standard_EXPORT XmlMXCAFDoc_AnimationDriver(const Handle(Message_Messenger)& theMessageDriver); Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.cxx index 5ee0e0b917..4dd5a9a259 100644 --- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.cxx +++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.cxx @@ -13,7 +13,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#include #include #include #include @@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_AnimationToolDriver,XmlMDF_ADriver) //purpose : //======================================================================= XmlMXCAFDoc_AnimationToolDriver::XmlMXCAFDoc_AnimationToolDriver - (const Handle(CDM_MessageDriver)& theMsgDriver) + (const Handle(Message_Messenger)& theMsgDriver) : XmlMDF_ADriver (theMsgDriver, "xcaf", "AnimationTool") { } diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.hxx index 731d34fcf4..2adf4ef4a9 100644 --- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.hxx +++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.hxx @@ -23,7 +23,7 @@ #include #include #include -class CDM_MessageDriver; +class Message_Messenger; class TDF_Attribute; class XmlObjMgt_Persistent; @@ -38,7 +38,7 @@ class XmlMXCAFDoc_AnimationToolDriver : public XmlMDF_ADriver public: - Standard_EXPORT XmlMXCAFDoc_AnimationToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver); + Standard_EXPORT XmlMXCAFDoc_AnimationToolDriver(const Handle(Message_Messenger)& theMsgDriver); Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; -- 2.39.5