Commit 40f8c44d authored by Kitware Robot's avatar Kitware Robot Committed by Ben Boeckel

clang-format: remove semicolons from definitions

clang-format treats them as declarations and formats accordingly.
parent d9968f38
......@@ -107,7 +107,7 @@ protected:
return (!this->ControlPointsItem->ClampPos(pos, bounds));
}
return false;
};
}
private:
vtkControlPointsAddPointItem(const vtkControlPointsAddPointItem&) = delete;
......
......@@ -39,10 +39,10 @@ public:
{
this->Pan() = vtkContextMouseEvent::LEFT_BUTTON;
//this->Zoom() = vtkContextMouseEvent::MIDDLE_BUTTON;
};
}
short& Pan() { return Data[0]; };
//short& Zoom() { return Data[1]; };
short& Pan() { return Data[0]; }
//short& Zoom() { return Data[1]; }
/**
* The box created as the mouse is dragged around the screen.
......
......@@ -52,11 +52,11 @@ public:
this->fDistance = distance;
this->ScenePos[0]=sceneOrigin[0]+x;
this->ScenePos[1]=sceneOrigin[1]+y;
};
}
void DrawCircle(vtkContext2D* painter, float radius)
{
painter->DrawArc(this->Position[0], this->Position[1], radius, 0.f, 360.f);
};
}
float Position[2];
float ScenePos[2];
vtkIdType PointIndex;
......
......@@ -359,7 +359,7 @@ public:
int vtkNotUsed(save)) =0;
virtual void SetVoidArray(void *array, vtkIdType size, int save,
int vtkNotUsed(deleteMethod))
{this->SetVoidArray(array,size,save);};
{this->SetVoidArray(array,size,save);}
//@}
/**
......@@ -757,7 +757,7 @@ ArrayT* vtkArrayDownCast(vtkAbstractArray *array)
{ \
return ArrayT::FastDownCast(array); \
} \
};
}
//@}
//@{
......@@ -774,7 +774,7 @@ ArrayT* vtkArrayDownCast(vtkAbstractArray *array)
{ \
return ArrayT<ValueT>::FastDownCast(array); \
} \
};
}
//@}
#endif
......@@ -47,7 +47,7 @@ public:
vtkTypeMacro(vtkCallbackCommand,vtkCommand);
static vtkCallbackCommand *New()
{return new vtkCallbackCommand;};
{return new vtkCallbackCommand;}
/**
* Satisfy the superclass API for callbacks. Recall that the caller is
......
......@@ -109,14 +109,14 @@ public:
* Initialize the traversal of the collection. This means the data pointer
* is set at the beginning of the list.
*/
void InitTraversal() { this->Current = this->Top;};
void InitTraversal() { this->Current = this->Top;}
/**
* A reentrant safe way to iterate through a collection.
* Just pass the same cookie value around each time
*/
void InitTraversal(vtkCollectionSimpleIterator &cookie) {
cookie = static_cast<vtkCollectionSimpleIterator>(this->Top);};
cookie = static_cast<vtkCollectionSimpleIterator>(this->Top);}
/**
* Get the next item in the collection. nullptr is returned if the collection
......
......@@ -46,20 +46,20 @@ public:
* Get the next dataarray in the list.
*/
vtkDataArray *GetNextItem() {
return static_cast<vtkDataArray *>(this->GetNextItemAsObject());};
return static_cast<vtkDataArray *>(this->GetNextItemAsObject());}
/**
* Get the ith dataarray in the list.
*/
vtkDataArray *GetItem(int i) {
return static_cast<vtkDataArray *>(this->GetItemAsObject(i));};
return static_cast<vtkDataArray *>(this->GetItemAsObject(i));}
/**
* Reentrant safe way to get an object in a collection. Just pass the
* same cookie back and forth.
*/
vtkDataArray *GetNextDataArray(vtkCollectionSimpleIterator &cookie) {
return static_cast<vtkDataArray *>(this->GetNextItemAsObject(cookie));};
return static_cast<vtkDataArray *>(this->GetNextItemAsObject(cookie));}
protected:
vtkDataArrayCollection() {}
......@@ -68,7 +68,7 @@ protected:
private:
// hide the standard AddItem from the user and the compiler.
void AddItem(vtkObject *o) { this->vtkCollection::AddItem(o); };
void AddItem(vtkObject *o) { this->vtkCollection::AddItem(o); }
private:
vtkDataArrayCollection(const vtkDataArrayCollection&) = delete;
......
......@@ -79,7 +79,7 @@ public:
virtual vtkEventDataDevice3D *GetAsEventDataDevice3D() { return nullptr; }
protected:
vtkEventData() {};
vtkEventData() {}
~vtkEventData() override {}
// subclasses override this to define their
......@@ -102,7 +102,7 @@ public:
vtkEventDataForDevice *ret = new vtkEventDataForDevice;
ret->InitializeObjectBase();
return ret;
};
}
vtkEventDataDevice GetDevice() const { return this->Device; }
vtkEventDataDeviceInput GetInput() const { return this->Input; }
......@@ -122,7 +122,7 @@ protected:
bool Equivalent(const vtkEventData *e) const override {
const vtkEventDataForDevice *edd = static_cast<const vtkEventDataForDevice *>(e);
return this->Device == edd->Device && this->Input == edd->Input && this->Action == edd->Action;
};
}
vtkEventDataForDevice() {
this->Device = vtkEventDataDevice::Unknown;
......@@ -232,7 +232,7 @@ public:
vtkEventDataButton3D *ret = new vtkEventDataButton3D;
ret->InitializeObjectBase();
return ret;
};
}
protected:
vtkEventDataButton3D() { this->Type = vtkCommand::Button3DEvent; }
......@@ -252,7 +252,7 @@ public:
vtkEventDataMove3D *ret = new vtkEventDataMove3D;
ret->InitializeObjectBase();
return ret;
};
}
protected:
vtkEventDataMove3D() { this->Type = vtkCommand::Move3DEvent; }
......
......@@ -37,7 +37,7 @@ public:
vtkTypeMacro(vtkEventForwarderCommand,vtkCommand);
static vtkEventForwarderCommand *New()
{return new vtkEventForwarderCommand;};
{return new vtkEventForwarderCommand;}
/**
* Satisfy the superclass API for callbacks. Recall that the caller is
......
......@@ -54,7 +54,7 @@ public:
/**
* Return the number of id's in the list.
*/
vtkIdType GetNumberOfIds() {return this->NumberOfIds;};
vtkIdType GetNumberOfIds() {return this->NumberOfIds;}
/**
* Return the id at location i.
......@@ -105,7 +105,7 @@ public:
/**
* Get a pointer to a particular data index.
*/
vtkIdType *GetPointer(const vtkIdType i) {return this->Ids + i;};
vtkIdType *GetPointer(const vtkIdType i) {return this->Ids + i;}
/**
* Get a pointer to a particular data index. Make sure data is allocated
......@@ -124,12 +124,12 @@ public:
/**
* Reset to an empty state but retain previously allocated memory.
*/
void Reset() {this->NumberOfIds = 0;};
void Reset() {this->NumberOfIds = 0;}
/**
* Free any unused memory.
*/
void Squeeze() {this->Resize(this->NumberOfIds);};
void Squeeze() {this->Resize(this->NumberOfIds);}
/**
* Copy an id list by explicitly copying the internal array.
......@@ -163,7 +163,7 @@ public:
* Intersect one id list with another. This method should become legacy.
*/
void IntersectWith(vtkIdList& otherIds)
{ this->IntersectWith(&otherIds); };
{ this->IntersectWith(&otherIds); }
//@{
/**
......
......@@ -46,20 +46,20 @@ public:
* Get the next IdList in the list.
*/
vtkIdList *GetNextItem() {
return static_cast<vtkIdList *>(this->GetNextItemAsObject());};
return static_cast<vtkIdList *>(this->GetNextItemAsObject());}
/**
* Get the ith IdList in the list.
*/
vtkIdList *GetItem(int i) {
return static_cast<vtkIdList *>(this->GetItemAsObject(i));};
return static_cast<vtkIdList *>(this->GetItemAsObject(i));}
/**
* Reentrant safe way to get an object in a collection. Just pass the
* same cookie back and forth.
*/
vtkIdList *GetNextIdList(vtkCollectionSimpleIterator &cookie) {
return static_cast<vtkIdList *>(this->GetNextItemAsObject(cookie));};
return static_cast<vtkIdList *>(this->GetNextItemAsObject(cookie));}
protected:
vtkIdListCollection() {}
......@@ -68,7 +68,7 @@ protected:
private:
// hide the standard AddItem from the user and the compiler.
void AddItem(vtkObject *o) { this->vtkCollection::AddItem(o); };
void AddItem(vtkObject *o) { this->vtkCollection::AddItem(o); }
private:
vtkIdListCollection(const vtkIdListCollection&) = delete;
......
......@@ -33,8 +33,8 @@ VTKCOMMONCORE_EXPORT ostream& operator<<(ostream& os, const vtkIndent& o);
class VTKCOMMONCORE_EXPORT vtkIndent
{
public:
void Delete() {delete this;};
explicit vtkIndent(int ind=0) {this->Indent=ind;};
void Delete() {delete this;}
explicit vtkIndent(int ind=0) {this->Indent=ind;}
static vtkIndent *New();
/**
......
......@@ -46,7 +46,7 @@ public:
* vtkInformation instances. Setting the number to smaller than the
* current number will remove entries from higher indices.
*/
int GetNumberOfInformationObjects() { return this->NumberOfInformationObjects; };
int GetNumberOfInformationObjects() { return this->NumberOfInformationObjects; }
void SetNumberOfInformationObjects(int n);
//@}
......
......@@ -120,9 +120,9 @@ public:
* or error messages are displayed.
*/
static void SetGlobalWarningDisplay(int val);
static void GlobalWarningDisplayOn(){vtkObject::SetGlobalWarningDisplay(1);};
static void GlobalWarningDisplayOn(){vtkObject::SetGlobalWarningDisplay(1);}
static void GlobalWarningDisplayOff()
{vtkObject::SetGlobalWarningDisplay(0);};
{vtkObject::SetGlobalWarningDisplay(0);}
static int GetGlobalWarningDisplay();
//@}
......@@ -235,8 +235,8 @@ public:
int InvokeEvent(const char *event, void *callData);
//@}
int InvokeEvent(unsigned long event) { return this->InvokeEvent(event, nullptr); };
int InvokeEvent(const char *event) { return this->InvokeEvent(event, nullptr); };
int InvokeEvent(unsigned long event) { return this->InvokeEvent(event, nullptr); }
int InvokeEvent(const char *event) { return this->InvokeEvent(event, nullptr); }
protected:
vtkObject();
......
......@@ -58,7 +58,7 @@ public:
*/
vtkObjectFactory *GetNextObjectFactory(vtkCollectionSimpleIterator &cookie) {
return static_cast<vtkObjectFactory *>(
this->GetNextItemAsObject(cookie));};
this->GetNextItemAsObject(cookie));}
protected:
vtkObjectFactoryCollection() {}
......@@ -67,7 +67,7 @@ protected:
private:
// hide the standard AddItem from the user and the compiler.
void AddItem(vtkObject *o) { this->vtkCollection::AddItem(o); };
void AddItem(vtkObject *o) { this->vtkCollection::AddItem(o); }
private:
vtkObjectFactoryCollection(const vtkObjectFactoryCollection&) = delete;
......
......@@ -44,7 +44,7 @@ public:
vtkTypeMacro(vtkOldStyleCallbackCommand,vtkCommand);
static vtkOldStyleCallbackCommand *New()
{return new vtkOldStyleCallbackCommand;};
{return new vtkOldStyleCallbackCommand;}
/**
* Satisfy the superclass API for callbacks.
......@@ -58,11 +58,11 @@ public:
* Methods to set and get client and callback information.
*/
void SetClientData(void *cd)
{this->ClientData = cd;};
{this->ClientData = cd;}
void SetCallback(void (*f)(void *clientdata))
{this->Callback = f;};
{this->Callback = f;}
void SetClientDataDeleteCallback(void (*f)(void *))
{this->ClientDataDeleteCallback = f;};
{this->ClientDataDeleteCallback = f;}
//@}
void *ClientData;
......
......@@ -53,7 +53,7 @@ public:
vtkOverrideInformation *GetNextOverrideInformation(
vtkCollectionSimpleIterator &cookie) {
return static_cast<vtkOverrideInformation *>(
this->GetNextItemAsObject(cookie));};
this->GetNextItemAsObject(cookie));}
protected:
vtkOverrideInformationCollection() {}
......@@ -62,7 +62,7 @@ protected:
private:
// hide the standard AddItem from the user and the compiler.
void AddItem(vtkObject *o) { this->vtkCollection::AddItem(o); };
void AddItem(vtkObject *o) { this->vtkCollection::AddItem(o); }
private:
vtkOverrideInformationCollection(const vtkOverrideInformationCollection&) = delete;
......
......@@ -167,10 +167,10 @@ public:
*/
void InsertPoint(vtkIdType id, const float x[3])
VTK_EXPECTS(0 <= id)
{ this->Data->InsertTuple(id,x);};
{ this->Data->InsertTuple(id,x);}
void InsertPoint(vtkIdType id, const double x[3])
VTK_EXPECTS(0 <= id)
{this->Data->InsertTuple(id,x);};
{this->Data->InsertTuple(id,x);}
void InsertPoint(vtkIdType id, double x, double y, double z)
VTK_EXPECTS(0 <= id);
//@}
......
......@@ -114,7 +114,7 @@ public:
/**
* Return the number of items in this queue.
*/
vtkIdType GetNumberOfItems() {return this->MaxId+1;};
vtkIdType GetNumberOfItems() {return this->MaxId+1;}
/**
* Empty the queue but without releasing memory. This avoids the
......
......@@ -842,7 +842,7 @@ virtual double *Get##name() VTK_SIZEHINT(2)\
// vtkTemplateMacro(myFunc(static_cast<VTK_TT*>(data), arg2));
// }
#define vtkTemplateMacroCase(typeN, type, call) \
case typeN: { typedef type VTK_TT; call; }; break
case typeN: { typedef type VTK_TT; call; } break
#define vtkTemplateMacro(call) \
vtkTemplateMacroCase(VTK_DOUBLE, double, call); \
vtkTemplateMacroCase(VTK_FLOAT, float, call); \
......
......@@ -113,7 +113,7 @@ template <typename T>
struct KeyComp
{
const T *Array;
KeyComp(T *array) : Array(array) {};
KeyComp(T *array) : Array(array) {}
bool operator() (vtkIdType idx0, vtkIdType idx1) const
{
return ( Array[idx0] < Array[idx1] );
......@@ -129,7 +129,7 @@ struct TupleComp
const T *Array;
int NumComp;
int K;
TupleComp(T *array, int n, int k) : Array(array), NumComp(n), K(k) {};
TupleComp(T *array, int n, int k) : Array(array), NumComp(n), K(k) {}
bool operator() (vtkIdType idx0, vtkIdType idx1) const
{return Array[idx0*NumComp+K] < Array[idx1*NumComp+K];}
};
......
......@@ -46,7 +46,7 @@ public:
/**
* Get the current output as a string
*/
std::string GetOutput() { return this->OStream.str(); };
std::string GetOutput() { return this->OStream.str(); }
protected:
vtkStringOutputWindow();
......
......@@ -32,9 +32,9 @@
class VTKCOMMONCORE_EXPORT vtkTimeStamp
{
public:
vtkTimeStamp() {this->ModifiedTime = 0;};
vtkTimeStamp() {this->ModifiedTime = 0;}
static vtkTimeStamp *New();
void Delete() {delete this;};
void Delete() {delete this;}
/**
* Set this objects time to the current time. The current time is
......@@ -51,22 +51,22 @@ public:
/**
* Return this object's Modified time.
*/
vtkMTimeType GetMTime() const {return this->ModifiedTime;};
vtkMTimeType GetMTime() const {return this->ModifiedTime;}
//@{
/**
* Support comparisons of time stamp objects directly.
*/
bool operator>(vtkTimeStamp& ts) {
return (this->ModifiedTime > ts.ModifiedTime);};
return (this->ModifiedTime > ts.ModifiedTime);}
bool operator<(vtkTimeStamp& ts) {
return (this->ModifiedTime < ts.ModifiedTime);};
return (this->ModifiedTime < ts.ModifiedTime);}
//@}
/**
* Allow for typecasting to unsigned long.
*/
operator vtkMTimeType() const {return this->ModifiedTime;};
operator vtkMTimeType() const {return this->ModifiedTime;}
private:
vtkMTimeType ModifiedTime;
......
......@@ -318,49 +318,49 @@ public:
*/
float ToFloat(bool *valid) const;
float ToFloat() const {
return this->ToFloat(nullptr); };
return this->ToFloat(nullptr); }
double ToDouble(bool *valid) const;
double ToDouble() const {
return this->ToDouble(nullptr); };
return this->ToDouble(nullptr); }
char ToChar(bool *valid) const;
char ToChar() const {
return this->ToChar(nullptr); };
return this->ToChar(nullptr); }
unsigned char ToUnsignedChar(bool *valid) const;
unsigned char ToUnsignedChar() const {
return this->ToUnsignedChar(nullptr); };
return this->ToUnsignedChar(nullptr); }
signed char ToSignedChar(bool *valid) const;
signed char ToSignedChar() const {
return this->ToSignedChar(nullptr); };
return this->ToSignedChar(nullptr); }
short ToShort(bool *valid) const;
short ToShort() const {
return this->ToShort(nullptr); };
return this->ToShort(nullptr); }
unsigned short ToUnsignedShort(bool *valid) const;
unsigned short ToUnsignedShort() const {
return this->ToUnsignedShort(nullptr); };
return this->ToUnsignedShort(nullptr); }
int ToInt(bool *valid) const;
int ToInt() const {
return this->ToInt(nullptr); };
return this->ToInt(nullptr); }
unsigned int ToUnsignedInt(bool *valid) const;
unsigned int ToUnsignedInt() const {
return this->ToUnsignedInt(nullptr); };
return this->ToUnsignedInt(nullptr); }
long ToLong(bool *valid) const;
long ToLong() const {
return this->ToLong(nullptr); };
return this->ToLong(nullptr); }
unsigned long ToUnsignedLong(bool *valid) const;
unsigned long ToUnsignedLong() const {
return this->ToUnsignedLong(nullptr); };
return this->ToUnsignedLong(nullptr); }
long long ToLongLong(bool *valid) const;
long long ToLongLong() const {
return this->ToLongLong(nullptr); };
return this->ToLongLong(nullptr); }
unsigned long long ToUnsignedLongLong(bool *valid) const;
unsigned long long ToUnsignedLongLong() const {
return this->ToUnsignedLongLong(nullptr); };
return this->ToUnsignedLongLong(nullptr); }
vtkTypeInt64 ToTypeInt64(bool *valid) const;
vtkTypeInt64 ToTypeInt64() const {
return this->ToTypeInt64(nullptr); };
return this->ToTypeInt64(nullptr); }
vtkTypeUInt64 ToTypeUInt64(bool *valid) const;
vtkTypeUInt64 ToTypeUInt64() const {
return this->ToTypeUInt64(nullptr); };
return this->ToTypeUInt64(nullptr); }
//@}
/**
......
......@@ -18,7 +18,7 @@
class TestDataObjectTypesTester: public vtkDataObjectTypes
{
public:
static int Test() { return vtkDataObjectTypes::Validate(); };
static int Test() { return vtkDataObjectTypes::Validate(); }
};
int TestDataObjectTypes(int vtkNotUsed(argc), char* vtkNotUsed(argv)[])
......
......@@ -284,7 +284,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAMRBox
* this number of bytes corresponds to the buffer size required to serialize
* any vtkAMRBox instance.
*/
static vtkIdType GetBytesize(){return 6*sizeof(int); };
static vtkIdType GetBytesize(){return 6*sizeof(int); }
/**
* Returns the linear index of the given cell structured coordinates
......