Fixes by clang-tidy

This commit is contained in:
magnesj 2021-04-15 02:14:51 +00:00 committed by Magne Sjaastad
parent 6421564b77
commit a44378e2f5
75 changed files with 91 additions and 91 deletions

View File

@ -47,7 +47,7 @@ private slots:
private:
RiaPlotWindowRedrawScheduler() = default;
~RiaPlotWindowRedrawScheduler() = default;
~RiaPlotWindowRedrawScheduler() override = default;
void startTimer( int msecs );

View File

@ -34,7 +34,7 @@ class RicMswBranch : public RicMswItem
{
public:
RicMswBranch( const QString& label, const RimWellPath* wellPath, double initialMD = 0.0, double initialTVD = 0.0 );
virtual ~RicMswBranch() = default;
~RicMswBranch() override = default;
void addSegment( std::unique_ptr<RicMswSegment> segment );
void insertAfterSegment( const RicMswSegment* insertAfter, std::unique_ptr<RicMswSegment> segment );

View File

@ -109,7 +109,7 @@ public:
double startTVD,
const RimWellPathValve* wellPathValve );
virtual ~RicMswValve() {}
~RicMswValve() override {}
const RimWellPathValve* wellPathValve() const;

View File

@ -18,7 +18,7 @@
#pragma once
#include <stdint.h>
#include <cstdint>
#include <map>

View File

@ -768,7 +768,7 @@ namespace farmhashte {
uint64_t Hash64(const char *s, size_t len) {
FARMHASH_DIE_IF_MISCONFIGURED;
return s == NULL ? 0 : len;
return s == nullptr ? 0 : len;
}
uint64_t Hash64WithSeed(const char *s, size_t len, uint64_t seed) {
@ -1000,7 +1000,7 @@ namespace farmhashnt {
uint32_t Hash32(const char *s, size_t len) {
FARMHASH_DIE_IF_MISCONFIGURED;
return s == NULL ? 0 : len;
return s == nullptr ? 0 : len;
}
uint32_t Hash32WithSeed(const char *s, size_t len, uint32_t seed) {
@ -1139,7 +1139,7 @@ namespace farmhashsu {
uint32_t Hash32(const char *s, size_t len) {
FARMHASH_DIE_IF_MISCONFIGURED;
return s == NULL ? 0 : len;
return s == nullptr ? 0 : len;
}
uint32_t Hash32WithSeed(const char *s, size_t len, uint32_t seed) {
@ -1359,7 +1359,7 @@ namespace farmhashsa {
uint32_t Hash32(const char *s, size_t len) {
FARMHASH_DIE_IF_MISCONFIGURED;
return s == NULL ? 0 : len;
return s == nullptr ? 0 : len;
}
uint32_t Hash32WithSeed(const char *s, size_t len, uint32_t seed) {

View File

@ -43,10 +43,10 @@
#ifndef FARM_HASH_H_
#define FARM_HASH_H_
#include <assert.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h> // for memcpy and memset
#include <cassert>
#include <cstdint>
#include <cstdlib>
#include <cstring> // for memcpy and memset
#include <utility>
#ifndef NAMESPACE_FOR_HASH_FUNCTIONS

View File

@ -37,7 +37,7 @@ class RicNewMultiPlotFeature : public caf::CmdFeature, public RicfCommandObject
public:
RicNewMultiPlotFeature();
virtual caf::PdmScriptResponse execute() override;
caf::PdmScriptResponse execute() override;
protected:
// Overrides

View File

@ -61,7 +61,7 @@ class RifOpmCommonEclipseSummary : public RifSummaryReaderInterface
{
public:
RifOpmCommonEclipseSummary();
~RifOpmCommonEclipseSummary();
~RifOpmCommonEclipseSummary() override;
void useLodsmaryFiles( bool enable );
void createLodsmaryFiles( bool enable );

View File

@ -63,7 +63,7 @@ public:
public:
RifReaderFmuRft( const QString& filePath );
~RifReaderFmuRft() = default;
~RifReaderFmuRft() override = default;
static QStringList findSubDirectoriesWithFmuRftData( const QString& filePath );
static bool directoryContainsFmuRftData( const QString& filePath );

View File

@ -19,7 +19,7 @@
#pragma once
#include <stdlib.h>
#include <cstdlib>
#include "RigFemResultPosEnum.h"
#include "RigFemTypes.h"

View File

@ -35,7 +35,7 @@ public:
RigFemPartResultCalculatorBarConverted( RigFemPartResultsCollection& collection,
const std::string& fieldName,
const std::string& fieldNameToConvert );
virtual ~RigFemPartResultCalculatorBarConverted();
~RigFemPartResultCalculatorBarConverted() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorCompaction : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorCompaction( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorCompaction();
~RigFemPartResultCalculatorCompaction() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorDSM : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorDSM( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorDSM();
~RigFemPartResultCalculatorDSM() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorED : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorED( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorED();
~RigFemPartResultCalculatorED() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorEV : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorEV( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorEV();
~RigFemPartResultCalculatorEV() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorEnIpPorBar : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorEnIpPorBar( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorEnIpPorBar();
~RigFemPartResultCalculatorEnIpPorBar() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorFOS : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorFOS( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorFOS();
~RigFemPartResultCalculatorFOS() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorFormationIndices : public RigFemPartResultCalcul
{
public:
explicit RigFemPartResultCalculatorFormationIndices( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorFormationIndices();
~RigFemPartResultCalculatorFormationIndices() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -37,7 +37,7 @@ class RigFemPartResultCalculatorGamma : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorGamma( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorGamma();
~RigFemPartResultCalculatorGamma() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorInitialPorosity : public RigFemPartResultCalcula
{
public:
explicit RigFemPartResultCalculatorInitialPorosity( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorInitialPorosity();
~RigFemPartResultCalculatorInitialPorosity() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -37,7 +37,7 @@ class RigFemPartResultCalculatorMudWeightWindow : public RigFemPartResultCalcula
{
public:
explicit RigFemPartResultCalculatorMudWeightWindow( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorMudWeightWindow();
~RigFemPartResultCalculatorMudWeightWindow() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNE : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorNE( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorNE();
~RigFemPartResultCalculatorNE() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNodalGradients : public RigFemPartResultCalculat
{
public:
explicit RigFemPartResultCalculatorNodalGradients( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorNodalGradients();
~RigFemPartResultCalculatorNodalGradients() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNormalSE : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorNormalSE( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorNormalSE();
~RigFemPartResultCalculatorNormalSE() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNormalST : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorNormalST( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorNormalST();
~RigFemPartResultCalculatorNormalST() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNormalized : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorNormalized( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorNormalized();
~RigFemPartResultCalculatorNormalized() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorPoreCompressibility : public RigFemPartResultCal
{
public:
explicit RigFemPartResultCalculatorPoreCompressibility( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorPoreCompressibility();
~RigFemPartResultCalculatorPoreCompressibility() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorPorosityPermeability : public RigFemPartResultCa
{
public:
explicit RigFemPartResultCalculatorPorosityPermeability( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorPorosityPermeability();
~RigFemPartResultCalculatorPorosityPermeability() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorPrincipalStrain : public RigFemPartResultCalcula
{
public:
explicit RigFemPartResultCalculatorPrincipalStrain( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorPrincipalStrain();
~RigFemPartResultCalculatorPrincipalStrain() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorPrincipalStress : public RigFemPartResultCalcula
{
public:
explicit RigFemPartResultCalculatorPrincipalStress( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorPrincipalStress();
~RigFemPartResultCalculatorPrincipalStress() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorQ : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorQ( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorQ();
~RigFemPartResultCalculatorQ() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorSFI : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorSFI( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorSFI();
~RigFemPartResultCalculatorSFI() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorSM : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorSM( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorSM();
~RigFemPartResultCalculatorSM() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorShearSE : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorShearSE( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorShearSE();
~RigFemPartResultCalculatorShearSE() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorShearST : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorShearST( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorShearST();
~RigFemPartResultCalculatorShearST() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorShearSlipIndicator : public RigFemPartResultCalc
{
public:
explicit RigFemPartResultCalculatorShearSlipIndicator( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorShearSlipIndicator();
~RigFemPartResultCalculatorShearSlipIndicator() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorStressAnisotropy : public RigFemPartResultCalcul
{
public:
explicit RigFemPartResultCalculatorStressAnisotropy( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorStressAnisotropy();
~RigFemPartResultCalculatorStressAnisotropy() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
RigFemScalarResultFrames* calculateTimeLapse( int partIndex, const RigFemResultAddress& resVarAddr );

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorStressGradients : public RigFemPartResultCalcula
{
public:
explicit RigFemPartResultCalculatorStressGradients( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorStressGradients();
~RigFemPartResultCalculatorStressGradients() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorSurfaceAlignedStress : public RigFemPartResultCa
{
public:
explicit RigFemPartResultCalculatorSurfaceAlignedStress( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorSurfaceAlignedStress();
~RigFemPartResultCalculatorSurfaceAlignedStress() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorSurfaceAngles : public RigFemPartResultCalculato
{
public:
explicit RigFemPartResultCalculatorSurfaceAngles( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorSurfaceAngles();
~RigFemPartResultCalculatorSurfaceAngles() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
};

View File

@ -31,7 +31,7 @@ class RigFemPartResultCalculatorTimeLapse : public RigFemPartResultCalculator
{
public:
explicit RigFemPartResultCalculatorTimeLapse( RigFemPartResultsCollection& collection );
virtual ~RigFemPartResultCalculatorTimeLapse();
~RigFemPartResultCalculatorTimeLapse() override;
bool isMatching( const RigFemResultAddress& resVarAddr ) const override;
RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;

View File

@ -71,7 +71,7 @@ protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
virtual void defineEditorAttribute( const caf::PdmFieldHandle* field,
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;

View File

@ -143,7 +143,7 @@ protected:
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
void initAfterRead();
void initAfterRead() override;
private:
cvf::Vec3d fracturePositionForUi() const;

View File

@ -59,7 +59,7 @@ class RimGridCrossPlot : public RimPlot, public RimNameConfigHolderInterface
public:
RimGridCrossPlot();
~RimGridCrossPlot();
~RimGridCrossPlot() override;
QString description() const override;

View File

@ -95,7 +95,7 @@ public:
public:
RimGridCrossPlotDataSet();
~RimGridCrossPlotDataSet();
~RimGridCrossPlotDataSet() override;
void setCellFilterView( RimGridView* cellFilterView );
void loadDataAndUpdate( bool updateParentPlot );

View File

@ -99,7 +99,7 @@ protected:
bool hasResults();
virtual size_t onTimeStepCountRequested() override;
size_t onTimeStepCountRequested() override;
private:
QString createAutoName() const override;

View File

@ -79,7 +79,7 @@ public:
void setToDefaultSizeSlice( SinglePlaneState plane, const cvf::Vec3d& position );
protected:
caf::PdmFieldHandle* userDescriptionField() override final;
caf::PdmFieldHandle* userDescriptionField() final;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,

View File

@ -109,7 +109,7 @@ public:
void rebuildGeometryAndScheduleCreateDisplayModel();
protected:
caf::PdmFieldHandle* userDescriptionField() override final;
caf::PdmFieldHandle* userDescriptionField() final;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,

View File

@ -51,7 +51,7 @@ public:
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
virtual void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
private:
void updateUiTreeName();

View File

@ -48,7 +48,7 @@ public:
protected:
virtual RimIntersectionResultsDefinitionCollection* findSeparateResultsCollection();
caf::PdmFieldHandle* objectToggleField() override final;
caf::PdmFieldHandle* objectToggleField() final;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;

View File

@ -61,18 +61,18 @@ public:
void update2dIntersectionViews();
protected:
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual caf::PdmFieldHandle* objectToggleField() override;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
virtual void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
virtual void initAfterRead() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void initAfterRead() override;
private:
void assignCaseIfMissing() const;

View File

@ -43,7 +43,7 @@ public:
protected:
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
virtual void initAfterRead() override;
void initAfterRead() override;
private:
caf::PdmField<bool> m_isActive;

View File

@ -51,7 +51,7 @@ public:
virtual const caf::TitledOverlayFrame* titledOverlayFrame() const = 0;
virtual caf::TitledOverlayFrame* titledOverlayFrame() = 0;
virtual int fontSize() const override;
int fontSize() const override;
void recreateLegend();

View File

@ -62,7 +62,7 @@ public:
public:
RimPlot();
virtual ~RimPlot();
~RimPlot() override;
QWidget* createPlotWidget( QWidget* parent = nullptr );
RowOrColSpan rowSpan() const;
@ -110,7 +110,7 @@ protected:
void updateFonts() override;
private:
virtual void doRenderWindowContent( QPaintDevice* paintDevice ) override;
void doRenderWindowContent( QPaintDevice* paintDevice ) override;
virtual void handleKeyPressEvent( QKeyEvent* event ) {}
virtual void handleWheelEvent( QWheelEvent* event ) {}
virtual RiuQwtPlotWidget* doCreatePlotViewWidget( QWidget* parent ) = 0;

View File

@ -56,7 +56,7 @@ public:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
protected:
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
protected:
caf::PdmField<bool> m_isActive;

View File

@ -36,7 +36,7 @@ public:
~RimVfpPlotCollection() override;
void addPlot( RimVfpPlot* newPlot );
std::vector<RimVfpPlot*> plots() const;
std::vector<RimVfpPlot*> plots() const override;
void deleteAllChildObjects();
size_t plotCount() const final;

View File

@ -103,7 +103,7 @@ protected:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
private:
static QString displayNameForView( RimGridView* view );

View File

@ -58,7 +58,7 @@ public:
caf::PdmField<ParameterSourceEnum>* sourceField( const RigWbsParameter& parameter ) const;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void loadDataAndUpdate();

View File

@ -95,7 +95,7 @@ protected:
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
virtual void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
void onTargetMoved( const caf::SignalEmitter* emitter, bool fullUpdate );

View File

@ -62,7 +62,7 @@ protected:
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;

View File

@ -31,5 +31,5 @@ class RimSummaryCrossPlot : public RimSummaryPlot
public:
RimSummaryCrossPlot();
virtual RimSummaryPlotSourceStepping* sourceSteppingObjectForKeyEventHandling() const override;
RimSummaryPlotSourceStepping* sourceSteppingObjectForKeyEventHandling() const override;
};

View File

@ -59,14 +59,14 @@ public:
void updateLegendRangesTextAndVisibility( RiuViewer* nativeOrOverrideViewer, bool isUsingOverrideViewer );
protected:
virtual void initAfterRead() override;
void initAfterRead() override;
private:
virtual RimIntersectionResultsDefinitionCollection* findSeparateResultsCollection() override;
RimIntersectionResultsDefinitionCollection* findSeparateResultsCollection() override;
caf::PdmFieldHandle* userDescriptionField() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
caf::PdmProxyValueField<QString> m_name;
caf::PdmPtrField<RimSurface*> m_surface;

View File

@ -65,7 +65,7 @@ public:
std::vector<RimRegularLegendConfig*> legendConfigs();
protected:
virtual void initAfterRead() override;
void initAfterRead() override;
caf::PdmFieldHandle* userDescriptionField() override;
private:

View File

@ -51,8 +51,8 @@ public:
private:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
RigSurface* surfaceData();

View File

@ -43,7 +43,7 @@ public:
RigWellPath( const std::vector<cvf::Vec3d>& wellPathPoints, const std::vector<double>& measuredDepths );
RigWellPath( const RigWellPath& rhs );
RigWellPath& operator=( const RigWellPath& rhs );
~RigWellPath();
~RigWellPath() override;
const std::vector<cvf::Vec3d>& wellPathPoints() const;
const std::vector<double>& measuredDepths() const;

View File

@ -28,7 +28,7 @@ class RiuAbstractOverlayContentFrame : public QFrame
Q_OBJECT
public:
RiuAbstractOverlayContentFrame( QWidget* parent = nullptr );
~RiuAbstractOverlayContentFrame();
~RiuAbstractOverlayContentFrame() override;
virtual void renderTo( QPainter* painter, const QRect& targetRect ) = 0;
};

View File

@ -37,7 +37,7 @@ class RiuCategoryLegendFrame : public RiuAbstractLegendFrame
public:
RiuCategoryLegendFrame( QWidget* parent, const QString& title, caf::CategoryMapper* categoryMapper );
~RiuCategoryLegendFrame();
~RiuCategoryLegendFrame() override;
private:
void layoutInfo( LayoutInfo* layout ) const override;

View File

@ -52,7 +52,7 @@ class RiuGridCrossQwtPlot : public RiuQwtPlotWidget
public:
RiuGridCrossQwtPlot( RimGridCrossPlot* crossPlot, QWidget* parent = nullptr );
~RiuGridCrossQwtPlot();
~RiuGridCrossQwtPlot() override;
RiuGridCrossQwtPlot( const RiuGridCrossQwtPlot& ) = delete;

View File

@ -79,7 +79,7 @@ class RiuMainWindow : public RiuMainWindowBase
public:
RiuMainWindow();
~RiuMainWindow();
~RiuMainWindow() override;
static RiuMainWindow* instance();

View File

@ -108,7 +108,7 @@ protected:
std::pair<int, int> rowAndColumnCount( int plotWidgetCount ) const;
virtual void onSelectionManagerSelectionChanged( const std::set<int>& changedSelectionLevels ) override;
void onSelectionManagerSelectionChanged( const std::set<int>& changedSelectionLevels ) override;
virtual bool showYAxis( int row, int column ) const;

View File

@ -57,7 +57,7 @@ class RiuPlotMainWindow : public RiuMainWindowBase
public:
RiuPlotMainWindow();
~RiuPlotMainWindow();
~RiuPlotMainWindow() override;
QString mainWindowName() override;

View File

@ -27,5 +27,5 @@ public:
QssSyntaxHighligter( QTextDocument* parent );
protected:
virtual void highlightBlock( const QString& text );
void highlightBlock( const QString& text ) override;
};

View File

@ -33,7 +33,7 @@ class RiuQtChartView : public QtCharts::QChartView, public RiuInterfaceToViewWin
{
public:
RiuQtChartView( RimPlotWindow* plotWindow, QWidget* parent = nullptr );
virtual ~RiuQtChartView();
~RiuQtChartView() override;
RimViewWindow* ownerViewWindow() const override;

View File

@ -41,7 +41,7 @@ public:
public:
RiuScalarMapperLegendFrame( QWidget* parent, const QString& title, cvf::ScalarMapper* scalarMapper );
~RiuScalarMapperLegendFrame();
~RiuScalarMapperLegendFrame() override;
void setTickPrecision( int precision );
void setTickFormat( NumberFormat format );

View File

@ -26,7 +26,7 @@ class TextEditWithCompletion : public QTextEdit
Q_OBJECT
public:
TextEditWithCompletion( QWidget* parent = nullptr );
~TextEditWithCompletion();
~TextEditWithCompletion() override;
void setCompleter( QCompleter* completer );
QCompleter* completer();