OCCT 7.0.0 porting

diff --git a/src/CAF/CAF_Operation.h b/src/CAF/CAF_Operation.h
index ed0738e1d52505cda42980ef1ad3c3865ddee927..08fc44e5eabc14e22988b72ac2e74f76fadc9dc4 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 d60fd3516d8f3162425481c47d80b5457b98b013..2210b0a8f07175658fe55bd5abd016067918a729 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 7279878ed8fa032f3318bbcd2ef0e7b0621a73b9..2246770ecbc848bdbdecf226c889a2b033bf7d67 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 2695e43677ac8ba233047cae8568343d28c19a9f..149b90d7d6c244eeb87a147941d5459219520712 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 2f21eee4b8a6bee9c10bc1e303a12e3d2930327d..fd50b40b2d2fd637a1228663f6a0bb3961fd436b 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 09786208ed67dc4a201c32f1709d052a3e33920c..de394784b59ead1778884bf463bbdcce0f34217b 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 95dbf5efc9bb81f2bf812cd515cb9b9d8dcc84c6..37e485b6c08fa665fdb83904546e2c922ef26f45 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 78ff9030d9408888dbf3841ee9171438e07157a6..0a8593cd32deedb80c6dd9f65306413073c2102f 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 b1f2f5a95f5833670ba1a4b8efbb9f568e50b75c..aa5fd34be334ef875acf86dae6e7fa1927b84e92 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 361a952b0283ea58696eb2ed48d5aa7d2b2897a8..b293b3b8a7fd43edd50f59a196f0f2eeb5d58285 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 8ff6ffa92989828c630662e252853e605fe000d6..df8a1f195874e2a7a69b3060ef3998720deec77b 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 1a98f25ca0706e7808f610ed33ba8cb924001e70..509e61f79e31671c3374ea5d15d3a4b634ae842e 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 5140d31150cd0f4fb79d9d0b840f23b5c7ba24bf..7449733ff721e8580597aea8e6e4c86abae07fbe 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 ed74826763fd234dcade00c4134ad5ed9e70ae7a..35af6e0b48db529c0eafc5478690cb2e1fbeb822 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 205e2d45bb4e8f443927ff0b79da8221706d545d..1fdd5bb23c3410491addf665e1d240f4c8643d94 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 ee72d17520db8fe55280f2385176a88e7ac6521d..7c7f53f06d555a81487fdf0523dc5a703e3805fe 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 334b3a70740694da031265125122d9e7072177a7..9afc5a58f270a3d69dc8c4ac53ddb023a6801f1a 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 613f9a1d312daff9279f0b4b399f01a0d9561f14..f3caa04bd24c1386510041f8702ec62e249d5f2e 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 7ed6a658a576dabf044a2b6d3c8012fe6aeec450..0103ad086221f4e021ae8adb8f99670eb37bf8c9 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 5c9d6bfcf097ebb38a51edb0627a44a0415e2d4b..dac14d5ae3c570fa9af3a132845566c15fd00346 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 83f0296036c15b15d7c896dd7cf2a02b5b547e87..ba5b3fff2d4f413c41440c7aaaa5bf65cc7b952f 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 9e044a1851f3918d8502c7e6e912c2883c77a57a..1ae33bd18524c33315d0ff99a82ad9948720ea44 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 019714abb13a7a33979fbaf0b0aceb0921c73777..da05e509b808e2c1e2ae9f697d3e1b63066a2a92 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 14809065699be5a3582303ea23ec45e76f566753..cdf8003aca60738a6e743c8a366ddc01896f0794 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 d7ecf3b358e3e93686d4252812f093620284788a..4ff4b1f444650c8498854b54c786cab942fc292f 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 5fd6407660db7af39fef66cb434fcea0142b1ef9..fb6f546fa9f9f69e55756ec1439ef7e3a32c9732 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 2fc00fab33e8f07dfd2ddbdc801811989041dcb1..e0845607fb577dd02e349ba3608695a0654016c5 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 8c4159c850274bf3be17f139f13de2d3b5fbb073..f314bfa51009dbb1e97fb67df5cf558e29a28466 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.h b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
index 67887dda44fadf7965a98584068c25fd96fe1fb6..cbaba2c0441ba71bad6e8fcbb0c81ec171186867 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 983b360c90fc94b4d6d303932d2c319a9d5d3a30..640440fafa8c27912c59824548e43ef718c6e44f 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 fc1be92b10c5a7a4fa48314d9dcfa777a60bed1c..104a54f3ef6b48c6cce0841f54ea11c77848d100 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 98acb1487901322b1655cabf6ee2843193c5e5ab..fcb3c8d9285396a2d8846cd093c37b5559212f70 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 6f5c54ce95470c69a17ec05d1177750967d5cf79..301cbfb345140b195bd1163da251916ee2c8e565 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 316b9c929cb2b3818c73db0bd26b4a2a7114bbdd..aa3ab0bc453e82ff236f762c42ebcec00fb3c80b 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 9e16a39238432254c753913d3f81a0a685fb1362..268b72e26b0ca5958bf76f6c69d7143b27ca30a7 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 09d071fce75f280777233cc700f44bd9d07f0b1c..e38e510eaccbee9be6fffed6ed3859103a7bb6d9 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 5e927fbb3eda784eef72f747ab9e65b2e29dd368..e3afe98cf190c32593a81e787cca44c4fd97a8fe 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>
@@ -593,9 +594,14 @@ void OCCViewer_ViewPort3d::paintEvent( QPaintEvent* e )
 #endif
   if ( !myWindow.IsNull() ) {
     QApplication::syncX();
-    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 1413b76e9eb1363d20ed3a0b47ea71d022ad4f5e..3a9d0d884d7ad7393041bcb34a946856065f4258 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 8ad6be95c8e4e742427b3ab5a6523c3c6fc3dca8..f642eb69b832d74b88029bb44c6789c8c8e7bdc3 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 9af06252b710b023ded14fde82ef41ff03fb254c..236e6f4ee4a72ceb5fab6a8cd212cf45e0906764 100755 (executable)
--- a/src/Prs/CMakeLists.txt
+++ b/src/Prs/CMakeLists.txt
@@ -17,6 +17,11 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+# additional include directories
+INCLUDE_DIRECTORIES(
+  ${CAS_INCLUDE_DIRS}
+)
+
 ADD_LIBRARY(SalomePrs SALOME_Prs.cxx)
 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 65d446510949a106fadb7799d1ead37cbbf4c933..cb0f7d955c04d43165c7bda1630080ed5eac12b7 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 5adb82901503d00050393cb6acbb930eb063cee7..bc85c79842605bdcca77f65b72d01bb4ec9a84c3 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 26613ffbe655cbd46c38ce881dfdac217e57eb43..90086af9f989c12a24f10443ce1bc03c5e6ee9ba 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 7716009ed249894d3e1ceec1dea46f556fe42aeb..6fb83580995599454e974e32c24916567254533a 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 32ad890c90c3416c2a3612a9898364cffb000d0c..07ffc121cc343fa6dbfc19abaa57d344c194ec07 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 b87d689448e293d6ef106f72c0dbac193e3fd134..584c3b11e62d5777e7713ef113770540cce50559 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 d14d022b5370d65397d50e67551a8eec081bcfdf..3e59c9098e9743521687d05b035c6a3217c0859d 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 497e35fd574d808e2f9461cf3f4956336e2c46d1..bb094f0b67373401cd3a88a772b70cefdd945ce5 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 b1dca577f4ce20a232c5a861bdd7a51c42dc7c0f..6f02d3dd0e7fd568432ba8856d7f747ba55fbbb1 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 3543de328b5297b75eb963e8c6331b7171187d20..d23cb1f3746691840c849c1d5611a10f08a192ee 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 10e849363b22a8a31a78bb1d821d9a69d4a00878..5ec5e644fbf927907e087cc48590c17a2c8c87d3 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/ViewerData_AISShape.cxx b/src/ViewerData/ViewerData_AISShape.cxx
index 777418e0c14dfc3c3eea5e354a42ff0f0128a857..a9465b3259945ca70d3c5946686d70e09d02ab41 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 bead6968e9e4dd48c4dec3d263817f658791de6e..d755daef3599e72c4129466b998970190dda7e90 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