Commit 3bd6f169 authored by Ken Martin's avatar Ken Martin
Browse files

changed how collecitons are done

parent 6fbf4c7a
......@@ -90,7 +90,7 @@ inline int vtkActorCollection::IsItemPresent(vtkActor *a)
// Get the next actor in the list.
inline vtkActor *vtkActorCollection::GetNextItem()
{
return (vtkActor *)(this->vtkCollection::GetNextItem());
return (vtkActor *)(this->GetNextItemAsObject());
}
#endif
......
......@@ -74,7 +74,7 @@ public:
int IsItemPresent(vtkObject *);
int GetNumberOfItems();
void InitTraversal();
vtkObject *GetNextItem();
vtkObject *GetNextItemAsObject();
protected:
int NumberOfItems;
......@@ -95,7 +95,7 @@ inline void vtkCollection::InitTraversal()
// Description:
// Get the next item in the collection. NULL is returned if the collection
// is exhausted.
inline vtkObject *vtkCollection::GetNextItem()
inline vtkObject *vtkCollection::GetNextItemAsObject()
{
vtkCollectionElement *elem=this->Current;
......
......@@ -87,7 +87,7 @@ inline int vtkDataSetCollection::IsItemPresent(vtkDataSet *ds)
// Get the next dataset in the list.
inline vtkDataSet *vtkDataSetCollection::GetNextItem()
{
return (vtkDataSet *)(this->vtkCollection::GetNextItem());
return (vtkDataSet *)(this->GetNextItemAsObject());
}
#endif
......@@ -88,7 +88,7 @@ inline int vtkImplicitFunctionCollection::IsItemPresent(vtkImplicitFunction *f)
// Get the next implicit function in the list.
inline vtkImplicitFunction *vtkImplicitFunctionCollection::GetNextItem()
{
return (vtkImplicitFunction *)(this->vtkCollection::GetNextItem());
return (vtkImplicitFunction *)(this->GetNextItemAsObject());
}
#endif
......@@ -91,7 +91,7 @@ inline int vtkLightCollection::IsItemPresent(vtkLight *a)
// exhausted.
inline vtkLight *vtkLightCollection::GetNextItem()
{
return (vtkLight *)(this->vtkCollection::GetNextItem());
return (vtkLight *)(this->GetNextItemAsObject());
}
#endif
......
......@@ -88,7 +88,7 @@ inline int vtkPolyDataCollection::IsItemPresent(vtkPolyData *pd)
// Get the next poly data in the list.
inline vtkPolyData *vtkPolyDataCollection::GetNextItem()
{
return (vtkPolyData *)(this->vtkCollection::GetNextItem());
return (vtkPolyData *)(this->GetNextItemAsObject());
}
#endif
......@@ -91,7 +91,7 @@ inline int vtkRendererCollection::IsItemPresent(vtkRenderer *a)
// Get the next renderer in the list. Return NULL when at the end of the list.
inline vtkRenderer *vtkRendererCollection::GetNextItem()
{
return (vtkRenderer *)(this->vtkCollection::GetNextItem());
return (vtkRenderer *)(this->GetNextItemAsObject());
}
#endif
......@@ -89,7 +89,7 @@ inline int vtkStructuredPointsCollection::IsItemPresent(vtkStructuredPoints *ds)
// is exhausted.
inline vtkStructuredPoints *vtkStructuredPointsCollection::GetNextItem()
{
return (vtkStructuredPoints *)(this->vtkCollection::GetNextItem());
return (vtkStructuredPoints *)(this->GetNextItemAsObject());
}
#endif
......@@ -89,7 +89,7 @@ inline int vtkTransformCollection::IsItemPresent(vtkTransform *t)
// list is reached.
inline vtkTransform *vtkTransformCollection::GetNextItem()
{
return (vtkTransform *)(this->vtkCollection::GetNextItem());
return (vtkTransform *)(this->GetNextItemAsObject());
}
#endif
......@@ -91,7 +91,7 @@ inline int vtkVolumeCollection::IsItemPresent(vtkVolume *a)
// is reached.
inline vtkVolume *vtkVolumeCollection::GetNextItem()
{
return (vtkVolume *)(this->vtkCollection::GetNextItem());
return (vtkVolume *)(this->GetNextItemAsObject());
}
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment