Migration to OCCT 7.0

diff --git a/src/CAF/CAF_Operation.h b/src/CAF/CAF_Operation.h
index 9dbbbdc0796664bc855895a3a008ff8fe3d1c054..4ba0a31c4a30af230bb2e7e982203fbe34a808cd 100755 (executable)
--- a/src/CAF/CAF_Operation.h
+++ b/src/CAF/CAF_Operation.h
@@ -28,9 +28,9 @@
 #include "SUIT_Operation.h"
 
 #include <Standard.hxx>
+#include <TDocStd_Document.hxx>
 
 class CAF_Study;
-class Handle(TDocStd_Document);
 
 class CAF_EXPORT CAF_Operation : public SUIT_Operation
 {

diff --git a/src/CAF/CAF_Study.cxx b/src/CAF/CAF_Study.cxx
index ab35820e0ae54a97949909e2a3b0dfca8fc9ce1b..15f6185ee63414402ff7caec02748c71877ea981 100755 (executable)
--- a/src/CAF/CAF_Study.cxx
+++ b/src/CAF/CAF_Study.cxx
@@ -33,7 +33,6 @@
 
 #include <TDF_Delta.hxx>
 #include <TDF_ListIteratorOfDeltaList.hxx>
-#include <TDocStd_Application.hxx>
 
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>

diff --git a/src/CAF/CAF_Study.h b/src/CAF/CAF_Study.h
index c80972b49b3ea2473a99259c92ca32841e3ee44d..40e57995c649d3d07e7851ea4650885762b82ec4 100755 (executable)
--- a/src/CAF/CAF_Study.h
+++ b/src/CAF/CAF_Study.h
@@ -28,9 +28,9 @@
 #include "SUIT_Study.h"
 
 #include <TDocStd_Document.hxx>
+#include <TDocStd_Application.hxx>
 
 class CAF_Application;
-class Handle(TDocStd_Application);
 
 #if defined WIN32
 #pragma warning ( disable: 4251 )

diff --git a/src/CASCatch/CASCatch_Failure.cxx b/src/CASCatch/CASCatch_Failure.cxx
index 37a3735a6445f0af65a61f1d2db374c2f1069a1e..ecdaf950c4ead06400abe04cfa309a1f2e24ac97 100644 (file)
--- a/src/CASCatch/CASCatch_Failure.cxx
+++ b/src/CASCatch/CASCatch_Failure.cxx
@@ -29,9 +29,7 @@
 #include <Standard_Type.hxx>
 #include <string.h>
 
-IMPLEMENT_STANDARD_HANDLE( CASCatch_Failure, Standard_Transient )
-IMPLEMENT_STANDARD_RTTIEXT( CASCatch_Failure, Standard_Transient ) 
-
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( CASCatch_Failure, Standard_Transient )
 
 #ifndef NO_CXX_EXCEPTION
 static Handle(CASCatch_Failure) RaisedError;

diff --git a/src/CASCatch/CASCatch_Failure.hxx b/src/CASCatch/CASCatch_Failure.hxx
index 51cd42927598cd1570a30a3d3bddaf83fc86a91f..27c1f6ea6080885049ca181200a51301bf82a807 100644 (file)
--- a/src/CASCatch/CASCatch_Failure.hxx
+++ b/src/CASCatch/CASCatch_Failure.hxx
@@ -26,6 +26,8 @@
 #ifndef CASCATCH_FAILURE_HXX
 #define CASCATCH_FAILURE_HXX
 
+#include <Basics_OCCTVersion.hxx>
+
 #include <Standard_Transient.hxx>
 #include <Standard_DefineHandle.hxx>
 DEFINE_STANDARD_HANDLE( CASCatch_Failure, Standard_Transient )
@@ -46,13 +48,13 @@ Standard_EXPORT CASCatch_Failure();
 Standard_EXPORT CASCatch_Failure(const Standard_CString aString);
 Standard_EXPORT void Reraise(const Standard_CString aMessage) ;
 Standard_EXPORT Standard_CString GetError() const;
-Standard_EXPORT static  Handle_CASCatch_Failure Caught() ;
+Standard_EXPORT static  Handle(CASCatch_Failure) Caught() ;
 Standard_EXPORT static  void Raise(const Standard_CString aMessage = "") ;
 Standard_EXPORT virtual  void Throw() const;public:
 
 public:
 
-DEFINE_STANDARD_RTTI( CASCatch_Failure )  
+  OCCT_DEFINE_STANDARD_RTTIEXT(CASCatch_Failure,Standard_Transient)
 
 private: 
 /*!\var myMessage

diff --git a/src/DDS/DDS.h b/src/DDS/DDS.h
index 8d60969de5690293bc9370f658c72b0d8f2d8f38..f2a03e9310f145aaa463eae1b87e263d6a361077 100644 (file)
--- a/src/DDS/DDS.h
+++ b/src/DDS/DDS.h
@@ -23,6 +23,8 @@
 #ifndef DDS_H
 #define DDS_H
 
+#include <Basics_OCCTVersion.hxx>
+
 #include <TCollection_AsciiString.hxx>
 
 #include <NCollection_DefineDataMap.hxx>

diff --git a/src/DDS/DDS_DicGroup.cxx b/src/DDS/DDS_DicGroup.cxx
index 18fdfdf5cd3f52da97278100b396db76f31b0536..ed5d18e5b338989666209ff03e0ea43bf981c8f8 100644 (file)
--- a/src/DDS/DDS_DicGroup.cxx
+++ b/src/DDS/DDS_DicGroup.cxx
@@ -32,8 +32,7 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(DDS_DicGroup, MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(DDS_DicGroup, MMgt_TShared)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_DicGroup, MMgt_TShared)
 
 /*!
   \class DDS_DicGroup
@@ -208,7 +207,7 @@ void DDS_DicGroup::FillDataMap( const LDOM_Element& theComponentData, const LDOM
   \param theID item identifier
   \return dictionary item
 */
-Handle_DDS_DicItem DDS_DicGroup::GetDicItem( const TCollection_AsciiString& theID ) const
+Handle(DDS_DicItem) DDS_DicGroup::GetDicItem( const TCollection_AsciiString& theID ) const
 {
   Handle(DDS_DicItem) aDicItem;
   // get dictionary item by id

diff --git a/src/DDS/DDS_DicGroup.h b/src/DDS/DDS_DicGroup.h
index 9a3ed9070dcdc99cdec89929c0c64af5596519cd..debefdbe68269c7b021ffeda43efc435f14ff77b 100644 (file)
--- a/src/DDS/DDS_DicGroup.h
+++ b/src/DDS/DDS_DicGroup.h
@@ -89,7 +89,7 @@ private:
   friend class DDS_Dictionary;
 
 public:
-  DEFINE_STANDARD_RTTI(DDS_DicGroup)
+  OCCT_DEFINE_STANDARD_RTTIEXT(DDS_DicGroup,MMgt_TShared)
 };
 
 typedef NCollection_IndexedDataMap<TCollection_AsciiString, Handle(DDS_DicGroup)> DDS_IndexedDataMapOfDicGroups;

diff --git a/src/DDS/DDS_DicItem.cxx b/src/DDS/DDS_DicItem.cxx
index 8679b466684c92534f87e7a800a9b762d970315a..2ff1d1c37b071f709a94b946c935e68631bd7252 100644 (file)
--- a/src/DDS/DDS_DicItem.cxx
+++ b/src/DDS/DDS_DicItem.cxx
@@ -23,9 +23,6 @@
 #include "DDS_DicItem.h"
 #include "DDS_Dictionary.h"
 
-#include <TColStd_SequenceOfInteger.hxx>
-#include <TColStd_SequenceOfExtendedString.hxx>
-
 #include <LDOM_Text.hxx>
 #include <LDOMString.hxx>
 #include <LDOM_Element.hxx>
@@ -33,11 +30,7 @@
 #include <UnitsAPI.hxx>
 #include <Units_Dimensions.hxx>
 
-#include <TColStd_MapOfReal.hxx>
-#include <TColStd_SequenceOfAsciiString.hxx>
-
-IMPLEMENT_STANDARD_HANDLE(DDS_DicItem, MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(DDS_DicItem, MMgt_TShared)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_DicItem, MMgt_TShared)
 
 /*!
   \class DDS_DicItem

diff --git a/src/DDS/DDS_DicItem.h b/src/DDS/DDS_DicItem.h
index 97091efb67c353892b22f3ee7da6e5b8070f0113..d3f01a51724d6ed473cf1b41be72bf5d68bdd35c 100644 (file)
--- a/src/DDS/DDS_DicItem.h
+++ b/src/DDS/DDS_DicItem.h
@@ -35,12 +35,13 @@
 #include <NCollection_DataMap.hxx>
 #include <NCollection_DefineIndexedDataMap.hxx>
 
+#include <TColStd_MapOfReal.hxx>
+#include <TColStd_SequenceOfInteger.hxx>
+#include <TColStd_SequenceOfAsciiString.hxx>
+#include <TColStd_SequenceOfExtendedString.hxx>
+
 class LDOM_Element;
 class DDS_Dictionary;
-class TColStd_MapOfReal;
-class TColStd_SequenceOfInteger;
-class TColStd_SequenceOfAsciiString;
-class TColStd_SequenceOfExtendedString;
 
 //  Class, containing all information about one parameter:
 //  unique    : id
@@ -252,8 +253,7 @@ private:
   friend class DDS_DicGroup;
 
 public:
-  // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI(DDS_DicItem)
+  OCCT_DEFINE_STANDARD_RTTIEXT(DDS_DicItem,MMgt_TShared)
 };
 
 DEFINE_STANDARD_HANDLE(DDS_DicItem, MMgt_TShared)

diff --git a/src/DDS/DDS_Dictionary.cxx b/src/DDS/DDS_Dictionary.cxx
index 6c9c541e6584ec9e559e7d327b6310d0d43cf4a2..b26dc1e6d9203c48628028180b9ad7f0a01bef58 100644 (file)
--- a/src/DDS/DDS_Dictionary.cxx
+++ b/src/DDS/DDS_Dictionary.cxx
@@ -38,8 +38,7 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(DDS_Dictionary, MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(DDS_Dictionary, MMgt_TShared)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_Dictionary, MMgt_TShared)
 
 Handle(DDS_Dictionary) DDS_Dictionary::myDictionary = Handle(DDS_Dictionary)();
 
@@ -423,7 +422,7 @@ void DDS_Dictionary::SetActiveUnitSystem( const TCollection_AsciiString& theSyst
   \brief Get the only instance of the data dictionary.
   \return the only instance of the data dictionary
 */
-Handle_DDS_Dictionary DDS_Dictionary::Get()
+Handle(DDS_Dictionary) DDS_Dictionary::Get()
 {
   if ( myDictionary.IsNull() )
     myDictionary = new DDS_Dictionary();
@@ -493,7 +492,7 @@ LDOMString DDS_Dictionary::KeyWord( const TCollection_AsciiString& key )
   \param theComponent component name
   \return handle to the data dictionary item
 */
-Handle_DDS_DicItem DDS_Dictionary::GetDicItem( const TCollection_AsciiString& theID,
+Handle(DDS_DicItem) DDS_Dictionary::GetDicItem( const TCollection_AsciiString& theID,
                                                 const TCollection_AsciiString& theComponent ) const
 {
   Handle(DDS_DicItem) aDicItem;
@@ -514,7 +513,7 @@ Handle_DDS_DicItem DDS_Dictionary::GetDicItem( const TCollection_AsciiString& th
   \param theID data dictionary item ID
   \return handle to the data dictionary item
 */
-Handle_DDS_DicItem DDS_Dictionary::GetDicItem( const TCollection_AsciiString& theID ) const
+Handle(DDS_DicItem) DDS_Dictionary::GetDicItem( const TCollection_AsciiString& theID ) const
 {
   Handle(DDS_DicItem) aDicItem;
   for ( Standard_Integer i = 1; i <= myGroupMap.Extent() && aDicItem.IsNull(); i++ )

diff --git a/src/DDS/DDS_Dictionary.h b/src/DDS/DDS_Dictionary.h
index 47bbad54a1d2f55aaab39d78723d5a8dc685725e..458f13f0f4b23da76cb54f8b82fb115d0a60b283 100644 (file)
--- a/src/DDS/DDS_Dictionary.h
+++ b/src/DDS/DDS_Dictionary.h
@@ -92,7 +92,7 @@ private:
   static Handle(DDS_Dictionary)                  myDictionary;
 
 public:
-  DEFINE_STANDARD_RTTI(DDS_Dictionary)
+  OCCT_DEFINE_STANDARD_RTTIEXT(DDS_Dictionary,MMgt_TShared)
 };
 
 #endif

diff --git a/src/DDS/DDS_KeyWords.cxx b/src/DDS/DDS_KeyWords.cxx
index 6bfa6d7b5fb25f2ce9b04882d624550b6574a7d2..f01c58b5a6e377494a30abb13fe8bd0358c0a964 100644 (file)
--- a/src/DDS/DDS_KeyWords.cxx
+++ b/src/DDS/DDS_KeyWords.cxx
@@ -22,8 +22,7 @@
 
 #include "DDS_KeyWords.h"
 
-IMPLEMENT_STANDARD_HANDLE(DDS_KeyWords, MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(DDS_KeyWords, MMgt_TShared)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_KeyWords, MMgt_TShared)
 
 /*!
   \class DDS_KeyWords
@@ -147,7 +146,7 @@ DDS_KeyWords::DDS_KeyWords()
   \brief Get the only instance of the class DDS_KeyWords.
   \return the only instance of the class
 */
-Handle_DDS_KeyWords DDS_KeyWords::Get()
+Handle(DDS_KeyWords) DDS_KeyWords::Get()
 {
   static Handle(DDS_KeyWords) keyWords;
 

diff --git a/src/DDS/DDS_KeyWords.h b/src/DDS/DDS_KeyWords.h
index ffdd1d78ec20f4d197880553fd3f2afac2ef9c14..62de5d8ff5457c9fea238bef9e76f67d6140594c 100644 (file)
--- a/src/DDS/DDS_KeyWords.h
+++ b/src/DDS/DDS_KeyWords.h
@@ -53,7 +53,7 @@ private:
   KeyWordMap                                  myKeyWord;
 
 public:
-  DEFINE_STANDARD_RTTI(DDS_KeyWords)
+  OCCT_DEFINE_STANDARD_RTTIEXT(DDS_KeyWords,MMgt_TShared)
 };
 
 #endif

diff --git a/src/LightApp/LightApp_OCCSelector.h b/src/LightApp/LightApp_OCCSelector.h
index fc9299c71e7c4babb0f4be55870ee87245fdecdb..06026d2adf980e39749760609a874dfdc866c583 100644 (file)
--- a/src/LightApp/LightApp_OCCSelector.h
+++ b/src/LightApp/LightApp_OCCSelector.h
@@ -33,7 +33,7 @@
 #ifndef DISABLE_OCCVIEWER
 #include <OCCViewer_ViewModel.h>
 
-class Handle_AIS_InteractiveObject;
+#include <AIS_InteractiveObject.hxx>
 #endif
 
 /*!

diff --git a/src/LightApp/LightApp_SelectionMgr.cxx b/src/LightApp/LightApp_SelectionMgr.cxx
index 4dd3857829083def6bbf810d4ce79c16cd0cd311..aeec9d101bcc39067f9ad73d1297b70776465291 100644 (file)
--- a/src/LightApp/LightApp_SelectionMgr.cxx
+++ b/src/LightApp/LightApp_SelectionMgr.cxx
@@ -34,9 +34,7 @@
   #include <SALOME_ListIO.hxx>
 
   // Open CASCADE Include
-  #include <TColStd_MapOfInteger.hxx>
   #include <TColStd_MapIteratorOfMapOfInteger.hxx>
-  #include <TColStd_IndexedMapOfInteger.hxx>
   #include <TCollection_AsciiString.hxx>
 #endif
 
@@ -458,9 +456,9 @@ void LightApp_SelectionMgr::setSelectionCacheEnabled( bool on )
 
 #ifndef DISABLE_SALOMEOBJECT
 
-QList<Handle_SALOME_InteractiveObject> LightApp_SelectionMgr::selectionCache( const QString& type ) const
+QList<Handle(SALOME_InteractiveObject)> LightApp_SelectionMgr::selectionCache( const QString& type ) const
 {
-  QList<Handle_SALOME_InteractiveObject> res;
+  QList<Handle(SALOME_InteractiveObject)> res;
 
   QStringList types;
   if ( !type.isEmpty() )

diff --git a/src/LightApp/LightApp_SelectionMgr.h b/src/LightApp/LightApp_SelectionMgr.h
index 06b02b193573c05947ffc1f2d471f0eab95ed6a4..57fc6eba95c7555afdf33c8262859353cdd2865f 100644 (file)
--- a/src/LightApp/LightApp_SelectionMgr.h
+++ b/src/LightApp/LightApp_SelectionMgr.h
@@ -34,9 +34,10 @@
   #include <QMap>
   #include <NCollection_DataMap.hxx>
 
+  #include <TColStd_IndexedMapOfInteger.hxx>
+  #include <TColStd_MapOfInteger.hxx>
+
   class SALOME_ListIO;
-  class TColStd_IndexedMapOfInteger;
-  class TColStd_MapOfInteger;
   class TCollection_AsciiString;
 #else
 #include <QStringList>

diff --git a/src/OBJECT/SALOME_AISObject.cxx b/src/OBJECT/SALOME_AISObject.cxx
index c72d5deb8b9f50978463b407adab3074848f6250..64bcbf9c901ac4978b31af785e0f8d8574a925db 100755 (executable)
--- a/src/OBJECT/SALOME_AISObject.cxx
+++ b/src/OBJECT/SALOME_AISObject.cxx
@@ -22,8 +22,7 @@
 
 #include "SALOME_AISObject.hxx"
 
-IMPLEMENT_STANDARD_HANDLE (SALOME_AISObject, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISObject, AIS_InteractiveObject)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISObject, AIS_InteractiveObject)
 
 SALOME_AISObject::SALOME_AISObject()
 {

diff --git a/src/OBJECT/SALOME_AISObject.hxx b/src/OBJECT/SALOME_AISObject.hxx
index 2028f244708e82df0056a9e794c35e06e6dc75f0..d30ce8a86ea6b9554bc989c1bd290a43c4c2f7ec 100755 (executable)
--- a/src/OBJECT/SALOME_AISObject.hxx
+++ b/src/OBJECT/SALOME_AISObject.hxx
@@ -35,14 +35,14 @@ public:
   Standard_EXPORT SALOME_AISObject();
   Standard_EXPORT ~SALOME_AISObject();
 
-  Standard_EXPORT virtual Handle_SALOME_InteractiveObject getIO() = 0;
+  Standard_EXPORT virtual Handle(SALOME_InteractiveObject) getIO() = 0;
   Standard_EXPORT virtual Standard_Boolean hasIO() = 0;
 
   Standard_EXPORT virtual Standard_CString getName() = 0;
   Standard_EXPORT virtual void setName(const Standard_CString aName) = 0;
 
 public:
-  DEFINE_STANDARD_RTTI(SALOME_AISObject);
+  OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_AISObject,AIS_InteractiveObject)
 };
 
 DEFINE_STANDARD_HANDLE(SALOME_AISObject, AIS_InteractiveObject)

diff --git a/src/OBJECT/SALOME_AISShape.cxx b/src/OBJECT/SALOME_AISShape.cxx
index 4e9f4c93b7a4e21d6fd296f7a80152ecf7da412f..7be2fd5c321e1cb3f2d1cd3a2001a66fcaa3a788 100755 (executable)
--- a/src/OBJECT/SALOME_AISShape.cxx
+++ b/src/OBJECT/SALOME_AISShape.cxx
@@ -22,8 +22,7 @@
 
 #include "SALOME_AISShape.hxx"
 
-IMPLEMENT_STANDARD_HANDLE (SALOME_AISShape, ViewerData_AISShape)
-IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISShape, ViewerData_AISShape)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISShape, ViewerData_AISShape)
 
 /*!
   Constructor

diff --git a/src/OBJECT/SALOME_AISShape.hxx b/src/OBJECT/SALOME_AISShape.hxx
index 42fe6ce82ce26d19da3b112672e02c1ac2efc5c2..acf22fa61e480753a197b204495f3e46373cd4c5 100755 (executable)
--- a/src/OBJECT/SALOME_AISShape.hxx
+++ b/src/OBJECT/SALOME_AISShape.hxx
@@ -29,8 +29,9 @@
 #include <Standard.hxx>
 #include <Standard_DefineHandle.hxx>
 
+#include <TColStd_IndexedMapOfInteger.hxx>
+
 class TopoDS_Shape;
-class TColStd_IndexedMapOfInteger;
 
 class SALOME_AISShape : public ViewerData_AISShape
 {
@@ -41,7 +42,7 @@ public:
   Standard_EXPORT virtual Standard_CString getName() = 0;
   Standard_EXPORT virtual void setName(const Standard_CString aName) = 0;
 
-  Standard_EXPORT virtual Handle_SALOME_InteractiveObject getIO() = 0;
+  Standard_EXPORT virtual Handle(SALOME_InteractiveObject) getIO() = 0;
   Standard_EXPORT virtual Standard_Boolean hasIO() = 0;
 
   Standard_EXPORT virtual void setTopLevel(Standard_Boolean) = 0;
@@ -53,7 +54,7 @@ public:
   Standard_EXPORT virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ) = 0;
 
 public:
-  DEFINE_STANDARD_RTTI(SALOME_AISShape);
+  OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_AISShape,ViewerData_AISShape)
 };
 
 DEFINE_STANDARD_HANDLE(SALOME_AISShape, ViewerData_AISShape)

diff --git a/src/OBJECT/SALOME_Filter.cxx b/src/OBJECT/SALOME_Filter.cxx
index 1064bb5fa3bde988ff779dc5bbc5be5608d78080..f52c49bce3871038c7033024597dd8e0e33c5342 100644 (file)
--- a/src/OBJECT/SALOME_Filter.cxx
+++ b/src/OBJECT/SALOME_Filter.cxx
@@ -22,8 +22,7 @@
 
 #include "SALOME_Filter.hxx"
 
-IMPLEMENT_STANDARD_HANDLE (SALOME_Filter, MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(SALOME_Filter, MMgt_TShared)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_Filter, MMgt_TShared)
 
 SALOME_Filter::SALOME_Filter()
 {

diff --git a/src/OBJECT/SALOME_Filter.hxx b/src/OBJECT/SALOME_Filter.hxx
index 3e7bd08b89bae0fd85d63a9613cf7357e13c7c3b..4f1c200cac422cf7d833d7f4aabccea73f29ca2c 100644 (file)
--- a/src/OBJECT/SALOME_Filter.hxx
+++ b/src/OBJECT/SALOME_Filter.hxx
@@ -38,7 +38,7 @@ public:
   Standard_EXPORT virtual Standard_Boolean IsOk(const Handle(SALOME_InteractiveObject)& anObj) const = 0;
 
 public:
-  DEFINE_STANDARD_RTTI(SALOME_Filter);
+  OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_Filter,MMgt_TShared)
 };
 
 DEFINE_STANDARD_HANDLE(SALOME_Filter, MMgt_TShared)

diff --git a/src/OBJECT/SALOME_InteractiveObject.cxx b/src/OBJECT/SALOME_InteractiveObject.cxx
index c97e5b0ab0a51859b5071710fd67e13b78b03af7..e357b0b20f49143fd9bde2d852755eae2a433aeb 100755 (executable)
--- a/src/OBJECT/SALOME_InteractiveObject.cxx
+++ b/src/OBJECT/SALOME_InteractiveObject.cxx
@@ -27,8 +27,7 @@
 
 #include "SALOME_InteractiveObject.hxx"
 
-IMPLEMENT_STANDARD_HANDLE (SALOME_InteractiveObject, MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(SALOME_InteractiveObject, MMgt_TShared)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_InteractiveObject, MMgt_TShared)
 
 /*!
   Default constructor

diff --git a/src/OBJECT/SALOME_InteractiveObject.hxx b/src/OBJECT/SALOME_InteractiveObject.hxx
index 35e1610412a7be7cdd230e32effb1d8893c81b26..95a74fcea8ecadae0f4254b63eb996ac6b341bb5 100755 (executable)
--- a/src/OBJECT/SALOME_InteractiveObject.hxx
+++ b/src/OBJECT/SALOME_InteractiveObject.hxx
@@ -27,6 +27,8 @@
 #include <Standard.hxx>
 #include <Standard_DefineHandle.hxx>
 
+#include <Basics_OCCTVersion.hxx>
+
 #include <string>
 
 class SALOME_InteractiveObject;
@@ -69,7 +71,7 @@ protected:
   std::string myReference;
 
 public:
-  DEFINE_STANDARD_RTTI(SALOME_InteractiveObject);
+  OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_InteractiveObject,MMgt_TShared)
 };
 
 #endif // SALOME_INTERACTIVEOBJECT_HXX

diff --git a/src/OBJECT/SALOME_TypeFilter.cxx b/src/OBJECT/SALOME_TypeFilter.cxx
index fb5ad4181e705b77a74a7833b36782fb65a6bdbf..b4191f10525d41eb5bef00a0eb3b00b20a3011d4 100644 (file)
--- a/src/OBJECT/SALOME_TypeFilter.cxx
+++ b/src/OBJECT/SALOME_TypeFilter.cxx
@@ -22,8 +22,7 @@
 
 #include "SALOME_TypeFilter.hxx"
 
-IMPLEMENT_STANDARD_HANDLE (SALOME_TypeFilter, SALOME_Filter)
-IMPLEMENT_STANDARD_RTTIEXT(SALOME_TypeFilter, SALOME_Filter)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_TypeFilter, SALOME_Filter)
 
 /*!
   Constructor

diff --git a/src/OBJECT/SALOME_TypeFilter.hxx b/src/OBJECT/SALOME_TypeFilter.hxx
index 8bb5bfcfc14f3b61b535cd8dd7b34f9ca7f86da9..a9a58f6344c8eeb381a0025d5e8ae56f54f870ed 100644 (file)
--- a/src/OBJECT/SALOME_TypeFilter.hxx
+++ b/src/OBJECT/SALOME_TypeFilter.hxx
@@ -40,7 +40,7 @@ protected:
   Standard_CString myKind;
 
 public:
-  DEFINE_STANDARD_RTTI(SALOME_TypeFilter);
+  OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_TypeFilter,SALOME_Filter)
 };
 
 DEFINE_STANDARD_HANDLE(SALOME_TypeFilter, SALOME_Filter)

diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt
index 16c7237f215aad126c7e96476b65aa8f482e6181..528be766b03d93cbaa81113940025828d9b08261 100755 (executable)
--- a/src/OCCViewer/CMakeLists.txt
+++ b/src/OCCViewer/CMakeLists.txt
@@ -79,7 +79,6 @@ SET(_moc_HEADERS
 SET(_other_HEADERS
   OCCViewer.h
   OCCViewer_ClipPlane.h
-  OCCViewer_Trihedron.h 
   OCCViewer_VService.h
   OCCViewer_Utilities.h
 )
@@ -172,7 +171,6 @@ SET(_other_SOURCES
   OCCViewer_FontWidget.cxx
   OCCViewer_SetRotationPointDlg.cxx
   OCCViewer_ToolTip.cxx
-  OCCViewer_Trihedron.cxx
   OCCViewer_VService.cxx
   OCCViewer_ViewFrame.cxx
   OCCViewer_ViewManager.cxx

diff --git a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
index f810ebff664efff9efb22b93e2cce79de736fe09..45e6693969ae598dffef7eabad6d349efe5390c7 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
+++ b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
@@ -141,7 +141,7 @@ bool OCCViewer_ClipPlaneInteractor::isClickable( const Handle(AIS_Plane)& thePla
 
   Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext();
 
-  if ( anAISContext->IsSelected( thePlane ) )
+  if ( anAISContext->IsSelected( Handle(AIS_InteractiveObject)::DownCast(thePlane) ) )
   {
     return false;
   }
@@ -172,7 +172,7 @@ bool OCCViewer_ClipPlaneInteractor::isDraggable( const Handle(AIS_Plane)& thePla
 
   Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext();
 
-  if ( !anAISContext->IsSelected( thePlane ) )
+  if ( !anAISContext->IsSelected( Handle(AIS_InteractiveObject)::DownCast(thePlane) ) ) 
   {
     return false;
   }
@@ -522,7 +522,7 @@ bool OCCViewer_ClipPlaneInteractor::mousePress( QMouseEvent* theEvent,
   // process mouse click on the object
   if ( myIsClickable )
   {
-    myViewer->getAISContext()->SetSelected( aPlane );
+    myViewer->getAISContext()->SetSelected( Handle(AIS_InteractiveObject)::DownCast(aPlane) );
     emit planeClicked( aPlane );
   }
 

diff --git a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
index ae79a441e9f95950536cf0ce19ad25344c762d8b..da13bdff882a30a586ff1ecc7ce6182dc6e08f96 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
+++ b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
@@ -34,7 +34,7 @@
 
 #include <vector>
 
-class Handle(V3d_View);
+#include <V3d_View.hxx>
 
 /*!
   \class OCCViewer_ClipPlaneInteractor.

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index 1c9e4633e65d47a4949e4315995e6398b2310b2d..83dcfdb601800c12b53fa38427a3dc9e73729c0b 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
@@ -40,7 +40,6 @@
 #include <Basics_OCCTVersion.hxx>
 
 #include <V3d_View.hxx>
-#include <Visual3d_View.hxx>
 #include <Geom_Plane.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_PlaneAspect.hxx>
@@ -647,8 +646,8 @@ OCCViewer_ClippingDlg::OCCViewer_ClippingDlg(OCCViewer_ViewWindow* parent , OCCV
 
   OCCViewer_ViewManager* aViewMgr = (OCCViewer_ViewManager*) myModel->getViewManager();
   myInteractor = new OCCViewer_ClipPlaneInteractor( aViewMgr, this );
-  connect( myInteractor, SIGNAL( planeClicked( const Handle_AIS_Plane& ) ), SLOT( onPlaneClicked( const Handle_AIS_Plane& ) ) );
-  connect( myInteractor, SIGNAL( planeDragged( const Handle_AIS_Plane& ) ), SLOT( onPlaneDragged( const Handle_AIS_Plane& ) ) );
+  connect( myInteractor, SIGNAL( planeClicked( const Handle(AIS_Plane)& ) ), SLOT( onPlaneClicked( const Handle(AIS_Plane)& ) ) );
+  connect( myInteractor, SIGNAL( planeDragged( const Handle(AIS_Plane)& ) ), SLOT( onPlaneDragged( const Handle(AIS_Plane)& ) ) );
 
   myLocalPlanes = myModel->getClipPlanes();
   synchronize();

diff --git a/src/OCCViewer/OCCViewer_ToolTip.cxx b/src/OCCViewer/OCCViewer_ToolTip.cxx
index d987eb49de054becd5c0c9803ab2ec238d141ccc..900a9818f2086454727e3b98036c7d27373dcdb0 100644 (file)
--- a/src/OCCViewer/OCCViewer_ToolTip.cxx
+++ b/src/OCCViewer/OCCViewer_ToolTip.cxx
@@ -27,8 +27,6 @@
 
 #include <SUIT_ViewManager.h>
 
-#include <SelectMgr_EntityOwner.hxx>
-
 /*!
   Constructor
 
@@ -88,7 +86,7 @@ void OCCViewer_ToolTip::onToolTip( QPoint p, QString& str, QFont& f, QRect& txtR
   if( !owner.IsNull() )
     emit toolTipFor( owner, txt );
 
-  Handle_AIS_InteractiveObject obj = aCont->DetectedInteractive();
+  Handle(AIS_InteractiveObject) obj = aCont->DetectedInteractive();
   if( txt.isEmpty() && !obj.IsNull() )
     emit toolTipFor( obj, txt );
 

diff --git a/src/OCCViewer/OCCViewer_ToolTip.h b/src/OCCViewer/OCCViewer_ToolTip.h
index d3fbe851b959f324aee387aa96cb455cd377023d..00e384352d72e7b4d78e27bf3d95da6bdeeeb48e 100644 (file)
--- a/src/OCCViewer/OCCViewer_ToolTip.h
+++ b/src/OCCViewer/OCCViewer_ToolTip.h
@@ -24,9 +24,10 @@
 #include <QtxToolTip.h>
 #include <QFont>
 
+#include <SelectMgr_EntityOwner.hxx>
+#include <AIS_InteractiveObject.hxx>
+
 class OCCViewer_ViewWindow;
-class Handle_SelectMgr_EntityOwner;
-class Handle_AIS_InteractiveObject;
 
 /*!
   \class OCCViewer_ToolTip

diff --git a/src/OCCViewer/OCCViewer_Trihedron.cxx b/src/OCCViewer/OCCViewer_Trihedron.cxx
index 826d8cdd386a8d54d2c21e39db11676ff8a639e9..4682ce950340f2c49a33dbb4ac605b6a720256ca 100644 (file)
--- a/src/OCCViewer/OCCViewer_Trihedron.cxx
+++ b/src/OCCViewer/OCCViewer_Trihedron.cxx
@@ -45,8 +45,7 @@
 
 #define PI   3.14159265359
 
-IMPLEMENT_STANDARD_HANDLE( OCCViewer_Trihedron, AIS_InteractiveObject )
-IMPLEMENT_STANDARD_RTTIEXT( OCCViewer_Trihedron, AIS_InteractiveObject )
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( OCCViewer_Trihedron, AIS_InteractiveObject )
 
 /*!
  * Constructor

diff --git a/src/OCCViewer/OCCViewer_Trihedron.h b/src/OCCViewer/OCCViewer_Trihedron.h
index 0c57bf442495267f3963a4e2ee93e572fad83797..0618e4f20a88bf49168b81cc897f533f7c3c9e1d 100644 (file)
--- a/src/OCCViewer/OCCViewer_Trihedron.h
+++ b/src/OCCViewer/OCCViewer_Trihedron.h
@@ -56,7 +56,7 @@ public:
 
   virtual void           display();
 
-  DEFINE_STANDARD_RTTI( OCCViewer_Trihedron )
+  OCCT_DEFINE_STANDARD_RTTIEXT(OCCViewer_Trihedron,AIS_InteractiveObject)
 
 private:
   unsigned int           myTextList;

diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx
index 0fe1ac0a6402989b5e2b36456551caab066333b2..706d2320de9c6703aa53857b5ae343ee762a80b4 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewModel.cxx
+++ b/src/OCCViewer/OCCViewer_ViewModel.cxx
@@ -60,7 +60,6 @@
 #else
   #include <AIS_Drawer.hxx>
 #endif
-#include <AIS_ListOfInteractive.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 
 #include <Graphic3d_Texture2Dmanual.hxx>
@@ -73,11 +72,13 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_TextAspect.hxx>
 
-#include <Visual3d_View.hxx>
-
 #include <V3d_DirectionalLight.hxx>
 #include <V3d_AmbientLight.hxx>
 
+#if OCC_VERSION_MAJOR < 7
+  #include <Visual3d_View.hxx>
+#endif
+
 /*!
   Get data for supported background modes: gradient types, identifiers and supported image formats
 */

diff --git a/src/OCCViewer/OCCViewer_ViewModel.h b/src/OCCViewer/OCCViewer_ViewModel.h
index 5e344e074fa0fd53df1313d3d3238b255b5c1851..41079ea3c9711b7a4815c2e0414d2d62a6144655 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewModel.h
+++ b/src/OCCViewer/OCCViewer_ViewModel.h
@@ -36,6 +36,7 @@
 #include <V3d_View.hxx>
 #include <AIS_Trihedron.hxx>
 #include <AIS_InteractiveContext.hxx>
+#include <AIS_ListOfInteractive.hxx>
 #include <Graphic3d_SequenceOfHClipPlane.hxx>
 
 class QKeyEvent;
@@ -47,8 +48,6 @@ class OCCViewer_ClippingDlg;
 class OCCViewer_ViewWindow;
 class OCCViewer_ViewPort3d;
 
-class AIS_ListOfInteractive;
-
 class QtxAction;
 
 

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index b0ba526d440ae4db77d3cfc0cc9e2074180b359d..814b97a97dc17be4d08b12610389dcad8fa1c3a1 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -39,8 +39,9 @@
 #include <QResizeEvent>
 #include <QApplication>
 
-#include <Visual3d_View.hxx>
-#include <V3d_Viewer.hxx>
+#if OCC_VERSION_MAJOR < 7
+  #include <Visual3d_View.hxx>
+#endif
 
 #if OCC_VERSION_LARGE > 0x06070100
 #include <V3d_View.hxx>
@@ -595,9 +596,14 @@ void OCCViewer_ViewPort3d::paintEvent( QPaintEvent* e )
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QApplication::syncX();
 #endif
-    QRect rc = e->rect();
-    if ( !myPaintersRedrawing )
+    if ( !myPaintersRedrawing ) {
+#if OCC_VERSION_MAJOR < 7
+      QRect rc = e->rect();
       activeView()->Redraw( rc.x(), rc.y(), rc.width(), rc.height() );
+#else
+      activeView()->Redraw();
+#endif
+    }
   }
   OCCViewer_ViewPort::paintEvent( e );
   myBusy = false;

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.h b/src/OCCViewer/OCCViewer_ViewPort3d.h
index b05bd3a4a310b11f29e42b55261788fa9af8c0be..e122cebabf1a0c253125db0f1757c3c54dbf90dd 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.h
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.h
@@ -29,13 +29,12 @@
 #include "Qtx.h"
 
 #include <V3d_View.hxx>
+#include <V3d_Viewer.hxx>
 
 class QColor;
 class QString;
 class QRect;
 
-class Handle(V3d_Viewer);
-
 #ifdef WIN32
 #pragma warning ( disable:4251 )
 #endif

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index d8682208616b21f387de6bf6e060800fff7099f9..704fe69713a3e5f385f639ad5c0476b53d1229ca 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -86,8 +86,10 @@
 #include <Graphic3d_RenderingParams.hxx>
 #endif
 
+#if OCC_VERSION_MAJOR < 7
+  #include <Visual3d_View.hxx>
+#endif
 
-#include <Visual3d_View.hxx>
 #include <V3d_Plane.hxx>
 #include <V3d_Light.hxx>
 
@@ -2273,7 +2275,11 @@ bool OCCViewer_ViewWindow::dumpViewToFormat( const QImage& img,
   if ( format != "PS" && format != "EPS")
    res = myViewPort->getView()->Dump( fileName.toStdString().c_str() );
 
+#if OCC_VERSION_MAJOR < 7
   Handle(Visual3d_View) a3dView = myViewPort->getView()->View();
+#else
+  Handle(Graphic3d_CView) a3dView = myViewPort->getView()->View();
+#endif
 
   if (format == "PS")
     res = a3dView->Export(strdup(qPrintable(fileName)), Graphic3d_EF_PostScript);

diff --git a/src/Prs/CMakeLists.txt b/src/Prs/CMakeLists.txt
index dc09889e87455bf199d9c403a856c9ac9ee6aea4..d1b3572aea6105bedf836bccc3874de2257284ea 100755 (executable)
--- a/src/Prs/CMakeLists.txt
+++ b/src/Prs/CMakeLists.txt
@@ -17,6 +17,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+# additional include directories
+INCLUDE_DIRECTORIES(
+  ${CAS_INCLUDE_DIRS}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES ${CAS_KERNEL})
+
 ADD_LIBRARY(SalomePrs SALOME_Prs.cxx)
+TARGET_LINK_LIBRARIES(SalomePrs ${_link_LIBRARIES})
+
 INSTALL(TARGETS SalomePrs EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 INSTALL(FILES SALOME_Prs.h DESTINATION ${SALOME_INSTALL_HEADERS})

diff --git a/src/Prs/SALOME_Prs.h b/src/Prs/SALOME_Prs.h
index dc4d9be4bf3617c41ce164176fbfec2a342ed89b..f7f5e330fa6f672a4609a921b4bbfba4d1e4c415 100755 (executable)
--- a/src/Prs/SALOME_Prs.h
+++ b/src/Prs/SALOME_Prs.h
@@ -33,13 +33,19 @@
 #define PRS_EXPORT
 #endif
 
+#include <string>
+#include <list>
+
+#include <Basics_OCCTVersion.hxx>
+
 class SALOME_View;
 class SALOME_Displayer;
 class SALOME_ListIO;
-class Handle_SALOME_InteractiveObject;
-
-#include <string>
-#include <list>
+#if OCC_VERSION_MAJOR >= 7
+  class SALOME_InteractiveObject;
+#else
+  class Handle_SALOME_InteractiveObject;
+#endif
 
 /*!
  \class SALOME_Prs
@@ -303,7 +309,7 @@ public:
 
   // New methods (asv)
   //! \retval Return false.
-  virtual bool isVisible( const Handle_SALOME_InteractiveObject& ){ return false; }
+  virtual bool isVisible( const Handle(SALOME_InteractiveObject)& ){ return false; }
   virtual void Repaint() {} //!< Null body here.
   virtual void GetVisible( SALOME_ListIO& theList ) {}
 };

diff --git a/src/QDS/QDS.cxx b/src/QDS/QDS.cxx
index a266719073d7b71ca364c31b7df685aeb66834ee..98e664de1fb9a4946629a42ac9d1a8aaa88cbce7 100644 (file)
--- a/src/QDS/QDS.cxx
+++ b/src/QDS/QDS.cxx
@@ -29,9 +29,6 @@
 #include <DDS_DicItem.h>
 #include <DDS_Dictionary.h>
 
-#include <TCollection_HAsciiString.hxx>
-#include <TCollection_HExtendedString.hxx>
-
 QList<QDS_Datum*> QDS::_datumList;
 
 /*!

diff --git a/src/QDS/QDS.h b/src/QDS/QDS.h
index 3b47bf8f94831ef41520b76b77580b4303be823e..a1a24140743f0e846d6150839291fcf00baae48e 100644 (file)
--- a/src/QDS/QDS.h
+++ b/src/QDS/QDS.h
@@ -41,11 +41,11 @@
 #include <QString>
 #include <QList>
 
-#include <TCollection_ExtendedString.hxx>
+#include <TCollection_HExtendedString.hxx>
+#include <TCollection_HAsciiString.hxx>
 
 class QDS_Datum;
-class Handle(TCollection_HAsciiString);
-class Handle(TCollection_HExtendedString);
+
 
 class QDS_EXPORT QDS
 {

diff --git a/src/SOCC/SOCC_Prs.h b/src/SOCC/SOCC_Prs.h
index 2ed3aff2a1b92fad827324a959a17f89d5c37879..7f4b791fba98def05e6e533455559b427b3df84a 100644 (file)
--- a/src/SOCC/SOCC_Prs.h
+++ b/src/SOCC/SOCC_Prs.h
@@ -33,7 +33,7 @@
 
 #include <AIS_ListOfInteractive.hxx>
 
-class Handle(AIS_InteractiveObject);
+class AIS_InteractiveObject;
 
 class SOCC_EXPORT SOCC_Prs : public SALOME_OCCPrs
 {

diff --git a/src/SOCC/SOCC_ViewModel.cxx b/src/SOCC/SOCC_ViewModel.cxx
index 14be3e51891ff3b1ec0c6ac312f316107784df2e..03825c7a4e84f665ad3847cdc24192f498152445 100755 (executable)
--- a/src/SOCC/SOCC_ViewModel.cxx
+++ b/src/SOCC/SOCC_ViewModel.cxx
@@ -25,8 +25,6 @@
 #include "SOCC_Prs.h"
 #include "SOCC_ViewWindow.h"
 
-#include "OCCViewer_Trihedron.h"
-
 #include "SUIT_Session.h"
 #include "SUIT_ResourceMgr.h"
 //#include "SUIT_Application.h"
@@ -40,7 +38,6 @@
 //#include CORBA_CLIENT_HEADER(SALOMEDS)
 
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
-#include <Visual3d_View.hxx>
 
 #include <SALOME_AISShape.hxx>
 #include <SALOME_AISObject.hxx>
@@ -491,8 +488,7 @@ void SOCC_Viewer::EraseAll( SALOME_Displayer* d, const bool forced )
   ic->DisplayedObjects( aList );
   AIS_ListIteratorOfListOfInteractive anIter( aList );
   for ( ; anIter.More(); anIter.Next() ) {
-    if ( (isTrihedronDisplayed && anIter.Value()->DynamicType() == STANDARD_TYPE( AIS_Trihedron )) ||
-         anIter.Value()->DynamicType() == STANDARD_TYPE( OCCViewer_Trihedron ))
+    if ( (isTrihedronDisplayed && anIter.Value()->DynamicType() == STANDARD_TYPE( AIS_Trihedron ) ) )
       continue;
 
     // erase an object

diff --git a/src/SOCC/SOCC_ViewModel.h b/src/SOCC/SOCC_ViewModel.h
index c4feb972ce12516ecd158a5155cff99938f093d8..df766159200b6fa5131498a9ea5f0e9c53826a87 100755 (executable)
--- a/src/SOCC/SOCC_ViewModel.h
+++ b/src/SOCC/SOCC_ViewModel.h
@@ -32,7 +32,7 @@
 #include "OCCViewer_ViewModel.h"
 
 class SALOME_ListIO;
-class Handle(SALOME_InteractiveObject);
+class SALOME_InteractiveObject;
 
 class SOCC_EXPORT SOCC_Viewer: public OCCViewer_Viewer, public SALOME_View
 {

diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h
index 4ed2e5a9237fdf2afbcf8bb3eaece393391a294c..d09a8e848b04ca671ff26da3baf19a19b56de238 100644 (file)
--- a/src/SVTK/SALOME_Actor.h
+++ b/src/SVTK/SALOME_Actor.h
@@ -31,7 +31,7 @@
 #include "SVTK_Selector.h"
 #include "SVTK.h"
 
-class Handle(SALOME_InteractiveObject);
+class SALOME_InteractiveObject;
 
 // undefining min and max because CASCADE's defines them and
 // it clashes with std::min(), std::max()

diff --git a/src/SVTK/SVTK_Selector.h b/src/SVTK/SVTK_Selector.h
index e197895cb88a5244277040a71ffbce34f3788653..c5c9831a58532832c5fc217e2d1a877a5d992f78 100644 (file)
--- a/src/SVTK/SVTK_Selector.h
+++ b/src/SVTK/SVTK_Selector.h
@@ -31,18 +31,18 @@
 #include "SVTK_Selection.h"
 #include "SALOME_ListIO.hxx"
 
+#include <VTKViewer_Filter.h>
+
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 
 #include <vtkObject.h>
 
-class Handle(VTKViewer_Filter);
-
+class SALOME_InteractiveObject;
 class SALOME_Actor;
 class SVTK_SelectionEvent;
 class vtkActorCollection;
 class vtkRenderer;
-class Handle(SALOME_InteractiveObject);
 
 //! Define an abstract interface for selection in SVTK package
 /*!

diff --git a/src/SalomeApp/SalomeApp_ListView.h b/src/SalomeApp/SalomeApp_ListView.h
index 9b046a26b0838b86fa81d96bcb2c0953c3610b5e..f55cef0cf0f7baae3742d74b9dbedd1739a0399e 100644 (file)
--- a/src/SalomeApp/SalomeApp_ListView.h
+++ b/src/SalomeApp/SalomeApp_ListView.h
@@ -36,10 +36,10 @@
 #include <QLineEdit>
 #include <QComboBox>
 
-class QToolButton; 
+#include <TColStd_ListOfInteger.hxx>
+#include <TColStd_ListOfReal.hxx>
 
-class TColStd_ListOfInteger;
-class TColStd_ListOfReal;
+class QToolButton; 
 
 // enumeration for ListView updating mode
 enum UpdateType {

diff --git a/src/VTKViewer/VTKViewer_Filter.cxx b/src/VTKViewer/VTKViewer_Filter.cxx
index 39ca0c5ca3f79ca44b9ee9244cdd5117a8c64ec4..7aa8e69a96317992f5dbf0abdc51f674d1cbe947 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Filter.cxx
+++ b/src/VTKViewer/VTKViewer_Filter.cxx
@@ -26,8 +26,7 @@
 
 #include "VTKViewer_Filter.h"
 
-IMPLEMENT_STANDARD_HANDLE(VTKViewer_Filter, MMgt_TShared)
-IMPLEMENT_STANDARD_RTTIEXT(VTKViewer_Filter, MMgt_TShared)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(VTKViewer_Filter, MMgt_TShared)
 
 /*!
  * \class       VTKViewer_Filter

diff --git a/src/VTKViewer/VTKViewer_Filter.h b/src/VTKViewer/VTKViewer_Filter.h
index 8c6f1925f89b118aee455e8a5e159d9046fa6df4..1ccb8ed14771a4df32e6be947f1b401dcc34cc77 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Filter.h
+++ b/src/VTKViewer/VTKViewer_Filter.h
@@ -33,6 +33,8 @@
 #include <MMgt_TShared.hxx>
 #include <Standard_DefineHandle.hxx>
 
+#include <Basics_OCCTVersion.hxx>
+
 class VTKViewer_Actor;
 
 DEFINE_STANDARD_HANDLE(VTKViewer_Filter, MMgt_TShared);
@@ -61,7 +63,7 @@ protected:
   VTKViewer_Actor*                             myActor;
 
 public:  
-  DEFINE_STANDARD_RTTI(VTKViewer_Filter)
+  OCCT_DEFINE_STANDARD_RTTIEXT(VTKViewer_Filter,MMgt_TShared)
 };
 
 #endif

diff --git a/src/ViewerData/CMakeLists.txt b/src/ViewerData/CMakeLists.txt
index 981e25a548ebb33ed5eef5f44eff89e90fafde7a..8e2128531e63b642c42e4a8577e5abb46c01ac32 100644 (file)
--- a/src/ViewerData/CMakeLists.txt
+++ b/src/ViewerData/CMakeLists.txt
@@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(${CAS_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${CAS_LDPATH} ${CAS_KERNEL} ${CAS_TKV3d})
+SET(_link_LIBRARIES ${CAS_LDPATH} ${CAS_KERNEL} ${CAS_VIEWER})
 
 # --- headers ---
 

diff --git a/src/ViewerData/ViewerData_AISShape.cxx b/src/ViewerData/ViewerData_AISShape.cxx
index 89ee780f23b4447c0a93d68e79babfd452b7adad..0e1b3f9f4c02ca12e50fe801d0f4d6e60f7f9f00 100644 (file)
--- a/src/ViewerData/ViewerData_AISShape.cxx
+++ b/src/ViewerData/ViewerData_AISShape.cxx
@@ -23,11 +23,9 @@
 #include "ViewerData_AISShape.hxx"
 
 #ifdef USE_TEXTURED_SHAPE
-IMPLEMENT_STANDARD_HANDLE (ViewerData_AISShape, AIS_TexturedShape)
-IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_TexturedShape)
+  OCCT_IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_TexturedShape)
 #else
-IMPLEMENT_STANDARD_HANDLE (ViewerData_AISShape, AIS_Shape)
-IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_Shape)
+  OCCT_IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_Shape)
 #endif
 
 /*!

diff --git a/src/ViewerData/ViewerData_AISShape.hxx b/src/ViewerData/ViewerData_AISShape.hxx
index 8ea403b59aede5709ab7ebd02480a87c1dce513b..bdb8246f459b40866b312fe8871c0aefc33d2eff 100644 (file)
--- a/src/ViewerData/ViewerData_AISShape.hxx
+++ b/src/ViewerData/ViewerData_AISShape.hxx
@@ -35,6 +35,8 @@
 #include <Standard.hxx>
 #include <Standard_DefineHandle.hxx>
 
+#include <Basics_OCCTVersion.hxx>
+
 class ViewerData_AISShape
 #ifdef USE_TEXTURED_SHAPE
   : public AIS_TexturedShape
@@ -62,13 +64,18 @@ protected:
   bool myIsClippable;
 
 public:
-  DEFINE_STANDARD_RTTI(ViewerData_AISShape)  
+
+#ifdef USE_TEXTURED_SHAPE
+  OCCT_DEFINE_STANDARD_RTTIEXT(ViewerData_AISShape,AIS_TexturedShape)
+#else
+  OCCT_DEFINE_STANDARD_RTTIEXT(ViewerData_AISShape,AIS_Shape)
+#endif
 };
 
 #ifdef USE_TEXTURED_SHAPE
-DEFINE_STANDARD_HANDLE(ViewerData_AISShape, AIS_TexturedShape)
+  DEFINE_STANDARD_HANDLE(ViewerData_AISShape, AIS_TexturedShape)
 #else
-DEFINE_STANDARD_HANDLE(ViewerData_AISShape, AIS_Shape)
+  DEFINE_STANDARD_HANDLE(ViewerData_AISShape, AIS_Shape)
 #endif
 
 #endif // _ViewerData_AISShape_HeaderFile