Remove virtual keyword from RimWellPathCompletionInterface overrides.

* Stop them from being overriden by child classes.
This commit is contained in:
Gaute Lindkvist 2018-10-10 08:44:26 +02:00
parent 0565e6e7e1
commit 88c4aa2591
4 changed files with 20 additions and 20 deletions

View File

@ -106,11 +106,11 @@ public:
virtual cvf::BoundingBox boundingBoxInDomainCoords() const override; virtual cvf::BoundingBox boundingBoxInDomainCoords() const override;
// Overrides from RimWellPathCompletionsInterface // Overrides from RimWellPathCompletionsInterface
virtual RiaDefines::WellPathComponentType componentType() const override; RiaDefines::WellPathComponentType componentType() const override;
virtual double startMD() const override; double startMD() const override;
virtual double endMD() const override; double endMD() const override;
virtual QString componentLabel() const override; QString componentLabel() const override;
virtual QString componentTypeLabel() const override; QString componentTypeLabel() const override;
public: public:

View File

@ -129,11 +129,11 @@ public:
friend class RimFractureTemplate; friend class RimFractureTemplate;
// RimWellPathCompletionsInterface overrides. // RimWellPathCompletionsInterface overrides.
virtual RiaDefines::WellPathComponentType componentType() const override; RiaDefines::WellPathComponentType componentType() const override;
virtual double startMD() const override; double startMD() const override;
virtual double endMD() const override; double endMD() const override;
virtual QString componentLabel() const override; QString componentLabel() const override;
virtual QString componentTypeLabel() const override; QString componentTypeLabel() const override;
protected: protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;

View File

@ -61,11 +61,11 @@ public:
void setUnitSystemSpecificDefaults(); void setUnitSystemSpecificDefaults();
// RimWellPathCompletionInterface overrides // RimWellPathCompletionInterface overrides
virtual RiaDefines::WellPathComponentType componentType() const override; RiaDefines::WellPathComponentType componentType() const override;
virtual double startMD() const; double startMD() const;
virtual double endMD() const; double endMD() const;
virtual QString componentLabel() const override; QString componentLabel() const override;
virtual QString componentTypeLabel() const override; QString componentTypeLabel() const override;
protected: protected:
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;

View File

@ -46,11 +46,11 @@ public:
void setDepthsFromWellPath(const RimWellPath* wellPath); void setDepthsFromWellPath(const RimWellPath* wellPath);
// Overrides from RimWellPathCompletionInterface // Overrides from RimWellPathCompletionInterface
virtual RiaDefines::WellPathComponentType componentType() const override; RiaDefines::WellPathComponentType componentType() const override;
virtual double startMD() const override; double startMD() const override;
virtual double endMD() const override; double endMD() const override;
virtual QString componentLabel() const override; QString componentLabel() const override;
virtual QString componentTypeLabel() const override; QString componentTypeLabel() const override;
private: private:
bool isDiameterSupported() const; bool isDiameterSupported() const;