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
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -63,7 +63,7 @@ public:
protected:
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;
private:

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

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

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

@@ -63,7 +63,7 @@ public:
protected:
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;
private:

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

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

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

@@ -59,7 +59,7 @@ public:
protected:
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;
private:

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

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