From 81c3ee5df22ab6d35ecc855f43f837ab4d9517c8 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 10 Jan 2019 15:34:14 +0100 Subject: [PATCH] #3944 System : Improve code quality using clang-tidy Remove redundant virtual and add override --- .../HoloLensCommands/RicHoloLensSession.h | 10 +++++----- .../HoloLensCommands/RicHoloLensSessionManager.h | 2 +- .../RicMeasurementPickEventHandler.h | 2 +- .../Annotations/RimPolylinesAnnotation.h | 4 ++-- .../Annotations/RimPolylinesAnnotationInView.h | 2 +- .../Annotations/RimPolylinesFromFileAnnotation.h | 6 +++--- .../Annotations/RimReachCircleAnnotation.h | 2 +- .../Annotations/RimReachCircleAnnotationInView.h | 2 +- .../Annotations/RimTextAnnotation.h | 2 +- .../Annotations/RimTextAnnotationInView.h | 2 +- .../RimUserDefinedPolylinesAnnotation.h | 4 ++-- .../RimCompletionTemplateCollection.h | 2 +- .../Completions/RimMultipleValveLocations.h | 4 ++-- .../Completions/RimWellPathAicdParameters.h | 2 +- ApplicationCode/ProjectDataModel/Rim3dView.h | 2 +- .../ProjectDataModel/RimContourMapView.h | 2 +- .../ProjectDataModel/RimEclipseView.h | 16 ++++++++-------- .../ProjectDataModel/RimGridCollection.h | 4 ++-- ApplicationCode/ProjectDataModel/RimNameConfig.h | 2 +- ApplicationCode/ProjectDataModel/RimOilField.h | 2 +- .../ReservoirDataModel/RigPolyLinesData.h | 2 +- 21 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensSession.h b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensSession.h index 94f0b89ae4..5ba8e81732 100644 --- a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensSession.h +++ b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensSession.h @@ -40,7 +40,7 @@ class RimGridView; class RicHoloLensSession : public QObject, private RicHoloLensRestResponseHandler { public: - ~RicHoloLensSession(); + ~RicHoloLensSession() override; static RicHoloLensSession* createSession(const QString& serverUrl, const QString& sessionName, const QByteArray& sessionPinCode, RicHoloLensSessionObserver* sessionObserver); static RicHoloLensSession* createDummyFileBackedSession(); @@ -53,10 +53,10 @@ public: private: RicHoloLensSession(); - virtual void handleSuccessfulCreateSession() override; - virtual void handleFailedCreateSession() override; - virtual void handleSuccessfulSendMetaData(int metaDataSequenceNumber, const QByteArray& jsonServerResponseString) override; - virtual void handleError(const QString& errMsg, const QString& url, const QString& serverData) override; + void handleSuccessfulCreateSession() override; + void handleFailedCreateSession() override; + void handleSuccessfulSendMetaData(int metaDataSequenceNumber, const QByteArray& jsonServerResponseString) override; + void handleError(const QString& errMsg, const QString& url, const QString& serverData) override; static bool parseJsonIntegerArray(const QByteArray& jsonString, std::vector* integerArr); diff --git a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensSessionManager.h b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensSessionManager.h index 74a3257fdc..6a19b775af 100644 --- a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensSessionManager.h +++ b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensSessionManager.h @@ -44,7 +44,7 @@ public: static void refreshToolbarState(); private: - virtual void handleSessionNotification(const RicHoloLensSession* session, Notification notification) override; + void handleSessionNotification(const RicHoloLensSession* session, Notification notification) override; private: RicHoloLensSessionManager(); diff --git a/ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.h b/ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.h index 9fcec82e8a..769ddd03a4 100644 --- a/ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.h +++ b/ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.h @@ -30,6 +30,6 @@ public: protected: bool handlePickEvent(const Ric3DPickEvent& eventObject) override; - void notifyUnregistered(); + void notifyUnregistered() override; }; diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h b/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h index c19a6ab188..132e2f6625 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h @@ -38,7 +38,7 @@ class RimPolylinesAnnotation : public caf::PdmObject public: RimPolylinesAnnotation(); - ~RimPolylinesAnnotation(); + ~RimPolylinesAnnotation() override; virtual cvf::ref 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 m_isActive; diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.h b/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.h index 153ff6d2b7..8d2b97d838 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.h @@ -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: diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.h b/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.h index 85faaec9de..2d45f02ceb 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.h @@ -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 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 m_userDescription; caf::PdmField m_polyLinesFileName; diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h b/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h index 7b4013d104..c0cc6b698b 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h @@ -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 m_isActive; diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.h b/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.h index ae25dcbdb5..86aa6f45d0 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.h @@ -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: diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.h b/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.h index b9de7d1a39..e46c3e24ee 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.h @@ -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; diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotationInView.h b/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotationInView.h index 390cce65d6..535eef561b 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotationInView.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotationInView.h @@ -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: diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h b/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h index 308e1a968e..4be8695567 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h @@ -39,11 +39,11 @@ class RimUserDefinedPolylinesAnnotation : public RimPolylinesAnnotation CAF_PDM_HEADER_INIT; public: RimUserDefinedPolylinesAnnotation(); - ~RimUserDefinedPolylinesAnnotation(); + ~RimUserDefinedPolylinesAnnotation() override; cvf::ref polyLinesData() override; std::vector 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); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.h b/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.h index 6b7f5c00e3..ea61683123 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.h @@ -46,6 +46,6 @@ private: caf::PdmChildField m_valveTemplates; protected: - virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; + void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; }; diff --git a/ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h b/ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h index 755015505b..d96b44aa90 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h @@ -57,8 +57,8 @@ public: int valveCount, const std::vector& locationOfValves); protected: - virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; - virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; + void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; + void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; private: int rangeCountFromSpacing() const; diff --git a/ApplicationCode/ProjectDataModel/Completions/RimWellPathAicdParameters.h b/ApplicationCode/ProjectDataModel/Completions/RimWellPathAicdParameters.h index e365975fa7..82fbf64233 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathAicdParameters.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathAicdParameters.h @@ -49,7 +49,7 @@ class RimWellPathAicdParameters : public caf::PdmObject CAF_PDM_HEADER_INIT; public: RimWellPathAicdParameters(); - ~RimWellPathAicdParameters(); + ~RimWellPathAicdParameters() override; bool isValid() const; bool isOpen() const; diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.h b/ApplicationCode/ProjectDataModel/Rim3dView.h index 4c685361af..126c335dac 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dView.h +++ b/ApplicationCode/ProjectDataModel/Rim3dView.h @@ -222,7 +222,7 @@ protected: void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; - virtual void updateViewWidgetAfterCreation() override; + void updateViewWidgetAfterCreation() override; QWidget* createViewWidget(QWidget* mainWindowParent) override; void initAfterRead() override; diff --git a/ApplicationCode/ProjectDataModel/RimContourMapView.h b/ApplicationCode/ProjectDataModel/RimContourMapView.h index 2a6f4121a2..4853052806 100644 --- a/ApplicationCode/ProjectDataModel/RimContourMapView.h +++ b/ApplicationCode/ProjectDataModel/RimContourMapView.h @@ -56,7 +56,7 @@ protected: caf::PdmFieldHandle* userDescriptionField() override; - virtual std::set allVisibleFaultGeometryTypes() const override; + std::set allVisibleFaultGeometryTypes() const override; QWidget* createViewWidget(QWidget* mainWindowParent) override; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.h b/ApplicationCode/ProjectDataModel/RimEclipseView.h index 5a8c1eb146..57a590ab62 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.h @@ -137,27 +137,27 @@ public: bool isUsingFormationNames() const override; - virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override; + void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override; - virtual std::vector legendConfigs() const override; + std::vector legendConfigs() const override; cvf::Color4f colorFromCellCategory(RivCellSetEnum geometryType) const; void syncronizeLocalAnnotationsFromGlobal(); protected: void initAfterRead() override; - virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; - virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; - virtual void onLoadDataAndUpdate() override; + void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; + void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; + void onLoadDataAndUpdate() override; caf::PdmFieldHandle* userDescriptionField() override; void createPartCollectionFromSelection(cvf::Collection* parts) override; bool showActiveCellsOnly() override; - virtual void updateCurrentTimeStep() override; + void updateCurrentTimeStep() override; void updateVisibleGeometriesAndCellColors(); void appendWellsAndFracturesToModel(); - virtual void createDisplayModel() override; + void createDisplayModel() override; RimPropertyFilterCollection* nativePropertyFilterCollection(); virtual std::set allVisibleFaultGeometryTypes() const; @@ -173,7 +173,7 @@ private: void updateStaticCellColors() override; void updateStaticCellColors(RivCellSetEnum geometryType); - virtual void updateLegends() override; + void updateLegends() override; void updateMinMaxValuesAndAddLegendToView(QString legendLabel, RimEclipseCellColors* resultColors, RigCaseCellResultsData* cellResultsData); void resetLegendsInViewer() override; void updateVirtualConnectionLegendRanges(); diff --git a/ApplicationCode/ProjectDataModel/RimGridCollection.h b/ApplicationCode/ProjectDataModel/RimGridCollection.h index 273832d2f1..b109ede592 100644 --- a/ApplicationCode/ProjectDataModel/RimGridCollection.h +++ b/ApplicationCode/ProjectDataModel/RimGridCollection.h @@ -37,7 +37,7 @@ class RimGridInfo : public caf::PdmObject public: RimGridInfo(); - ~RimGridInfo() {} + ~RimGridInfo() override {} void setName(const QString& name); void setEclipseGridIndex(int index); @@ -68,7 +68,7 @@ class RimGridInfoCollection : public caf::PdmObject public: RimGridInfoCollection(); - ~RimGridInfoCollection() {} + ~RimGridInfoCollection() override {} bool isActive() const; void addGridInfo(RimGridInfo * gridInfo); diff --git a/ApplicationCode/ProjectDataModel/RimNameConfig.h b/ApplicationCode/ProjectDataModel/RimNameConfig.h index 3ffc8fb8f7..839608ecef 100644 --- a/ApplicationCode/ProjectDataModel/RimNameConfig.h +++ b/ApplicationCode/ProjectDataModel/RimNameConfig.h @@ -56,7 +56,7 @@ public: void uiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); 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; QString autoName() const; virtual void updateAllSettings(); diff --git a/ApplicationCode/ProjectDataModel/RimOilField.h b/ApplicationCode/ProjectDataModel/RimOilField.h index e2e1790755..7f07818bf3 100644 --- a/ApplicationCode/ProjectDataModel/RimOilField.h +++ b/ApplicationCode/ProjectDataModel/RimOilField.h @@ -69,7 +69,7 @@ public: caf::PdmChildField measurement; protected: - virtual void initAfterRead() override; + void initAfterRead() override; private: caf::PdmChildField m_fractureTemplateCollection_OBSOLETE; diff --git a/ApplicationCode/ReservoirDataModel/RigPolyLinesData.h b/ApplicationCode/ReservoirDataModel/RigPolyLinesData.h index e5ff4b053a..b5fbcc56c8 100644 --- a/ApplicationCode/ReservoirDataModel/RigPolyLinesData.h +++ b/ApplicationCode/ReservoirDataModel/RigPolyLinesData.h @@ -32,7 +32,7 @@ class RigPolyLinesData : public cvf::Object { public: RigPolyLinesData(); - ~RigPolyLinesData(); + ~RigPolyLinesData() override; const std::vector >& polyLines() const { return m_polylines;} void setPolyLines(const std::vector >& polyLines) { m_polylines = polyLines;}