Commit 4161b2ee authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot
Browse files

Merge topic 'correct_more_common_override_warnings'

e40d4564 vtkAbstractTransform derived classes now use VTK_OVERRIDE.
d32e45cd Add missing VTK_OVERRIDE to some Common kit classes
895c0f70 vtkRungeKutta classes now uses VTK_OVERRIDE.
17e3f953 vtkOutputWindow derived classes now use VTK_OVERRIDE.
225fe876 vtkCommand derived classes now use VTK_OVERRIDE.
edf2fff2 vtkLookupTable now use VTK_OVERRIDE
e8004bce vtkRandomSequence* classes now use VTK_OVERRIDE.
b5309c6d

 vtkInformation* classes now use VTK_OVERRIDE.
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: default avatarDavid E DeMarle <dave.demarle@kitware.com>
Merge-request: !1878
parents b5e0dd73 e40d4564
Pipeline #24242 canceled with stage
......@@ -36,11 +36,11 @@ public:
// Description:
// Current value.
virtual double GetValue();
double GetValue() VTK_OVERRIDE;
// Description:
// Move to the next number in the random sequence.
virtual void Next();
void Next() VTK_OVERRIDE;
// Description:
// Return the uniformly distributed sequence of random numbers.
......
......@@ -51,7 +51,9 @@ public:
// the instance invoking the event; eid is the event id (see
// vtkCommand.h); and calldata is information sent when the callback
// was invoked (e.g., progress value in the vtkCommand::ProgressEvent).
virtual void Execute(vtkObject *caller, unsigned long eid, void *callData);
void Execute(vtkObject *caller,
unsigned long eid,
void *callData) VTK_OVERRIDE;
// Description:
// Methods to set and get client and callback information, and the callback
......
......@@ -345,7 +345,7 @@ public:
// the same effect as invoking Delete() (i.e., it reduces the reference
// count by 1).
void UnRegister();
virtual void UnRegister(vtkObjectBase *)
void UnRegister(vtkObjectBase *) VTK_OVERRIDE
{ this->UnRegister(); }
// Description:
......
......@@ -144,7 +144,7 @@ class VTKCOMMONCORE_EXPORT vtkConditionVariable : public vtkObject
public:
static vtkConditionVariable* New();
vtkTypeMacro(vtkConditionVariable,vtkObject);
void PrintSelf( ostream& os, vtkIndent indent );
void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
// Description:
// Wake one thread waiting for the condition to change.
......
......@@ -36,7 +36,7 @@ public:
// Description:
// Set the collection over which to iterate.
virtual void SetCollection(vtkCollection*);
void SetCollection(vtkCollection*) VTK_OVERRIDE;
void SetCollection(vtkDataArrayCollection*);
// Description:
......
......@@ -41,7 +41,9 @@ public:
// the instance invoking the event; eid is the event id (see
// vtkCommand.h); and calldata is information sent when the callback
// was invoked (e.g., progress value in the vtkCommand::ProgressEvent).
void Execute(vtkObject *caller, unsigned long eid, void *callData);
void Execute(vtkObject *caller,
unsigned long eid,
void *callData) VTK_OVERRIDE;
// Description:
// Methods to set and get client and callback information, and the callback
......
......@@ -37,7 +37,7 @@ public:
// Description:
// Put the text into the log file.
// New lines are converted to carriage return new lines.
virtual void DisplayText(const char*);
void DisplayText(const char*) VTK_OVERRIDE;
// Description:
// Sets the name for the log file.
......
......@@ -85,7 +85,7 @@ public:
// Description:
// Modified signature with no arguments that calls Modified
// on vtkObject superclass.
VTKCOMMONCORE_EXPORT void Modified();
VTKCOMMONCORE_EXPORT void Modified() VTK_OVERRIDE;
// Description:
// Modified signature that takes an information key as an argument.
......
......@@ -55,11 +55,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Report a reference this key has in the given information object.
virtual void Report(vtkInformation* info, vtkGarbageCollector* collector);
void Report(vtkInformation* info, vtkGarbageCollector* collector) VTK_OVERRIDE;
private:
vtkInformationDataObjectKey(const vtkInformationDataObjectKey&) VTK_DELETE_FUNCTION;
......
......@@ -53,11 +53,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Print the key's value in an information object to a stream.
virtual void Print(ostream& os, vtkInformation* info);
void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
protected:
// Description:
......
......@@ -59,11 +59,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Print the key's value in an information object to a stream.
virtual void Print(ostream& os, vtkInformation* info);
void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
protected:
// The required length of the vector value (-1 is no restriction).
......
......@@ -53,11 +53,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Print the key's value in an information object to a stream.
virtual void Print(ostream& os, vtkInformation* info);
void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
protected:
// Description:
......
......@@ -53,13 +53,13 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Duplicate (new instance created) the entry associated with this key from
// one information object to another (new instances of any contained
// vtkInformation and vtkInformationVector objects are created).
virtual void DeepCopy(vtkInformation* from, vtkInformation* to);
void DeepCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
private:
vtkInformationInformationKey(const vtkInformationInformationKey&) VTK_DELETE_FUNCTION;
......
......@@ -46,17 +46,17 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Duplicate (new instance created) the entry associated with this key from
// one information object to another (new instances of any contained
// vtkInformation and vtkInformationVector objects are created).
virtual void DeepCopy(vtkInformation* from, vtkInformation* to);
void DeepCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Report a reference this key has in the given information object.
virtual void Report(vtkInformation* info, vtkGarbageCollector* collector);
void Report(vtkInformation* info, vtkGarbageCollector* collector) VTK_OVERRIDE;
private:
vtkInformationInformationVectorKey(const vtkInformationInformationVectorKey&) VTK_DELETE_FUNCTION;
......
......@@ -53,11 +53,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Print the key's value in an information object to a stream.
virtual void Print(ostream& os, vtkInformation* info);
void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
protected:
// Description:
......
......@@ -47,11 +47,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Print the key's value in an information object to a stream.
virtual void Print(ostream& os, vtkInformation* info);
void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
protected:
// The required length of the vector value (-1 is no restriction).
......
......@@ -60,11 +60,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Print the key's value in an information object to a stream.
virtual void Print(ostream& os, vtkInformation* info);
void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
protected:
// The required length of the vector value (-1 is no restriction).
......
......@@ -59,11 +59,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Print the key's value in an information object to a stream.
virtual void Print(ostream& os, vtkInformation* info);
void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
private:
vtkInformationKeyVectorKey(const vtkInformationKeyVectorKey&) VTK_DELETE_FUNCTION;
......
......@@ -58,11 +58,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Report a reference this key has in the given information object.
virtual void Report(vtkInformation* info, vtkGarbageCollector* collector);
void Report(vtkInformation* info, vtkGarbageCollector* collector) VTK_OVERRIDE;
protected:
// The type required of all objects stored with this key.
......
......@@ -121,11 +121,11 @@ public:
// Copy the entry associated with this key from one information
// object to another. If there is no entry in the first information
// object for this key, the value is removed from the second.
virtual void ShallowCopy(vtkInformation* from, vtkInformation* to);
void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
// Description:
// Print the key's value in an information object to a stream.
virtual void Print(ostream& os, vtkInformation* info);
void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
protected:
// The type required of all objects stored with this key.
......
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