OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0024947: Redesign OCCT legacy type system -- automatic

Browse Source 
Automatic upgrade with command "occt_upgdare . -rtti"
This commit is contained in:
abv
2015-07-11 11:06:11 +03:00
parent 69ff08ff28
commit ec357c5cbb
816 changed files with 1280 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

@@ -1933,7 +1933,7 @@ class FilledCircle : public AIS_InteractiveObject
{
public:
// CASCADE RTTI
DEFINE_STANDARD_RTTI(FilledCircle);
DEFINE_STANDARD_RTTI(FilledCircle, AIS_InteractiveObject);
FilledCircle(gp_Pnt theCenter, Standard_Real theRadius);
FilledCircle(Handle(Geom_Circle) theCircle);
@@ -1955,8 +1955,6 @@ protected:
};
IMPLEMENT_STANDARD_HANDLE(FilledCircle, AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(FilledCircle, AIS_InteractiveObject)
FilledCircle::FilledCircle(gp_Pnt theCenter, Standard_Real theRadius)
{
@@ -2656,6 +2654,7 @@ static int VDrawText (Draw_Interpretor& theDI,
#include <TopExp_Explorer.hxx>
#include <TopAbs.hxx>
#include <StdSelect_ShapeTypeFilter.hxx>
#include <AIS_InteractiveObject.hxx>
//===============================================================================================
@@ -3148,7 +3147,7 @@ public:
myMarkerAspect = theMarkerAspect;
}
DEFINE_STANDARD_RTTI(MyPArrayObject);
DEFINE_STANDARD_RTTI(MyPArrayObject, AIS_InteractiveObject);
private:
@@ -3172,8 +3171,6 @@ protected:
};
IMPLEMENT_STANDARD_HANDLE(MyPArrayObject, AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(MyPArrayObject, AIS_InteractiveObject)
void MyPArrayObject::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
const Handle(Prs3d_Presentation)& aPresentation,
@@ -4337,7 +4334,7 @@ class Triangle: public AIS_InteractiveObject
{
public:
// CASCADE RTTI
DEFINE_STANDARD_RTTI(Triangle);
DEFINE_STANDARD_RTTI(Triangle, AIS_InteractiveObject);
Triangle (const gp_Pnt& theP1,
const gp_Pnt& theP2,
const gp_Pnt& theP3);
@@ -4353,8 +4350,7 @@ private:
gp_Pnt myPoint2;
gp_Pnt myPoint3;
};
IMPLEMENT_STANDARD_HANDLE(Triangle, AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(Triangle, AIS_InteractiveObject)
Triangle::Triangle (const gp_Pnt& theP1,
const gp_Pnt& theP2,
@@ -4532,7 +4528,7 @@ class SegmentObject: public AIS_InteractiveObject
{
public:
// CASCADE RTTI
DEFINE_STANDARD_RTTI(SegmentObject);
DEFINE_STANDARD_RTTI(SegmentObject, AIS_InteractiveObject);
SegmentObject (const gp_Pnt& thePnt1, const gp_Pnt& thePnt2);
protected:
void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
@@ -4545,8 +4541,7 @@ private:
gp_Pnt myPoint1;
gp_Pnt myPoint2;
};
IMPLEMENT_STANDARD_HANDLE(SegmentObject, AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(SegmentObject, AIS_InteractiveObject)
SegmentObject::SegmentObject (const gp_Pnt& thePnt1, const gp_Pnt& thePnt2)
{
@@ -4922,7 +4917,7 @@ public:
myMarkerAspect = theMarkerAspect;
}
DEFINE_STANDARD_RTTI(MyPArrayObject);
DEFINE_STANDARD_RTTI(MyPArrayObject, AIS_InteractiveObject);
private:
@@ -4940,8 +4935,6 @@ protected:
Handle(Graphic3d_AspectMarker3d) myMarkerAspect;
};
IMPLEMENT_STANDARD_HANDLE(ViewerTest_MarkersArrayObject, AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(ViewerTest_MarkersArrayObject, AIS_InteractiveObject)
void ViewerTest_MarkersArrayObject::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
const Handle(Prs3d_Presentation)& aPresentation,

5
src/ViewerTest/ViewerTest_OpenGlCommands.cxx
View File

@@ -62,7 +62,7 @@ class VUserDrawObj : public AIS_InteractiveObject
{
public:
// CASCADE RTTI
DEFINE_STANDARD_RTTI(VUserDrawObj);
DEFINE_STANDARD_RTTI(VUserDrawObj, AIS_InteractiveObject);
VUserDrawObj()
{
@@ -125,8 +125,7 @@ private:
friend class Element;
};
IMPLEMENT_STANDARD_HANDLE(VUserDrawObj, AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(VUserDrawObj, AIS_InteractiveObject)
void VUserDrawObj::Compute(const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/,
const Handle(Prs3d_Presentation)& thePresentation,

2
src/ViewerTest/ViewerTest_RelationCommands.cxx
View File

@@ -2373,6 +2373,8 @@ static int VTangentBuilder(Draw_Interpretor& di, Standard_Integer argc, const ch
//Draw arg : vsymetric Name
//==============================================================================
#include <AIS_SymmetricRelation.hxx>
#include <AIS_InteractiveObject.hxx>
#include <AIS_Dimension.hxx>
static int VSymmetricBuilder(Draw_Interpretor& di, Standard_Integer argc, const char** argv)

15
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@@ -4576,7 +4576,7 @@ class V3d_TextItem : public Visual3d_LayerItem
public:
// CASCADE RTTI
DEFINE_STANDARD_RTTI(V3d_TextItem)
DEFINE_STANDARD_RTTI(V3d_TextItem, Visual3d_LayerItem)
// constructor
Standard_EXPORT V3d_TextItem(const TCollection_AsciiString& theText,
@@ -4605,8 +4605,6 @@ private:
TCollection_AsciiString myFontName;
};
IMPLEMENT_STANDARD_HANDLE(V3d_TextItem, Visual3d_LayerItem)
IMPLEMENT_STANDARD_RTTIEXT(V3d_TextItem, Visual3d_LayerItem)
// create and add to display the text item
V3d_TextItem::V3d_TextItem (const TCollection_AsciiString& theText,
@@ -4651,7 +4649,7 @@ class V3d_LineItem : public Visual3d_LayerItem
{
public:
// CASCADE RTTI
DEFINE_STANDARD_RTTI(V3d_LineItem)
DEFINE_STANDARD_RTTI(V3d_LineItem, Visual3d_LayerItem)
// constructor
Standard_EXPORT V3d_LineItem(Standard_Real X1, Standard_Real Y1,
@@ -4673,8 +4671,6 @@ private:
Standard_Real myTransparency;
};
IMPLEMENT_STANDARD_HANDLE(V3d_LineItem, Visual3d_LayerItem)
IMPLEMENT_STANDARD_RTTIEXT(V3d_LineItem, Visual3d_LayerItem)
// default constructor for line item
V3d_LineItem::V3d_LineItem(Standard_Real X1, Standard_Real Y1,
@@ -6523,11 +6519,12 @@ public:
const Standard_ShortReal theXShift,
const Standard_ShortReal theYShift,
const Standard_ShortReal theAngle);
DEFINE_STANDARD_RTTI(OCC_TextureEnv);
DEFINE_STANDARD_RTTI(OCC_TextureEnv, Graphic3d_TextureEnv);
};
DEFINE_STANDARD_HANDLE(OCC_TextureEnv, Graphic3d_TextureEnv);
IMPLEMENT_STANDARD_HANDLE(OCC_TextureEnv, Graphic3d_TextureEnv);
IMPLEMENT_STANDARD_RTTIEXT(OCC_TextureEnv, Graphic3d_TextureEnv);
OCC_TextureEnv::OCC_TextureEnv(const Standard_CString theFileName)
: Graphic3d_TextureEnv(theFileName)