#3944 clang-tidy : Apply changes on geomech and ssihub

This commit is contained in:
Magne Sjaastad
2019-01-10 22:12:11 +01:00
parent d460d3d77d
commit cee966a6d1
17 changed files with 62 additions and 62 deletions

View File

@@ -32,7 +32,7 @@ class RimOilFieldEntry : public caf::PdmObject
public:
RimOilFieldEntry();
~RimOilFieldEntry();
~RimOilFieldEntry() override;
caf::PdmField<QString> name;
@@ -45,10 +45,10 @@ public:
RimWellPathEntry* find(const QString& name, RimWellPathEntry::WellTypeEnum wellPathType);
virtual caf::PdmFieldHandle* userDescriptionField();
virtual caf::PdmFieldHandle* objectToggleField();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void initAfterRead();
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void initAfterRead() override;
//private:
void updateEnabledState();

View File

@@ -31,12 +31,12 @@ class RimOilRegionEntry : public caf::PdmObject
public:
RimOilRegionEntry();
~RimOilRegionEntry();
~RimOilRegionEntry() override;
virtual caf::PdmFieldHandle* userDescriptionField();
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void updateState();

View File

@@ -41,7 +41,7 @@ public:
public:
RimWellPathImport();
~RimWellPathImport();
~RimWellPathImport() override;
caf::PdmField<bool> wellTypeSurvey;
caf::PdmField<bool> wellTypePlans;
@@ -56,9 +56,9 @@ public:
void updateRegions(const QStringList& regions, const QStringList& fields, const QStringList& edmIds);
virtual void initAfterRead();
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
virtual void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute * attribute );
void initAfterRead() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute * attribute ) override;
void updateFieldVisibility();

View File

@@ -44,8 +44,8 @@ public:
static RimWellPathEntry* createWellPathEntry(const QString& name, const QString& surveyType, const QString& requestUrl, const QString& absolutePath, WellTypeEnum wellType);
virtual caf::PdmFieldHandle* userDescriptionField();
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
caf::PdmField<QString> name;
caf::PdmField<bool> selected;

View File

@@ -59,7 +59,7 @@ class AuthenticationPage : public QWizardPage
public:
AuthenticationPage(const QString& webServiceAddress, QWidget *parent = nullptr);
virtual void initializePage();
void initializePage() override;
};
@@ -72,9 +72,9 @@ class FieldSelectionPage : public QWizardPage
public:
FieldSelectionPage(RimWellPathImport* wellPathImport, QWidget* parent = nullptr);
~FieldSelectionPage();
~FieldSelectionPage() override;
virtual void initializePage();
void initializePage() override;
private:
caf::PdmUiPropertyView* m_propertyView;
@@ -90,7 +90,7 @@ class ObjectGroupWithHeaders : public caf::PdmObjectCollection
public:
ObjectGroupWithHeaders() {};
virtual void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute * attribute);
void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute * attribute) override;
};
//--------------------------------------------------------------------------------------------------
@@ -128,9 +128,9 @@ class WellSelectionPage : public QWizardPage
public:
WellSelectionPage(RimWellPathImport* wellPathImport, QWidget* parent = nullptr);
~WellSelectionPage();
~WellSelectionPage() override;
virtual void initializePage();
void initializePage() override;
void buildWellTreeView();
void selectedWellPathEntries(std::vector<DownloadEntity>& downloadEntities, caf::PdmObjectHandle* objHandle);
@@ -155,7 +155,7 @@ class WellSummaryPage : public QWizardPage
public:
WellSummaryPage(RimWellPathImport* wellPathImport, QWidget* parent = nullptr);
virtual void initializePage();
void initializePage() override;
void updateSummaryPage();
@@ -183,7 +183,7 @@ public:
public:
RiuWellImportWizard(const QString& webServiceAddress, const QString& downloadFolder, RimWellPathImport* wellPathImportObject, QWidget *parent = nullptr);
~RiuWellImportWizard();
~RiuWellImportWizard() override;
void setCredentials(const QString& username, const QString& password);
QStringList absoluteFilePathsToWellPaths() const;