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

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

View File

@@ -92,7 +92,7 @@ public:
public: public:
RiaApplication(int& argc, char** argv); RiaApplication(int& argc, char** argv);
~RiaApplication(); ~RiaApplication() override;
static RiaApplication* instance(); static RiaApplication* instance();
@@ -218,7 +218,7 @@ private:
friend RiaArgumentParser; friend RiaArgumentParser;
void setHelpText(const QString& helpText); void setHelpText(const QString& helpText);
virtual bool notify(QObject *, QEvent *) override; bool notify(QObject *, QEvent *) override;
private slots: private slots:
void slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus); void slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);

View File

@@ -40,7 +40,7 @@ private slots:
private: private:
RiaCompletionTypeCalculationScheduler() : m_recalculateCompletionTypeTimer(nullptr) {} RiaCompletionTypeCalculationScheduler() : m_recalculateCompletionTypeTimer(nullptr) {}
~RiaCompletionTypeCalculationScheduler(); ~RiaCompletionTypeCalculationScheduler() override;
RiaCompletionTypeCalculationScheduler(const RiaCompletionTypeCalculationScheduler& o) = delete; RiaCompletionTypeCalculationScheduler(const RiaCompletionTypeCalculationScheduler& o) = delete;
void operator=(const RiaCompletionTypeCalculationScheduler& o) = delete; void operator=(const RiaCompletionTypeCalculationScheduler& o) = delete;

View File

@@ -39,17 +39,17 @@ public:
void setPropertiesFromView(Rim3dView* view); void setPropertiesFromView(Rim3dView* view);
void clearSelectedResultsFromMemory(); void clearSelectedResultsFromMemory();
protected: protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private: private:
std::vector<RigFemResultAddress> selectedGeoMechResults() const; std::vector<RigFemResultAddress> selectedGeoMechResults() const;
std::vector<RigEclipseResultInfo> selectedEclipseResults() const; std::vector<RigEclipseResultInfo> selectedEclipseResults() const;
std::set<RigFemResultAddress> findGeoMechCaseResultsInUse() const; std::set<RigFemResultAddress> findGeoMechCaseResultsInUse() const;
std::set<RigEclipseResultInfo> findEclipseResultsInUse() const; std::set<RigEclipseResultInfo> findEclipseResultsInUse() const;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override; bool* useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override; void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
private: private:
caf::PdmPtrField<RimCase*> m_case; caf::PdmPtrField<RimCase*> m_case;
caf::PdmField<std::vector<size_t>> m_resultsToDelete; caf::PdmField<std::vector<size_t>> m_resultsToDelete;

View File

@@ -41,7 +41,7 @@ public:
typedef caf::AppEnum<SummaryRestartFilesImportMode> SummaryRestartFilesImportModeType; typedef caf::AppEnum<SummaryRestartFilesImportMode> SummaryRestartFilesImportModeType;
RiaPreferences(void); RiaPreferences(void);
virtual ~RiaPreferences(void); ~RiaPreferences(void) override;
QStringList tabNames(); QStringList tabNames();
@@ -87,9 +87,9 @@ public: // Pdm Fields
caf::PdmField<SummaryRestartFilesImportModeType> gridImportMode; caf::PdmField<SummaryRestartFilesImportModeType> gridImportMode;
protected: protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly); QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
private: private:
caf::PdmChildField<RifReaderSettings*> m_readerSettings; caf::PdmChildField<RifReaderSettings*> m_readerSettings;

View File

@@ -42,7 +42,7 @@ private:
void startTimer(int msecs); void startTimer(int msecs);
RiaViewRedrawScheduler() : m_resViewUpdateTimer(nullptr) {} RiaViewRedrawScheduler() : m_resViewUpdateTimer(nullptr) {}
~RiaViewRedrawScheduler(); ~RiaViewRedrawScheduler() override;
RiaViewRedrawScheduler(const RiaViewRedrawScheduler& o) = delete; RiaViewRedrawScheduler(const RiaViewRedrawScheduler& o) = delete;
void operator=(const RiaViewRedrawScheduler& o) = delete; void operator=(const RiaViewRedrawScheduler& o) = delete;

View File

@@ -45,12 +45,12 @@ class RiaDefaultConsoleLogger : public RiaLogger
public: public:
RiaDefaultConsoleLogger(); RiaDefaultConsoleLogger();
virtual int level() const override; int level() const override;
virtual void setLevel(int logLevel) override; void setLevel(int logLevel) override;
virtual void error( const char* message) override; void error( const char* message) override;
virtual void warning(const char* message) override; void warning(const char* message) override;
virtual void info( const char* message) override; void info( const char* message) override;
virtual void debug( const char* message) override; void debug( const char* message) override;
private: private:
static void writeMessageToConsole(const char* prefix, const char* message); static void writeMessageToConsole(const char* prefix, const char* message);

View File

@@ -30,7 +30,7 @@ class RiaRegressionTest : public caf::PdmObject
public: public:
RiaRegressionTest(void); RiaRegressionTest(void);
virtual ~RiaRegressionTest(void); ~RiaRegressionTest(void) override;
void writeSettingsToApplicationStore() const; void writeSettingsToApplicationStore() const;
void readSettingsFromApplicationStore(); void readSettingsFromApplicationStore();
@@ -44,5 +44,5 @@ public:
caf::PdmField<bool> showInteractiveDiffImages; caf::PdmField<bool> showInteractiveDiffImages;
protected: protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
}; };

View File

@@ -35,7 +35,7 @@ class RicfCommandObject : public caf::PdmObject, public RicfObjectCapability
{ {
public: public:
RicfCommandObject(); RicfCommandObject();
~RicfCommandObject(); ~RicfCommandObject() override;
virtual void execute() = 0; virtual void execute() = 0;
}; };

View File

@@ -189,7 +189,7 @@ public:
// Xml Serializing // Xml Serializing
public: public:
virtual void readFieldData (QTextStream& inputStream, caf::PdmObjectFactory* objectFactory, RicfMessages* errorMessageContainer) override void readFieldData (QTextStream& inputStream, caf::PdmObjectFactory* objectFactory, RicfMessages* errorMessageContainer) override
{ {
//m_field->xmlCapability()->assertValid(); //m_field->xmlCapability()->assertValid();
typename FieldType::FieldDataType value; typename FieldType::FieldDataType value;
@@ -197,7 +197,7 @@ public:
m_field->setValue(value); m_field->setValue(value);
} }
virtual void writeFieldData(QTextStream& outputStream) const override void writeFieldData(QTextStream& outputStream) const override
{ {
//m_field->xmlCapability()->assertValid(); //m_field->xmlCapability()->assertValid();
RicfFieldWriter<typename FieldType::FieldDataType>::writeFieldData(m_field->value(), outputStream); RicfFieldWriter<typename FieldType::FieldDataType>::writeFieldData(m_field->value(), outputStream);

View File

@@ -39,7 +39,7 @@ class RicfFieldHandle : public caf::PdmFieldCapability
public: public:
RicfFieldHandle(caf::PdmFieldHandle* owner , bool giveOwnership); RicfFieldHandle(caf::PdmFieldHandle* owner , bool giveOwnership);
virtual ~RicfFieldHandle(); ~RicfFieldHandle() override;
virtual void readFieldData (QTextStream& inputStream, virtual void readFieldData (QTextStream& inputStream,
caf::PdmObjectFactory* objectFactory, caf::PdmObjectFactory* objectFactory,

View File

@@ -38,7 +38,7 @@ class RicfObjectCapability : public caf::PdmObjectCapability
public: public:
RicfObjectCapability(caf::PdmObjectHandle* owner, bool giveOwnership); RicfObjectCapability(caf::PdmObjectHandle* owner, bool giveOwnership);
virtual ~RicfObjectCapability(); ~RicfObjectCapability() override;
void readFields(QTextStream& inputStream, caf::PdmObjectFactory* objectFactory, RicfMessages* errorMessageContainer); void readFields(QTextStream& inputStream, caf::PdmObjectFactory* objectFactory, RicfMessages* errorMessageContainer);
void writeFields(QTextStream& outputStream) const; void writeFields(QTextStream& outputStream) const;

View File

@@ -34,7 +34,7 @@ class RicfCloseProject : public RicfCommandObject
public: public:
RicfCloseProject(); RicfCloseProject();
virtual void execute() override; void execute() override;
private: private:
}; };

View File

@@ -34,7 +34,7 @@ class RicfComputeCaseGroupStatistics : public RicfCommandObject
public: public:
RicfComputeCaseGroupStatistics(); RicfComputeCaseGroupStatistics();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField< std::vector<int> > m_caseIds; caf::PdmField< std::vector<int> > m_caseIds;

View File

@@ -49,7 +49,7 @@ class RicfCreateMultipleFractures : public RicfCommandObject
public: public:
RicfCreateMultipleFractures(); RicfCreateMultipleFractures();
virtual void execute() override; void execute() override;
static std::vector<RimWellPath*> wellPaths(const std::vector<QString>& wellPathNames); static std::vector<RimWellPath*> wellPaths(const std::vector<QString>& wellPathNames);
private: private:

View File

@@ -34,7 +34,7 @@ class RicfExportMsw : public RicfCommandObject
public: public:
RicfExportMsw(); RicfExportMsw();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<int> m_caseId; caf::PdmField<int> m_caseId;

View File

@@ -34,7 +34,7 @@ class RicfExportMultiCaseSnapshots : public RicfCommandObject
public: public:
RicfExportMultiCaseSnapshots(); RicfExportMultiCaseSnapshots();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<QString> m_gridListFile; caf::PdmField<QString> m_gridListFile;

View File

@@ -38,7 +38,7 @@ class RicfExportProperty : public RicfCommandObject
public: public:
RicfExportProperty(); RicfExportProperty();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<int> m_caseId; caf::PdmField<int> m_caseId;

View File

@@ -40,7 +40,7 @@ class RicfExportPropertyInViews : public RicfCommandObject
public: public:
RicfExportPropertyInViews(); RicfExportPropertyInViews();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<int> m_caseId; caf::PdmField<int> m_caseId;

View File

@@ -37,7 +37,7 @@ class RicfExportSimWellFractureCompletions : public RicfCommandObject
public: public:
RicfExportSimWellFractureCompletions(); RicfExportSimWellFractureCompletions();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<int> m_caseId; caf::PdmField<int> m_caseId;

View File

@@ -44,7 +44,7 @@ public:
public: public:
RicfExportSnapshots(); RicfExportSnapshots();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<SnapshotsTypeEnum> m_type; caf::PdmField<SnapshotsTypeEnum> m_type;

View File

@@ -41,7 +41,7 @@ class RicfExportVisibleCells : public RicfCommandObject
public: public:
RicfExportVisibleCells(); RicfExportVisibleCells();
virtual void execute() override; void execute() override;
private: private:
RimEclipseView* viewFromCaseIdAndViewName(int caseId, const QString& viewName); RimEclipseView* viewFromCaseIdAndViewName(int caseId, const QString& viewName);

View File

@@ -37,7 +37,7 @@ class RicfExportWellPathCompletions : public RicfCommandObject
public: public:
RicfExportWellPathCompletions(); RicfExportWellPathCompletions();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<int> m_caseId; caf::PdmField<int> m_caseId;

View File

@@ -37,7 +37,7 @@ class RicfExportWellPaths : public RicfCommandObject
public: public:
RicfExportWellPaths(); RicfExportWellPaths();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<std::vector<QString>> m_wellPathNames; caf::PdmField<std::vector<QString>> m_wellPathNames;

View File

@@ -34,7 +34,7 @@ class RicfLoadCase : public RicfCommandObject
public: public:
RicfLoadCase(); RicfLoadCase();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<QString> m_path; caf::PdmField<QString> m_path;

View File

@@ -34,7 +34,7 @@ class RicfOpenProject : public RicfCommandObject
public: public:
RicfOpenProject(); RicfOpenProject();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<QString> m_path; caf::PdmField<QString> m_path;

View File

@@ -40,7 +40,7 @@ public:
int caseId() const; int caseId() const;
QString filePath() const; QString filePath() const;
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<QString> m_newGridFile; caf::PdmField<QString> m_newGridFile;
@@ -63,7 +63,7 @@ public:
void setCaseReplacePairs(const std::map<int, QString>& caseIdToGridFileNameMap); void setCaseReplacePairs(const std::map<int, QString>& caseIdToGridFileNameMap);
virtual void execute() override; void execute() override;
private: private:
std::map<int, QString> m_caseIdToGridFileNameMap; std::map<int, QString> m_caseIdToGridFileNameMap;

View File

@@ -34,7 +34,7 @@ class RicfReplaceSourceCases : public RicfCommandObject
public: public:
RicfReplaceSourceCases(); RicfReplaceSourceCases();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<QString> m_gridListFile; caf::PdmField<QString> m_gridListFile;

View File

@@ -34,7 +34,7 @@ class RicfRunOctaveScript : public RicfCommandObject
public: public:
RicfRunOctaveScript(); RicfRunOctaveScript();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<QString> m_path; caf::PdmField<QString> m_path;

View File

@@ -36,7 +36,7 @@ class RicfScaleFractureTemplate : public RicfCommandObject
public: public:
RicfScaleFractureTemplate(); RicfScaleFractureTemplate();
virtual void execute() override; void execute() override;
private: private:
void initAfterRead() override; void initAfterRead() override;

View File

@@ -36,7 +36,7 @@ class RicfSetExportFolder : public RicfCommandObject
public: public:
RicfSetExportFolder(); RicfSetExportFolder();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<RicfCommandFileExecutor::ExportTypeEnum> m_type; caf::PdmField<RicfCommandFileExecutor::ExportTypeEnum> m_type;

View File

@@ -36,7 +36,7 @@ class RicfSetFractureContainment : public RicfCommandObject
public: public:
RicfSetFractureContainment(); RicfSetFractureContainment();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<int> m_id; caf::PdmField<int> m_id;

View File

@@ -34,7 +34,7 @@ class RicfSetMainWindowSize : public RicfCommandObject
public: public:
RicfSetMainWindowSize(); RicfSetMainWindowSize();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<int> m_height; caf::PdmField<int> m_height;

View File

@@ -34,7 +34,7 @@ class RicfSetStartDir : public RicfCommandObject
public: public:
RicfSetStartDir(); RicfSetStartDir();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<QString> m_path; caf::PdmField<QString> m_path;

View File

@@ -34,7 +34,7 @@ class RicfSetTimeStep : public RicfCommandObject
public: public:
RicfSetTimeStep(); RicfSetTimeStep();
virtual void execute() override; void execute() override;
private: private:
caf::PdmField<int> m_caseId; caf::PdmField<int> m_caseId;

View File

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

View File

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

View File

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

View File

@@ -30,9 +30,9 @@ class RicHelpAboutFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override; void setupActionLook( QAction* actionToSetup ) override;
}; };
@@ -45,9 +45,9 @@ class RicHelpCommandLineFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
}; };
@@ -60,9 +60,9 @@ class RicHelpOpenUsersGuideFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
}; };

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -33,9 +33,9 @@ class RicShowPlotDataFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
public: public:
static void showTabbedTextWindow(const QString& title, std::function<QString(DateTimePeriod)> textProvider); static void showTabbedTextWindow(const QString& title, std::function<QString(DateTimePeriod)> textProvider);

View File

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

View File

@@ -31,9 +31,9 @@ class RicTileWindowsFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
}; };
//================================================================================================== //==================================================================================================
@@ -45,8 +45,8 @@ class RicTilePlotWindowsFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered(bool isChecked); void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup); void setupActionLook(QAction* actionToSetup) override;
}; };

View File

@@ -30,9 +30,9 @@ class RicEditPerforationCollectionFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
private: private:
static RimPerforationCollection* selectedPerforationCollection(); static RimPerforationCollection* selectedPerforationCollection();

View File

@@ -45,9 +45,9 @@ class RicExportFishbonesLateralsFeature : public caf::CmdFeature
//static void exportFishboneLaterals(const RimWellPath* wellPath, QTextStream& stream, double mdStepSize); //static void exportFishboneLaterals(const RimWellPath* wellPath, QTextStream& stream, double mdStepSize);
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
private: private:
static RimFishbonesCollection* selectedFishbonesCollection(); static RimFishbonesCollection* selectedFishbonesCollection();

View File

@@ -30,9 +30,9 @@ class RicNewFishbonesSubsAtMeasuredDepthFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
private: private:
static RiuWellPathSelectionItem* wellPathSelectionItem(); static RiuWellPathSelectionItem* wellPathSelectionItem();

View File

@@ -33,9 +33,9 @@ public:
static void askUserToSetUsefulScaling(RimFishbonesCollection* fishboneCollection); static void askUserToSetUsefulScaling(RimFishbonesCollection* fishboneCollection);
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
private: private:
static RimFishbonesCollection* selectedFishbonesCollection(); static RimFishbonesCollection* selectedFishbonesCollection();

View File

@@ -30,9 +30,9 @@ class RicNewPerforationIntervalAtMeasuredDepthFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
private: private:
static RiuWellPathSelectionItem* wellPathSelectionItem(); static RiuWellPathSelectionItem* wellPathSelectionItem();

View File

@@ -32,9 +32,9 @@ class RicNewPerforationIntervalFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override; void setupActionLook( QAction* actionToSetup ) override;
private: private:
RimPerforationCollection* selectedPerforationCollection(); RimPerforationCollection* selectedPerforationCollection();

View File

@@ -31,9 +31,9 @@ class RicWellPathImportCompletionsFileFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override; void setupActionLook( QAction* actionToSetup ) override;
private: private:
static RimFishboneWellPathCollection* selectedWellPathCollection(); static RimFishboneWellPathCollection* selectedWellPathCollection();

View File

@@ -31,9 +31,9 @@ class RicWellPathImportPerforationIntervalsFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override; void setupActionLook( QAction* actionToSetup ) override;
private: private:
static RimWellPathCollection* selectedWellPathCollection(); static RimWellPathCollection* selectedWellPathCollection();

View File

@@ -38,7 +38,7 @@ public:
caf::PdmField<QString> folder; caf::PdmField<QString> folder;
caf::PdmPtrField<RimEclipseCase*> caseToApply; caf::PdmPtrField<RimEclipseCase*> caseToApply;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override; QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
protected: protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override; void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
}; };

View File

@@ -91,11 +91,11 @@ public:
bool reportCompletionsTypesIndividually() const; bool reportCompletionsTypesIndividually() const;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
protected: protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private: private:
caf::PdmField<CombinationModeType> m_reportCompletionTypesSeparately; caf::PdmField<CombinationModeType> m_reportCompletionTypesSeparately;

View File

@@ -30,9 +30,9 @@ class RicExportCompletionsForVisibleSimWellsFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
private: private:
std::vector<RimSimWellInView*> visibleSimWells(); std::vector<RimSimWellInView*> visibleSimWells();

View File

@@ -31,9 +31,9 @@ class RicExportCompletionsForVisibleWellPathsFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
public: public:
static std::vector<RimWellPath*> visibleWellPaths(); static std::vector<RimWellPath*> visibleWellPaths();

View File

@@ -36,9 +36,9 @@ class RicExportFishbonesWellSegmentsFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
public: public:
static void exportWellSegments(const RimWellPath* wellPath, static void exportWellSegments(const RimWellPath* wellPath,

View File

@@ -37,7 +37,7 @@ public:
static void exportWellSegments(const RimWellPath* wellPath, const std::vector<RimWellPathFracture*>& fractures, const RicCaseAndFileExportSettingsUi& settings); static void exportWellSegments(const RimWellPath* wellPath, const std::vector<RimWellPathFracture*>& fractures, const RicCaseAndFileExportSettingsUi& settings);
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
}; };

View File

@@ -36,9 +36,9 @@ public:
const std::vector<RimSimWellInView*>& simWells); const std::vector<RimSimWellInView*>& simWells);
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
private: private:
std::vector<RimWellPath*> selectedWellPaths(); std::vector<RimWellPath*> selectedWellPaths();

View File

@@ -33,11 +33,11 @@ class RicAppendIntersectionFeatureCmd : public caf::CmdExecuteCommand
{ {
public: public:
explicit RicAppendIntersectionFeatureCmd(RimIntersectionCollection* intersectionCollection); explicit RicAppendIntersectionFeatureCmd(RimIntersectionCollection* intersectionCollection);
virtual ~RicAppendIntersectionFeatureCmd(); ~RicAppendIntersectionFeatureCmd() override;
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
private: private:
caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection; caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection;
@@ -54,9 +54,9 @@ class RicAppendIntersectionFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
}; };

View File

@@ -38,9 +38,9 @@ class RicCopyIntersectionsToAllViewsInCaseFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
void copyIntersectionsToOtherViews(RimCase& gridCase, std::vector<RimIntersection*> intersections); void copyIntersectionsToOtherViews(RimCase& gridCase, std::vector<RimIntersection*> intersections);
void copyIntersectionBoxesToOtherViews(RimCase& gridCase, std::vector<RimIntersectionBox*> intersectionBoxes); void copyIntersectionBoxesToOtherViews(RimCase& gridCase, std::vector<RimIntersectionBox*> intersectionBoxes);

View File

@@ -33,11 +33,11 @@ class RicNewAzimuthDipIntersectionFeatureCmd : public caf::CmdExecuteCommand
{ {
public: public:
explicit RicNewAzimuthDipIntersectionFeatureCmd(RimIntersectionCollection* intersectionCollection); explicit RicNewAzimuthDipIntersectionFeatureCmd(RimIntersectionCollection* intersectionCollection);
virtual ~RicNewAzimuthDipIntersectionFeatureCmd(); ~RicNewAzimuthDipIntersectionFeatureCmd() override;
virtual QString name() override; QString name() override;
virtual void redo() override; void redo() override;
virtual void undo() override; void undo() override;
private: private:
caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection; caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection;
@@ -56,9 +56,9 @@ public:
RicNewAzimuthDipIntersectionFeature(); RicNewAzimuthDipIntersectionFeature();
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override; void setupActionLook( QAction* actionToSetup ) override;
}; };

View File

@@ -34,11 +34,11 @@ class RicNewPolylineIntersectionFeatureCmd : public caf::CmdExecuteCommand
{ {
public: public:
explicit RicNewPolylineIntersectionFeatureCmd(RimIntersectionCollection* intersectionCollection); explicit RicNewPolylineIntersectionFeatureCmd(RimIntersectionCollection* intersectionCollection);
virtual ~RicNewPolylineIntersectionFeatureCmd(); ~RicNewPolylineIntersectionFeatureCmd() override;
virtual QString name() override; QString name() override;
virtual void redo() override; void redo() override;
virtual void undo() override; void undo() override;
private: private:
caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection; caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection;
@@ -57,9 +57,9 @@ public:
RicNewPolylineIntersectionFeature(); RicNewPolylineIntersectionFeature();
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override; void setupActionLook( QAction* actionToSetup ) override;
}; };

View File

@@ -34,11 +34,11 @@ class RicNewSimWellIntersectionCmd : public caf::CmdExecuteCommand
{ {
public: public:
RicNewSimWellIntersectionCmd(RimIntersectionCollection* intersectionCollection, RimSimWellInView* simWell); RicNewSimWellIntersectionCmd(RimIntersectionCollection* intersectionCollection, RimSimWellInView* simWell);
virtual ~RicNewSimWellIntersectionCmd(); ~RicNewSimWellIntersectionCmd() override;
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
private: private:
caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection; caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection;
@@ -56,9 +56,9 @@ class RicNewSimWellIntersectionFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
}; };

View File

@@ -34,11 +34,11 @@ class RicNewWellPathIntersectionFeatureCmd : public caf::CmdExecuteCommand
{ {
public: public:
RicNewWellPathIntersectionFeatureCmd(RimIntersectionCollection* intersectionCollection, RimWellPath* wellPath); RicNewWellPathIntersectionFeatureCmd(RimIntersectionCollection* intersectionCollection, RimWellPath* wellPath);
virtual ~RicNewWellPathIntersectionFeatureCmd(); ~RicNewWellPathIntersectionFeatureCmd() override;
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
private: private:
caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection; caf::PdmPointer<RimIntersectionCollection> m_intersectionCollection;
@@ -59,9 +59,9 @@ public:
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
}; };

View File

@@ -29,10 +29,10 @@ class RicEclipseWellShowLabelFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual bool isCommandChecked() override; bool isCommandChecked() override;
}; };
//================================================================================================== //==================================================================================================
@@ -43,10 +43,10 @@ class RicEclipseWellShowHeadFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual bool isCommandChecked() override; bool isCommandChecked() override;
}; };
//================================================================================================== //==================================================================================================
@@ -57,10 +57,10 @@ class RicEclipseWellShowPipeFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual bool isCommandChecked() override; bool isCommandChecked() override;
}; };
//================================================================================================== //==================================================================================================
@@ -71,10 +71,10 @@ class RicEclipseWellShowSpheresFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual bool isCommandChecked() override; bool isCommandChecked() override;
}; };
//================================================================================================== //==================================================================================================
@@ -85,10 +85,10 @@ class RicEclipseWellShowWellCellsFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual bool isCommandChecked() override; bool isCommandChecked() override;
}; };
//================================================================================================== //==================================================================================================
@@ -99,9 +99,9 @@ class RicEclipseWellShowWellCellFenceFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual bool isCommandChecked() override; bool isCommandChecked() override;
}; };

View File

@@ -33,9 +33,9 @@ class RicAddEclipseInputPropertyFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
private: private:
RimEclipseInputPropertyCollection* selectedInputPropertyCollection() const; RimEclipseInputPropertyCollection* selectedInputPropertyCollection() const;

View File

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

View File

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

View File

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

View File

@@ -34,9 +34,9 @@ class RicCreateGridCaseGroupFromFilesFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
private: private:
QString m_pathFilter; QString m_pathFilter;

View File

@@ -28,10 +28,10 @@ class RicEclipseCaseNewGroupExec : public caf::CmdExecuteCommand
{ {
public: public:
RicEclipseCaseNewGroupExec(); RicEclipseCaseNewGroupExec();
virtual ~RicEclipseCaseNewGroupExec(); ~RicEclipseCaseNewGroupExec() override;
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };

View File

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

View File

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

View File

@@ -31,11 +31,11 @@ class RicEclipsePropertyFilterInsertExec : public caf::CmdExecuteCommand
{ {
public: public:
explicit RicEclipsePropertyFilterInsertExec(RimEclipsePropertyFilter* propertyFilter); explicit RicEclipsePropertyFilterInsertExec(RimEclipsePropertyFilter* propertyFilter);
virtual ~RicEclipsePropertyFilterInsertExec(); ~RicEclipsePropertyFilterInsertExec() override;
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
private: private:
caf::PdmPointer<RimEclipsePropertyFilter> m_propertyFilter; caf::PdmPointer<RimEclipsePropertyFilter> m_propertyFilter;

View File

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

View File

@@ -31,11 +31,11 @@ class RicEclipsePropertyFilterNewExec : public caf::CmdExecuteCommand
{ {
public: public:
explicit RicEclipsePropertyFilterNewExec(RimEclipsePropertyFilterCollection* propertyFilterCollection); explicit RicEclipsePropertyFilterNewExec(RimEclipsePropertyFilterCollection* propertyFilterCollection);
virtual ~RicEclipsePropertyFilterNewExec(); ~RicEclipsePropertyFilterNewExec() override;
virtual QString name(); QString name() override;
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
private: private:
caf::PdmPointer<RimEclipsePropertyFilterCollection> m_propertyFilterCollection; caf::PdmPointer<RimEclipsePropertyFilterCollection> m_propertyFilterCollection;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -39,9 +39,9 @@ class RicNewStatisticsCaseFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
private: private:
caf::PdmUiItem* selectedValidUIItem(); caf::PdmUiItem* selectedValidUIItem();

View File

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

View File

@@ -31,9 +31,9 @@ class RicExportCarfin : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override; void setupActionLook( QAction* actionToSetup ) override;
private: private:
static RimEclipseCase* selectedCase(); static RimEclipseCase* selectedCase();

View File

@@ -53,10 +53,10 @@ private:
void setCasePointers(RimEclipseCase* rimCase); void setCasePointers(RimEclipseCase* rimCase);
void setDefaultValuesFromCase(); void setDefaultValuesFromCase();
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override; QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override; void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
private: private:

View File

@@ -37,9 +37,9 @@ class RicExportFaultsFeature : public caf::CmdFeature
protected: protected:
// Overrides // Overrides
virtual bool isCommandEnabled(); bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ); void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ); void setupActionLook( QAction* actionToSetup ) override;
private: private:
static void saveFault(QString completeFilename, const RigMainGrid* mainGrid, const std::vector<RigFault::FaultFace>& faultFaces, QString faultName); static void saveFault(QString completeFilename, const RigMainGrid* mainGrid, const std::vector<RigFault::FaultFace>& faultFaces, QString faultName);

View File

@@ -80,9 +80,9 @@ class RicExportLgrFeature : public caf::CmdFeature
size_t timeStep); size_t timeStep);
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
private: private:
static std::vector<RimWellPath*> selectedWellPaths(); static std::vector<RimWellPath*> selectedWellPaths();

View File

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

View File

@@ -33,9 +33,9 @@ class RicExportMultipleSnapshotsFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
public: public:
static void exportMultipleSnapshots(const QString& folder, RimProject* project); static void exportMultipleSnapshots(const QString& folder, RimProject* project);

View File

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

View File

@@ -46,7 +46,7 @@ class RicExportToLasFileResampleUi : public caf::PdmObject
public: public:
RicExportToLasFileResampleUi(void); RicExportToLasFileResampleUi(void);
~RicExportToLasFileResampleUi(); ~RicExportToLasFileResampleUi() override;
caf::PdmField<QString> exportFolder; caf::PdmField<QString> exportFolder;
@@ -58,11 +58,11 @@ public:
void tvdrkbDiffForWellPaths(std::vector<double>* rkbDiffs); void tvdrkbDiffForWellPaths(std::vector<double>* rkbDiffs);
void setRkbDiffs(const std::vector<QString>& wellNames, const std::vector<double>& rkbDiffs); void setRkbDiffs(const std::vector<QString>& wellNames, const std::vector<double>& rkbDiffs);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override; void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
protected: protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private: private:
void updateFieldVisibility(); void updateFieldVisibility();

View File

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

View File

@@ -37,9 +37,9 @@ public :
const QString& logPrefix); const QString& logPrefix);
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered(bool isChecked) override; void onActionTriggered(bool isChecked) override;
virtual void setupActionLook(QAction* actionToSetup) override; void setupActionLook(QAction* actionToSetup) override;
private: private:
RimEclipseView* selectedView() const; RimEclipseView* selectedView() const;
@@ -53,9 +53,9 @@ class RicSaveEclipseInputActiveVisibleCellsFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
virtual bool isCommandEnabled() override; bool isCommandEnabled() override;
virtual void onActionTriggered( bool isChecked ) override; void onActionTriggered( bool isChecked ) override;
virtual void setupActionLook( QAction* actionToSetup ) override; void setupActionLook( QAction* actionToSetup ) override;
private: private:
static RimEclipseView* getEclipseActiveView(); static RimEclipseView* getEclipseActiveView();

View File

@@ -41,7 +41,7 @@ public:
public: public:
RicSaveEclipseInputVisibleCellsUi(void); RicSaveEclipseInputVisibleCellsUi(void);
~RicSaveEclipseInputVisibleCellsUi(); ~RicSaveEclipseInputVisibleCellsUi() override;
caf::PdmField<QString> exportFilename; caf::PdmField<QString> exportFilename;
caf::PdmField<ExportKeywordEnum> exportKeyword; caf::PdmField<ExportKeywordEnum> exportKeyword;
@@ -50,9 +50,9 @@ public:
caf::PdmField<int> inactiveCellsValue; caf::PdmField<int> inactiveCellsValue;
protected: protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private: private:
QString getDefaultExportPath() const; QString getDefaultExportPath() const;

Some files were not shown because too many files have changed in this diff Show More