From db3cb1cedee437f688efbd6d53b0101e9f3d1077 Mon Sep 17 00:00:00 2001 From: abv Date: Tue, 22 Apr 2014 16:45:16 +0400 Subject: [PATCH] 0024858: Convert class V3d_ListOfTransient to non-CDL Class V3d_ListOfTransient converted to non-CDL form (pure HXX) --- src/V3d/FILES | 3 +- src/V3d/V3d.cdl | 2 +- src/V3d/V3d_ListOfTransient.cdl | 31 -------------------- src/V3d/V3d_ListOfTransient.cxx | 42 -------------------------- src/V3d/V3d_ListOfTransient.hxx | 52 +++++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 75 deletions(-) delete mode 100644 src/V3d/V3d_ListOfTransient.cdl delete mode 100644 src/V3d/V3d_ListOfTransient.cxx create mode 100644 src/V3d/V3d_ListOfTransient.hxx diff --git a/src/V3d/FILES b/src/V3d/FILES index 4d211e0077..92b2a77791 100755 --- a/src/V3d/FILES +++ b/src/V3d/FILES @@ -11,4 +11,5 @@ V3d_Viewer_4.cxx V3d_View_Print.cxx V3d_View_5.cxx V3d_Plane.hxx -V3d_Plane.cxx \ No newline at end of file +V3d_Plane.cxx +V3d_ListOfTransient.hxx diff --git a/src/V3d/V3d.cdl b/src/V3d/V3d.cdl index a500431aec..1b54e890e7 100644 --- a/src/V3d/V3d.cdl +++ b/src/V3d/V3d.cdl @@ -207,7 +207,7 @@ is ---Category: Instantiated classes --------------------------------- - private class ListOfTransient; + imported ListOfTransient; pointer ViewerPointer to Viewer from V3d; pointer ViewPointer to View from V3d; diff --git a/src/V3d/V3d_ListOfTransient.cdl b/src/V3d/V3d_ListOfTransient.cdl deleted file mode 100644 index 8d0a7bf116..0000000000 --- a/src/V3d/V3d_ListOfTransient.cdl +++ /dev/null @@ -1,31 +0,0 @@ --- Created on: 1995-05-17 --- Created by: Mister rmi --- Copyright (c) 1995-1999 Matra Datavision --- Copyright (c) 1999-2014 OPEN CASCADE SAS --- --- This file is part of Open CASCADE Technology software library. --- --- This library is free software; you can redistribute it and/or modify it under --- the terms of the GNU Lesser General Public License version 2.1 as published --- by the Free Software Foundation, with special exception defined in the file --- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT --- distribution for complete text of the license and disclaimer of any warranty. --- --- Alternatively, this file may be used under the terms of Open CASCADE --- commercial license or contractual agreement. - -private class ListOfTransient from V3d inherits ListOfTransient from TColStd - -is - - Create returns ListOfTransient from V3d; - - Contains(me; aTransient: Transient from Standard) - returns Boolean from Standard - is static; - - Remove(me: in out; aTransient: Transient from Standard) - is static; - - -end ListOfTransient from V3d; diff --git a/src/V3d/V3d_ListOfTransient.cxx b/src/V3d/V3d_ListOfTransient.cxx deleted file mode 100644 index c950245733..0000000000 --- a/src/V3d/V3d_ListOfTransient.cxx +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include -#include - -V3d_ListOfTransient::V3d_ListOfTransient():TColStd_ListOfTransient() {} - -Standard_Boolean V3d_ListOfTransient::Contains(const Handle(Standard_Transient)& aTransient) const { - if(IsEmpty()) return Standard_False; - TColStd_ListIteratorOfListOfTransient i(*this); - Standard_Boolean found = Standard_False; - for(; i.More() && !found; i.Next()) { - found = i.Value() == aTransient; - } - return found; -} - -void V3d_ListOfTransient::Remove(const Handle(Standard_Transient)& aTransient){ - - - if(!IsEmpty()){ - TColStd_ListIteratorOfListOfTransient i(*this); - Standard_Boolean found = Standard_False; - while(i.More() && !found) - if( i.Value() == aTransient ) { - TColStd_ListOfTransient::Remove(i);} - else { - i.Next();} - } -} diff --git a/src/V3d/V3d_ListOfTransient.hxx b/src/V3d/V3d_ListOfTransient.hxx new file mode 100644 index 0000000000..001a2727d8 --- /dev/null +++ b/src/V3d/V3d_ListOfTransient.hxx @@ -0,0 +1,52 @@ +// Created on: 1995-05-17 +// Created by: Mister rmi +// Copyright (c) 1995-1999 Matra Datavision +// Copyright (c) 1999-2014 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef _V3d_ListOfTransient_HeaderFile +#define _V3d_ListOfTransient_HeaderFile + +#include +#include + +//! List of transient objects with methods to check presence and remove elements +class V3d_ListOfTransient: public TColStd_ListOfTransient +{ +public: + + //! Return true if theObject is stored in the list + Standard_Boolean Contains (const Handle(Standard_Transient)& theObject) const + { + for (TColStd_ListIteratorOfListOfTransient it (*this); it.More(); it.Next()) + { + if (it.Value() == theObject) + return Standard_True; + } + return Standard_False; + } + + //! Remove all elements equal to theObject from the list + void Remove (const Handle(Standard_Transient)& theObject) + { + for (TColStd_ListIteratorOfListOfTransient it (*this); it.More();) + { + if (it.Value() == theObject) + TColStd_ListOfTransient::Remove (it); + else + it.Next(); + } + } +}; + +#endif