OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

clang-tidy : Remove redundant 'virtual' and add 'override'

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-18 19:45:57 +02:00
parent c8285602b1
commit 6346ed012c
599 changed files with 2056 additions and 2056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifCaseRealizationParametersReader.h
View File

@@ -71,9 +71,9 @@ class RifCaseRealizationParametersReader : public RifCaseRealizationReader
{
public:
RifCaseRealizationParametersReader(const QString& fileName);
virtual ~RifCaseRealizationParametersReader();
~RifCaseRealizationParametersReader() override;
virtual void parse() override;
void parse() override;
private:
QTextStream* openDataStream();
@@ -92,9 +92,9 @@ class RifCaseRealizationRunspecificationReader : public RifCaseRealizationReader
{
public:
RifCaseRealizationRunspecificationReader(const QString& fileName);
virtual ~RifCaseRealizationRunspecificationReader();
~RifCaseRealizationRunspecificationReader() override;
virtual void parse() override;
void parse() override;
private:
QXmlStreamReader * openDataStream();

6
ApplicationCode/FileInterface/RifColumnBasedUserData.h
View File

@@ -39,13 +39,13 @@ class RifColumnBasedUserData : public RifSummaryReaderInterface
{
public:
RifColumnBasedUserData();
~RifColumnBasedUserData();
~RifColumnBasedUserData() override;
bool parse(const QString& data, QString* errorText = nullptr);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress,
bool values(const RifEclipseSummaryAddress& resultAddress,
std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;

6
ApplicationCode/FileInterface/RifCsvUserData.h
View File

@@ -41,13 +41,13 @@ class RifCsvUserData : public RifSummaryReaderInterface
{
public:
RifCsvUserData();
~RifCsvUserData();
~RifCsvUserData() override;
bool parse(const QString& fileName, const AsciiDataParseOptions& parseOptions, QString* errorText = nullptr);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress,
bool values(const RifEclipseSummaryAddress& resultAddress,
std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;

12
ApplicationCode/FileInterface/RifCsvUserDataParser.h
View File

@@ -88,11 +88,11 @@ class RifCsvUserDataFileParser : public RifCsvUserDataParser
{
public:
RifCsvUserDataFileParser(const QString& fileName, QString* errorText = nullptr);
virtual ~RifCsvUserDataFileParser();
~RifCsvUserDataFileParser() override;
protected:
virtual QTextStream* openDataStream() override;
virtual void closeDataStream() override;
QTextStream* openDataStream() override;
void closeDataStream() override;
private:
bool openFile();
@@ -112,11 +112,11 @@ class RifCsvUserDataPastedTextParser : public RifCsvUserDataParser
{
public:
RifCsvUserDataPastedTextParser(const QString& text, QString* errorText = nullptr);
virtual ~RifCsvUserDataPastedTextParser();
~RifCsvUserDataPastedTextParser() override;
protected:
virtual QTextStream* openDataStream() override;
virtual void closeDataStream() override;
QTextStream* openDataStream() override;
void closeDataStream() override;
private:
QString m_text;

6
ApplicationCode/FileInterface/RifDerivedEnsembleReader.h
View File

@@ -35,9 +35,9 @@ class RifDerivedEnsembleReader : public RifSummaryReaderInterface
public:
RifDerivedEnsembleReader(RimDerivedEnsembleCase* derivedCase);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
private:
RimDerivedEnsembleCase* m_derivedCase;

2
ApplicationCode/FileInterface/RifEclipseInputFileTools.h
View File

@@ -56,7 +56,7 @@ class RifEclipseInputFileTools : public cvf::Object
{
public:
RifEclipseInputFileTools();
virtual ~RifEclipseInputFileTools();
~RifEclipseInputFileTools() override;
static bool openGridFile(const QString& fileName, RigEclipseCaseData* eclipseCase, bool readFaultData);

2
ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
View File

@@ -89,7 +89,7 @@ class RifEclipseRestartDataAccess : public cvf::Object
{
public:
RifEclipseRestartDataAccess();
virtual ~RifEclipseRestartDataAccess();
~RifEclipseRestartDataAccess() override;
virtual bool open() = 0;
virtual void setRestartFiles(const QStringList& fileSet) = 0;

24
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h
View File

@@ -35,26 +35,26 @@ class RifEclipseRestartFilesetAccess : public RifEclipseRestartDataAccess
{
public:
RifEclipseRestartFilesetAccess();
virtual ~RifEclipseRestartFilesetAccess();
~RifEclipseRestartFilesetAccess() override;
bool open();
void setRestartFiles(const QStringList& fileSet);
void close();
bool open() override;
void setRestartFiles(const QStringList& fileSet) override;
void close() override;
void setTimeSteps(const std::vector<QDateTime>& timeSteps);
size_t timeStepCount();
void setTimeSteps(const std::vector<QDateTime>& timeSteps) override;
size_t timeStepCount() override;
void timeSteps(std::vector<QDateTime>* timeSteps, std::vector<double>* daysSinceSimulationStart) override;
std::vector<int> reportNumbers();
std::vector<int> reportNumbers() override;
void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts);
bool results(const QString& resultName, size_t timeStep, size_t gridCount, std::vector<double>* values);
void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts) override;
bool results(const QString& resultName, size_t timeStep, size_t gridCount, std::vector<double>* values) override;
bool dynamicNNCResults(const ecl_grid_type* grid, size_t timeStep, std::vector<double>* waterFlux, std::vector<double>* oilFlux, std::vector<double>* gasFlux) override;
virtual void readWellData(well_info_type* well_info, bool importCompleteMswData);
virtual int readUnitsType();
void readWellData(well_info_type* well_info, bool importCompleteMswData) override;
int readUnitsType() override;
virtual std::set<RiaDefines::PhaseType> availablePhases() const override;
std::set<RiaDefines::PhaseType> availablePhases() const override;
private:
void openTimeStep(size_t timeStep);

22
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h
View File

@@ -39,25 +39,25 @@ class RifEclipseUnifiedRestartFileAccess : public RifEclipseRestartDataAccess
{
public:
RifEclipseUnifiedRestartFileAccess();
virtual ~RifEclipseUnifiedRestartFileAccess();
~RifEclipseUnifiedRestartFileAccess() override;
void setRestartFiles(const QStringList& fileSet);
bool open();
void close();
void setRestartFiles(const QStringList& fileSet) override;
bool open() override;
void close() override;
size_t timeStepCount();
size_t timeStepCount() override;
void timeSteps(std::vector<QDateTime>* timeSteps, std::vector<double>* daysSinceSimulationStart) override;
std::vector<int> reportNumbers();
std::vector<int> reportNumbers() override;
void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts);
bool results(const QString& resultName, size_t timeStep, size_t gridCount, std::vector<double>* values);
void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts) override;
bool results(const QString& resultName, size_t timeStep, size_t gridCount, std::vector<double>* values) override;
bool dynamicNNCResults(const ecl_grid_type* grid, size_t timeStep, std::vector<double>* waterFlux, std::vector<double>* oilFlux, std::vector<double>* gasFlux) override;
virtual void readWellData(well_info_type * well_info, bool importCompleteMswData);
virtual int readUnitsType();
void readWellData(well_info_type * well_info, bool importCompleteMswData) override;
int readUnitsType() override;
virtual std::set<RiaDefines::PhaseType> availablePhases() const override;
std::set<RiaDefines::PhaseType> availablePhases() const override;
private:
bool openFile();

2
ApplicationCode/FileInterface/RifElementPropertyReader.h
View File

@@ -37,7 +37,7 @@ class RifElementPropertyReader : public cvf::Object
{
public:
RifElementPropertyReader(const std::vector<int>& elementIdxToId);
virtual ~RifElementPropertyReader();
~RifElementPropertyReader() override;
void addFile(const std::string& fileName);
void removeFile(const std::string& fileName);

6
ApplicationCode/FileInterface/RifEnsembleStatisticsReader.h
View File

@@ -33,9 +33,9 @@ class RifEnsembleStatisticsReader : public RifSummaryReaderInterface
public:
RifEnsembleStatisticsReader(RimEnsembleStatisticsCase* ensStatCase);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
private:
bool validateAddress(const RifEclipseSummaryAddress& address) const;

2
ApplicationCode/FileInterface/RifHdf5Reader.h
View File

@@ -36,7 +36,7 @@ public:
virtual ~RifHdf5Reader();
std::vector<QDateTime> timeSteps() const override;
virtual QStringList propertyNames() const override;
QStringList propertyNames() const override;
bool dynamicResult(const QString& result, size_t stepIndex, std::vector<double>* values) const override;
private:

6
ApplicationCode/FileInterface/RifKeywordVectorUserData.h
View File

@@ -40,13 +40,13 @@ class RifKeywordVectorUserData : public RifSummaryReaderInterface
{
public:
RifKeywordVectorUserData();
~RifKeywordVectorUserData();
~RifKeywordVectorUserData() override;
bool parse(const QString& data, const QString& customWellName);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress,
bool values(const RifEclipseSummaryAddress& resultAddress,
std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;

8
ApplicationCode/FileInterface/RifReaderEclipseInput.h
View File

@@ -29,11 +29,11 @@ class RifReaderEclipseInput : public RifReaderInterface
{
public:
RifReaderEclipseInput();
virtual ~RifReaderEclipseInput();
~RifReaderEclipseInput() override;
// Virtual interface implementation
virtual bool open(const QString& fileName, RigEclipseCaseData* eclipseCase);
bool open(const QString& fileName, RigEclipseCaseData* eclipseCase) override;
virtual bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values ) { return false; }
virtual bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values ) { return false; }
bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values ) override { return false; }
bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values ) override { return false; }
};

10
ApplicationCode/FileInterface/RifReaderEclipseOutput.h
View File

@@ -51,16 +51,16 @@ class RifReaderEclipseOutput : public RifReaderInterface
{
public:
RifReaderEclipseOutput();
virtual ~RifReaderEclipseOutput();
~RifReaderEclipseOutput() override;
bool open(const QString& fileName, RigEclipseCaseData* eclipseCase);
bool open(const QString& fileName, RigEclipseCaseData* eclipseCase) override;
void setHdf5FileName(const QString& fileName);
void setFileDataAccess(RifEclipseRestartDataAccess* restartDataAccess);
virtual bool openAndReadActiveCellData(const QString& fileName, const std::vector<QDateTime>& mainCaseTimeSteps, RigEclipseCaseData* eclipseCase);
bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values);
bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values);
bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values) override;
bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values) override;
void sourSimRlResult(const QString& result, size_t stepIndex, std::vector<double>* values);
std::vector<QDateTime> allTimeSteps() const;
@@ -68,7 +68,7 @@ public:
static bool transferGeometry(const ecl_grid_type* mainEclGrid, RigEclipseCaseData* eclipseCase);
static void transferCoarseningInfo(const ecl_grid_type* eclGrid, RigGridBase* grid);
virtual std::set<RiaDefines::PhaseType> availablePhases() const override;
std::set<RiaDefines::PhaseType> availablePhases() const override;
private:
bool readActiveCellInfo();

2
ApplicationCode/FileInterface/RifReaderEclipseRft.h
View File

@@ -42,7 +42,7 @@ class RifReaderEclipseRft : public cvf::Object
{
public:
RifReaderEclipseRft(const QString& fileName);
~RifReaderEclipseRft();
~RifReaderEclipseRft() override;
const std::vector<RifEclipseRftAddress>& eclipseRftAddresses();
void values(const RifEclipseRftAddress& rftAddress, std::vector<double>* values);

10
ApplicationCode/FileInterface/RifReaderEclipseSummary.h
View File

@@ -56,21 +56,21 @@ class RifReaderEclipseSummary : public RifSummaryReaderInterface
{
public:
RifReaderEclipseSummary();
~RifReaderEclipseSummary();
~RifReaderEclipseSummary() override;
bool open(const QString& headerFileName, bool includeRestartFiles);
std::vector<RifRestartFileInfo> getRestartFiles(const QString& headerFileName, bool* hasWarnings);
RifRestartFileInfo getFileInfo(const QString& headerFileName);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
QStringList warnings() const { return m_warnings; }
virtual void markForCachePurge(const RifEclipseSummaryAddress& address) override;
void markForCachePurge(const RifEclipseSummaryAddress& address) override;
static void purgeCache();
private:

2
ApplicationCode/FileInterface/RifReaderInterface.h
View File

@@ -48,7 +48,7 @@ class RifReaderInterface : public cvf::Object
{
public:
RifReaderInterface() { }
virtual ~RifReaderInterface() { }
~RifReaderInterface() override { }
bool isFaultImportEnabled();
bool isImportOfCompleteMswDataEnabled();

8
ApplicationCode/FileInterface/RifReaderMockModel.h
View File

@@ -27,7 +27,7 @@ class RifReaderMockModel : public RifReaderInterface
{
public:
RifReaderMockModel();
virtual ~RifReaderMockModel();
~RifReaderMockModel() override;
void setWorldCoordinates(cvf::Vec3d minWorldCoordinate, cvf::Vec3d maxWorldCoordinate);
void setGridPointDimensions(const cvf::Vec3st& gridPointDimensions);
@@ -36,10 +36,10 @@ public:
void addLocalGridRefinement(const cvf::Vec3st& minCellPosition, const cvf::Vec3st& maxCellPosition, const cvf::Vec3st& singleCellRefinementFactors);
virtual bool open( const QString& fileName, RigEclipseCaseData* eclipseCase );
bool open( const QString& fileName, RigEclipseCaseData* eclipseCase ) override;
virtual bool staticResult( const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values );
virtual bool dynamicResult( const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values );
bool staticResult( const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values ) override;
bool dynamicResult( const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values ) override;
private:
void populateReservoir(RigEclipseCaseData* eclipseCase);

6
ApplicationCode/FileInterface/RifReaderObservedData.h
View File

@@ -40,15 +40,15 @@ class RifReaderObservedData : public RifSummaryReaderInterface
{
public:
RifReaderObservedData();
~RifReaderObservedData();
~RifReaderObservedData() override;
bool open(const QString& headerFileName,
const QString& identifierName,
RifEclipseSummaryAddress::SummaryVarCategory summaryCategory);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress,
bool values(const RifEclipseSummaryAddress& resultAddress,
std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;

4
ApplicationCode/FileInterface/RifReaderSettings.h
View File

@@ -44,9 +44,9 @@ public:
caf::PdmField<bool> skipWellData;
private:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
};