Commit eb025f36 authored by Berk Geveci's avatar Berk Geveci
Browse files

Fixed warnings

parent e1358623
......@@ -38,7 +38,7 @@ vtkCommand.cxx
vtkCompositeDataIterator.cxx
vtkCompositeDataSet.cxx
vtkCompositeDataVisitor.cxx
vtkCompositeDataVisitorCommand.cxx
vtkCompositeDataCommand.cxx
vtkContourValues.cxx
vtkConvexPointSet.cxx
vtkCoordinate.cxx
......@@ -208,7 +208,7 @@ vtkCommand
vtkCompositeDataIterator
vtkCompositeDataSet
vtkCompositeDataVisitor
vtkCompositeDataVisitorCommand
vtkCompositeDataCommand
vtkDataArray
vtkDataSet
vtkExplicitCell
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkCompositeDataVisitorCommand.cxx
Module: vtkCompositeDataCommand.cxx
Language: C++
Date: $Date$
Version: $Revision$
......@@ -15,22 +15,22 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkCompositeDataVisitorCommand.h"
#include "vtkCompositeDataCommand.h"
vtkCxxRevisionMacro(vtkCompositeDataVisitorCommand, "1.1");
vtkCxxRevisionMacro(vtkCompositeDataCommand, "1.1");
//----------------------------------------------------------------------------
vtkCompositeDataVisitorCommand::vtkCompositeDataVisitorCommand()
vtkCompositeDataCommand::vtkCompositeDataCommand()
{
}
//----------------------------------------------------------------------------
vtkCompositeDataVisitorCommand::~vtkCompositeDataVisitorCommand()
vtkCompositeDataCommand::~vtkCompositeDataCommand()
{
}
//----------------------------------------------------------------------------
void vtkCompositeDataVisitorCommand::PrintSelf(ostream& os, vtkIndent indent)
void vtkCompositeDataCommand::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os,indent);
}
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkCompositeDataVisitorCommand.h
Module: vtkCompositeDataCommand.h
Language: C++
Date: $Date$
Version: $Revision$
......@@ -15,27 +15,27 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkCompositeDataVisitorCommand - abstract superclass for commands
// .NAME vtkCompositeDataCommand - abstract superclass for commands
// .SECTION Description
// vtkCompositeDataVisitorCommand and it's subclasses are used by
// vtkCompositeDataCommand and it's subclasses are used by
// the visitor classes. Visitors apply the command on each item
// of a collection by calling Execute and passing the appropriate
// arguments
// .SECTION See Also
// vtkCompositeDataVisitor
#ifndef __vtkCompositeDataVisitorCommand_h
#define __vtkCompositeDataVisitorCommand_h
#ifndef __vtkCompositeDataCommand_h
#define __vtkCompositeDataCommand_h
#include "vtkObject.h"
class vtkCompositeDataVisitor;
class vtkDataObject;
class VTK_COMMON_EXPORT vtkCompositeDataVisitorCommand : public vtkObject
class VTK_COMMON_EXPORT vtkCompositeDataCommand : public vtkObject
{
public:
vtkTypeRevisionMacro(vtkCompositeDataVisitorCommand, vtkObject);
vtkTypeRevisionMacro(vtkCompositeDataCommand, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......@@ -52,13 +52,13 @@ public:
virtual void Initialize() {};
protected:
vtkCompositeDataVisitorCommand();
virtual ~vtkCompositeDataVisitorCommand();
vtkCompositeDataCommand();
virtual ~vtkCompositeDataCommand();
private:
vtkCompositeDataVisitorCommand(const vtkCompositeDataVisitorCommand&); // Not implemented.
void operator=(const vtkCompositeDataVisitorCommand&); // Not implemented.
vtkCompositeDataCommand(const vtkCompositeDataCommand&); // Not implemented.
void operator=(const vtkCompositeDataCommand&); // Not implemented.
};
#endif /* __vtkCompositeDataVisitorCommand_h */
#endif /* __vtkCompositeDataCommand_h */
......@@ -17,13 +17,13 @@
=========================================================================*/
#include "vtkCompositeDataVisitor.h"
#include "vtkCompositeDataVisitorCommand.h"
#include "vtkCompositeDataCommand.h"
vtkCxxRevisionMacro(vtkCompositeDataVisitor, "1.1");
vtkCxxRevisionMacro(vtkCompositeDataVisitor, "1.2");
vtkCxxSetObjectMacro(vtkCompositeDataVisitor,
Command,
vtkCompositeDataVisitorCommand);
vtkCompositeDataCommand);
//----------------------------------------------------------------------------
vtkCompositeDataVisitor::vtkCompositeDataVisitor()
......
......@@ -26,7 +26,7 @@
#include "vtkObject.h"
class vtkCompositeDataVisitorCommand;
class vtkCompositeDataCommand;
class VTK_COMMON_EXPORT vtkCompositeDataVisitor : public vtkObject
{
......@@ -39,8 +39,8 @@ public:
// Set/get the command object applied to each item. The visitor
// will call Execute() on the command with the current item
// as an argument.
void SetCommand(vtkCompositeDataVisitorCommand* comm);
vtkGetObjectMacro(Command, vtkCompositeDataVisitorCommand);
void SetCommand(vtkCompositeDataCommand* comm);
vtkGetObjectMacro(Command, vtkCompositeDataCommand);
//ETX
// Description:
......@@ -59,7 +59,7 @@ protected:
vtkCompositeDataVisitor();
virtual ~vtkCompositeDataVisitor();
vtkCompositeDataVisitorCommand* Command;
vtkCompositeDataCommand* Command;
int CreateTransitionElements;
private:
......
......@@ -19,12 +19,12 @@
#include "vtkAMRBox.h"
#include "vtkCompositeDataIterator.h"
#include "vtkCompositeDataVisitorCommand.h"
#include "vtkCompositeDataCommand.h"
#include "vtkHierarchicalBoxDataSet.h"
#include "vtkObjectFactory.h"
#include "vtkUniformGrid.h"
vtkCxxRevisionMacro(vtkHierarchicalBoxVisitor, "1.1");
vtkCxxRevisionMacro(vtkHierarchicalBoxVisitor, "1.2");
vtkStandardNewMacro(vtkHierarchicalBoxVisitor);
vtkCxxSetObjectMacro(vtkHierarchicalBoxVisitor,
......
......@@ -20,10 +20,10 @@
#include "vtkCompositeDataSet.h"
#include "vtkDataSet.h"
#include "vtkMultiBlockDataIterator.h"
#include "vtkCompositeDataVisitorCommand.h"
#include "vtkCompositeDataCommand.h"
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkMultiBlockDataVisitor, "1.1");
vtkCxxRevisionMacro(vtkMultiBlockDataVisitor, "1.2");
vtkStandardNewMacro(vtkMultiBlockDataVisitor);
vtkCxxSetObjectMacro(vtkMultiBlockDataVisitor,
......
......@@ -31,17 +31,17 @@
#ifndef __vtkApplyFilterCommand_h
#define __vtkApplyFilterCommand_h
#include "vtkCompositeDataVisitorCommand.h"
#include "vtkCompositeDataCommand.h"
class vtkApplyFilterCommandInternal;
class vtkMultiBlockDataSet;
class vtkSource;
class vtkDataObject;
class VTK_FILTERING_EXPORT vtkApplyFilterCommand : public vtkCompositeDataVisitorCommand
class VTK_FILTERING_EXPORT vtkApplyFilterCommand : public vtkCompositeDataCommand
{
public:
vtkTypeRevisionMacro(vtkApplyFilterCommand, vtkCompositeDataVisitorCommand);
vtkTypeRevisionMacro(vtkApplyFilterCommand, vtkCompositeDataCommand);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......
......@@ -26,7 +26,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkApplyFilterCommandInternal.h"
vtkCxxRevisionMacro(vtkHierarchicalBoxApplyFilterCommand, "1.1");
vtkCxxRevisionMacro(vtkHierarchicalBoxApplyFilterCommand, "1.2");
vtkStandardNewMacro(vtkHierarchicalBoxApplyFilterCommand);
vtkCxxSetObjectMacro(vtkHierarchicalBoxApplyFilterCommand,
......@@ -62,7 +62,7 @@ void vtkHierarchicalBoxApplyFilterCommand::Initialize()
//----------------------------------------------------------------
void vtkHierarchicalBoxApplyFilterCommand::Execute(
vtkCompositeDataVisitor *caller, vtkDataObject *input, void* callData)
vtkCompositeDataVisitor *, vtkDataObject *input, void* callData)
{
if (!this->Output)
{
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkHierarchicalBoxApplyFilterCommand.h
Module: $RCSfile: vtkHierarchicalBoxApplyFilterCommand#include "vtkCompositeDataCommand.h"
.h,v $
Language: C++
Date: $Date$
Version: $Revision$
......
......@@ -23,7 +23,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkObjectFactory.h"
#include "vtkSource.h"
vtkCxxRevisionMacro(vtkMultiBlockApplyFilterCommand, "1.1");
vtkCxxRevisionMacro(vtkMultiBlockApplyFilterCommand, "1.2");
vtkStandardNewMacro(vtkMultiBlockApplyFilterCommand);
vtkCxxSetObjectMacro(vtkMultiBlockApplyFilterCommand,
......@@ -52,7 +52,7 @@ void vtkMultiBlockApplyFilterCommand::Initialize()
}
//----------------------------------------------------------------
void vtkMultiBlockApplyFilterCommand::Execute(vtkCompositeDataVisitor *caller,
void vtkMultiBlockApplyFilterCommand::Execute(vtkCompositeDataVisitor *,
vtkDataObject *input,
void*)
{
......
......@@ -28,7 +28,7 @@
vtkCxxRevisionMacro(vtkHierarchicalBoxCellDataToPointData, "1.1");
vtkCxxRevisionMacro(vtkHierarchicalBoxCellDataToPointData, "1.2");
vtkStandardNewMacro(vtkHierarchicalBoxCellDataToPointData);
//----------------------------------------------------------------------------
......@@ -62,7 +62,7 @@ void vtkHierarchicalBoxCellDataToPointData::ExecuteData(vtkDataObject* dooutput)
vtkHierarchicalBoxDataSet* output = comm->GetOutput();
this->GetOutput()->ShallowCopy(output);
dooutput->ShallowCopy(output);
comm->Delete();
visitor->Delete();
......
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