0029220: Application Framework - replace CDM_MessageDriver interface by Message_Messe...

diff --git a/src/AppStd/AppStd_Application.hxx b/src/AppStd/AppStd_Application.hxx
index 08196a7..bf9b64a 100644 (file)
--- a/src/AppStd/AppStd_Application.hxx
+++ b/src/AppStd/AppStd_Application.hxx
@@ -22,7 +22,6 @@
 #include <TDocStd_Application.hxx>
 #include <TColStd_SequenceOfExtendedString.hxx>
 #include <Standard_CString.hxx>
-class CDM_MessageDriver;
 
 
 class AppStd_Application;

diff --git a/src/AppStdL/AppStdL_Application.hxx b/src/AppStdL/AppStdL_Application.hxx
index e6d668c..a7f7aeb 100644 (file)
--- a/src/AppStdL/AppStdL_Application.hxx
+++ b/src/AppStdL/AppStdL_Application.hxx
@@ -22,8 +22,6 @@
 #include <TDocStd_Application.hxx>
 #include <TColStd_SequenceOfExtendedString.hxx>
 #include <Standard_CString.hxx>
-class CDM_MessageDriver;
-
 
 class AppStdL_Application;
 DEFINE_STANDARD_HANDLE(AppStdL_Application, TDocStd_Application)

diff --git a/src/BinDrivers/BinDrivers.cxx b/src/BinDrivers/BinDrivers.cxx
index e9e2dd7..312c8a7 100644 (file)
--- a/src/BinDrivers/BinDrivers.cxx
+++ b/src/BinDrivers/BinDrivers.cxx
@@ -25,7 +25,7 @@
 #include <BinMDocStd.hxx>
 #include <BinMFunction.hxx>
 #include <BinMNaming.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Plugin_Macro.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_GUID.hxx>
@@ -82,7 +82,7 @@ void BinDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp)
 //=======================================================================
 
 Handle(BinMDF_ADriverTable) BinDrivers::AttributeDrivers 
-                         (const Handle(CDM_MessageDriver)& aMsgDrv)
+                         (const Handle(Message_Messenger)& aMsgDrv)
 {
   Handle(BinMDF_ADriverTable) aTable = new BinMDF_ADriverTable;
 

diff --git a/src/BinDrivers/BinDrivers.hxx b/src/BinDrivers/BinDrivers.hxx
index 80fa7df..fc74905 100644 (file)
--- a/src/BinDrivers/BinDrivers.hxx
+++ b/src/BinDrivers/BinDrivers.hxx
@@ -21,7 +21,7 @@
 class Standard_Transient;
 class Standard_GUID;
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class TCollection_AsciiString;
 class BinDrivers_DocumentStorageDriver;
 class BinDrivers_DocumentRetrievalDriver;
@@ -37,7 +37,7 @@ public:
   Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp);
 
   //! Creates the table of drivers of types supported
-  Standard_EXPORT static Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& MsgDrv);
+  Standard_EXPORT static Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(Message_Messenger)& MsgDrv);
   
   //! returns "1"
   Standard_EXPORT static TCollection_AsciiString StorageVersion();

diff --git a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cxx b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cxx
index 1923746..45e6a1a 100644 (file)
--- a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cxx
+++ b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cxx
@@ -21,7 +21,7 @@
 #include <BinMDF_ADriverTable.hxx>
 #include <BinMNaming.hxx>
 #include <BinMNaming_NamedShapeDriver.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_IStream.hxx>
@@ -45,7 +45,7 @@ BinDrivers_DocumentRetrievalDriver::BinDrivers_DocumentRetrievalDriver ()
 //=======================================================================
 
 Handle(BinMDF_ADriverTable) BinDrivers_DocumentRetrievalDriver::AttributeDrivers
-       (const Handle(CDM_MessageDriver)& theMessageDriver)
+       (const Handle(Message_Messenger)& theMessageDriver)
 {
   return BinDrivers::AttributeDrivers (theMessageDriver);
 }
@@ -58,7 +58,7 @@ Handle(BinMDF_ADriverTable) BinDrivers_DocumentRetrievalDriver::AttributeDrivers
 void BinDrivers_DocumentRetrievalDriver::ReadShapeSection
                               (BinLDrivers_DocumentSection& /*theSection*/,
                                Standard_IStream&            theIS,
-                              const Standard_Boolean       /*isMess*/)
+                               const Standard_Boolean       /*isMess*/)
 
 {
   // Read Shapes
@@ -74,8 +74,8 @@ void BinDrivers_DocumentRetrievalDriver::ReadShapeSection
     catch(Standard_Failure const& anException) {
       const TCollection_ExtendedString aMethStr
         ("BinDrivers_DocumentRetrievalDriver: ");
-      WriteMessage (aMethStr + "error of Shape Section " +
-        anException.GetMessageString());
+      myMsgDriver ->Send(aMethStr + "error of Shape Section " +
+        anException.GetMessageString(), Message_Fail);
     }
   }
 }
@@ -85,8 +85,8 @@ void BinDrivers_DocumentRetrievalDriver::ReadShapeSection
 //purpose  : 
 //=======================================================================
 void BinDrivers_DocumentRetrievalDriver::CheckShapeSection(
-                             const Storage_Position& /*ShapeSectionPos*/, 
-                                                Standard_IStream& /*IS*/)
+                              const Storage_Position& /*ShapeSectionPos*/,
+                              Standard_IStream& /*IS*/)
 {}
 
 //=======================================================================
@@ -111,7 +111,7 @@ void BinDrivers_DocumentRetrievalDriver::Clear()
 //purpose  : 
 //=======================================================================
 void BinDrivers_DocumentRetrievalDriver::PropagateDocumentVersion(
-                                   const Standard_Integer theDocVersion )
+                                    const Standard_Integer theDocVersion )
 {
   BinMDataStd::SetDocumentVersion(theDocVersion);
   BinMNaming::SetDocumentVersion(theDocVersion);

diff --git a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.hxx b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.hxx
index 4691634..2275a83 100644 (file)
--- a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.hxx
+++ b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.hxx
@@ -25,7 +25,7 @@
 #include <Storage_Position.hxx>
 #include <Standard_Integer.hxx>
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class BinLDrivers_DocumentSection;
 
 
@@ -42,7 +42,7 @@ public:
   //! Constructor
   Standard_EXPORT BinDrivers_DocumentRetrievalDriver();
   
-  Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& theMsgDriver) Standard_OVERRIDE;
+  Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(Message_Messenger)& theMsgDriver) Standard_OVERRIDE;
   
   Standard_EXPORT virtual void ReadShapeSection (BinLDrivers_DocumentSection& theSection, Standard_IStream& theIS, const Standard_Boolean isMess = Standard_False) Standard_OVERRIDE;
   

diff --git a/src/BinDrivers/BinDrivers_DocumentStorageDriver.cxx b/src/BinDrivers/BinDrivers_DocumentStorageDriver.cxx
index 6416c8d..3c1f9e5 100644 (file)
--- a/src/BinDrivers/BinDrivers_DocumentStorageDriver.cxx
+++ b/src/BinDrivers/BinDrivers_DocumentStorageDriver.cxx
@@ -20,7 +20,7 @@
 #include <BinMDF_ADriver.hxx>
 #include <BinMDF_ADriverTable.hxx>
 #include <BinMNaming_NamedShapeDriver.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
@@ -43,7 +43,7 @@ BinDrivers_DocumentStorageDriver::BinDrivers_DocumentStorageDriver ()
 //=======================================================================
 
 Handle(BinMDF_ADriverTable) BinDrivers_DocumentStorageDriver::AttributeDrivers
-       (const Handle(CDM_MessageDriver)& theMessageDriver)
+       (const Handle(Message_Messenger)& theMessageDriver)
 {
   return BinDrivers::AttributeDrivers (theMessageDriver);
 }
@@ -70,7 +70,7 @@ Standard_Boolean BinDrivers_DocumentStorageDriver::IsWithTriangles() const
 //function : SetWithTriangles
 //purpose  :
 //=======================================================================
-void BinDrivers_DocumentStorageDriver::SetWithTriangles (const Handle(CDM_MessageDriver)& theMessageDriver,
+void BinDrivers_DocumentStorageDriver::SetWithTriangles (const Handle(Message_Messenger)& theMessageDriver,
                                                          const Standard_Boolean theWithTriangulation)
 {
   if (myDrivers.IsNull())
@@ -113,10 +113,8 @@ void BinDrivers_DocumentStorageDriver::WriteShapeSection
       aNamedShapeDriver->WriteShapeSection (theOS);
     }
     catch(Standard_Failure const& anException) {
-      TCollection_ExtendedString anErrorStr ("Error: ");
-      TCollection_ExtendedString aStr = 
-       anErrorStr + "BinDrivers_DocumentStorageDriver, Shape Section :";
-      WriteMessage (aStr  + anException.GetMessageString());
+      TCollection_ExtendedString anErrorStr ("BinDrivers_DocumentStorageDriver, Shape Section :");
+      myMsgDriver->Send (anErrorStr  + anException.GetMessageString(), Message_Fail);
     }
   }
    

diff --git a/src/BinDrivers/BinDrivers_DocumentStorageDriver.hxx b/src/BinDrivers/BinDrivers_DocumentStorageDriver.hxx
index 4c1d843..5cd7c3f 100644 (file)
--- a/src/BinDrivers/BinDrivers_DocumentStorageDriver.hxx
+++ b/src/BinDrivers/BinDrivers_DocumentStorageDriver.hxx
@@ -18,11 +18,11 @@
 
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
-
-#include <BinLDrivers_DocumentStorageDriver.hxx>
 #include <Standard_OStream.hxx>
+#include <BinLDrivers_DocumentStorageDriver.hxx>
+
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class BinLDrivers_DocumentSection;
 
 
@@ -39,7 +39,7 @@ public:
   //! Constructor
   Standard_EXPORT BinDrivers_DocumentStorageDriver();
   
-  Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& theMsgDriver) Standard_OVERRIDE;
+  Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(Message_Messenger)& theMsgDriver) Standard_OVERRIDE;
   
   //! implements the procedure of writing a shape section to file
   Standard_EXPORT virtual void WriteShapeSection (BinLDrivers_DocumentSection& theDocSection, Standard_OStream& theOS) Standard_OVERRIDE;
@@ -48,7 +48,7 @@ public:
   Standard_EXPORT Standard_Boolean IsWithTriangles() const;
 
   //! Set if triangulation should be stored or not.
-  Standard_EXPORT void SetWithTriangles (const Handle(CDM_MessageDriver)& theMessageDriver,
+  Standard_EXPORT void SetWithTriangles (const Handle(Message_Messenger)& theMessageDriver,
                                          const Standard_Boolean theWithTriangulation);
 
   DEFINE_STANDARD_RTTIEXT(BinDrivers_DocumentStorageDriver,BinLDrivers_DocumentStorageDriver)

diff --git a/src/BinLDrivers/BinLDrivers.cxx b/src/BinLDrivers/BinLDrivers.cxx
index 17c0893..2b9dcd2 100644 (file)
--- a/src/BinLDrivers/BinLDrivers.cxx
+++ b/src/BinLDrivers/BinLDrivers.cxx
@@ -22,7 +22,7 @@
 #include <BinMDF_ADriverTable.hxx>
 #include <BinMDocStd.hxx>
 #include <BinMFunction.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Plugin_Macro.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_GUID.hxx>
@@ -81,7 +81,7 @@ void BinLDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp)
 //=======================================================================
 
 Handle(BinMDF_ADriverTable) BinLDrivers::AttributeDrivers 
-                         (const Handle(CDM_MessageDriver)& aMsgDrv)
+                         (const Handle(Message_Messenger)& aMsgDrv)
 {
   Handle(BinMDF_ADriverTable) aTable = new BinMDF_ADriverTable;
 

diff --git a/src/BinLDrivers/BinLDrivers.hxx b/src/BinLDrivers/BinLDrivers.hxx
index 444b76f..8397459 100644 (file)
--- a/src/BinLDrivers/BinLDrivers.hxx
+++ b/src/BinLDrivers/BinLDrivers.hxx
@@ -21,7 +21,7 @@
 class Standard_Transient;
 class Standard_GUID;
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class TCollection_AsciiString;
 class BinLDrivers_DocumentStorageDriver;
 class BinLDrivers_DocumentRetrievalDriver;
@@ -39,7 +39,7 @@ public:
   Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp);
 
   //! Creates a table of the supported drivers' types
-  Standard_EXPORT static Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& MsgDrv);
+  Standard_EXPORT static Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(Message_Messenger)& MsgDrv);
   
   //! returns last storage version
   Standard_EXPORT static TCollection_AsciiString StorageVersion();

diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
index ccc4e1f..54d45b6 100644 (file)
--- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
@@ -24,7 +24,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <CDM_Application.hxx>
 #include <CDM_Document.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <FSD_BinaryFile.hxx>
 #include <FSD_FileHeader.hxx>
 #include <OSD_OpenFile.hxx>
@@ -120,7 +120,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
     Handle(TDocStd_Document)::DownCast(theDoc);
   if (aDoc.IsNull()) {
 #ifdef OCCT_DEBUG
-    WriteMessage (aMethStr + "error: null document");
+    myMsgDriver->Send (aMethStr + "error: null document", Message_Fail);
 #endif
     myReaderStatus = PCDM_RS_NoDocument;
     return;
@@ -154,7 +154,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
   // 1.a Version of writer
   if (!aHeaderData->StorageVersion().IsIntegerValue()) {
     // file has no format version
-    WriteMessage (aMethStr + "error: file has no format version");
+    myMsgDriver->Send (aMethStr + "error: file has no format version", Message_Fail);
     myReaderStatus = PCDM_RS_FormatFailure;
     return;
   }
@@ -164,9 +164,9 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
   if (!CheckDocumentVersion(aFileVer, aCurrVer)) {
     myReaderStatus = PCDM_RS_NoVersion;
     // file was written with another version
-    WriteMessage (aMethStr + "error: wrong file version: " +
-                 aHeaderData->StorageVersion() + " while current is " +
-                 BinLDrivers::StorageVersion());
+    myMsgDriver->Send (aMethStr + "error: wrong file version: " +
+                 aHeaderData->StorageVersion() + " while current is " +
+                 BinLDrivers::StorageVersion(), Message_Fail);
     return;
   }
 
@@ -185,14 +185,14 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
     else if (begin) {
       if ( aFileVer < 8 ) {
 #ifdef DATATYPE_MIGRATION
-       TCollection_AsciiString  newName;       
-       if(Storage_Schema::CheckTypeMigration(aStr, newName)) {
+        TCollection_AsciiString  newName;      
+        if(Storage_Schema::CheckTypeMigration(aStr, newName)) {
 #ifdef OCCT_DEBUG
-         cout << "CheckTypeMigration:OldType = " <<aStr << " Len = "<<aStr.Length()<<endl;
-         cout << "CheckTypeMigration:NewType = " <<newName  << " Len = "<< newName.Length()<<endl;
+          cout << "CheckTypeMigration:OldType = " <<aStr << " Len = "<<aStr.Length()<<endl;
+          cout << "CheckTypeMigration:NewType = " <<newName  << " Len = "<< newName.Length()<<endl;
 #endif
-         aStr = newName;
-       }
+          aStr = newName;
+        }
 #endif  
       } 
       aTypeNames.Append (aStr);    
@@ -208,11 +208,11 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
     if (myDrivers->GetDriver(i).IsNull()) 
       myMapUnsupported.Add(i);
   if (!myMapUnsupported.IsEmpty()) {
-    WriteMessage (aMethStr + "warning: "
-                  "the following attributes have no driver:");
+    myMsgDriver->Send (aMethStr + "warning: "
+                  "the following attributes have no driver:", Message_Warning);
     for (i=1; i <= aTypeNames.Length(); i++)
       if (myMapUnsupported.Contains(i))
-       WriteMessage (aTypeNames(i));
+        myMsgDriver->Send (aTypeNames(i), Message_Warning);
   }
 
   // propagate the opened document version to data drivers
@@ -238,7 +238,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
 
     if (theIStream.eof()) {
       // There is no shape section in the file.
-      WriteMessage (aMethStr + "error: shape section is not found");
+      myMsgDriver->Send (aMethStr + "error: shape section is not found", Message_Fail);
       myReaderStatus = PCDM_RS_ReaderException;
       return;
     }
@@ -249,7 +249,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
     for (; anIterS.More(); anIterS.Next()) {
       BinLDrivers_DocumentSection& aCurSection = anIterS.ChangeValue();
       if (aCurSection.IsPostRead() == Standard_False) {
-        theIStream.seekg ((std::streamsize)aCurSection.Offset());
+        theIStream.seekg ((streampos) aCurSection.Offset());
         if (aCurSection.Name().IsEqual ((Standard_CString)SHAPESECTION_POS)) 
           ReadShapeSection (aCurSection, theIStream);
         else
@@ -269,7 +269,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
     if (aShapeLabel.Length() > 0) {
       // version 2+(with shapes) and higher goes here
       if(aShapeLabel.Length() <= 0 || aShapeLabel != SHAPESECTION_POS) {
-        WriteMessage (aMethStr + "error: Format failure");
+        myMsgDriver->Send (aMethStr + "error: Format failure", Message_Fail);
         myReaderStatus = PCDM_RS_FormatFailure;
         return;
       }
@@ -285,13 +285,13 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
       cout <<"aShapeSectionPos = " <<aShapeSectionPos <<endl;
 #endif
       if(aShapeSectionPos) { 
-       aDocumentPos = theIStream.tellg();
-       theIStream.seekg((streampos) aShapeSectionPos);
+        aDocumentPos = theIStream.tellg();
+        theIStream.seekg((streampos) aShapeSectionPos);
 
-       CheckShapeSection(aShapeSectionPos, theIStream);
-       // Read Shapes
-       BinLDrivers_DocumentSection aCurSection;
-       ReadShapeSection (aCurSection, theIStream, Standard_False);
+        CheckShapeSection(aShapeSectionPos, theIStream);
+        // Read Shapes
+        BinLDrivers_DocumentSection aCurSection;
+        ReadShapeSection (aCurSection, theIStream, Standard_False);
       }
     }
   } // end of reading Sections or shape section
@@ -321,8 +321,8 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
     for (; aSectIter.More(); aSectIter.Next()) {
       BinLDrivers_DocumentSection& aCurSection = aSectIter.ChangeValue();
       if (aCurSection.IsPostRead()) {
-       theIStream.seekg ((std::streamsize)aCurSection.Offset());
-       ReadSection (aCurSection, theDoc, theIStream); 
+        theIStream.seekg ((streampos) aCurSection.Offset());
+        ReadSection (aCurSection, theDoc, theIStream); 
       }
     }
   }
@@ -359,31 +359,31 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
       else
         tAtt = aDriver->NewEmpty();
       if (tAtt->Label().IsNull())
-       theLabel.AddAttribute (tAtt);
+        theLabel.AddAttribute (tAtt);
       else
-       WriteMessage (aMethStr +
-                     "warning: attempt to attach attribute " +
-                     aDriver->TypeName() + " to a second label");
+        myMsgDriver->Send (aMethStr +
+                     "warning: attempt to attach attribute " +
+                     aDriver->TypeName() + " to a second label", Message_Warning);
 
       Standard_Boolean ok = aDriver->Paste (myPAtt, tAtt, myRelocTable);
       if (!ok) {
         // error converting persistent to transient
-        WriteMessage (aMethStr + "warning: failure reading attribute " +
-                      aDriver->TypeName());
+        myMsgDriver->Send (aMethStr + "warning: failure reading attribute " +
+                      aDriver->TypeName(), Message_Warning);
       }
       else if (!isBound)
         myRelocTable.Bind (anID, tAtt);
     }
     else if (!myMapUnsupported.Contains(myPAtt.TypeId()))
-      WriteMessage (aMethStr + "warning: type ID not registered in header: "
-                    + myPAtt.TypeId());
+      myMsgDriver->Send (aMethStr + "warning: type ID not registered in header: "
+                    + myPAtt.TypeId(), Message_Warning);
 
     // read next attribute
     theIS >> myPAtt;
   }
   if (!theIS || myPAtt.TypeId() != BinLDrivers_ENDATTRLIST) {
     // unexpected EOF or garbage data
-    WriteMessage (aMethStr + "error: unexpected EOF or garbage data");
+    myMsgDriver->Send (aMethStr + "error: unexpected EOF or garbage data", Message_Fail);
     myReaderStatus = PCDM_RS_UnrecognizedFileFormat;
     return -1;
   }
@@ -414,7 +414,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
   }
   if (aTag != BinLDrivers_ENDLABEL) {
     // invalid end label marker
-    WriteMessage (aMethStr + "error: invalid end label marker");
+    myMsgDriver->Send (aMethStr + "error: invalid end label marker", Message_Fail);
     myReaderStatus = PCDM_RS_UnrecognizedFileFormat;
     return -1;
   }
@@ -428,25 +428,11 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
 //=======================================================================
 
 Handle(BinMDF_ADriverTable) BinLDrivers_DocumentRetrievalDriver::AttributeDrivers
-       (const Handle(CDM_MessageDriver)& theMessageDriver)
+       (const Handle(Message_Messenger)& theMessageDriver)
 {
   return BinLDrivers::AttributeDrivers (theMessageDriver);
 }
 
-
-//=======================================================================
-//function : WriteMessage
-//purpose  : write   theMessage   to   the   MessageDriver   of
-//           theApplication
-//=======================================================================
-
-void BinLDrivers_DocumentRetrievalDriver::WriteMessage
-                         (const TCollection_ExtendedString& theMsg)
-{
-  if (!myMsgDriver.IsNull())
-    myMsgDriver->Write (theMsg.ToExtString());
-}
-
 //=======================================================================
 //function : ReadSection
 //purpose  : 
@@ -467,13 +453,13 @@ void BinLDrivers_DocumentRetrievalDriver::ReadSection
 
 void BinLDrivers_DocumentRetrievalDriver::ReadShapeSection
                               (BinLDrivers_DocumentSection& theSection,
-                               Standard_IStream&            /*theIS*/,
-                              const Standard_Boolean isMess)
+                              Standard_IStream&            /*theIS*/,
+                              const Standard_Boolean isMess)
 
 {
   if(isMess && theSection.Length()) {
     const TCollection_ExtendedString aMethStr ("BinLDrivers_DocumentRetrievalDriver: ");
-    WriteMessage (aMethStr + "warning: Geometry is not supported by Lite schema. ");
+    myMsgDriver->Send (aMethStr + "warning: Geometry is not supported by Lite schema. ", Message_Warning);
   }
 }
 
@@ -482,8 +468,8 @@ void BinLDrivers_DocumentRetrievalDriver::ReadShapeSection
 //purpose  : 
 //=======================================================================
 void BinLDrivers_DocumentRetrievalDriver::CheckShapeSection(
-                                 const Storage_Position& ShapeSectionPos, 
-                                                   Standard_IStream& IS)
+                                          const Storage_Position& ShapeSectionPos, 
+                                          Standard_IStream& IS)
 {
   if (!IS.eof())
   {
@@ -493,7 +479,7 @@ void BinLDrivers_DocumentRetrievalDriver::CheckShapeSection(
 #endif
     if(ShapeSectionPos != endPos) {
       const TCollection_ExtendedString aMethStr ("BinLDrivers_DocumentRetrievalDriver: ");
-      WriteMessage (aMethStr + "warning: Geometry is not supported by Lite schema. ");
+      myMsgDriver->Send (aMethStr + "warning: Geometry is not supported by Lite schema. ", Message_Warning);
     }
   }
 }

diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx
index bf0294b..b970577 100644 (file)
--- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx
@@ -31,7 +31,7 @@
 #include <Storage_Data.hxx>
 
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class TCollection_ExtendedString;
 class PCDM_Document;
 class CDM_Document;
@@ -66,7 +66,7 @@ public:
                                      const Handle(CDM_Document)&     theDoc,
                                      const Handle(CDM_Application)&  theApplication) Standard_OVERRIDE;
   
-  Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(Message_Messenger)& theMsgDriver);
 
 
 
@@ -101,20 +101,15 @@ protected:
   //! The default implementation: if the version of the file is greater than the
   //! current or lesser than 2, then return false, else true
   Standard_EXPORT virtual Standard_Boolean CheckDocumentVersion (const Standard_Integer theFileVersion, const Standard_Integer theCurVersion);
-  
-  //! write  theMessage  to  the  MessageDriver  of  the
-  //! Application
-  Standard_EXPORT void WriteMessage (const TCollection_ExtendedString& theMessage);
 
   Handle(BinMDF_ADriverTable) myDrivers;
   BinObjMgt_RRelocationTable myRelocTable;
-
+  Handle(Message_Messenger) myMsgDriver;
 
 private:
 
 
   BinObjMgt_Persistent myPAtt;
-  Handle(CDM_MessageDriver) myMsgDriver;
   TColStd_MapOfInteger myMapUnsupported;
   BinLDrivers_VectorOfDocumentSection mySections;
 

diff --git a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
index a8313f6..5249b05 100644 (file)
--- a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
@@ -23,7 +23,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <CDM_Application.hxx>
 #include <CDM_Document.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <FSD_BinaryFile.hxx>
 #include <FSD_FileHeader.hxx>
 #include <OSD_OpenFile.hxx>
@@ -158,7 +158,7 @@ void BinLDrivers_DocumentStorageDriver::Write (const Handle(CDM_Document)& theDo
     if (!myRelocTable.Extent()) {
       // No objects written
 #ifdef OCCT_DEBUG
-      WriteMessage ("BinLDrivers_DocumentStorageDriver, no objects written");
+      myMsgDriver->Send ("BinLDrivers_DocumentStorageDriver, no objects written", Message_Info);
 #endif
       SetIsError(Standard_True);
       SetStoreStatus(PCDM_SS_No_Obj);
@@ -168,9 +168,8 @@ void BinLDrivers_DocumentStorageDriver::Write (const Handle(CDM_Document)& theDo
     if (!theOStream) {
       // A problem with the stream
 #ifdef OCCT_DEBUG
-      TCollection_ExtendedString anErrorStr ("Error: ");
-      WriteMessage (anErrorStr + "BinLDrivers_DocumentStorageDriver, Problem with the file stream, rdstate="
-                    + (Standard_Integer )theOStream.rdstate());
+      TCollection_ExtendedString anErrorStr ("BinLDrivers_DocumentStorageDriver, Problem with the file stream, rdstate = ");
+      myMsgDriver->Send (anErrorStr + (Standard_Integer )theOStream.rdstate(), Message_Info);
 #endif
       SetIsError(Standard_True);
       SetStoreStatus(PCDM_SS_WriteFailure);
@@ -194,7 +193,7 @@ void BinLDrivers_DocumentStorageDriver::UnsupportedAttrMsg
   if (!myMapUnsupported.Contains(theType)) {
     myMapUnsupported.Add(theType);
 #ifdef OCCT_DEBUG
-    WriteMessage (aMsg + theType->Name() + " not found");
+    myMsgDriver->Send (aMsg + theType->Name() + " not found", Message_Info);
 #endif
   }
 }
@@ -281,7 +280,7 @@ void BinLDrivers_DocumentStorageDriver::WriteSubTree
 //=======================================================================
 
 Handle(BinMDF_ADriverTable) BinLDrivers_DocumentStorageDriver::AttributeDrivers
-       (const Handle(CDM_MessageDriver)& theMessageDriver)
+       (const Handle(Message_Messenger)& theMessageDriver)
 {
   return BinLDrivers::AttributeDrivers (theMessageDriver);
 }
@@ -480,19 +479,6 @@ void BinLDrivers_DocumentStorageDriver::WriteInfoSection
 }
 
 //=======================================================================
-//function : WriteMessage
-//purpose  : write  theMessage  to  the  MessageDriver  of  the
-//           Application
-//=======================================================================
-
-void BinLDrivers_DocumentStorageDriver::WriteMessage
-                         (const TCollection_ExtendedString& theMsg)
-{
-  if (!myMsgDriver.IsNull())
-    myMsgDriver->Write (theMsg.ToExtString());
-}
-
-//=======================================================================
 //function : AddSection
 //purpose  :
 //=======================================================================

diff --git a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx
index be8083a..c95198f 100644 (file)
--- a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx
@@ -30,7 +30,7 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Type.hxx>
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class TCollection_ExtendedString;
 class CDM_Document;
 class TDF_Label;
@@ -57,7 +57,7 @@ public:
   //! Write <theDocument> to theOStream
   Standard_EXPORT virtual void Write (const Handle(CDM_Document)& theDocument, Standard_OStream& theOStream) Standard_OVERRIDE;
   
-  Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(Message_Messenger)& theMsgDriver);
   
   //! Create a section that should be written after the OCAF data
   Standard_EXPORT void AddSection (const TCollection_AsciiString& theName, const Standard_Boolean isPostRead = Standard_True);
@@ -78,14 +78,10 @@ protected:
   
   //! defines the procedure of writing a shape  section to file
   Standard_EXPORT virtual void WriteShapeSection (BinLDrivers_DocumentSection& theDocSection, Standard_OStream& theOS);
-  
-  //! write  theMessage  to  the  MessageDriver  of  the
-  //! Application
-  Standard_EXPORT void WriteMessage (const TCollection_ExtendedString& theMessage);
 
   Handle(BinMDF_ADriverTable) myDrivers;
   BinObjMgt_SRelocationTable myRelocTable;
-
+  Handle(Message_Messenger) myMsgDriver;
 
 private:
 
@@ -102,7 +98,6 @@ private:
   Standard_EXPORT void UnsupportedAttrMsg (const Handle(Standard_Type)& theType);
 
   BinObjMgt_Persistent myPAtt;
-  Handle(CDM_MessageDriver) myMsgDriver;
   TDF_LabelList myEmptyLabels;
   TColStd_MapOfTransient myMapUnsupported;
   TColStd_IndexedMapOfTransient myTypesMap;

diff --git a/src/BinMDF/BinMDF.cxx b/src/BinMDF/BinMDF.cxx
index 60a7942..4ec3aa3 100644 (file)
--- a/src/BinMDF/BinMDF.cxx
+++ b/src/BinMDF/BinMDF.cxx
@@ -18,14 +18,14 @@
 #include <BinMDF_ADriverTable.hxx>
 #include <BinMDF_ReferenceDriver.hxx>
 #include <BinMDF_TagSourceDriver.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 
 //=======================================================================
 //function : AddDrivers
 //purpose  : 
 //=======================================================================
 void BinMDF::AddDrivers (const Handle(BinMDF_ADriverTable)& aDriverTable,
-                         const Handle(CDM_MessageDriver)&   aMsgDrv)
+                         const Handle(Message_Messenger)&   aMsgDrv)
 {
   aDriverTable->AddDriver (new BinMDF_ReferenceDriver (aMsgDrv) );
   aDriverTable->AddDriver (new BinMDF_TagSourceDriver (aMsgDrv) );

diff --git a/src/BinMDF/BinMDF.hxx b/src/BinMDF/BinMDF.hxx
index 23c441b..eeb43b5 100644 (file)
--- a/src/BinMDF/BinMDF.hxx
+++ b/src/BinMDF/BinMDF.hxx
@@ -21,7 +21,7 @@
 #include <Standard_Handle.hxx>
 
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class BinMDF_ADriver;
 class BinMDF_ReferenceDriver;
 class BinMDF_TagSourceDriver;
@@ -52,7 +52,7 @@ public:
 
   
   //! Adds the attribute storage drivers to <aDriverTable>.
-  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& aDriverTable, const Handle(CDM_MessageDriver)& aMsgDrv);
+  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& aDriverTable, const Handle(Message_Messenger)& aMsgDrv);
 
 
 

diff --git a/src/BinMDF/BinMDF_ADriver.cxx b/src/BinMDF/BinMDF_ADriver.cxx
index df5a8c0..8786c67 100644 (file)
--- a/src/BinMDF/BinMDF_ADriver.cxx
+++ b/src/BinMDF/BinMDF_ADriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDF_ADriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
@@ -28,20 +28,10 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDF_ADriver,Standard_Transient)
 //function : BinMDF_ADriver
 //purpose  : Constructor
 //=======================================================================
-BinMDF_ADriver::BinMDF_ADriver (const Handle(CDM_MessageDriver)& theMsgDriver,
+BinMDF_ADriver::BinMDF_ADriver (const Handle(Message_Messenger)& theMsgDriver,
                                 const Standard_CString           theName)
      : myMessageDriver (theMsgDriver)
 {
   if (theName)
     myTypeName = theName;
-}
-//=======================================================================
-//function : WriteMessage
-//purpose  :
-//=======================================================================
-
-void BinMDF_ADriver::WriteMessage
-                              (const TCollection_ExtendedString& aMessage) const
-{
-  myMessageDriver -> Write (aMessage.ToExtString());
-}
+}
\ No newline at end of file

diff --git a/src/BinMDF/BinMDF_ADriver.hxx b/src/BinMDF/BinMDF_ADriver.hxx
index 8c06fd1..ba63dfa 100644 (file)
--- a/src/BinMDF/BinMDF_ADriver.hxx
+++ b/src/BinMDF/BinMDF_ADriver.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Boolean.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-class CDM_MessageDriver;
+class Message_Messenger;
 class TDF_Attribute;
 class TCollection_AsciiString;
 class BinObjMgt_Persistent;
@@ -62,11 +62,6 @@ public:
   //! into <aTarget>, using the relocation table
   //! <aRelocTable> to keep the sharings.
   Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& aSource, BinObjMgt_Persistent& aTarget, BinObjMgt_SRelocationTable& aRelocTable) const = 0;
-  
-  //! Send message to Application (usually when error occurres)
-  Standard_EXPORT void WriteMessage (const TCollection_ExtendedString& theMessage) const;
-
-
 
 
   DEFINE_STANDARD_RTTIEXT(BinMDF_ADriver,Standard_Transient)
@@ -74,15 +69,11 @@ public:
 protected:
 
   
-  Standard_EXPORT BinMDF_ADriver(const Handle(CDM_MessageDriver)& theMsgDriver, const Standard_CString theName = NULL);
+  Standard_EXPORT BinMDF_ADriver(const Handle(Message_Messenger)& theMsgDriver, const Standard_CString theName = NULL);
 
   TCollection_AsciiString myTypeName;
 
-
-private:
-
-
-  Handle(CDM_MessageDriver) myMessageDriver;
+  Handle(Message_Messenger) myMessageDriver;
 
 
 };

diff --git a/src/BinMDF/BinMDF_ReferenceDriver.cxx b/src/BinMDF/BinMDF_ReferenceDriver.cxx
index 178be2b..08e5d09 100644 (file)
--- a/src/BinMDF/BinMDF_ReferenceDriver.cxx
+++ b/src/BinMDF/BinMDF_ReferenceDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDF_ReferenceDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDF_Reference.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDF_ReferenceDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDF_ReferenceDriver::BinMDF_ReferenceDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDF_Reference)->Name())
 {
 }

diff --git a/src/BinMDF/BinMDF_ReferenceDriver.hxx b/src/BinMDF/BinMDF_ReferenceDriver.hxx
index d525618..959bc32 100644 (file)
--- a/src/BinMDF/BinMDF_ReferenceDriver.hxx
+++ b/src/BinMDF/BinMDF_ReferenceDriver.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 BinMDF_ReferenceDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDF_ReferenceDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDF_ReferenceDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDF/BinMDF_TagSourceDriver.cxx b/src/BinMDF/BinMDF_TagSourceDriver.cxx
index 946e85e..ad444fa 100644 (file)
--- a/src/BinMDF/BinMDF_TagSourceDriver.cxx
+++ b/src/BinMDF/BinMDF_TagSourceDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDF_TagSourceDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDF_TagSource.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDF_TagSourceDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDF_TagSourceDriver::BinMDF_TagSourceDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDF/BinMDF_TagSourceDriver.hxx b/src/BinMDF/BinMDF_TagSourceDriver.hxx
index 455a0c2..83d2170 100644 (file)
--- a/src/BinMDF/BinMDF_TagSourceDriver.hxx
+++ b/src/BinMDF/BinMDF_TagSourceDriver.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 BinMDF_TagSourceDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDF_TagSourceDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDF_TagSourceDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd.cxx b/src/BinMDataStd/BinMDataStd.cxx
index 9885934..c0c3611 100644 (file)
--- a/src/BinMDataStd/BinMDataStd.cxx
+++ b/src/BinMDataStd/BinMDataStd.cxx
@@ -42,7 +42,7 @@
 #include <BinMDataStd_UAttributeDriver.hxx>
 #include <BinMDataStd_VariableDriver.hxx>
 #include <BinMDF_ADriverTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 
 static Standard_Integer myDocumentVersion = -1;
 //=======================================================================
@@ -51,7 +51,7 @@ static Standard_Integer myDocumentVersion = -1;
 //=======================================================================
 
 void BinMDataStd::AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable,
-                              const Handle(CDM_MessageDriver)&   theMsgDriver)
+                              const Handle(Message_Messenger)&   theMsgDriver)
 {
   theDriverTable->AddDriver (new BinMDataStd_CommentDriver     (theMsgDriver) );
   theDriverTable->AddDriver (new BinMDataStd_ExpressionDriver  (theMsgDriver) );

diff --git a/src/BinMDataStd/BinMDataStd.hxx b/src/BinMDataStd/BinMDataStd.hxx
index bef76cf..659ef2f 100644 (file)
--- a/src/BinMDataStd/BinMDataStd.hxx
+++ b/src/BinMDataStd/BinMDataStd.hxx
@@ -24,7 +24,7 @@
 #include <BinObjMgt_Persistent.hxx>
 
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class BinMDataStd_NameDriver;
 class BinMDataStd_IntegerDriver;
 class BinMDataStd_RealDriver;
@@ -61,7 +61,7 @@ public:
 
   
   //! Adds the attribute drivers to <theDriverTable>.
-  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(CDM_MessageDriver)& aMsgDrv);
+  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(Message_Messenger)& aMsgDrv);
   
   Standard_EXPORT static void SetDocumentVersion (const Standard_Integer DocVersion);
   

diff --git a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx
index d95c89b..c4346df 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_AsciiString.hxx>
 #include <TDF_Attribute.hxx>
@@ -32,7 +32,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_AsciiStringDriver,BinMDF_ADriver)
 //purpose  :
 //=======================================================================
 BinMDataStd_AsciiStringDriver::BinMDataStd_AsciiStringDriver
-                         (const Handle(CDM_MessageDriver)& theMessageDriver)
+                         (const Handle(Message_Messenger)& theMessageDriver)
      : BinMDF_ADriver (theMessageDriver, STANDARD_TYPE(TDataStd_AsciiString)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx
index e771af4..35c5b04 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.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 BinMDataStd_AsciiStringDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_AsciiStringDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_AsciiStringDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cxx
index 7bddede..347ce54 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd_BooleanArrayDriver.hxx>
 #include <BinMDataStd.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_HArray1OfByte.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_BooleanArrayDriver,BinMDF_ADriver)
 //function : BinMDataStd_BooleanArrayDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataStd_BooleanArrayDriver::BinMDataStd_BooleanArrayDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_BooleanArrayDriver::BinMDataStd_BooleanArrayDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_BooleanArray)->Name())
 {
 

diff --git a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.hxx
index c56bc52..5989628 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.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 BinMDataStd_BooleanArrayDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_BooleanArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_BooleanArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_BooleanListDriver.cxx b/src/BinMDataStd/BinMDataStd_BooleanListDriver.cxx
index 974ed9e..f07a5b3 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_BooleanListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_BooleanListDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd_BooleanListDriver.hxx>
 #include <BinMDataStd.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfByte.hxx>
 #include <TDataStd_BooleanList.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_BooleanListDriver,BinMDF_ADriver)
 //function : BinMDataStd_BooleanListDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataStd_BooleanListDriver::BinMDataStd_BooleanListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_BooleanListDriver::BinMDataStd_BooleanListDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_BooleanList)->Name())
 {
 

diff --git a/src/BinMDataStd/BinMDataStd_BooleanListDriver.hxx b/src/BinMDataStd/BinMDataStd_BooleanListDriver.hxx
index 9c1304d..2688305 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_BooleanListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_BooleanListDriver.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 BinMDataStd_BooleanListDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_BooleanListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_BooleanListDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx
index 2651f19..6f0cc7d 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd.hxx>
 #include <BinMDataStd_ByteArrayDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_HArray1OfByte.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ByteArrayDriver,BinMDF_ADriver)
 //function : BinMDataStd_ByteArrayDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataStd_ByteArrayDriver::BinMDataStd_ByteArrayDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_ByteArrayDriver::BinMDataStd_ByteArrayDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_ByteArray)->Name())
 {
 

diff --git a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.hxx
index 0a2c09f..b3f324e 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.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 BinMDataStd_ByteArrayDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_ByteArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_ByteArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_CommentDriver.cxx b/src/BinMDataStd/BinMDataStd_CommentDriver.cxx
index bb30012..cf3a932 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_CommentDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_CommentDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_CommentDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Comment.hxx>
 #include <TDF_Attribute.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_CommentDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_CommentDriver::BinMDataStd_CommentDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDataStd/BinMDataStd_CommentDriver.hxx b/src/BinMDataStd/BinMDataStd_CommentDriver.hxx
index 515e31b..93fc895 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_CommentDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_CommentDriver.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 BinMDataStd_CommentDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_CommentDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_CommentDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_DirectoryDriver.cxx b/src/BinMDataStd/BinMDataStd_DirectoryDriver.cxx
index 1b2eba6..1ebcb40 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_DirectoryDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_DirectoryDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Directory.hxx>
 #include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_DirectoryDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMDataStd_DirectoryDriver::BinMDataStd_DirectoryDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_Directory)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_DirectoryDriver.hxx b/src/BinMDataStd/BinMDataStd_DirectoryDriver.hxx
index f13a201..c91a36e 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_DirectoryDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_DirectoryDriver.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 BinMDataStd_DirectoryDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_DirectoryDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_DirectoryDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_ExpressionDriver.cxx b/src/BinMDataStd/BinMDataStd_ExpressionDriver.cxx
index 9b841d0..cc9b08f 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ExpressionDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ExpressionDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_ExpressionDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Expression.hxx>
 #include <TDataStd_Variable.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ExpressionDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_ExpressionDriver::BinMDataStd_ExpressionDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx b/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx
index 657f269..bae055c 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ExpressionDriver.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 BinMDataStd_ExpressionDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_ExpressionDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_ExpressionDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx
index e208f8a..32140af 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd.hxx>
 #include <BinMDataStd_ExtStringArrayDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfExtendedString.hxx>
 #include <TColStd_HArray1OfExtendedString.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ExtStringArrayDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_ExtStringArrayDriver::BinMDataStd_ExtStringArrayDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_ExtStringArray)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.hxx
index 7075688..d75d45b 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.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 BinMDataStd_ExtStringArrayDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_ExtStringArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_ExtStringArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx
index 1df2237..35c3724 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd_ExtStringListDriver.hxx>
 #include <BinMDataStd.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfExtendedString.hxx>
 #include <TDataStd_ExtStringList.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ExtStringListDriver,BinMDF_ADriver)
 //function : BinMDataStd_ExtStringListDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataStd_ExtStringListDriver::BinMDataStd_ExtStringListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_ExtStringListDriver::BinMDataStd_ExtStringListDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_ExtStringList)->Name())
 {
 

diff --git a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.hxx b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.hxx
index 909cace..4dc4d76 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.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 BinMDataStd_ExtStringListDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_ExtStringListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_ExtStringListDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx
index ccc5e91..ce8004c 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx
@@ -20,7 +20,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <TColStd_HPackedMapOfInteger.hxx>
@@ -36,7 +36,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntPackedMapDriver,BinMDF_ADriver)
 //purpose  :
 //=======================================================================
 BinMDataStd_IntPackedMapDriver::BinMDataStd_IntPackedMapDriver
-                         (const Handle(CDM_MessageDriver)& theMessageDriver)
+                         (const Handle(Message_Messenger)& theMessageDriver)
      : BinMDF_ADriver (theMessageDriver, STANDARD_TYPE(TDataStd_IntPackedMap)->Name())
 {
 }
@@ -63,13 +63,13 @@ Standard_Boolean BinMDataStd_IntPackedMapDriver::Paste
 {
   Handle(TDataStd_IntPackedMap) aTagAtt = Handle(TDataStd_IntPackedMap)::DownCast(Target);
   if(aTagAtt.IsNull()) {
-    WriteMessage (TCollection_ExtendedString("IntPackedMapDriver:: The target attribute is Null."));
+    myMessageDriver->Send ("IntPackedMapDriver:: The target attribute is Null.", Message_Fail);
     return Standard_False;
   }
 
   Standard_Integer aSize = 0;
   if (! (Source >> aSize)) {
-    WriteMessage (TCollection_ExtendedString("Cannot retrieve size for IntPackedMap attribute."));
+    myMessageDriver->Send ("Cannot retrieve size for IntPackedMap attribute.", Message_Fail);
     return Standard_False;
   }
   if(aSize) {
@@ -78,7 +78,7 @@ Standard_Boolean BinMDataStd_IntPackedMapDriver::Paste
     for(Standard_Integer i = 0; i< aSize; i++) {
       Standard_Boolean ok = Source >> aKey;
       if (!ok) {
-       WriteMessage ("Cannot retrieve integer member for IntPackedMap attribute.");
+       myMessageDriver->Send ("Cannot retrieve integer member for IntPackedMap attribute.", Message_Fail);
        return Standard_False;
       }
       if(!aHMap->ChangeMap().Add( aKey )) return Standard_False;
@@ -110,7 +110,7 @@ void BinMDataStd_IntPackedMapDriver::Paste
 {
   Handle(TDataStd_IntPackedMap) anAtt = Handle(TDataStd_IntPackedMap)::DownCast(Source);
   if (anAtt.IsNull()) {
-    WriteMessage ("IntPackedMapDriver:: The source attribute is Null.");
+    myMessageDriver->Send ("IntPackedMapDriver:: The source attribute is Null.", Message_Fail);
     return;
   }
   Standard_Integer aSize = (anAtt->IsEmpty()) ? 0 : anAtt->Extent();

diff --git a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx
index 8194122..de07d74 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.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 BinMDataStd_IntPackedMapDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_IntPackedMapDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_IntPackedMapDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx
index 29f44e5..408410c 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd.hxx>
 #include <BinMDataStd_IntegerArrayDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TDataStd_IntegerArray.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntegerArrayDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_IntegerArrayDriver::BinMDataStd_IntegerArrayDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_IntegerArray)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.hxx
index 582fdad..6430741 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.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 BinMDataStd_IntegerArrayDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_IntegerArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_IntegerArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx b/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx
index b963ca6..5ddca9f 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_IntegerDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDF_Attribute.hxx>
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntegerDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_IntegerDriver::BinMDataStd_IntegerDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_Integer)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_IntegerDriver.hxx b/src/BinMDataStd/BinMDataStd_IntegerDriver.hxx
index 9fbd27e..0c8d672 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_IntegerDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerDriver.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 BinMDataStd_IntegerDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_IntegerDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_IntegerDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_IntegerListDriver.cxx b/src/BinMDataStd/BinMDataStd_IntegerListDriver.cxx
index 6945304..cc94ed2 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_IntegerListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerListDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd_IntegerListDriver.hxx>
 #include <BinMDataStd.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntegerListDriver,BinMDF_ADriver)
 //function : BinMDataStd_IntegerListDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataStd_IntegerListDriver::BinMDataStd_IntegerListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_IntegerListDriver::BinMDataStd_IntegerListDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_IntegerList)->Name())
 {
 

diff --git a/src/BinMDataStd/BinMDataStd_IntegerListDriver.hxx b/src/BinMDataStd/BinMDataStd_IntegerListDriver.hxx
index 23bc69e..09614db 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_IntegerListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerListDriver.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 BinMDataStd_IntegerListDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_IntegerListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_IntegerListDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_NameDriver.cxx b/src/BinMDataStd/BinMDataStd_NameDriver.cxx
index 96817dc..25531e8 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_NameDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_NameDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_NameDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDF_Attribute.hxx>
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_NameDriver,BinMDF_ADriver)
 //purpose  :
 //=======================================================================
 BinMDataStd_NameDriver::BinMDataStd_NameDriver
-                         (const Handle(CDM_MessageDriver)& theMessageDriver)
+                         (const Handle(Message_Messenger)& theMessageDriver)
      : BinMDF_ADriver (theMessageDriver, STANDARD_TYPE(TDataStd_Name)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_NameDriver.hxx b/src/BinMDataStd/BinMDataStd_NameDriver.hxx
index 19e20fc..86e89a6 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_NameDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_NameDriver.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 BinMDataStd_NameDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_NameDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_NameDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_NamedDataDriver.cxx b/src/BinMDataStd/BinMDataStd_NamedDataDriver.cxx
index cf463bc..15e64a4 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_NamedDataDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_NamedDataDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_NamedDataDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfStringInteger.hxx>
@@ -42,7 +42,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_NamedDataDriver,BinMDF_ADriver)
 //function : BinMDataStd_NamedDataDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataStd_NamedDataDriver::BinMDataStd_NamedDataDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_NamedDataDriver::BinMDataStd_NamedDataDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_NamedData)->Name())
 {
 

diff --git a/src/BinMDataStd/BinMDataStd_NamedDataDriver.hxx b/src/BinMDataStd/BinMDataStd_NamedDataDriver.hxx
index a66d2f9..835548d 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_NamedDataDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_NamedDataDriver.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 BinMDataStd_NamedDataDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_NamedDataDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_NamedDataDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_NoteBookDriver.cxx b/src/BinMDataStd/BinMDataStd_NoteBookDriver.cxx
index d369ba6..35c536c 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_NoteBookDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_NoteBookDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_NoteBook.hxx>
 #include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_NoteBookDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMDataStd_NoteBookDriver::BinMDataStd_NoteBookDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_NoteBook)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_NoteBookDriver.hxx b/src/BinMDataStd/BinMDataStd_NoteBookDriver.hxx
index 415a0a3..11dee1a 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_NoteBookDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_NoteBookDriver.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 BinMDataStd_NoteBookDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_NoteBookDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_NoteBookDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx
index b0eafdb..fa43a79 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd.hxx>
 #include <BinMDataStd_RealArrayDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TDataStd_RealArray.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_RealArrayDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_RealArrayDriver::BinMDataStd_RealArrayDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_RealArray)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_RealArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_RealArrayDriver.hxx
index 0dc8210..9169301 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_RealArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_RealArrayDriver.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 BinMDataStd_RealArrayDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_RealArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_RealArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_RealDriver.cxx b/src/BinMDataStd/BinMDataStd_RealDriver.cxx
index a987ccb..e147eec 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_RealDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_RealDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_RealDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDF_Attribute.hxx>
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_RealDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_RealDriver::BinMDataStd_RealDriver 
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_Real)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_RealDriver.hxx b/src/BinMDataStd/BinMDataStd_RealDriver.hxx
index 51801a5..33e05c4 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_RealDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_RealDriver.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 BinMDataStd_RealDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_RealDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_RealDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_RealListDriver.cxx b/src/BinMDataStd/BinMDataStd_RealListDriver.cxx
index 957ca3e..a1c4a19 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_RealListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_RealListDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd_RealListDriver.hxx>
 #include <BinMDataStd.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_RealListDriver,BinMDF_ADriver)
 //function : BinMDataStd_RealListDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataStd_RealListDriver::BinMDataStd_RealListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_RealListDriver::BinMDataStd_RealListDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_RealList)->Name())
 {
 

diff --git a/src/BinMDataStd/BinMDataStd_RealListDriver.hxx b/src/BinMDataStd/BinMDataStd_RealListDriver.hxx
index 5353092..ac9e47a 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_RealListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_RealListDriver.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 BinMDataStd_RealListDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_RealListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_RealListDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cxx
index 57b2490..c1d47a7 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd_ReferenceArrayDriver.hxx>
 #include <BinMDataStd.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_ReferenceArray.hxx>
 #include <TDF_Attribute.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ReferenceArrayDriver,BinMDF_ADriver)
 //function : BinMDataStd_ReferenceArrayDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataStd_ReferenceArrayDriver::BinMDataStd_ReferenceArrayDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_ReferenceArrayDriver::BinMDataStd_ReferenceArrayDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_ReferenceArray)->Name())
 {
 

diff --git a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.hxx
index dc6e605..0045111 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.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 BinMDataStd_ReferenceArrayDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_ReferenceArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_ReferenceArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cxx b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cxx
index 3f43858..3105ec5 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cxx
@@ -17,7 +17,7 @@
 #include <BinMDataStd_ReferenceListDriver.hxx>
 #include <BinMDataStd.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_ReferenceList.hxx>
 #include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ReferenceListDriver,BinMDF_ADriver)
 //function : BinMDataStd_ReferenceListDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataStd_ReferenceListDriver::BinMDataStd_ReferenceListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_ReferenceListDriver::BinMDataStd_ReferenceListDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_ReferenceList)->Name())
 {
 

diff --git a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.hxx b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.hxx
index 81ddaa6..2436cb7 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.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 BinMDataStd_ReferenceListDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_ReferenceListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_ReferenceListDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_RelationDriver.cxx b/src/BinMDataStd/BinMDataStd_RelationDriver.cxx
index 25120e9..581a073 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_RelationDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_RelationDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_RelationDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Relation.hxx>
 #include <TDataStd_Variable.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_RelationDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_RelationDriver::BinMDataStd_RelationDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDataStd/BinMDataStd_RelationDriver.hxx b/src/BinMDataStd/BinMDataStd_RelationDriver.hxx
index ca6915b..eee881e 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_RelationDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_RelationDriver.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 BinMDataStd_RelationDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_RelationDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_RelationDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_TickDriver.cxx b/src/BinMDataStd/BinMDataStd_TickDriver.cxx
index 2421395..278432d 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_TickDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_TickDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Tick.hxx>
 #include <TDF_Attribute.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_TickDriver,BinMDF_ADriver)
 //function : BinMDataStd_TickDriver
 //purpose  : 
 //=======================================================================
-BinMDataStd_TickDriver::BinMDataStd_TickDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataStd_TickDriver::BinMDataStd_TickDriver(const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_Tick)->Name())
 {
 }

diff --git a/src/BinMDataStd/BinMDataStd_TickDriver.hxx b/src/BinMDataStd/BinMDataStd_TickDriver.hxx
index 3fe9c31..430d972 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_TickDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_TickDriver.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 BinMDataStd_TickDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_TickDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_TickDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cxx b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cxx
index f094718..48ab0a2 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_TreeNodeDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <TDataStd_TreeNode.hxx>
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_TreeNodeDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_TreeNodeDriver::BinMDataStd_TreeNodeDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx
index 8bcd2e3..b272da2 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.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 BinMDataStd_TreeNodeDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_TreeNodeDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_TreeNodeDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_UAttributeDriver.cxx b/src/BinMDataStd/BinMDataStd_UAttributeDriver.cxx
index 9e1fa27..7500f36 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_UAttributeDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_UAttributeDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_UAttributeDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_UAttribute.hxx>
 #include <TDF_Attribute.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_UAttributeDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_UAttributeDriver::BinMDataStd_UAttributeDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx b/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx
index b71d5d0..47742f4 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_UAttributeDriver.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 BinMDataStd_UAttributeDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_UAttributeDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_UAttributeDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataStd/BinMDataStd_VariableDriver.cxx b/src/BinMDataStd/BinMDataStd_VariableDriver.cxx
index 96d2cc3..ccc2dbc 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_VariableDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_VariableDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMDataStd_VariableDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDataStd_Variable.hxx>
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_VariableDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataStd_VariableDriver::BinMDataStd_VariableDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDataStd/BinMDataStd_VariableDriver.hxx b/src/BinMDataStd/BinMDataStd_VariableDriver.hxx
index 2406c33..57b07d8 100644 (file)
--- a/src/BinMDataStd/BinMDataStd_VariableDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_VariableDriver.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 BinMDataStd_VariableDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataStd_VariableDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataStd_VariableDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd.cxx b/src/BinMDataXtd/BinMDataXtd.cxx
index 10402c0..7b967f7 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd.cxx
+++ b/src/BinMDataXtd/BinMDataXtd.cxx
@@ -25,7 +25,7 @@
 #include <BinMDataXtd_PointDriver.hxx>
 #include <BinMDataXtd_ShapeDriver.hxx>
 #include <BinMDF_ADriverTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <BinMDataXtd_PresentationDriver.hxx>
 #include <BinMDataXtd_PositionDriver.hxx>
 #include <BinMDataXtd_TriangulationDriver.hxx>
@@ -37,7 +37,7 @@ static Standard_Integer myDocumentVersion = -1;
 //=======================================================================
 
 void BinMDataXtd::AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable,
-                              const Handle(CDM_MessageDriver)&   theMsgDriver)
+                              const Handle(Message_Messenger)&   theMsgDriver)
 {
   theDriverTable->AddDriver (new BinMDataXtd_ConstraintDriver   (theMsgDriver) );
   theDriverTable->AddDriver (new BinMDataXtd_GeometryDriver     (theMsgDriver) );

diff --git a/src/BinMDataXtd/BinMDataXtd.hxx b/src/BinMDataXtd/BinMDataXtd.hxx
index cddf90b..a4f1ac8 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd.hxx
+++ b/src/BinMDataXtd/BinMDataXtd.hxx
@@ -22,7 +22,7 @@
 
 #include <Standard_Integer.hxx>
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class BinMDataXtd_PointDriver;
 class BinMDataXtd_AxisDriver;
 class BinMDataXtd_PlaneDriver;
@@ -42,7 +42,7 @@ public:
 
   
   //! Adds the attribute drivers to <theDriverTable>.
-  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(CDM_MessageDriver)& aMsgDrv);
+  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(Message_Messenger)& aMsgDrv);
   
   Standard_EXPORT static void SetDocumentVersion (const Standard_Integer DocVersion);
   

diff --git a/src/BinMDataXtd/BinMDataXtd_AxisDriver.cxx b/src/BinMDataXtd/BinMDataXtd_AxisDriver.cxx
index a0a60c6..149d3c8 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_AxisDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_AxisDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataXtd_Axis.hxx>
 #include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_AxisDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMDataXtd_AxisDriver::BinMDataXtd_AxisDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataXtd_Axis)->Name())
 {
 }

diff --git a/src/BinMDataXtd/BinMDataXtd_AxisDriver.hxx b/src/BinMDataXtd/BinMDataXtd_AxisDriver.hxx
index 1218674..8af19ce 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_AxisDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_AxisDriver.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 BinMDataXtd_AxisDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_AxisDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_AxisDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cxx b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cxx
index 47ce2b4..bdd79dc 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cxx
@@ -17,7 +17,7 @@
 
 #include <BinMDataXtd_ConstraintDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDataXtd_Constraint.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_ConstraintDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataXtd_ConstraintDriver::BinMDataXtd_ConstraintDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx
index 6ee9f7d..7a66e74 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.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 BinMDataXtd_ConstraintDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_ConstraintDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_ConstraintDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cxx b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cxx
index 6d32070..5144b18 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cxx
@@ -17,7 +17,7 @@
 
 #include <BinMDataXtd_GeometryDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataXtd_Geometry.hxx>
 #include <TDF_Attribute.hxx>
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_GeometryDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataXtd_GeometryDriver::BinMDataXtd_GeometryDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx
index 4a40724..0cf882c 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.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 BinMDataXtd_GeometryDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_GeometryDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_GeometryDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cxx
index db75226..72a6bfc 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cxx
@@ -17,7 +17,7 @@
 
 #include <BinMDataXtd_PatternStdDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_Real.hxx>
@@ -32,7 +32,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PatternStdDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataXtd_PatternStdDriver::BinMDataXtd_PatternStdDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
       : BinMDF_ADriver (theMsgDriver, NULL)
 {}
 

diff --git a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx
index ca12d14..51c3f45 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.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 BinMDataXtd_PatternStdDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_PatternStdDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_PatternStdDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cxx
index 7af4277..51ff6b3 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataXtd_Placement.hxx>
 #include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PlacementDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMDataXtd_PlacementDriver::BinMDataXtd_PlacementDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataXtd_Placement)->Name())
 {
 }

diff --git a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.hxx
index 1a03b22..8378a0f 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.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 BinMDataXtd_PlacementDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_PlacementDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_PlacementDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cxx
index 8c46014..75beee8 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataXtd_Plane.hxx>
 #include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PlaneDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMDataXtd_PlaneDriver::BinMDataXtd_PlaneDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataXtd_Plane)->Name())
 {
 }

diff --git a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.hxx
index 6d00b06..19b6fb4 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.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 BinMDataXtd_PlaneDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_PlaneDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_PlaneDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_PointDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PointDriver.cxx
index 4d1900a..8371af9 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PointDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PointDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataXtd_Point.hxx>
 #include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PointDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMDataXtd_PointDriver::BinMDataXtd_PointDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataXtd_Point)->Name())
 {
 }

diff --git a/src/BinMDataXtd/BinMDataXtd_PointDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PointDriver.hxx
index a8d22b6..4c8ddad 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PointDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PointDriver.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 BinMDataXtd_PointDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_PointDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_PointDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_PositionDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PositionDriver.cxx
index 2a4491a..e857140 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PositionDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PositionDriver.cxx
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PositionDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataXtd_PositionDriver::BinMDataXtd_PositionDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataXtd_Position)->Name())
 {
 }

diff --git a/src/BinMDataXtd/BinMDataXtd_PositionDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PositionDriver.hxx
index b747858..2ceecc5 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PositionDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PositionDriver.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 BinMDataXtd_PositionDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_PositionDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_PositionDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx
index 0dc0dc3..3e30f77 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx
@@ -17,7 +17,7 @@
 
 #include <TDataXtd_Presentation.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PresentationDriver,BinMDF_ADriver)
 
@@ -26,7 +26,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PresentationDriver,BinMDF_ADriver)
 //purpose  : Constructor
 //=======================================================================
 BinMDataXtd_PresentationDriver::BinMDataXtd_PresentationDriver
-                          (const Handle(CDM_MessageDriver)& theMsgDriver)
+                          (const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(TDataXtd_Presentation)->Name())
 {
 }

diff --git a/src/BinMDataXtd/BinMDataXtd_PresentationDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.hxx
index 206bdc9..e7f242e 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_PresentationDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.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;
 
@@ -39,7 +39,7 @@ class BinMDataXtd_PresentationDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_PresentationDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_PresentationDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cxx b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cxx
index 34b9161..5696019 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataXtd_Shape.hxx>
 #include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_ShapeDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMDataXtd_ShapeDriver::BinMDataXtd_ShapeDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataXtd_Shape)->Name())
 {
 }

diff --git a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.hxx b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.hxx
index 76c5e85..cb8b06e 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.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 BinMDataXtd_ShapeDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDataXtd_ShapeDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_ShapeDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMDataXtd/BinMDataXtd_TriangulationDriver.cxx b/src/BinMDataXtd/BinMDataXtd_TriangulationDriver.cxx
index fa7e565..503999b 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_TriangulationDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_TriangulationDriver.cxx
@@ -15,7 +15,7 @@
 
 #include <BinMDataXtd_TriangulationDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDataXtd_Triangulation.hxx>
 #include <TDF_Attribute.hxx>
@@ -26,7 +26,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_TriangulationDriver,BinMDF_ADriver)
 //function : BinMDataXtd_TriangulationDriver
 //purpose  : Constructor
 //=======================================================================
-BinMDataXtd_TriangulationDriver::BinMDataXtd_TriangulationDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMDataXtd_TriangulationDriver::BinMDataXtd_TriangulationDriver(const Handle(Message_Messenger)& theMsgDriver)
   : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataXtd_Triangulation)->Name())
 {
 

diff --git a/src/BinMDataXtd/BinMDataXtd_TriangulationDriver.hxx b/src/BinMDataXtd/BinMDataXtd_TriangulationDriver.hxx
index 66476b8..0b34976 100644 (file)
--- a/src/BinMDataXtd/BinMDataXtd_TriangulationDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_TriangulationDriver.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;
 
@@ -35,7 +35,7 @@ class BinMDataXtd_TriangulationDriver : public BinMDF_ADriver
 
 public:
 
-  Standard_EXPORT BinMDataXtd_TriangulationDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDataXtd_TriangulationDriver(const Handle(Message_Messenger)& theMessageDriver);
 
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
 

diff --git a/src/BinMDocStd/BinMDocStd.cxx b/src/BinMDocStd/BinMDocStd.cxx
index f8b6e41..72d2802 100644 (file)
--- a/src/BinMDocStd/BinMDocStd.cxx
+++ b/src/BinMDocStd/BinMDocStd.cxx
@@ -17,14 +17,14 @@
 #include <BinMDF_ADriverTable.hxx>
 #include <BinMDocStd.hxx>
 #include <BinMDocStd_XLinkDriver.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 
 //=======================================================================
 //function : AddDrivers
 //purpose  : 
 //=======================================================================
 void BinMDocStd::AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable,
-                              const Handle(CDM_MessageDriver)&   theMsgDriver)
+                              const Handle(Message_Messenger)&   theMsgDriver)
 {
   theDriverTable->AddDriver (new BinMDocStd_XLinkDriver  (theMsgDriver) );
   

diff --git a/src/BinMDocStd/BinMDocStd.hxx b/src/BinMDocStd/BinMDocStd.hxx
index 32b51f4..efba2c0 100644 (file)
--- a/src/BinMDocStd/BinMDocStd.hxx
+++ b/src/BinMDocStd/BinMDocStd.hxx
@@ -21,7 +21,7 @@
 #include <Standard_Handle.hxx>
 
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class BinMDocStd_XLinkDriver;
 
 
@@ -34,7 +34,7 @@ public:
 
   
   //! Adds the attribute drivers to <theDriverTable>.
-  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(CDM_MessageDriver)& aMsgDrv);
+  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(Message_Messenger)& aMsgDrv);
 
 
 

diff --git a/src/BinMDocStd/BinMDocStd_XLinkDriver.cxx b/src/BinMDocStd/BinMDocStd_XLinkDriver.cxx
index b35cf16..4383219 100644 (file)
--- a/src/BinMDocStd/BinMDocStd_XLinkDriver.cxx
+++ b/src/BinMDocStd/BinMDocStd_XLinkDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDocStd_XLink.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMDocStd_XLinkDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMDocStd_XLinkDriver::BinMDocStd_XLinkDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDocStd_XLink)->Name())
 {
 }

diff --git a/src/BinMDocStd/BinMDocStd_XLinkDriver.hxx b/src/BinMDocStd/BinMDocStd_XLinkDriver.hxx
index dca3ce3..03134ed 100644 (file)
--- a/src/BinMDocStd/BinMDocStd_XLinkDriver.hxx
+++ b/src/BinMDocStd/BinMDocStd_XLinkDriver.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 BinMDocStd_XLinkDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMDocStd_XLinkDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMDocStd_XLinkDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMFunction/BinMFunction.cxx b/src/BinMFunction/BinMFunction.cxx
index f9c09dc..4e0324d 100644 (file)
--- a/src/BinMFunction/BinMFunction.cxx
+++ b/src/BinMFunction/BinMFunction.cxx
@@ -19,14 +19,14 @@
 #include <BinMFunction_FunctionDriver.hxx>
 #include <BinMFunction_GraphNodeDriver.hxx>
 #include <BinMFunction_ScopeDriver.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 
 //=======================================================================
 //function : AddDrivers
 //purpose  : 
 //=======================================================================
 void BinMFunction::AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable,
-                              const Handle(CDM_MessageDriver)&   theMsgDriver)
+                              const Handle(Message_Messenger)&   theMsgDriver)
 {
   theDriverTable->AddDriver (new BinMFunction_FunctionDriver  (theMsgDriver) );
   theDriverTable->AddDriver (new BinMFunction_GraphNodeDriver (theMsgDriver) );

diff --git a/src/BinMFunction/BinMFunction.hxx b/src/BinMFunction/BinMFunction.hxx
index 83fc032..8d1c849 100644 (file)
--- a/src/BinMFunction/BinMFunction.hxx
+++ b/src/BinMFunction/BinMFunction.hxx
@@ -21,7 +21,7 @@
 #include <Standard_Handle.hxx>
 
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class BinMFunction_FunctionDriver;
 class BinMFunction_GraphNodeDriver;
 class BinMFunction_ScopeDriver;
@@ -36,7 +36,7 @@ public:
 
   
   //! Adds the attribute drivers to <theDriverTable>.
-  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(CDM_MessageDriver)& aMsgDrv);
+  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(Message_Messenger)& aMsgDrv);
 
 
 

diff --git a/src/BinMFunction/BinMFunction_FunctionDriver.cxx b/src/BinMFunction/BinMFunction_FunctionDriver.cxx
index eae9bed..6db9236 100644 (file)
--- a/src/BinMFunction/BinMFunction_FunctionDriver.cxx
+++ b/src/BinMFunction/BinMFunction_FunctionDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <TFunction_Function.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMFunction_FunctionDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMFunction_FunctionDriver::BinMFunction_FunctionDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TFunction_Function)->Name())
 {
 }

diff --git a/src/BinMFunction/BinMFunction_FunctionDriver.hxx b/src/BinMFunction/BinMFunction_FunctionDriver.hxx
index 34a1f3d..bb6d5b5 100644 (file)
--- a/src/BinMFunction/BinMFunction_FunctionDriver.hxx
+++ b/src/BinMFunction/BinMFunction_FunctionDriver.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 BinMFunction_FunctionDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMFunction_FunctionDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMFunction_FunctionDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMFunction/BinMFunction_GraphNodeDriver.cxx b/src/BinMFunction/BinMFunction_GraphNodeDriver.cxx
index 6632a3f..122ab8c 100644 (file)
--- a/src/BinMFunction/BinMFunction_GraphNodeDriver.cxx
+++ b/src/BinMFunction/BinMFunction_GraphNodeDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_MapIteratorOfMapOfInteger.hxx>
@@ -32,7 +32,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMFunction_GraphNodeDriver,BinMDF_ADriver)
 //function : BinMFunction_GraphNodeDriver
 //purpose  : 
 //=======================================================================
-BinMFunction_GraphNodeDriver::BinMFunction_GraphNodeDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMFunction_GraphNodeDriver::BinMFunction_GraphNodeDriver(const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TFunction_GraphNode)->Name())
 {
 }

diff --git a/src/BinMFunction/BinMFunction_GraphNodeDriver.hxx b/src/BinMFunction/BinMFunction_GraphNodeDriver.hxx
index d61e623..64b6ea4 100644 (file)
--- a/src/BinMFunction/BinMFunction_GraphNodeDriver.hxx
+++ b/src/BinMFunction/BinMFunction_GraphNodeDriver.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 BinMFunction_GraphNodeDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMFunction_GraphNodeDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMFunction_GraphNodeDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMFunction/BinMFunction_ScopeDriver.cxx b/src/BinMFunction/BinMFunction_ScopeDriver.cxx
index 374d44a..412b85e 100644 (file)
--- a/src/BinMFunction/BinMFunction_ScopeDriver.cxx
+++ b/src/BinMFunction/BinMFunction_ScopeDriver.cxx
@@ -19,7 +19,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TDF_Attribute.hxx>
@@ -34,7 +34,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMFunction_ScopeDriver,BinMDF_ADriver)
 //function : BinMFunction_GraphNodeDriver
 //purpose  : 
 //=======================================================================
-BinMFunction_ScopeDriver::BinMFunction_ScopeDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMFunction_ScopeDriver::BinMFunction_ScopeDriver(const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TFunction_Scope)->Name())
 {
 }

diff --git a/src/BinMFunction/BinMFunction_ScopeDriver.hxx b/src/BinMFunction/BinMFunction_ScopeDriver.hxx
index 0d63038..560f4e4 100644 (file)
--- a/src/BinMFunction/BinMFunction_ScopeDriver.hxx
+++ b/src/BinMFunction/BinMFunction_ScopeDriver.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 BinMFunction_ScopeDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMFunction_ScopeDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMFunction_ScopeDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMNaming/BinMNaming.cxx b/src/BinMNaming/BinMNaming.cxx
index 41767ec..530c490 100644 (file)
--- a/src/BinMNaming/BinMNaming.cxx
+++ b/src/BinMNaming/BinMNaming.cxx
@@ -18,7 +18,7 @@
 #include <BinMNaming.hxx>
 #include <BinMNaming_NamedShapeDriver.hxx>
 #include <BinMNaming_NamingDriver.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 
 static Standard_Integer myDocumentVersion = -1;
 //=======================================================================
@@ -26,7 +26,7 @@ static Standard_Integer myDocumentVersion = -1;
 //purpose  : 
 //=======================================================================
 void BinMNaming::AddDrivers (const Handle(BinMDF_ADriverTable)& aDriverTable,
-                             const Handle(CDM_MessageDriver)&   aMessageDriver)
+                             const Handle(Message_Messenger)&   aMessageDriver)
 {
   aDriverTable->AddDriver (new BinMNaming_NamedShapeDriver(aMessageDriver));
   aDriverTable->AddDriver (new BinMNaming_NamingDriver(aMessageDriver));

diff --git a/src/BinMNaming/BinMNaming.hxx b/src/BinMNaming/BinMNaming.hxx
index f53dfbb..27aea44 100644 (file)
--- a/src/BinMNaming/BinMNaming.hxx
+++ b/src/BinMNaming/BinMNaming.hxx
@@ -22,7 +22,7 @@
 
 #include <Standard_Integer.hxx>
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class BinMNaming_NamedShapeDriver;
 class BinMNaming_NamingDriver;
 
@@ -36,7 +36,7 @@ public:
 
   
   //! Adds the attribute drivers to <theDriverTable>.
-  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(CDM_MessageDriver)& aMsgDrv);
+  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(Message_Messenger)& aMsgDrv);
   
   Standard_EXPORT static void SetDocumentVersion (const Standard_Integer DocVersion);
   

diff --git a/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx b/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
index f134517..eeac367 100644 (file)
--- a/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
+++ b/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
@@ -18,7 +18,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinTools_LocationSet.hxx>
 #include <BinTools_ShapeSet.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
@@ -141,7 +141,7 @@ static int TranslateFrom  (const BinObjMgt_Persistent&  theSource,
 //=======================================================================
 
 BinMNaming_NamedShapeDriver::BinMNaming_NamedShapeDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TNaming_NamedShape)->Name()), myShapeSet(Standard_False),myFormatNb(FORMAT_NUMBER)
 {
 }

diff --git a/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx b/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx
index 057199d..06368b0 100644 (file)
--- a/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx
+++ b/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx
@@ -27,7 +27,7 @@
 #include <BinObjMgt_SRelocationTable.hxx>
 #include <Standard_IStream.hxx>
 #include <Standard_OStream.hxx>
-class CDM_MessageDriver;
+class Message_Messenger;
 class TDF_Attribute;
 class BinObjMgt_Persistent;
 class BinTools_LocationSet;
@@ -43,7 +43,7 @@ class BinMNaming_NamedShapeDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMNaming_NamedShapeDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMNaming_NamedShapeDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMNaming/BinMNaming_NamingDriver.cxx b/src/BinMNaming/BinMNaming_NamingDriver.cxx
index 8c93b43..5fc8aa2 100644 (file)
--- a/src/BinMNaming/BinMNaming_NamingDriver.cxx
+++ b/src/BinMNaming/BinMNaming_NamingDriver.cxx
@@ -20,7 +20,7 @@
 #include <BinObjMgt_Persistent.hxx>
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
@@ -123,7 +123,7 @@ static TopAbs_ShapeEnum CharToShapeType(const Standard_Character theCharType)
 //=======================================================================
 
 BinMNaming_NamingDriver::BinMNaming_NamingDriver
-                        (const Handle(CDM_MessageDriver)& theMsgDriver)
+                        (const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TNaming_Naming)->Name())
 {
 }
@@ -222,19 +222,19 @@ Standard_Boolean BinMNaming_NamingDriver::Paste
           else {
             aMsg = TCollection_ExtendedString("BinMNaming_NamingDriver: "
                                               "Cannot retrieve Index of Name");
-            WriteMessage (aMsg); 
+            myMessageDriver->Send (aMsg, Message_Warning); 
           }
         } else {
           aMsg = TCollection_ExtendedString("BinMNaming_NamingDriver: "
                                             "Cannot retrieve reference on "
                                             "StopNamedShape");
-          WriteMessage (aMsg); 
+          myMessageDriver->Send (aMsg, Message_Warning); 
         }
       } else {
         aMsg = TCollection_ExtendedString("BinMNaming_NamingDriver: "
                                           "Cannot retrieve reference on "
                                           "Arguments of Name");
-       WriteMessage (aMsg);
+       myMessageDriver->Send (aMsg, Message_Warning);
          }
 
     if(BinMNaming::DocumentVersion() > 3) {
@@ -285,7 +285,7 @@ Standard_Boolean BinMNaming_NamingDriver::Paste
          } else {
           aMsg = TCollection_ExtendedString("BinMNaming_NamingDriver: "
                                             "Cannot retrieve Name Orientation ");
-         WriteMessage (aMsg);
+         myMessageDriver->Send (aMsg, Message_Warning);
          }
        }
        }

diff --git a/src/BinMNaming/BinMNaming_NamingDriver.hxx b/src/BinMNaming/BinMNaming_NamingDriver.hxx
index 8768804..dbd1e98 100644 (file)
--- a/src/BinMNaming/BinMNaming_NamingDriver.hxx
+++ b/src/BinMNaming/BinMNaming_NamingDriver.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 BinMNaming_NamingDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMNaming_NamingDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
+  Standard_EXPORT BinMNaming_NamingDriver(const Handle(Message_Messenger)& theMessageDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc.cxx b/src/BinMXCAFDoc/BinMXCAFDoc.cxx
index 0ebe7bf..28b13c5 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc.cxx
@@ -42,7 +42,7 @@
 #include <BinMXCAFDoc_ViewDriver.hxx>
 #include <BinMXCAFDoc_ViewToolDriver.hxx>
 #include <BinMXCAFDoc_VolumeDriver.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <TNaming_NamedShape.hxx>
 
 //=======================================================================
@@ -50,7 +50,7 @@
 //purpose  : 
 //=======================================================================
 void BinMXCAFDoc::AddDrivers(const Handle(BinMDF_ADriverTable)& theDriverTable,
-                                              const Handle(CDM_MessageDriver)&   theMsgDrv) 
+                             const Handle(Message_Messenger)&   theMsgDrv) 
 {
   theDriverTable->AddDriver( new BinMXCAFDoc_AreaDriver     (theMsgDrv));
   theDriverTable->AddDriver( new BinMXCAFDoc_CentroidDriver (theMsgDrv));

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc.hxx b/src/BinMXCAFDoc/BinMXCAFDoc.hxx
index d18a4ce..bfd6213 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc.hxx
@@ -21,7 +21,7 @@
 #include <Standard_Handle.hxx>
 
 class BinMDF_ADriverTable;
-class CDM_MessageDriver;
+class Message_Messenger;
 class BinMXCAFDoc_AreaDriver;
 class BinMXCAFDoc_CentroidDriver;
 class BinMXCAFDoc_ClippingPlaneToolDriver;
@@ -53,7 +53,7 @@ public:
 
   
   //! Adds the attribute drivers to <theDriverTable>.
-  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(CDM_MessageDriver)& theMsgDrv);
+  Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(Message_Messenger)& theMsgDrv);
 
 
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cxx
index 445c2bd..bbb29fe 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_AreaDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_Area.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_AreaDriver,BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_AreaDriver::BinMXCAFDoc_AreaDriver(const Handle(CDM_MessageDriver)& theMsgDriver) 
+BinMXCAFDoc_AreaDriver::BinMXCAFDoc_AreaDriver(const Handle(Message_Messenger)& theMsgDriver) 
      : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Area)->Name()) {
 }
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.hxx
index af3441e..4e2e2e1 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.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_AreaDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_AreaDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_AreaDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AssemblyItemRefDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_AssemblyItemRefDriver.cxx
index 7d362ec..356b659 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AssemblyItemRefDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AssemblyItemRefDriver.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <BinMXCAFDoc_AssemblyItemRefDriver.hxx>
@@ -26,7 +26,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_AssemblyItemRefDriver, BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_AssemblyItemRefDriver::BinMXCAFDoc_AssemblyItemRefDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_AssemblyItemRefDriver::BinMXCAFDoc_AssemblyItemRefDriver(const Handle(Message_Messenger)& theMsgDriver)
   : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_AssemblyItemRef)->Name())
 {
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AssemblyItemRefDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_AssemblyItemRefDriver.hxx
index 9f031ea..ebacff8 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AssemblyItemRefDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AssemblyItemRefDriver.hxx
@@ -24,7 +24,7 @@
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
 
-class CDM_MessageDriver;
+class Message_Messenger;
 class TDF_Attribute;
 class BinObjMgt_Persistent;
 
@@ -35,7 +35,7 @@ class BinMXCAFDoc_AssemblyItemRefDriver : public BinMDF_ADriver
 {
 public:
 
-  Standard_EXPORT BinMXCAFDoc_AssemblyItemRefDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_AssemblyItemRefDriver(const Handle(Message_Messenger)& theMsgDriver);
 
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cxx
index ebc8469..53fbb56 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_CentroidDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_Centroid.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_CentroidDriver,BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_CentroidDriver::BinMXCAFDoc_CentroidDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_CentroidDriver::BinMXCAFDoc_CentroidDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Centroid)->Name()) {
 }
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.hxx
index d0938dd..115de2d 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.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_CentroidDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_CentroidDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_CentroidDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ClippingPlaneToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_ClippingPlaneToolDriver.cxx
index 54c5105..9727b5c 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ClippingPlaneToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ClippingPlaneToolDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_ClippingPlaneToolDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_ClippingPlaneTool.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_ClippingPlaneToolDriver, BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMXCAFDoc_ClippingPlaneToolDriver::BinMXCAFDoc_ClippingPlaneToolDriver
-  (const Handle(CDM_MessageDriver)& theMsgDriver)
+  (const Handle(Message_Messenger)& theMsgDriver)
   : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_ClippingPlaneTool)->Name())
 {
 }

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ClippingPlaneToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_ClippingPlaneToolDriver.hxx
index b86cc75..2eaf230 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ClippingPlaneToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ClippingPlaneToolDriver.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_ClippingPlaneToolDriver : public BinMDF_ADriver
 {
 public:
 
-  Standard_EXPORT BinMXCAFDoc_ClippingPlaneToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_ClippingPlaneToolDriver(const Handle(Message_Messenger)& theMsgDriver);
 
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cxx
index 57a3420..b8ffbba 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_ColorDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_Color.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_ColorDriver,BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_ColorDriver::BinMXCAFDoc_ColorDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_ColorDriver::BinMXCAFDoc_ColorDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Color)->Name()) {
 }
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.hxx
index 0caebfd..3bfe550 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.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_ColorDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_ColorDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_ColorDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cxx
index 181df4e..604a1fa 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_ColorToolDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_ColorTool.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_ColorToolDriver,BinMDF_ADriver)
 //function : 
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_ColorToolDriver::BinMXCAFDoc_ColorToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_ColorToolDriver::BinMXCAFDoc_ColorToolDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_ColorTool)->Name()) {
 }
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.hxx
index 71e8812..d18e4fc 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.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_ColorToolDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_ColorToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_ColorToolDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cxx
index d15ada8..8dc949d 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_DatumDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_Array1OfReal.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_DatumDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMXCAFDoc_DatumDriver::BinMXCAFDoc_DatumDriver
-  (const Handle(CDM_MessageDriver)& theMsgDriver)
+  (const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Datum)->Name())
 {
 }

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.hxx
index 705edf2..f3d0204 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.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_DatumDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_DatumDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_DatumDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cxx
index 8df20ba..f2bde50 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_DimTolDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_Array1OfReal.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_DimTolDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMXCAFDoc_DimTolDriver::BinMXCAFDoc_DimTolDriver
-  (const Handle(CDM_MessageDriver)& theMsgDriver)
+  (const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_DimTol)->Name())
 {
 }

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.hxx
index eb3f93b..93b2825 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.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_DimTolDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_DimTolDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_DimTolDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cxx
index fdc4ccb..0044d1e 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_DimTolToolDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_DimTolTool.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_DimTolToolDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMXCAFDoc_DimTolToolDriver::BinMXCAFDoc_DimTolToolDriver
-  (const Handle(CDM_MessageDriver)& theMsgDriver)
+  (const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_DimTolTool)->Name())
 {
 }

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.hxx
index 51024da..ae484d6 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.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_DimTolToolDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_DimTolToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_DimTolToolDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimensionDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimensionDriver.cxx
index 160abcc..7c780f1 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimensionDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimensionDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_DimensionDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_Array1OfReal.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_DimensionDriver,BinMDF_ADriver)
 //function : Constructor
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_DimensionDriver::BinMXCAFDoc_DimensionDriver (const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_DimensionDriver::BinMXCAFDoc_DimensionDriver (const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Dimension)->Name())
 {
 }

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimensionDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimensionDriver.hxx
index 3be43ad..665dcfb 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimensionDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimensionDriver.hxx
@@ -24,7 +24,7 @@
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
 
-class CDM_MessageDriver;
+class Message_Messenger;
 class TDF_Attribute;
 class BinObjMgt_Persistent;
 
@@ -37,7 +37,7 @@ class BinMXCAFDoc_DimensionDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_DimensionDriver (const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_DimensionDriver (const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cxx
index 5b73f00..59720c1 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_DocumentToolDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_DocumentToolDriver,BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_DocumentToolDriver::BinMXCAFDoc_DocumentToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver) 
+BinMXCAFDoc_DocumentToolDriver::BinMXCAFDoc_DocumentToolDriver(const Handle(Message_Messenger)& theMsgDriver) 
      : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_DocumentTool)->Name()) {
 }
 
@@ -44,8 +44,8 @@ Handle(TDF_Attribute) BinMXCAFDoc_DocumentToolDriver::NewEmpty() const {
 //purpose  : 
 //=======================================================================
 Standard_Boolean BinMXCAFDoc_DocumentToolDriver::Paste(const BinObjMgt_Persistent& /*theSource*/,
-                                                       const Handle(TDF_Attribute)& theTarget,
-                                                       BinObjMgt_RRelocationTable& /*theRelocTable*/) const
+                                                        const Handle(TDF_Attribute)& theTarget,
+                                                        BinObjMgt_RRelocationTable& /*theRelocTable*/) const
 {
   Handle(XCAFDoc_DocumentTool) T = Handle(XCAFDoc_DocumentTool)::DownCast(theTarget);
   T->Init();

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.hxx
index b4f9492..e591150 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.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_DocumentToolDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_DocumentToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_DocumentToolDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_GeomToleranceDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_GeomToleranceDriver.cxx
index 59bb73e..e9f81b9 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_GeomToleranceDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_GeomToleranceDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_GeomToleranceDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_Array1OfReal.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_GeomToleranceDriver,BinMDF_ADriver)
 //function : Constructor
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_GeomToleranceDriver::BinMXCAFDoc_GeomToleranceDriver (const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_GeomToleranceDriver::BinMXCAFDoc_GeomToleranceDriver (const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_GeomTolerance)->Name())
 {
 }

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_GeomToleranceDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_GeomToleranceDriver.hxx
index 0c01139..cc4a4c7 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_GeomToleranceDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_GeomToleranceDriver.hxx
@@ -24,7 +24,7 @@
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
 
-class CDM_MessageDriver;
+class Message_Messenger;
 class TDF_Attribute;
 class BinObjMgt_Persistent;
 
@@ -37,7 +37,7 @@ class BinMXCAFDoc_GeomToleranceDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_GeomToleranceDriver (const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_GeomToleranceDriver (const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cxx
index 74d88c1..15c2452 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_GraphNodeDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_GraphNode.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_GraphNodeDriver,BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_GraphNodeDriver::BinMXCAFDoc_GraphNodeDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_GraphNodeDriver::BinMXCAFDoc_GraphNodeDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_GraphNode)->Name()) {
 }
 
@@ -44,8 +44,8 @@ Handle(TDF_Attribute) BinMXCAFDoc_GraphNodeDriver::NewEmpty() const {
 //purpose  : 
 //=======================================================================
 Standard_Boolean BinMXCAFDoc_GraphNodeDriver::Paste(const BinObjMgt_Persistent& theSource,
-                                                   const Handle(TDF_Attribute)& theTarget,
-                                                   BinObjMgt_RRelocationTable& theRelocTable) const
+                                                    const Handle(TDF_Attribute)& theTarget,
+                                                    BinObjMgt_RRelocationTable& theRelocTable) const
 {
   Handle(XCAFDoc_GraphNode) aT = Handle(XCAFDoc_GraphNode)::DownCast(theTarget);
   Standard_Integer anID;

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.hxx
index 105dc61..e748c87 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.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_GraphNodeDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_GraphNodeDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_GraphNodeDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cxx
index d69d182..6afe0c3 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_LayerToolDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_LayerTool.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_LayerToolDriver,BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_LayerToolDriver::BinMXCAFDoc_LayerToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_LayerToolDriver::BinMXCAFDoc_LayerToolDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_LayerTool)->Name()) {
 }
 
@@ -44,8 +44,8 @@ Handle(TDF_Attribute) BinMXCAFDoc_LayerToolDriver::NewEmpty() const {
 //purpose  : 
 //=======================================================================
 Standard_Boolean BinMXCAFDoc_LayerToolDriver::Paste(const BinObjMgt_Persistent& /*theSource*/,
-                                                   const Handle(TDF_Attribute)& /*theTarget*/,
-                                                   BinObjMgt_RRelocationTable& /*theRelocTable*/) const
+                                                    const Handle(TDF_Attribute)& /*theTarget*/,
+                                                    BinObjMgt_RRelocationTable& /*theRelocTable*/) const
 {
   return Standard_True;
 }
@@ -55,8 +55,8 @@ Standard_Boolean BinMXCAFDoc_LayerToolDriver::Paste(const BinObjMgt_Persistent&
 //purpose  : 
 //=======================================================================
 void BinMXCAFDoc_LayerToolDriver::Paste(const Handle(TDF_Attribute)& /*theSource*/,
-                                       BinObjMgt_Persistent& /*theTarget*/,
-                                       BinObjMgt_SRelocationTable& /*theRelocTable*/) const
+                                        BinObjMgt_Persistent& /*theTarget*/,
+                                        BinObjMgt_SRelocationTable& /*theRelocTable*/) const
 {
 }
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.hxx
index d66d746..b336f5b 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.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_LayerToolDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_LayerToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_LayerToolDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx
index 3d58f6c..95465ef 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx
@@ -18,7 +18,7 @@
 #include <BinMXCAFDoc_LocationDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
 #include <BinTools_LocationSet.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <gp_Mat.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_XYZ.hxx>
@@ -35,7 +35,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_LocationDriver,BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_LocationDriver::BinMXCAFDoc_LocationDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_LocationDriver::BinMXCAFDoc_LocationDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Location)->Name())
      , myLocations(0) {
 }
@@ -53,8 +53,8 @@ Handle(TDF_Attribute) BinMXCAFDoc_LocationDriver::NewEmpty() const {
 //purpose  : 
 //=======================================================================
 Standard_Boolean BinMXCAFDoc_LocationDriver::Paste(const BinObjMgt_Persistent& theSource,
-                                                  const Handle(TDF_Attribute)& theTarget,
-                                                  BinObjMgt_RRelocationTable& theRelocTable) const
+                                                   const Handle(TDF_Attribute)& theTarget,
+                                                   BinObjMgt_RRelocationTable& theRelocTable) const
 {
   Handle(XCAFDoc_Location) anAtt = Handle(XCAFDoc_Location)::DownCast(theTarget);
   TopLoc_Location aLoc;
@@ -81,8 +81,8 @@ void BinMXCAFDoc_LocationDriver::Paste(const Handle(TDF_Attribute)& theSource,
 //purpose  : 
 //=======================================================================
 Standard_Boolean BinMXCAFDoc_LocationDriver::Translate(const BinObjMgt_Persistent& theSource,
-                                                      TopLoc_Location& theLoc,
-                                                      BinObjMgt_RRelocationTable& theMap) const
+                                                       TopLoc_Location& theLoc,
+                                                       BinObjMgt_RRelocationTable& theMap) const
 {
   Standard_Integer anId = 0;
   theSource >> anId;

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.hxx
index b7355bd..76fe223 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.hxx
@@ -24,7 +24,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;
 class TopLoc_Location;
@@ -40,7 +40,7 @@ class BinMXCAFDoc_LocationDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_LocationDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_LocationDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cxx
index c820450..ea41cf5 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_MaterialDriver.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>
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_MaterialDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMXCAFDoc_MaterialDriver::BinMXCAFDoc_MaterialDriver
-  (const Handle(CDM_MessageDriver)& theMsgDriver)
+  (const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Material)->Name())
 {
 }

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.hxx
index caa65a3..f2ecd6a 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.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_MaterialDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_MaterialDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_MaterialDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cxx
index 1e16af9..4adc8f3 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_MaterialToolDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_MaterialTool.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_MaterialToolDriver,BinMDF_ADriver)
 //purpose  : 
 //=======================================================================
 BinMXCAFDoc_MaterialToolDriver::BinMXCAFDoc_MaterialToolDriver
-  (const Handle(CDM_MessageDriver)& theMsgDriver)
+  (const Handle(Message_Messenger)& theMsgDriver)
 : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_MaterialTool)->Name())
 {
 }

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.hxx
index 9005038..908fb5b 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.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_MaterialToolDriver : public BinMDF_ADriver
 public:
 
   
-  Standard_EXPORT BinMXCAFDoc_MaterialToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_MaterialToolDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NoteBalloonDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_NoteBalloonDriver.cxx
index 700ec10..cf7bf92 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NoteBalloonDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NoteBalloonDriver.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <BinMXCAFDoc_NoteBalloonDriver.hxx>
@@ -26,7 +26,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_NoteBalloonDriver, BinMXCAFDoc_NoteCommen
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_NoteBalloonDriver::BinMXCAFDoc_NoteBalloonDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_NoteBalloonDriver::BinMXCAFDoc_NoteBalloonDriver(const Handle(Message_Messenger)& theMsgDriver)
   : BinMXCAFDoc_NoteCommentDriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_NoteBalloon)->Name())
 {
 }
@@ -44,7 +44,7 @@ Handle(TDF_Attribute) BinMXCAFDoc_NoteBalloonDriver::NewEmpty() const
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_NoteBalloonDriver::BinMXCAFDoc_NoteBalloonDriver(const Handle(CDM_MessageDriver)& theMsgDriver,
+BinMXCAFDoc_NoteBalloonDriver::BinMXCAFDoc_NoteBalloonDriver(const Handle(Message_Messenger)& theMsgDriver,
                                                              Standard_CString                 theName)
   : BinMXCAFDoc_NoteCommentDriver(theMsgDriver, theName)
 {

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NoteBalloonDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_NoteBalloonDriver.hxx
index 444b77a..516f3a7 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NoteBalloonDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NoteBalloonDriver.hxx
@@ -25,7 +25,7 @@ class BinMXCAFDoc_NoteBalloonDriver : public BinMXCAFDoc_NoteCommentDriver
 {
 public:
   
-  Standard_EXPORT BinMXCAFDoc_NoteBalloonDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_NoteBalloonDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   
@@ -34,7 +34,7 @@ public:
 
 protected:
 
-  BinMXCAFDoc_NoteBalloonDriver(const Handle(CDM_MessageDriver)& theMsgDriver,
+  BinMXCAFDoc_NoteBalloonDriver(const Handle(Message_Messenger)& theMsgDriver,
                                 Standard_CString                 theName);
 
 };

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NoteBinDataDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_NoteBinDataDriver.cxx
index ee73b46..c37709d 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NoteBinDataDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NoteBinDataDriver.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <TColStd_HArray1OfByte.hxx>
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_NoteBinDataDriver, BinMXCAFDoc_NoteDriver
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_NoteBinDataDriver::BinMXCAFDoc_NoteBinDataDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_NoteBinDataDriver::BinMXCAFDoc_NoteBinDataDriver(const Handle(Message_Messenger)& theMsgDriver)
   : BinMXCAFDoc_NoteDriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_NoteBinData)->Name())
 {
 }
@@ -81,8 +81,8 @@ Standard_Boolean BinMXCAFDoc_NoteBinDataDriver::Paste(const BinObjMgt_Persistent
 //purpose  : 
 //=======================================================================
 void BinMXCAFDoc_NoteBinDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
-                                                                       BinObjMgt_Persistent&        theTarget,
-                                                                       BinObjMgt_SRelocationTable&  theRelocTable) const
+                                                       BinObjMgt_Persistent&        theTarget,
+                                                       BinObjMgt_SRelocationTable&  theRelocTable) const
 {
   BinMXCAFDoc_NoteDriver::Paste(theSource, theTarget, theRelocTable);
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NoteBinDataDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_NoteBinDataDriver.hxx
index 422f797..1ca25c4 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NoteBinDataDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NoteBinDataDriver.hxx
@@ -25,7 +25,7 @@ class BinMXCAFDoc_NoteBinDataDriver : public BinMXCAFDoc_NoteDriver
 {
 public:
   
-  Standard_EXPORT BinMXCAFDoc_NoteBinDataDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_NoteBinDataDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NoteCommentDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_NoteCommentDriver.cxx
index e550915..14e00cf 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NoteCommentDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NoteCommentDriver.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <BinMXCAFDoc_NoteCommentDriver.hxx>
@@ -26,7 +26,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_NoteCommentDriver, BinMXCAFDoc_NoteDriver
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_NoteCommentDriver::BinMXCAFDoc_NoteCommentDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_NoteCommentDriver::BinMXCAFDoc_NoteCommentDriver(const Handle(Message_Messenger)& theMsgDriver)
   : BinMXCAFDoc_NoteDriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_NoteComment)->Name())
 {
 }
@@ -69,8 +69,8 @@ Standard_Boolean BinMXCAFDoc_NoteCommentDriver::Paste(const BinObjMgt_Persistent
 //purpose  : 
 //=======================================================================
 void BinMXCAFDoc_NoteCommentDriver::Paste(const Handle(TDF_Attribute)& theSource,
-                                                                       BinObjMgt_Persistent&        theTarget,
-                                                                       BinObjMgt_SRelocationTable&  theRelocTable) const
+                                          BinObjMgt_Persistent&        theTarget,
+                                          BinObjMgt_SRelocationTable&  theRelocTable) const
 {
   BinMXCAFDoc_NoteDriver::Paste(theSource, theTarget, theRelocTable);
 
@@ -83,7 +83,7 @@ void BinMXCAFDoc_NoteCommentDriver::Paste(const Handle(TDF_Attribute)& theSource
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_NoteCommentDriver::BinMXCAFDoc_NoteCommentDriver(const Handle(CDM_MessageDriver)& theMsgDriver,
+BinMXCAFDoc_NoteCommentDriver::BinMXCAFDoc_NoteCommentDriver(const Handle(Message_Messenger)& theMsgDriver,
                                                              Standard_CString                 theName)
   : BinMXCAFDoc_NoteDriver(theMsgDriver, theName)
 {

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NoteCommentDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_NoteCommentDriver.hxx
index cad5b6b..8ae85f4 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NoteCommentDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NoteCommentDriver.hxx
@@ -25,7 +25,7 @@ class BinMXCAFDoc_NoteCommentDriver : public BinMXCAFDoc_NoteDriver
 {
 public:
   
-  Standard_EXPORT BinMXCAFDoc_NoteCommentDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_NoteCommentDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-  BinMXCAFDoc_NoteCommentDriver(const Handle(CDM_MessageDriver)& theMsgDriver,
+  BinMXCAFDoc_NoteCommentDriver(const Handle(Message_Messenger)& theMsgDriver,
                                 Standard_CString                 theName);
 
 };

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NoteDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_NoteDriver.cxx
index fc00d0b..477f153 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NoteDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NoteDriver.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <BinMXCAFDoc_NoteDriver.hxx>
@@ -26,7 +26,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_NoteDriver, BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_NoteDriver::BinMXCAFDoc_NoteDriver(const Handle(CDM_MessageDriver)& theMsgDriver,
+BinMXCAFDoc_NoteDriver::BinMXCAFDoc_NoteDriver(const Handle(Message_Messenger)& theMsgDriver,
                                                Standard_CString                 theName)
   : BinMDF_ADriver(theMsgDriver, theName)
 {
@@ -59,8 +59,8 @@ Standard_Boolean BinMXCAFDoc_NoteDriver::Paste(const BinObjMgt_Persistent&  theS
 //purpose  : 
 //=======================================================================
 void BinMXCAFDoc_NoteDriver::Paste(const Handle(TDF_Attribute)& theSource,
-                                                                BinObjMgt_Persistent&        theTarget,
-                                                                BinObjMgt_SRelocationTable&  /*theRelocTable*/) const
+                                         BinObjMgt_Persistent&        theTarget,
+                                         BinObjMgt_SRelocationTable&  /*theRelocTable*/) const
 {
   Handle(XCAFDoc_Note) aNote = Handle(XCAFDoc_Note)::DownCast(theSource);
   if (!aNote.IsNull())

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NoteDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_NoteDriver.hxx
index 17900a0..10be389 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NoteDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NoteDriver.hxx
@@ -24,7 +24,7 @@
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
 
-class CDM_MessageDriver;
+class Message_Messenger;
 class TDF_Attribute;
 class BinObjMgt_Persistent;
 
@@ -47,7 +47,7 @@ public:
 
 protected:
 
-  BinMXCAFDoc_NoteDriver(const Handle(CDM_MessageDriver)& theMsgDriver,
+  BinMXCAFDoc_NoteDriver(const Handle(Message_Messenger)& theMsgDriver,
                          Standard_CString                 theName);
 
 };

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NotesToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_NotesToolDriver.cxx
index a3979e2..f100f09 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NotesToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NotesToolDriver.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement.
 
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <BinMXCAFDoc_NotesToolDriver.hxx>
@@ -26,7 +26,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_NotesToolDriver, BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_NotesToolDriver::BinMXCAFDoc_NotesToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_NotesToolDriver::BinMXCAFDoc_NotesToolDriver(const Handle(Message_Messenger)& theMsgDriver)
   : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_NotesTool)->Name())
 {
 }
@@ -56,7 +56,7 @@ Standard_Boolean BinMXCAFDoc_NotesToolDriver::Paste(const BinObjMgt_Persistent&
 //purpose  : 
 //=======================================================================
 void BinMXCAFDoc_NotesToolDriver::Paste(const Handle(TDF_Attribute)& /*theSource*/,
-                                                                     BinObjMgt_Persistent&        /*theTarget*/,
-                                                                     BinObjMgt_SRelocationTable&  /*theRelocTable*/) const
+                                        BinObjMgt_Persistent&        /*theTarget*/,
+                                        BinObjMgt_SRelocationTable&  /*theRelocTable*/) const
 {
 }

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_NotesToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_NotesToolDriver.hxx
index 3a8fa0a..61129f0 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_NotesToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_NotesToolDriver.hxx
@@ -24,7 +24,7 @@
 #include <BinObjMgt_RRelocationTable.hxx>
 #include <BinObjMgt_SRelocationTable.hxx>
 
-class CDM_MessageDriver;
+class Message_Messenger;
 class TDF_Attribute;
 class BinObjMgt_Persistent;
 
@@ -35,7 +35,7 @@ class BinMXCAFDoc_NotesToolDriver : public BinMDF_ADriver
 {
 public:
   
-  Standard_EXPORT BinMXCAFDoc_NotesToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver);
+  Standard_EXPORT BinMXCAFDoc_NotesToolDriver(const Handle(Message_Messenger)& theMsgDriver);
   
   Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
   

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cxx
index 7598c4a..6b2897f 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cxx
@@ -16,7 +16,7 @@
 
 #include <BinMXCAFDoc_ShapeToolDriver.hxx>
 #include <BinObjMgt_Persistent.hxx>
-#include <CDM_MessageDriver.hxx>
+#include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_ShapeToolDriver,BinMDF_ADriver)
 //function :
 //purpose  : 
 //=======================================================================
-BinMXCAFDoc_ShapeToolDriver::BinMXCAFDoc_ShapeToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
+BinMXCAFDoc_ShapeToolDriver::BinMXCAFDoc_ShapeToolDriver(const Handle(Message_Messenger)& theMsgDriver)
      : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_ShapeTool)->Name())
 {
 }
@@ -45,8 +45,8 @@ Handle(TDF_Attribute) BinMXCAFDoc_ShapeToolDriver::NewEmpty() const {
 //purpose  : 
 //=======================================================================
 Standard_Boolean BinMXCAFDoc_ShapeToolDriver::Paste(const BinObjMgt_Persistent& /*theSource*/,
-                                                   const Handle(TDF_Attribute)& /*theTarget*/,
-                                                   BinObjMgt_RRelocationTable& /*theRelocTable*/) const
+                                                    const Handle(TDF_Attribute)& /*theTarget*/,
+                                                    BinObjMgt_RRelocationTable& /*theRelocTable*/) const
 {
   return Standard_True;
 }
@@ -56,8 +56,8 @@ Standard_Boolean BinMXCAFDoc_ShapeToolDriver::Paste(const BinObjMgt_Persistent&
 //purpose  : 
 //=======================================================================
 void BinMXCAFDoc_ShapeToolDriver::Paste(const Handle(TDF_Attribute)& /*theSource*/,
-                                       BinObjMgt_Persistent& /*theTarget*/,
-                                       BinObjMgt_SRelocationTable& /*theRelocTable*/) const
+                                        BinObjMgt_Persistent& /*theTarget*/,
+                                        BinObjMgt_SRelocationTable& /*theRelocTable*/) const
 {
 }
 

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.hxx
index ff2f249..