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

clang-tidy : Remove redundant 'virtual' and add 'override'

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-18 19:45:57 +02:00
parent c8285602b1
commit 6346ed012c
599 changed files with 2056 additions and 2056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.h
View File

@@ -37,9 +37,9 @@ public:
static bool exportTextToFile(const QString& fileName, const QString& text);
protected:
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
private:
static bool exportAsciiForSummaryPlot(const QString& fileName,

6
ApplicationCode/Commands/SummaryPlotCommands/RicDuplicateSummaryCrossPlotFeature.h
View File

@@ -33,7 +33,7 @@ class RicDuplicateSummaryCrossPlotFeature : public caf::CmdFeature
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
};

6
ApplicationCode/Commands/SummaryPlotCommands/RicDuplicateSummaryPlotFeature.h
View File

@@ -33,7 +33,7 @@ class RicDuplicateSummaryPlotFeature : public caf::CmdFeature
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
};

6
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.h
View File

@@ -38,9 +38,9 @@ public:
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
private:

6
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurveCalculationFeature.h
View File

@@ -32,7 +32,7 @@ class RicEditSummaryCurveCalculationFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
protected:
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
};

6
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h
View File

@@ -38,9 +38,9 @@ public:
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
private:

6
ApplicationCode/Commands/SummaryPlotCommands/RicNewDerivedEnsembleFeature.h
View File

@@ -37,7 +37,7 @@ public:
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
};

6
ApplicationCode/Commands/SummaryPlotCommands/RicNewEnsembleCurveFilterFeature.h
View File

@@ -33,7 +33,7 @@ class RicNewEnsembleCurveFilterFeature : public caf::CmdFeature
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
};

6
ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.h
View File

@@ -32,9 +32,9 @@ class RicNewGridTimeHistoryCurveFeature : public caf::CmdFeature
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
private:
static void createCurveFromSelectionItem(const RiuSelectionItem* selectionItem, RimSummaryPlot* plot);

6
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotCurveFeature.h
View File

@@ -31,9 +31,9 @@ class RicNewSummaryCrossPlotCurveFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
protected:
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
private:
RimSummaryCrossPlot* selectedCrossPlot() const;

6
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotFeature.h
View File

@@ -33,7 +33,7 @@ class RicNewSummaryCrossPlotFeature : public caf::CmdFeature
private:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
};

6
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.h
View File

@@ -32,9 +32,9 @@ class RicNewSummaryCurveFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook( QAction* actionToSetup );
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
private:
RimSummaryPlot* selectedSummaryPlot() const;

6
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.h
View File

@@ -32,9 +32,9 @@ class RicNewSummaryEnsembleCurveSetFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook( QAction* actionToSetup );
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
private:
RimSummaryPlot* selectedSummaryPlot() const;

6
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.h
View File

@@ -33,7 +33,7 @@ class RicNewSummaryPlotFeature : public caf::CmdFeature
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
};

6
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataCurveFeature.h
View File

@@ -34,9 +34,9 @@ class RicPasteAsciiDataCurveFeature : public caf::CmdFeature
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
private:
static std::vector<caf::PdmPointer<RimAsciiDataCurve> > asciiDataCurves();

6
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.h
View File

@@ -47,9 +47,9 @@ public:
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
private:
static QString getPastedData();

8
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h
View File

@@ -129,10 +129,10 @@ public:
void createNewPlot();
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
void initialize(RifCsvUserDataParser* parser);

6
ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryCaseFeature.h
View File

@@ -33,9 +33,9 @@ class RicPasteSummaryCaseFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
private:
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* action) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* action) override;
static std::vector<caf::PdmPointer<RimSummaryCase> > summaryCases();
static void removeFromSourceCollection(RimSummaryCase* summaryCase);

4
ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryCrossPlotCurveFeature.h
View File

@@ -37,7 +37,7 @@ class RicPasteSummaryCrossPlotCurveFeature : public RicPasteSummaryCurveFeature
protected:
// Overrides
virtual bool isCommandEnabled() override;
bool isCommandEnabled() override;
//virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
void setupActionLook(QAction* actionToSetup) override;
};

6
ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryCrossPlotFeature.h
View File

@@ -37,9 +37,9 @@ public:
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
private:
static std::vector<caf::PdmPointer<RimSummaryCrossPlot> > summaryPlots();

6
ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryCurveFeature.h
View File

@@ -38,9 +38,9 @@ public:
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
static std::vector<caf::PdmPointer<RimSummaryCurve> > summaryCurvesOnClipboard();
};

6
ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryPlotFeature.h
View File

@@ -37,9 +37,9 @@ public:
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
private:
static std::vector<caf::PdmPointer<RimSummaryPlot> > summaryPlots();

6
ApplicationCode/Commands/SummaryPlotCommands/RicPasteTimeHistoryCurveFeature.h
View File

@@ -34,9 +34,9 @@ class RicPasteTimeHistoryCurveFeature : public caf::CmdFeature
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
private:
static std::vector<caf::PdmPointer<RimGridTimeHistoryCurve> > timeHistoryCurves();

4
ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.h
View File

@@ -42,10 +42,10 @@ public:
bool isCreateNewPlotChecked() const;
QString newPlotName() const;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
caf::PdmPtrField<RimSummaryPlot*> m_selectedSummaryPlot;

6
ApplicationCode/Commands/SummaryPlotCommands/RicShowSummaryCurveCalculatorFeature.h
View File

@@ -34,7 +34,7 @@ public:
static void hideCurveCalculatorDialog();
protected:
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
};

10
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h
View File

@@ -49,11 +49,11 @@ public:
static RimSummaryCalculationCollection* calculationCollection();
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual void onEditorWidgetsCreated();
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void onEditorWidgetsCreated() override;
private:
// TODO : Move to a common caf helper class

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h
View File

@@ -34,7 +34,7 @@ class RicSummaryCurveCalculatorDialog : public QDialog
public:
RicSummaryCurveCalculatorDialog(QWidget* parent);
~RicSummaryCurveCalculatorDialog();
~RicSummaryCurveCalculatorDialog() override;
void setCalculationAndUpdateUi(RimSummaryCalculation* calculation);

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h
View File

@@ -47,15 +47,15 @@ class RicSummaryCurveCalculatorEditor : public caf::PdmUiFormLayoutObjectEditor
public:
RicSummaryCurveCalculatorEditor();
~RicSummaryCurveCalculatorEditor();
~RicSummaryCurveCalculatorEditor() override;
RicSummaryCurveCalculator* calculator() const;
private:
virtual void recursivelyConfigureAndUpdateTopLevelUiOrdering(const caf::PdmUiOrdering& topLevelUiItems,
void recursivelyConfigureAndUpdateTopLevelUiOrdering(const caf::PdmUiOrdering& topLevelUiItems,
const QString& uiConfigName) override;
virtual QWidget* createWidget(QWidget* parent) override;
QWidget* createWidget(QWidget* parent) override;
QMinimizePanel* updateGroupBoxWithContent(caf::PdmUiGroup* group, const QString& uiConfigName);

12
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.h
View File

@@ -63,7 +63,7 @@ private:
public:
RicSummaryCurveCreator();
virtual ~RicSummaryCurveCreator();
~RicSummaryCurveCreator() override;
RimSummaryPlot* previewPlot() const;
void updateFromSummaryPlot(RimSummaryPlot* targetPlot,
@@ -76,12 +76,12 @@ public:
void updateCurveNames();
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue);
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName,
const QVariant& newValue) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName,
caf::PdmUiEditorAttribute* attribute) override;
void syncPreviewCurvesFromUiSelection();

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.h
View File

@@ -38,7 +38,7 @@ class RicSummaryCurveCreatorDialog : public QDialog
Q_OBJECT
public:
RicSummaryCurveCreatorDialog(QWidget* parent);
~RicSummaryCurveCreatorDialog();
~RicSummaryCurveCreatorDialog() override;
void updateFromSummaryPlot(RimSummaryPlot* summaryPlot);
void updateFromDefaultCases(const std::vector<caf::PdmObject*> defaultSources);

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.h
View File

@@ -51,16 +51,16 @@ class RicSummaryCurveCreatorSplitterUi : public caf::PdmUiFormLayoutObjectEditor
public:
RicSummaryCurveCreatorSplitterUi(QWidget* parent);
~RicSummaryCurveCreatorSplitterUi();
~RicSummaryCurveCreatorSplitterUi() override;
void updateFromSummaryPlot(RimSummaryPlot* summaryPlot);
void updateFromDefaultSources(const std::vector<caf::PdmObject*> defaultSources);
private:
virtual void recursivelyConfigureAndUpdateTopLevelUiOrdering(const caf::PdmUiOrdering& topLevelUiOrdering,
void recursivelyConfigureAndUpdateTopLevelUiOrdering(const caf::PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName) override;
virtual QWidget* createWidget(QWidget* parent) override;
QWidget* createWidget(QWidget* parent) override;
QWidget* getOrCreateCurveTreeWidget();
QWidget* getOrCreatePlotWidget();

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveSwitchAxisFeature.h
View File

@@ -36,9 +36,9 @@ class RicSummaryCurveSwitchAxisFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
protected:
// Overrides
virtual bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override;
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
private:
static void extractSelectedCurves(std::vector<RimSummaryCurve*>* summaryCurves,

6
ApplicationCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.h
View File

@@ -30,7 +30,7 @@ class RicViewZoomAllFeature : public caf::CmdFeature
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override;
void setupActionLook(QAction* actionToSetup) override;
};