Corrections after rebasing on IR

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx
index 492f3e07b7b5ebaf8d9fb9b8773e60a4c54b9d66..93074ecf2c9b40441d9578e0611384b8f73aa226 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_AnimationDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TDF_Attribute.hxx>
@@ -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 0c3bd4cee49c7035c8f07a6dad79e0478dc74752..669bdf444f91bd3f83886a2bd138e19ddea1d7ea 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.hxx
@@ -23,7 +23,7 @@
 #include <Standard_Boolean.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-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 00afab34e58a372d80f7accb651a47eedefe1abb..7417545321760fc98c49cc05848e25035de8668a 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_AnimationToolDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_AnimationTool.hxx>
@@ -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 313955b303ce9f8a4392c11c91cde3ef79d6696c..8a533011a357fff7f2316661e28e8e69301133f0 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.hxx
@@ -23,7 +23,7 @@
 #include <Standard_Boolean.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-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 009b7e26e880409f635a00baa455f524adc95423..8c772203f20fff7000a39c863a3044320936a475 100644 (file)
--- 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 42c0475d040f3461962b8435f010a70fe27e08d3..b96694e2b634512da460533f5af10f05755636a8 100644 (file)
--- 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 e1c952651fbff60a82d8bdcaea23d99a56f04c1b..78c3be2a14942a2ad75deed7b8f029b1ba910c0a 100644 (file)
--- 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 99ba3fc242005f259b93796589a3a98cbf1cebe7..64c8dcf5bb991d60f97c42da38edc56f56c3a118 100644 (file)
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_HArray1OfByte.hxx>
@@ -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 1cdf3685e8f06273c407ccc8d1ae573b9758c127..7c23181c87cbe41ecaf93a71d7385504c0071c26 100644 (file)
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.hxx
@@ -23,7 +23,7 @@
 #include <Standard_Boolean.hxx>
 #include <XmlObjMgt_RRelocationTable.hxx>
 #include <XmlObjMgt_SRelocationTable.hxx>
-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 5ee0e0b917861eb066fad32408596a461d9a655e..4dd5a9a2595284b586949d39532859a999211aa4 100644 (file)
--- 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 <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_AnimationTool.hxx>
@@ -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 731d34fcf4c7cd4d33dfe15785c65aab7a030758..2adf4ef4a9745b05ab85b23711b078408e9e647b 100644 (file)
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.hxx
@@ -23,7 +23,7 @@
 #include <Standard_Boolean.hxx>
 #include <XmlObjMgt_RRelocationTable.hxx>
 #include <XmlObjMgt_SRelocationTable.hxx>
-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;