Skip to content

Commit ef7a2e5

Browse files
committed
Rest of override
1 parent 08d3bc4 commit ef7a2e5

File tree

136 files changed

+1658
-1638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+1658
-1638
lines changed

src/Core/Algorithms/Base/AlgorithmLogger.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ namespace Algorithms {
4545
Core::Logging::LoggerHandle getLogger() const { return logger_; }
4646

4747
/// functions for the algorithm, so it can forward errors if needed
48-
virtual void error(const std::string& error) const;
49-
virtual bool errorReported() const;
50-
virtual void setErrorFlag(bool flag);
51-
virtual void warning(const std::string& warning) const;
52-
virtual void remark(const std::string& remark) const;
53-
virtual void status(const std::string& status) const;
48+
void error(const std::string& error) const override;
49+
bool errorReported() const override;
50+
void setErrorFlag(bool flag) override;
51+
void warning(const std::string& warning) const override;
52+
void remark(const std::string& remark) const override;
53+
void status(const std::string& status) const override;
5454
private:
5555
Core::Logging::LoggerHandle logger_;
5656
Core::Logging::LoggerHandle defaultLogger_;

src/Core/Algorithms/Factory/HardCodedAlgorithmFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace SCIRun {
4646
using AlgoMakerMap = std::map<std::string, NamedAlgoMaker>;
4747

4848
HardCodedAlgorithmFactory();
49-
virtual SCIRun::Core::Algorithms::AlgorithmHandle create(const std::string& moduleName, const AlgorithmCollaborator* algoCollaborator) const;
49+
SCIRun::Core::Algorithms::AlgorithmHandle create(const std::string& moduleName, const AlgorithmCollaborator* algoCollaborator) const override;
5050
size_t numAlgorithms() const { return factoryMap_.size(); }
5151
AlgoMakerMap::const_iterator begin() const { return factoryMap_.cbegin(); }
5252
AlgoMakerMap::const_iterator end() const { return factoryMap_.cend(); }

src/Core/Algorithms/Field/Tests/GetDomainBoundaryTests.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ class GetDomainBoundaryTestsParameterized : public ::testing::TestWithParam < st
189189
//algo_.set(Parameters::DisconnectBoundaries, ::std::tr1::get<5>(GetParam()));
190190
//ASSERT_TRUE(algo_.runImpl(latVol, unused, boundary));
191191
}
192-
virtual void TearDown()
193-
{ }
192+
193+
void TearDown() override { }
194194
};
195195

196196
TEST_P(GetDomainBoundaryTestsParameterized, LatVolBoundry_Parameterized)

src/Core/Algorithms/Field/Tests/JoinFieldsAlgoTests.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ class JoinFieldsAlgoTestsParameterized : public ::testing::TestWithParam < std::
150150
algo_.set(JoinFieldsAlgo::MakeNoData, std::get<3>(GetParam()));
151151
algo_.set(JoinFieldsAlgo::Tolerance, std::get<4>(GetParam()));
152152
}
153-
virtual void TearDown(){ }
153+
154+
void TearDown() override { }
154155
};
155156

156157
TEST_P(JoinFieldsAlgoTestsParameterized, JoinFieldsAlgo_Parameterized)

src/Core/Algorithms/Legacy/Converter/ConvertMatrixToString.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace SCIRun {
4545
static AlgorithmOutputName ResultString;
4646
ConvertMatrixToStringAlgo() {}
4747
bool run(Datatypes::MatrixHandle input, Datatypes::StringHandle& output) const;
48-
virtual AlgorithmOutput run(const AlgorithmInput& input) const;
48+
AlgorithmOutput run(const AlgorithmInput& input) const override;
4949
};
5050
}}}}
5151

src/Core/Algorithms/Legacy/Fields/Cleanup/CleanupTetMesh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace Fields {
4646
{
4747
public:
4848
CleanupTetMeshAlgo();
49-
AlgorithmOutput run(const AlgorithmInput& input) const;
49+
AlgorithmOutput run(const AlgorithmInput& input) const override;
5050
static AlgorithmInputName InputTetMesh;
5151
static AlgorithmOutputName OutputTetMesh;
5252
bool run(FieldHandle input, FieldHandle& output) const;

src/Core/Algorithms/Legacy/Fields/Cleanup/RemoveUnusedNodes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class SCISHARE RemoveUnusedNodesAlgo : public AlgorithmBase
4949
/// run the algorithm
5050
bool run(FieldHandle input, FieldHandle& output) const;
5151

52-
virtual AlgorithmOutput run(const AlgorithmInput& input) const;
52+
AlgorithmOutput run(const AlgorithmInput& input) const override;
5353
};
5454

5555
}}}}

src/Core/Algorithms/Legacy/Fields/ClipMesh/ClipMeshByIsovalue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class SCISHARE ClipMeshByIsovalueAlgo : public AlgorithmBase
5959
/// run the algorithm
6060
bool run(FieldHandle input, FieldHandle& output, Datatypes::MatrixHandle& mapping) const;
6161
bool run(FieldHandle input, FieldHandle& output) const;
62-
virtual AlgorithmOutput run(const AlgorithmInput& input) const;
62+
AlgorithmOutput run(const AlgorithmInput& input) const override;
6363
static AlgorithmInputName InputField;
6464
static AlgorithmOutputName OutputField;
6565
static AlgorithmParameterName LessThanIsoValue;

src/Core/Algorithms/Legacy/Fields/ClipMesh/ClipMeshBySelection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class SCISHARE ClipMeshBySelectionAlgo : public AlgorithmBase
5656
static const AlgorithmInputName SelectionField;
5757
static const AlgorithmOutputName Mapping;
5858

59-
virtual AlgorithmOutput run(const AlgorithmInput& input) const;
59+
AlgorithmOutput run(const AlgorithmInput& input) const override;
6060
};
6161

6262
}}}}

src/Core/Algorithms/Legacy/Fields/ConvertMeshType/ConvertMeshToTetVolMesh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SCISHARE ConvertMeshToTetVolMeshAlgo : public AlgorithmBase
4545
}
4646

4747
bool run(FieldHandle input, FieldHandle& output) const;
48-
AlgorithmOutput run(const AlgorithmInput& input) const;
48+
AlgorithmOutput run(const AlgorithmInput& input) const override;
4949

5050
static AlgorithmInputName HexOrLatVol;
5151
static AlgorithmOutputName TetVol;

0 commit comments

Comments
 (0)