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

#3944 System : Improve code quality using clang-tidy

Browse Source 
Remove redundant virtual and add override
This commit is contained in:
Magne Sjaastad 2019-01-10 15:34:14 +01:00
parent 14cce66d2a
commit 81c3ee5df2
21 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Commands/HoloLensCommands/RicHoloLensSession.h
View File

@ -40,7 +40,7 @@ class RimGridView;
class RicHoloLensSession : public QObject, private RicHoloLensRestResponseHandler class RicHoloLensSession : public QObject, private RicHoloLensRestResponseHandler
{ {
public: public:
~RicHoloLensSession(); ~RicHoloLensSession() override;
static RicHoloLensSession* createSession(const QString& serverUrl, const QString& sessionName, const QByteArray& sessionPinCode, RicHoloLensSessionObserver* sessionObserver); static RicHoloLensSession* createSession(const QString& serverUrl, const QString& sessionName, const QByteArray& sessionPinCode, RicHoloLensSessionObserver* sessionObserver);
static RicHoloLensSession* createDummyFileBackedSession(); static RicHoloLensSession* createDummyFileBackedSession();
@ -53,10 +53,10 @@ public:
private: private:
RicHoloLensSession(); RicHoloLensSession();
virtual void handleSuccessfulCreateSession() override; void handleSuccessfulCreateSession() override;
virtual void handleFailedCreateSession() override; void handleFailedCreateSession() override;
virtual void handleSuccessfulSendMetaData(int metaDataSequenceNumber, const QByteArray& jsonServerResponseString) override; void handleSuccessfulSendMetaData(int metaDataSequenceNumber, const QByteArray& jsonServerResponseString) override;
virtual void handleError(const QString& errMsg, const QString& url, const QString& serverData) override; void handleError(const QString& errMsg, const QString& url, const QString& serverData) override;
static bool parseJsonIntegerArray(const QByteArray& jsonString, std::vector<int>* integerArr); static bool parseJsonIntegerArray(const QByteArray& jsonString, std::vector<int>* integerArr);

2
ApplicationCode/Commands/HoloLensCommands/RicHoloLensSessionManager.h
View File

@ -44,7 +44,7 @@ public:
static void refreshToolbarState(); static void refreshToolbarState();
private: private:
virtual void handleSessionNotification(const RicHoloLensSession* session, Notification notification) override; void handleSessionNotification(const RicHoloLensSession* session, Notification notification) override;
private: private:
RicHoloLensSessionManager(); RicHoloLensSessionManager();

2
ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.h
View File

@ -30,6 +30,6 @@ public:
protected: protected:
bool handlePickEvent(const Ric3DPickEvent& eventObject) override; bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
void notifyUnregistered(); void notifyUnregistered() override;
}; };

4
ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h
View File

@ -38,7 +38,7 @@ class RimPolylinesAnnotation : public caf::PdmObject
public: public:
RimPolylinesAnnotation(); RimPolylinesAnnotation();
~RimPolylinesAnnotation(); ~RimPolylinesAnnotation() override;
virtual cvf::ref<RigPolyLinesData> polyLinesData() = 0; virtual cvf::ref<RigPolyLinesData> polyLinesData() = 0;
virtual bool isEmpty() = 0; virtual bool isEmpty() = 0;
@ -53,7 +53,7 @@ public:
RimPolylineAppearance* appearance() const; RimPolylineAppearance* appearance() const;
protected: protected:
virtual caf::PdmFieldHandle* objectToggleField() override; caf::PdmFieldHandle* objectToggleField() override;
protected: protected:
caf::PdmField<bool> m_isActive; caf::PdmField<bool> m_isActive;

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

@ -63,7 +63,7 @@ public:
protected: protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual caf::PdmFieldHandle* objectToggleField() override; caf::PdmFieldHandle* objectToggleField() override;
caf::PdmFieldHandle* userDescriptionField() override; caf::PdmFieldHandle* userDescriptionField() override;
private: private:

6
ApplicationCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.h
View File

@ -29,14 +29,14 @@ class RimPolylinesFromFileAnnotation : public RimPolylinesAnnotation
public: public:
RimPolylinesFromFileAnnotation(); RimPolylinesFromFileAnnotation();
~RimPolylinesFromFileAnnotation(); ~RimPolylinesFromFileAnnotation() override;
void setFileName(const QString& fileName); void setFileName(const QString& fileName);
QString fileName() const; QString fileName() const;
void readPolyLinesFile(QString * errorMessage); void readPolyLinesFile(QString * errorMessage);
cvf::ref<RigPolyLinesData> polyLinesData() override; cvf::ref<RigPolyLinesData> polyLinesData() override;
virtual bool isEmpty() override; bool isEmpty() override;
void setDescriptionFromFileName(); void setDescriptionFromFileName();
@ -45,7 +45,7 @@ protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private: private:
virtual caf::PdmFieldHandle* userDescriptionField() override; caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmField<QString> m_userDescription; caf::PdmField<QString> m_userDescription;
caf::PdmField<caf::FilePath> m_polyLinesFileName; caf::PdmField<caf::FilePath> m_polyLinesFileName;

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

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

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

@ -63,7 +63,7 @@ public:
protected: protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual caf::PdmFieldHandle* objectToggleField() override; caf::PdmFieldHandle* objectToggleField() override;
caf::PdmFieldHandle* userDescriptionField() override; caf::PdmFieldHandle* userDescriptionField() override;
private: private:

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

@ -71,7 +71,7 @@ protected:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* userDescriptionField() override; caf::PdmFieldHandle* userDescriptionField() override;
virtual caf::PdmFieldHandle* objectToggleField() override; caf::PdmFieldHandle* objectToggleField() override;
private: private:
friend class RicTextAnnotation3dEditor; friend class RicTextAnnotation3dEditor;

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

@ -59,7 +59,7 @@ public:
protected: protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual caf::PdmFieldHandle* objectToggleField() override; caf::PdmFieldHandle* objectToggleField() override;
caf::PdmFieldHandle* userDescriptionField() override; caf::PdmFieldHandle* userDescriptionField() override;
private: private:

4
ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h
View File

@ -39,11 +39,11 @@ class RimUserDefinedPolylinesAnnotation : public RimPolylinesAnnotation
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimUserDefinedPolylinesAnnotation(); RimUserDefinedPolylinesAnnotation();
~RimUserDefinedPolylinesAnnotation(); ~RimUserDefinedPolylinesAnnotation() override;
cvf::ref<RigPolyLinesData> polyLinesData() override; cvf::ref<RigPolyLinesData> polyLinesData() override;
std::vector<RimPolylineTarget*> activeTargets() const; std::vector<RimPolylineTarget*> activeTargets() const;
virtual bool isEmpty() override; bool isEmpty() override;
void appendTarget(const cvf::Vec3d& defaultPos = cvf::Vec3d::ZERO); void appendTarget(const cvf::Vec3d& defaultPos = cvf::Vec3d::ZERO);
void insertTarget(const RimPolylineTarget* targetToInsertBefore, RimPolylineTarget* targetToInsert); void insertTarget(const RimPolylineTarget* targetToInsertBefore, RimPolylineTarget* targetToInsert);

2
ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.h
View File

@ -46,6 +46,6 @@ private:
caf::PdmChildField<RimValveTemplateCollection*> m_valveTemplates; caf::PdmChildField<RimValveTemplateCollection*> m_valveTemplates;
protected: protected:
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
}; };

4
ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h
View File

@ -57,8 +57,8 @@ public:
int valveCount, int valveCount,
const std::vector<double>& locationOfValves); const std::vector<double>& locationOfValves);
protected: protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) 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;
private: private:
int rangeCountFromSpacing() const; int rangeCountFromSpacing() const;

2
ApplicationCode/ProjectDataModel/Completions/RimWellPathAicdParameters.h
View File

@ -49,7 +49,7 @@ class RimWellPathAicdParameters : public caf::PdmObject
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimWellPathAicdParameters(); RimWellPathAicdParameters();
~RimWellPathAicdParameters(); ~RimWellPathAicdParameters() override;
bool isValid() const; bool isValid() const;
bool isOpen() const; bool isOpen() const;

2
ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@ -222,7 +222,7 @@ protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void updateViewWidgetAfterCreation() override; void updateViewWidgetAfterCreation() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override; QWidget* createViewWidget(QWidget* mainWindowParent) override;
void initAfterRead() override; void initAfterRead() override;

2
ApplicationCode/ProjectDataModel/RimContourMapView.h
View File

@ -56,7 +56,7 @@ protected:
caf::PdmFieldHandle* userDescriptionField() override; caf::PdmFieldHandle* userDescriptionField() override;
virtual std::set<RivCellSetEnum> allVisibleFaultGeometryTypes() const override; std::set<RivCellSetEnum> allVisibleFaultGeometryTypes() const override;
QWidget* createViewWidget(QWidget* mainWindowParent) override; QWidget* createViewWidget(QWidget* mainWindowParent) override;

16
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -137,27 +137,27 @@ public:
bool isUsingFormationNames() const override; bool isUsingFormationNames() const override;
virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override; void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override;
virtual std::vector<RimLegendConfig*> legendConfigs() const override; std::vector<RimLegendConfig*> legendConfigs() const override;
cvf::Color4f colorFromCellCategory(RivCellSetEnum geometryType) const; cvf::Color4f colorFromCellCategory(RivCellSetEnum geometryType) const;
void syncronizeLocalAnnotationsFromGlobal(); void syncronizeLocalAnnotationsFromGlobal();
protected: protected:
void initAfterRead() override; void initAfterRead() override;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
virtual void onLoadDataAndUpdate() override; void onLoadDataAndUpdate() override;
caf::PdmFieldHandle* userDescriptionField() override; caf::PdmFieldHandle* userDescriptionField() override;
void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts) override; void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts) override;
bool showActiveCellsOnly() override; bool showActiveCellsOnly() override;
virtual void updateCurrentTimeStep() override; void updateCurrentTimeStep() override;
void updateVisibleGeometriesAndCellColors(); void updateVisibleGeometriesAndCellColors();
void appendWellsAndFracturesToModel(); void appendWellsAndFracturesToModel();
virtual void createDisplayModel() override; void createDisplayModel() override;
RimPropertyFilterCollection* nativePropertyFilterCollection(); RimPropertyFilterCollection* nativePropertyFilterCollection();
virtual std::set<RivCellSetEnum> allVisibleFaultGeometryTypes() const; virtual std::set<RivCellSetEnum> allVisibleFaultGeometryTypes() const;
@ -173,7 +173,7 @@ private:
void updateStaticCellColors() override; void updateStaticCellColors() override;
void updateStaticCellColors(RivCellSetEnum geometryType); void updateStaticCellColors(RivCellSetEnum geometryType);
virtual void updateLegends() override; void updateLegends() override;
void updateMinMaxValuesAndAddLegendToView(QString legendLabel, RimEclipseCellColors* resultColors, RigCaseCellResultsData* cellResultsData); void updateMinMaxValuesAndAddLegendToView(QString legendLabel, RimEclipseCellColors* resultColors, RigCaseCellResultsData* cellResultsData);
void resetLegendsInViewer() override; void resetLegendsInViewer() override;
void updateVirtualConnectionLegendRanges(); void updateVirtualConnectionLegendRanges();

4
ApplicationCode/ProjectDataModel/RimGridCollection.h
View File

@ -37,7 +37,7 @@ class RimGridInfo : public caf::PdmObject
public: public:
RimGridInfo(); RimGridInfo();
~RimGridInfo() {} ~RimGridInfo() override {}
void setName(const QString& name); void setName(const QString& name);
void setEclipseGridIndex(int index); void setEclipseGridIndex(int index);
@ -68,7 +68,7 @@ class RimGridInfoCollection : public caf::PdmObject
public: public:
RimGridInfoCollection(); RimGridInfoCollection();
~RimGridInfoCollection() {} ~RimGridInfoCollection() override {}
bool isActive() const; bool isActive() const;
void addGridInfo(RimGridInfo * gridInfo); void addGridInfo(RimGridInfo * gridInfo);

2
ApplicationCode/ProjectDataModel/RimNameConfig.h
View File

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

2
ApplicationCode/ProjectDataModel/RimOilField.h
View File

@ -69,7 +69,7 @@ public:
caf::PdmChildField<RimMeasurement*> measurement; caf::PdmChildField<RimMeasurement*> measurement;
protected: protected:
virtual void initAfterRead() override; void initAfterRead() override;
private: private:
caf::PdmChildField<RimFractureTemplateCollection*> m_fractureTemplateCollection_OBSOLETE; caf::PdmChildField<RimFractureTemplateCollection*> m_fractureTemplateCollection_OBSOLETE;

2
ApplicationCode/ReservoirDataModel/RigPolyLinesData.h
View File

@ -32,7 +32,7 @@ class RigPolyLinesData : public cvf::Object
{ {
public: public:
RigPolyLinesData(); RigPolyLinesData();
~RigPolyLinesData(); ~RigPolyLinesData() override;
const std::vector<std::vector<cvf::Vec3d> >& polyLines() const { return m_polylines;} const std::vector<std::vector<cvf::Vec3d> >& polyLines() const { return m_polylines;}
void setPolyLines(const std::vector<std::vector<cvf::Vec3d> >& polyLines) { m_polylines = polyLines;} void setPolyLines(const std::vector<std::vector<cvf::Vec3d> >& polyLines) { m_polylines = polyLines;}