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

#1061 Add missing override keyword in ApplicationCode.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-09-14 21:47:48 +02:00
parent 69a1901904
commit 724131d310
27 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/CMakeLists.txt
View File

@@ -371,7 +371,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set_target_properties(ResInsight PROPERTIES COMPILE_FLAGS "-Wall -Wno-unused-parameter -Wno-reorder -Wno-parentheses -Wno-switch -Wno-inconsistent-missing-override -Wno-delete-abstract-non-virtual-dtor -Wno-undefined-var-template -Wno-invalid-source-encoding -Wno-enum-compare -Wno-call-to-pure-virtual-from-ctor-dtor -Wno-unused-variable -Wno-unused-private-field -Wno-unused-lambda-capture -Wno-delete-non-abstract-non-virtual-dtor -Wno-braced-scalar-init -Wno-tautological-constant-out-of-range-compare")
set_target_properties(ResInsight PROPERTIES COMPILE_FLAGS "-Wall -Wno-unused-parameter -Wno-reorder -Wno-parentheses -Wno-switch -Wno-delete-abstract-non-virtual-dtor -Wno-undefined-var-template -Wno-invalid-source-encoding -Wno-enum-compare -Wno-call-to-pure-virtual-from-ctor-dtor -Wno-unused-variable -Wno-unused-private-field -Wno-unused-lambda-capture -Wno-delete-non-abstract-non-virtual-dtor -Wno-braced-scalar-init -Wno-tautological-constant-out-of-range-compare")
endif()
endif()

6
ApplicationCode/GrpcInterface/RiaGrpcCallbacks.h
View File

@@ -120,7 +120,7 @@ public:
void onProcessRequest() override;
protected:
virtual QString methodType() const;
virtual QString methodType() const override;
private:
ServerContext m_context;
@@ -160,7 +160,7 @@ public:
void onProcessRequest() override;
protected:
virtual QString methodType() const;
virtual QString methodType() const override;
private:
ServerContext m_context;
@@ -204,7 +204,7 @@ public:
void onFinishRequest() override;
protected:
virtual QString methodType() const;
virtual QString methodType() const override;
private:
ServerContext m_context;

4
ApplicationCode/GrpcInterface/RiaGrpcCaseService.h
View File

@@ -140,10 +140,10 @@ public:
RiaSelectedCellsStateHandler* stateHandler );
grpc::Status GetReservoirBoundingBox( grpc::ServerContext* context,
const rips::CaseRequest* request,
rips::BoundingBox* reply );
rips::BoundingBox* reply ) override;
grpc::Status GetCoarseningInfoArray( grpc::ServerContext* context,
const rips::CaseRequest* request,
rips::CoarseningInfoArray* reply );
rips::CoarseningInfoArray* reply ) override;
std::vector<RiaGrpcCallbackInterface*> createCallbacks() override;
};

8
ApplicationCode/GrpcInterface/RiaGrpcPdmObjectService.cpp
View File

@@ -41,10 +41,10 @@ struct DataHolder : public AbstractDataHolder
size_t dataCount() const override { return data.size(); }
size_t dataSizeOf() const override { return sizeof( typename DataType::value_type ); }
void reserveReplyStorage( rips::PdmObjectGetterReply* reply ) const;
void addValueToReply( size_t valueIndex, rips::PdmObjectGetterReply* reply ) const;
size_t getValuesFromChunk( size_t startIndex, const rips::PdmObjectSetterChunk* chunk );
void applyValuesToProxyField( caf::PdmProxyFieldHandle* proxyField );
void reserveReplyStorage( rips::PdmObjectGetterReply* reply ) const override;
void addValueToReply( size_t valueIndex, rips::PdmObjectGetterReply* reply ) const override;
size_t getValuesFromChunk( size_t startIndex, const rips::PdmObjectSetterChunk* chunk ) override;
void applyValuesToProxyField( caf::PdmProxyFieldHandle* proxyField ) override;
DataType data;
};

4
ApplicationCode/GrpcInterface/RiaGrpcSimulationWellService.h
View File

@@ -47,11 +47,11 @@ class RiaGrpcSimulationWellService final : public rips::SimulationWell::AsyncSer
public:
grpc::Status GetSimulationWellStatus( grpc::ServerContext* context,
const rips::SimulationWellRequest* request,
rips::SimulationWellStatus* reply );
rips::SimulationWellStatus* reply ) override;
grpc::Status GetSimulationWellCells( grpc::ServerContext* context,
const rips::SimulationWellRequest* request,
rips::SimulationWellCellInfoArray* reply );
rips::SimulationWellCellInfoArray* reply ) override;
std::vector<RiaGrpcCallbackInterface*> createCallbacks() override;

2
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.h
View File

@@ -60,7 +60,7 @@ public:
void onGlobalCollectionChanged( const RimAnnotationCollection* globalCollection );
int fontSize() const override;
void updateFonts();
void updateFonts() override;
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override;

2
ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.h
View File

@@ -60,7 +60,7 @@ protected:
void updateCurveAppearance() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
private:
bool isUsingConnectionNumberDepthType() const;

2
ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@@ -127,7 +127,7 @@ public:
cvf::Color3f backgroundColor() const override; // Implementation of RiuViewerToViewInterface
void applyBackgroundColorAndFontChanges();
int fontSize() const;
int fontSize() const override;
void updateFonts() override;
void disableLighting( bool disable );

2
ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
View File

@@ -55,7 +55,7 @@ public:
bool openEclipseGridFile() override;
bool importGridAndResultMetaData( bool showTimeStepFilter );
bool importAsciiInputProperties( const QStringList& fileNames );
bool importAsciiInputProperties( const QStringList& fileNames ) override;
void reloadEclipseGridFile() override;
bool openAndReadActiveCellData( RigEclipseCaseData* mainEclipseCase );

2
ApplicationCode/ProjectDataModel/RimFractureModelCurve.h
View File

@@ -71,7 +71,7 @@ public:
RiaDefines::CurveProperty curveProperty() const override;
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void performDataExtraction( bool* isUsingPseudoLength ) override;

3
ApplicationCode/ProjectDataModel/RimIntersectionCollection.h
View File

@@ -77,7 +77,8 @@ public:
std::vector<RimExtrudedCurveIntersection*> intersections() const;
std::vector<RimBoxIntersection*> intersectionBoxes() const;
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects );
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;

4
ApplicationCode/ProjectDataModel/RimPlot.h
View File

@@ -98,11 +98,11 @@ protected:
static void attachPlotWidgetSignals( RimPlot* plot, RiuQwtPlotWidget* plotWidget );
QWidget* createViewWidget( QWidget* parent = nullptr ) final;
void updateFonts();
void updateFonts() override;
private:
virtual void doRemoveFromCollection() = 0;
virtual void doRenderWindowContent( QPaintDevice* paintDevice );
virtual void doRenderWindowContent( QPaintDevice* paintDevice ) override;
virtual void handleKeyPressEvent( QKeyEvent* event ) {}
virtual void handleWheelEvent( QWheelEvent* event ) {}
virtual RiuQwtPlotWidget* doCreatePlotViewWidget( QWidget* parent ) = 0;

3
ApplicationCode/ProjectDataModel/RimPropertyFilterCollection.h
View File

@@ -46,7 +46,8 @@ public:
void updateDisplayModelNotifyManagedViews( RimPropertyFilter* changedFilter ) const;
virtual void updateIconState() = 0;
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects );
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
protected:
// Overridden methods

2
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h
View File

@@ -118,7 +118,7 @@ public:
};
typedef caf::AppEnum<CategoryColorModeType> CategoryColorModeEnum;
void onRecreateLegend();
void onRecreateLegend() override;
void setColorLegend( RimColorLegend* colorLegend );
RimColorLegend* colorLegend() const;

2
ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.h
View File

@@ -169,7 +169,7 @@ protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly );
bool* useOptionsOnly ) override;
caf::PdmFieldHandle* objectToggleField() override;
void initAfterRead() override;

2
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h
View File

@@ -57,7 +57,7 @@ public:
void setUiValuesFromLegendConfig( const RimTernaryLegendConfig* otherLegendConfig );
void setAutomaticRanges( TernaryArrayIndex ternaryIndex, double globalMin, double globalMax, double localMin, double localMax );
void onRecreateLegend();
void onRecreateLegend() override;
bool showLegend() const;
void setTitle( const QString& title );
const RivTernaryScalarMapper* scalarMapper() const;

3
ApplicationCode/ProjectDataModel/RimViewLinkerCollection.h
View File

@@ -40,7 +40,8 @@ public:
caf::PdmField<bool> isActive;
caf::PdmChildField<RimViewLinker*> viewLinker;
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects );
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
protected:
caf::PdmFieldHandle* objectToggleField() override { return &isActive; }

2
ApplicationCode/ProjectDataModel/RimWellLogCurve.h
View File

@@ -87,7 +87,7 @@ protected:
void updateLegendsInPlot() override;
void setOverrideCurveDataXRange( double minimumValue, double maximumValue );
void calculateCurveDataXRange();
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
private:
cvf::ref<RigWellLogCurveData> m_curveData;

3
ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h
View File

@@ -61,7 +61,8 @@ public:
void removeExtractors( const RigEclipseCaseData* caseData );
void removeExtractors( const RigGeoMechCaseData* caseData );
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects );
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
caf::PdmChildArrayField<RimWellLogPlot*> wellLogPlots;

2
ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.h
View File

@@ -41,7 +41,7 @@ class RimcFractureModelCollection_newFractureModel : public caf::PdmObjectMethod
public:
RimcFractureModelCollection_newFractureModel( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;

2
ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.h
View File

@@ -41,7 +41,7 @@ class RimcFractureModelPlot_exportToFile : public caf::PdmObjectMethod
public:
RimcFractureModelPlot_exportToFile( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;

2
ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.h
View File

@@ -41,7 +41,7 @@ class RimcFractureModelPlotCollection_newFractureModelPlot : public caf::PdmObje
public:
RimcFractureModelPlotCollection_newFractureModelPlot( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;

6
ApplicationCode/ProjectDataModelCommands/RimcProject.h
View File

@@ -36,7 +36,7 @@ class RimProject_importSummaryCase : public caf::PdmObjectMethod
public:
RimProject_importSummaryCase( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
@@ -54,7 +54,7 @@ class RimProject_summaryCase : public caf::PdmObjectMethod
public:
RimProject_summaryCase( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
@@ -73,7 +73,7 @@ class RimProject_surfaceFolder : public caf::PdmObjectMethod
public:
RimProject_surfaceFolder( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;

8
ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.h
View File

@@ -36,7 +36,7 @@ class RimSummaryCase_summaryVectorValues : public caf::PdmObjectMethod
public:
RimSummaryCase_summaryVectorValues( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
@@ -54,7 +54,7 @@ class RimSummaryCase_availableAddresses : public caf::PdmObjectMethod
public:
RimSummaryCase_availableAddresses( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
};
@@ -69,7 +69,7 @@ class RimSummaryCase_availableTimeSteps : public caf::PdmObjectMethod
public:
RimSummaryCase_availableTimeSteps( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
};
@@ -84,7 +84,7 @@ class RimSummaryCase_resampleValues : public caf::PdmObjectMethod
public:
RimSummaryCase_resampleValues( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;

2
ApplicationCode/ProjectDataModelCommands/RimcSummaryPlotCollection.h
View File

@@ -44,7 +44,7 @@ class RimcSummaryPlotCollection_newSummaryPlot : public caf::PdmObjectMethod
public:
RimcSummaryPlotCollection_newSummaryPlot( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;

4
ApplicationCode/ProjectDataModelCommands/RimcSurfaceCollection.h
View File

@@ -43,7 +43,7 @@ class RimcSurfaceCollection_importSurface : public caf::PdmObjectMethod
public:
RimcSurfaceCollection_importSurface( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
@@ -62,7 +62,7 @@ class RimcSurfaceCollection_addFolder : public caf::PdmObjectMethod
public:
RimcSurfaceCollection_addFolder( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
caf::PdmObjectHandle* execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;

2
ApplicationCode/UserInterface/RiuQwtPlotLegend.h
View File

@@ -24,7 +24,7 @@ class RiuQwtPlotLegend : public QwtLegend
Q_OBJECT
public:
RiuQwtPlotLegend( QWidget* parent = nullptr );
void resizeEvent( QResizeEvent* event );
void resizeEvent( QResizeEvent* event ) override;
QSize sizeHint() const override;
public slots:
void updateLegend( const QVariant&, const QList<QwtLegendData>& ) override;