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 clang-tidy : Apply clang-tidy on caf

Browse Source
This commit is contained in:
Magne Sjaastad 2019-01-10 22:13:19 +01:00
parent cee966a6d1
commit 65ee55c96d
28 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Fwk/AppFwk/CommonCode/cafEffectGenerator.h
View File

@ -141,11 +141,11 @@ public:
void enableLighting(bool enableLighting) { m_enableLighting = enableLighting; }
protected:
virtual bool isEqual(const EffectGenerator* other) const;
virtual EffectGenerator* copy() const;
bool isEqual(const EffectGenerator* other) const override;
EffectGenerator* copy() const override;
virtual void updateForShaderBasedRendering(cvf::Effect* effect) const;
virtual void updateForFixedFunctionRendering(cvf::Effect* effect) const;
void updateForShaderBasedRendering(cvf::Effect* effect) const override;
void updateForFixedFunctionRendering(cvf::Effect* effect) const override;
private:
void updateCommonEffect(cvf::Effect* effect) const;
@ -183,11 +183,11 @@ public:
static bool isImagesEqual(const cvf::TextureImage* texImg1, const cvf::TextureImage* texImg2);
protected:
virtual bool isEqual(const EffectGenerator* other) const;
virtual EffectGenerator* copy() const;
bool isEqual(const EffectGenerator* other) const override;
EffectGenerator* copy() const override;
virtual void updateForShaderBasedRendering(cvf::Effect* effect) const;
virtual void updateForFixedFunctionRendering(cvf::Effect* effect) const;
void updateForShaderBasedRendering(cvf::Effect* effect) const override;
void updateForFixedFunctionRendering(cvf::Effect* effect) const override;
private:
void updateCommonEffect(cvf::Effect* effect) const;
@ -219,11 +219,11 @@ public:
void setUndefinedColor(cvf::Color3f color) { m_undefinedColor = color; }
protected:
virtual bool isEqual(const EffectGenerator* other) const;
virtual EffectGenerator* copy() const;
bool isEqual(const EffectGenerator* other) const override;
EffectGenerator* copy() const override;
virtual void updateForShaderBasedRendering(cvf::Effect* effect) const;
virtual void updateForFixedFunctionRendering(cvf::Effect* effect) const;
void updateForShaderBasedRendering(cvf::Effect* effect) const override;
void updateForFixedFunctionRendering(cvf::Effect* effect) const override;
private:
void updateCommonEffect(cvf::Effect* effect) const;
@ -249,11 +249,11 @@ public:
void setLineWidth(float lineWidth);
protected:
virtual bool isEqual(const EffectGenerator* other) const;
virtual EffectGenerator* copy() const;
bool isEqual(const EffectGenerator* other) const override;
EffectGenerator* copy() const override;
virtual void updateForShaderBasedRendering(cvf::Effect* effect) const;
virtual void updateForFixedFunctionRendering(cvf::Effect* effect) const;
void updateForShaderBasedRendering(cvf::Effect* effect) const override;
void updateForFixedFunctionRendering(cvf::Effect* effect) const override;
private:
cvf::Color3f m_color;
@ -273,11 +273,11 @@ public:
TextEffectGenerator();
protected:
virtual bool isEqual(const EffectGenerator* other) const;
virtual EffectGenerator* copy() const;
bool isEqual(const EffectGenerator* other) const override;
EffectGenerator* copy() const override;
virtual void updateForShaderBasedRendering(cvf::Effect* effect) const;
virtual void updateForFixedFunctionRendering(cvf::Effect* effect) const;
void updateForShaderBasedRendering(cvf::Effect* effect) const override;
void updateForFixedFunctionRendering(cvf::Effect* effect) const override;
};
@ -292,10 +292,10 @@ public:
VectorEffectGenerator();
protected:
virtual bool isEqual(const EffectGenerator* other) const;
virtual EffectGenerator* copy() const;
bool isEqual(const EffectGenerator* other) const override;
EffectGenerator* copy() const override;
virtual void updateForShaderBasedRendering(cvf::Effect* effect) const;
virtual void updateForFixedFunctionRendering(cvf::Effect* effect) const;
void updateForShaderBasedRendering(cvf::Effect* effect) const override;
void updateForFixedFunctionRendering(cvf::Effect* effect) const override;
};
}

2
Fwk/AppFwk/CommonCode/cafMessagePanel.h
View File

@ -63,7 +63,7 @@ public:
void showWarning(QString warn);
void showError(QString error);
virtual QSize sizeHint () const;
QSize sizeHint () const override;
bool isVisibleToUser();
private:

2
Fwk/AppFwk/CommonCode/cafMouseState.cpp
View File

@ -42,7 +42,7 @@
#include <QMouseEvent>
#include <QGraphicsSceneMouseEvent>
#include <math.h>
#include <cmath>
namespace caf {

2
Fwk/AppFwk/CommonCode/cvfStructGridGeometryGenerator.h
View File

@ -165,7 +165,7 @@ class StructGridGeometryGenerator : public Object
{
public:
explicit StructGridGeometryGenerator(const StructGridInterface* grid, bool useOpenMP);
~StructGridGeometryGenerator();
~StructGridGeometryGenerator() override;
// Setup methods

2
Fwk/AppFwk/cafProjectDataModel/cafFactory.h
View File

@ -178,7 +178,7 @@ namespace caf
class ObjectCreator : public ObjectCreatorBase
{
public:
virtual BaseType * create() { return new TypeToCreate(); }
BaseType * create() override { return new TypeToCreate(); }
};
// Map to store factory

8
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmDataValueField.h
View File

@ -66,7 +66,7 @@ public:
PdmDataValueField() {}
PdmDataValueField(const PdmDataValueField& other) { m_fieldValue = other.m_fieldValue; }
explicit PdmDataValueField(const DataType& fieldValue) { m_fieldValue = fieldValue; }
virtual ~PdmDataValueField() {}
~PdmDataValueField() override {}
// Assignment
@ -81,9 +81,9 @@ public:
// Implementation of PdmValueField interface
virtual QVariant toQVariant() const { CAF_ASSERT(isInitializedByInitFieldMacro()); return PdmValueFieldSpecialization<DataType>::convert(m_fieldValue); }
virtual void setFromQVariant(const QVariant& variant) { CAF_ASSERT(isInitializedByInitFieldMacro()); PdmValueFieldSpecialization<DataType>::setFromVariant(variant, m_fieldValue); }
virtual bool isReadOnly() const { return false; }
QVariant toQVariant() const override { CAF_ASSERT(isInitializedByInitFieldMacro()); return PdmValueFieldSpecialization<DataType>::convert(m_fieldValue); }
void setFromQVariant(const QVariant& variant) override { CAF_ASSERT(isInitializedByInitFieldMacro()); PdmValueFieldSpecialization<DataType>::setFromVariant(variant, m_fieldValue); }
bool isReadOnly() const override { return false; }
// Access operators

8
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmProxyValueField.h
View File

@ -23,7 +23,7 @@ class PdmProxyValueField : public PdmValueField
public:
typedef DataType FieldDataType;
PdmProxyValueField() { m_valueSetter = NULL; m_valueGetter = NULL; }
virtual ~PdmProxyValueField() { if (m_valueSetter) delete m_valueSetter; if (m_valueGetter) delete m_valueGetter; }
~PdmProxyValueField() override { if (m_valueSetter) delete m_valueSetter; if (m_valueGetter) delete m_valueGetter; }
// Assignment
@ -36,9 +36,9 @@ public:
// Implementation of PdmValueField interface
virtual QVariant toQVariant() const { DataType val = value(); return PdmValueFieldSpecialization<DataType>::convert(val); }
virtual void setFromQVariant(const QVariant& variant) { DataType val; PdmValueFieldSpecialization<DataType>::setFromVariant(variant, val); setValue(val); }
virtual bool isReadOnly() const { if (!m_valueSetter) { return true; } else { return false; } }
QVariant toQVariant() const override { DataType val = value(); return PdmValueFieldSpecialization<DataType>::convert(val); }
void setFromQVariant(const QVariant& variant) override { DataType val; PdmValueFieldSpecialization<DataType>::setFromVariant(variant, val); setValue(val); }
bool isReadOnly() const override { if (!m_valueSetter) { return true; } else { return false; } }
// Access operators

10
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.h
View File

@ -39,7 +39,7 @@ public:
PdmPtrField() : m_isResolved(false) { }
explicit PdmPtrField(const DataTypePtr& fieldValue);
virtual ~PdmPtrField();
~PdmPtrField() override;
// Assignment
@ -52,9 +52,9 @@ public:
void setValue(const DataTypePtr& fieldValue);
// QVariant access
virtual QVariant toQVariant() const override;
virtual void setFromQVariant(const QVariant& variant) override;
virtual bool isReadOnly() const override { return false; }
QVariant toQVariant() const override;
void setFromQVariant(const QVariant& variant) override;
bool isReadOnly() const override { return false; }
// Access operators
@ -66,7 +66,7 @@ public:
// Ptr referenced objects
virtual void ptrReferencedObjects(std::vector<PdmObjectHandle*>* objectsToFill);
void ptrReferencedObjects(std::vector<PdmObjectHandle*>* objectsToFill) override;
private:

2
Fwk/AppFwk/cafTensor/cafTensor3.inl
View File

@ -22,7 +22,7 @@
#include "cvfSystem.h"
#include <algorithm>
#include "cvfMatrix3.h"
#include <math.h>
#include <cmath>
namespace caf {

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
View File

@ -93,7 +93,7 @@ public:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void keyPressEvent(QKeyEvent *event)
void keyPressEvent(QKeyEvent *event) override
{
QTreeView::keyPressEvent(event);

4
Fwk/AppFwk/cafViewer/cafCadNavigation.h
View File

@ -46,9 +46,9 @@ class CadNavigation : public TrackBallBasedNavigation
{
public:
CadNavigation();
virtual ~CadNavigation();
~CadNavigation() override;
protected:
virtual bool handleInputEvent(QInputEvent* inputEvent);
bool handleInputEvent(QInputEvent* inputEvent) override;
};
} // End namespace caf

12
Fwk/AppFwk/cafViewer/cafCeetronNavigation.h
View File

@ -50,14 +50,14 @@ class CeetronNavigation : public NavigationPolicy
{
public:
CeetronNavigation();
virtual ~CeetronNavigation();
~CeetronNavigation() override;
protected:
// General navigation policy reimplememtation
virtual void init();
virtual bool handleInputEvent(QInputEvent* inputEvent);
virtual void setView( const cvf::Vec3d& alongDirection, const cvf::Vec3d& upDirection );
virtual cvf::Vec3d pointOfInterest();
virtual void setPointOfInterest(cvf::Vec3d poi);
void init() override;
bool handleInputEvent(QInputEvent* inputEvent) override;
void setView( const cvf::Vec3d& alongDirection, const cvf::Vec3d& upDirection ) override;
cvf::Vec3d pointOfInterest() override;
void setPointOfInterest(cvf::Vec3d poi) override;
// Ceetron navigation stuff
void mouseMoveEvent(QMouseEvent* event);

4
Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.h
View File

@ -44,9 +44,9 @@ class CeetronPlusNavigation : public TrackBallBasedNavigation
{
public:
CeetronPlusNavigation();
virtual ~CeetronPlusNavigation();
~CeetronPlusNavigation() override;
protected:
virtual bool handleInputEvent(QInputEvent* inputEvent);
bool handleInputEvent(QInputEvent* inputEvent) override;
};
} // End namespace caf

2
Fwk/AppFwk/cafViewer/cafNavigationPolicy.h
View File

@ -57,7 +57,7 @@ class NavigationPolicy : public cvf::Object
{
public:
NavigationPolicy();
virtual ~NavigationPolicy();
~NavigationPolicy() override;
friend class Viewer;
public: // protected: // Should be protected but this friending does not work on gcc 4.1.2

10
Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.h
View File

@ -59,17 +59,17 @@ class TrackBallBasedNavigation: public NavigationPolicy
{
public:
TrackBallBasedNavigation();
virtual ~TrackBallBasedNavigation();
~TrackBallBasedNavigation() override;
void enableEventEating(bool enable) { m_consumeEvents = enable; }
void enableRotation(bool enable) { m_isRotationEnabled = enable; }
protected:
// General navigation policy overrides
virtual void init();
void init() override;
virtual void setView( const cvf::Vec3d& alongDirection, const cvf::Vec3d& upDirection );
virtual cvf::Vec3d pointOfInterest();
virtual void setPointOfInterest(cvf::Vec3d poi);
void setView( const cvf::Vec3d& alongDirection, const cvf::Vec3d& upDirection ) override;
cvf::Vec3d pointOfInterest() override;
void setPointOfInterest(cvf::Vec3d poi) override;
void updatePointOfInterestDuringZoomIfNecessary(int zoomX, int zoomY);
void forcePointOfInterestUpdateDuringNextWheelZoom();

6
Fwk/AppFwk/cafViewer/cafViewer.cpp
View File

@ -90,13 +90,13 @@ public:
m_uniformSet->setUniform(m_headlightPosition.p());
}
virtual ~GlobalViewerDynUniformSet() {}
~GlobalViewerDynUniformSet() override {}
void setHeadLightPosition(const cvf::Vec3f posRelativeToCamera) { m_headlightPosition->set(posRelativeToCamera);}
virtual cvf::UniformSet* uniformSet() { return m_uniformSet.p(); }
virtual void update(cvf::Rendering* rendering){};
cvf::UniformSet* uniformSet() override { return m_uniformSet.p(); }
void update(cvf::Rendering* rendering) override{};
private:
cvf::ref<cvf::UniformSet> m_uniformSet;

10
Fwk/AppFwk/cafViewer/cafViewer.h
View File

@ -81,7 +81,7 @@ class Viewer : public caf::OpenGLWidget
Q_OBJECT
public:
Viewer(const QGLFormat& format, QWidget* parent);
~Viewer();
~Viewer() override;
QWidget* layoutWidget() { return m_layoutWidget; } // Use this when putting it into something
cvf::Camera* mainCamera();
@ -159,7 +159,7 @@ public slots:
virtual void slotEndAnimation();
public:
virtual QSize sizeHint() const;
QSize sizeHint() const override;
protected:
// Method to override if painting directly on the OpenGl Canvas is needed.
@ -169,11 +169,11 @@ protected:
virtual void optimizeClippingPlanes();
// Standard overrides. Not for overriding
virtual void resizeGL(int width, int height);
virtual void paintEvent(QPaintEvent* event);
void resizeGL(int width, int height) override;
void paintEvent(QPaintEvent* event) override;
// Support the navigation policy concept
virtual bool event( QEvent* e );
bool event( QEvent* e ) override;
cvf::ref<caf::NavigationPolicy> m_navigationPolicy;
bool m_navigationPolicyEnabled;

2
Fwk/AppFwk/cafVizExtensions/cafBoxManipulatorGeometryGenerator.h
View File

@ -23,7 +23,7 @@ class BoxManipulatorGeometryGenerator : public cvf::Object
{
public:
BoxManipulatorGeometryGenerator();
~BoxManipulatorGeometryGenerator();
~BoxManipulatorGeometryGenerator() override;
void setOrigin(const cvf::Vec3d& origin);
void setSize(const cvf::Vec3d& size);

2
Fwk/AppFwk/cafVizExtensions/cafBoxManipulatorPartManager.h
View File

@ -49,7 +49,7 @@ public:
public:
BoxManipulatorPartManager();
~BoxManipulatorPartManager();
~BoxManipulatorPartManager() override;
void setOrigin(const cvf::Vec3d& origin);
void setSize(const cvf::Vec3d& size);

2
Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.h
View File

@ -28,7 +28,7 @@ class CategoryLegend : public caf::TitledOverlayFrame
{
public:
CategoryLegend(cvf::Font* font, const CategoryMapper* categoryMapper);
virtual ~CategoryLegend();
~CategoryLegend() override;
size_t categoryCount() const;

12
Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.h
View File

@ -30,14 +30,14 @@ public:
// Overrides used from legend
virtual cvf::Vec2f mapToTextureCoord(double scalarValue) const;
virtual bool updateTexture(cvf::TextureImage* image) const;
cvf::Vec2f mapToTextureCoord(double scalarValue) const override;
bool updateTexture(cvf::TextureImage* image) const override;
virtual cvf::Color3ub mapToColor(double normalizedValue) const;
cvf::Color3ub mapToColor(double normalizedValue) const override;
virtual void majorTickValues(std::vector<double>* domainValues) const;
virtual double normalizedValue(double domainValue) const;
virtual double domainValue(double normalizedValue) const;
void majorTickValues(std::vector<double>* domainValues) const override;
double normalizedValue(double domainValue) const override;
double domainValue(double normalizedValue) const override;
private:
friend class CategoryLegend;

10
Fwk/AppFwk/cafVizExtensions/cafFixedAtlasFont.h
View File

@ -73,12 +73,12 @@ public:
public:
explicit FixedAtlasFont(FontSize size);
virtual ~FixedAtlasFont();
~FixedAtlasFont() override;
virtual const cvf::String& name() const;
virtual cvf::ref<cvf::Glyph> getGlyph(wchar_t character);
virtual cvf::uint advance(wchar_t character, wchar_t nextCharacter);
virtual bool isEmpty();
const cvf::String& name() const override;
cvf::ref<cvf::Glyph> getGlyph(wchar_t character) override;
cvf::uint advance(wchar_t character, wchar_t nextCharacter) override;
bool isEmpty() override;
private:
// Load/unload font

2
Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp
View File

@ -2,7 +2,7 @@
#include "cafHexGridIntersectionTools.h"
#include "cvfPlane.h"
#include <math.h>
#include <cmath>
#include <algorithm>

4
Fwk/AppFwk/cafVizExtensions/cafOverlayScalarMapperLegend.h
View File

@ -78,7 +78,7 @@ class OverlayScalarMapperLegend : public caf::TitledOverlayFrame
public:
OverlayScalarMapperLegend(Font* font);
virtual ~OverlayScalarMapperLegend();
~OverlayScalarMapperLegend() override;
void setScalarMapper(const ScalarMapper* scalarMapper);
@ -86,7 +86,7 @@ public:
enum NumberFormat { AUTO, SCIENTIFIC, FIXED};
void setTickFormat(NumberFormat format);
virtual cvf::Vec2ui preferredSize() override;
cvf::Vec2ui preferredSize() override;
protected:
void render(OpenGLContext* oglContext, const Vec2i& position, const Vec2ui& size) override;

4
Fwk/AppFwk/cafVizExtensions/cafOverlayScaleLegend.h
View File

@ -80,7 +80,7 @@ public:
public:
OverlayScaleLegend(Font* font);
virtual ~OverlayScaleLegend();
~OverlayScaleLegend() override;
void setTickPrecision(int precision);
enum NumberFormat { AUTO, SCIENTIFIC, FIXED};
@ -88,7 +88,7 @@ public:
void setOrientation(Orientation orientation);
Orientation orientation() const;
virtual cvf::Vec2ui preferredSize() override;
cvf::Vec2ui preferredSize() override;
void setDisplayCoordTransform(const caf::DisplayCoordTransform* displayCoordTransform);
void updateFromCamera(const Camera* camera);

4
Fwk/AppFwk/cafVizExtensions/cafTitledOverlayFrame.h
View File

@ -56,7 +56,7 @@ namespace caf {
{
public:
TitledOverlayFrame(cvf::Font* font, unsigned int width = 100, unsigned int height = 200);
virtual ~TitledOverlayFrame();
~TitledOverlayFrame() override;
void setRenderSize(const cvf::Vec2ui& size);
cvf::Vec2ui renderSize() const;
@ -85,7 +85,7 @@ namespace caf {
cvf::Font* font();
private:
cvf::Vec2ui sizeHint() override final; // Will return the size to use for rendering, and is really not a hint.
cvf::Vec2ui sizeHint() final; // Will return the size to use for rendering, and is really not a hint.
cvf::Vec2ui m_renderSize; // The rendered size of the color legend area in pixels
cvf::Color3f m_textColor;

6
Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp
View File

@ -128,8 +128,8 @@ public:
CVF_ASSERT(renderConfiguration);
m_renderConfiguration = renderConfiguration;
}
virtual cvf::UniformSet* uniformSet() { return nullptr; }
virtual void update(cvf::Rendering* rendering)
cvf::UniformSet* uniformSet() override { return nullptr; }
void update(cvf::Rendering* rendering) override
{
m_renderConfiguration->updateEffectsForRendering(rendering);
}
@ -151,7 +151,7 @@ public:
m_isOpaquePass = isOpaquePass;
}
virtual void sort(cvf::RenderQueue* renderQueue) const
void sort(cvf::RenderQueue* renderQueue) const override
{
using namespace cvf;
std::vector<RenderItem*>* renderItems = renderQueue->renderItemsForSorting();

12
Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.h
View File

@ -28,7 +28,7 @@ namespace caf
{
public:
TransparentWBRenderConfiguration();
virtual ~TransparentWBRenderConfiguration();
~TransparentWBRenderConfiguration() override;
void resize(int width, int height);
void prepareForRendering(); // UpdateCameras and scene ...
@ -79,14 +79,14 @@ namespace caf
{
public:
WBTransparencySurfaceEffectGenerator(const cvf::Color4f& color, caf::PolygonOffset polygonOffset, bool useSpecular);
~WBTransparencySurfaceEffectGenerator();
~WBTransparencySurfaceEffectGenerator() override;
protected:
virtual bool isEqual(const EffectGenerator* other) const;
virtual EffectGenerator* copy() const;
bool isEqual(const EffectGenerator* other) const override;
EffectGenerator* copy() const override;
virtual void updateForShaderBasedRendering(cvf::Effect* effect) const;
virtual void updateForFixedFunctionRendering(cvf::Effect* effect) const;
void updateForShaderBasedRendering(cvf::Effect* effect) const override;
void updateForFixedFunctionRendering(cvf::Effect* effect) const override;
private:
void updateCommonEffect(cvf::Effect* effect) const;