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

4
ApplicationCode/UserInterface/RiuCadNavigation.h
View File

@@ -25,7 +25,7 @@ class RiuCadNavigation : public caf::TrackBallBasedNavigation
{
public:
RiuCadNavigation();
virtual ~RiuCadNavigation();
~RiuCadNavigation() override;
protected:
virtual bool handleInputEvent(QInputEvent* inputEvent);
bool handleInputEvent(QInputEvent* inputEvent) override;
};

2
ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.h
View File

@@ -36,7 +36,7 @@ class RiuCvfOverlayItemWidget : public QWidget
Q_OBJECT
public:
explicit RiuCvfOverlayItemWidget(QWidget* parent = nullptr);
~RiuCvfOverlayItemWidget();
~RiuCvfOverlayItemWidget() override;
void updateFromOverlyItem( cvf::OverlayItem * item);

16
ApplicationCode/UserInterface/RiuDragDrop.h
View File

@@ -43,17 +43,17 @@ class RiuDragDrop : public caf::PdmUiDragDropInterface
{
public:
RiuDragDrop();
virtual ~RiuDragDrop();
~RiuDragDrop() override;
protected:
virtual Qt::DropActions supportedDropActions() const;
virtual Qt::ItemFlags flags(const QModelIndex &index) const;
virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
virtual QMimeData* mimeData(const QModelIndexList &indexes) const;
virtual QStringList mimeTypes() const;
Qt::DropActions supportedDropActions() const override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
QMimeData* mimeData(const QModelIndexList &indexes) const override;
QStringList mimeTypes() const override;
virtual void onDragCanceled();
virtual void onProposedDropActionUpdated(Qt::DropAction action);
void onDragCanceled() override;
void onProposedDropActionUpdated(Qt::DropAction action) override;
private:
void moveCasesToGridGroup(caf::PdmObjectGroup& objectGroup, RimIdenticalGridCaseGroup* gridCaseGroup);

2
ApplicationCode/UserInterface/RiuEditPerforationCollectionWidget.h
View File

@@ -36,7 +36,7 @@ class RiuEditPerforationCollectionWidget : public QDialog
Q_OBJECT
public:
RiuEditPerforationCollectionWidget(QWidget* parent, RimPerforationCollection* perforationCollection);
~RiuEditPerforationCollectionWidget();
~RiuEditPerforationCollectionWidget() override;
private slots:
void customMenuRequested(QPoint pos);

2
ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.h
View File

@@ -34,7 +34,7 @@ class RiuExportMultipleSnapshotsWidget : public QDialog
Q_OBJECT
public:
RiuExportMultipleSnapshotsWidget(QWidget* parent, RimProject* project);
~RiuExportMultipleSnapshotsWidget();
~RiuExportMultipleSnapshotsWidget() override;
void addSnapshotItemFromActiveView();
void addEmptySnapshotItems(size_t itemCount);

8
ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.h
View File

@@ -48,7 +48,7 @@ class RiuFlowCharacteristicsPlot : public QFrame, public RiuInterfaceToViewWindo
Q_OBJECT;
public:
RiuFlowCharacteristicsPlot(RimFlowCharacteristicsPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuFlowCharacteristicsPlot();
~RiuFlowCharacteristicsPlot() override;
void setLorenzCurve(const QStringList& dateTimeStrings, const std::vector<QDateTime>& dateTimes, const std::vector<double>& timeHistoryValues);
void addFlowCapStorageCapCurve(const QDateTime& dateTime, const std::vector<double>& xVals, const std::vector<double>& yVals);
@@ -60,14 +60,14 @@ public:
void showLegend(bool show);
RimFlowCharacteristicsPlot* ownerPlotDefinition();
virtual RimViewWindow* ownerViewWindow() const override;
RimViewWindow* ownerViewWindow() const override;
static void addWindowZoom(QwtPlot* plot);
static RiuQwtPlotCurve* createEmptyCurve(QwtPlot* plot, const QString& curveName, const QColor& curveColor);
protected:
virtual QSize sizeHint() const override;
virtual QSize minimumSizeHint() const override;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
private:
void setDefaults();

4
ApplicationCode/UserInterface/RiuGeoQuestNavigation.h
View File

@@ -26,7 +26,7 @@ class RiuGeoQuestNavigation : public caf::TrackBallBasedNavigation
{
public:
RiuGeoQuestNavigation();
virtual ~RiuGeoQuestNavigation();
~RiuGeoQuestNavigation() override;
protected:
virtual bool handleInputEvent(QInputEvent* inputEvent);
bool handleInputEvent(QInputEvent* inputEvent) override;
};

2
ApplicationCode/UserInterface/RiuGridStatisticsHistogramWidget.h
View File

@@ -37,7 +37,7 @@ public:
void setMean(double mean) {m_mean = mean;}
protected:
virtual void paintEvent(QPaintEvent* event);
void paintEvent(QPaintEvent* event) override;
private:
void draw(QPainter *painter,int x, int y, int width, int height );

2
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -607,7 +607,7 @@ void RiuMainWindow::createToolBars()
class RiuDockWidget : public QDockWidget
{
public:
explicit RiuDockWidget(const QString& title, QWidget* parent = 0, Qt::WindowFlags flags = 0)
explicit RiuDockWidget(const QString& title, QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr)
: QDockWidget(title, parent, flags)
{
}

2
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@@ -125,7 +125,7 @@ public:
void showProcessMonitorDockPanel();
protected:
virtual void closeEvent(QCloseEvent* event);
void closeEvent(QCloseEvent* event) override;
private:
void createActions();

4
ApplicationCode/UserInterface/RiuMdiSubWindow.h
View File

@@ -27,11 +27,11 @@ class RiuMdiSubWindow : public QMdiSubWindow
public:
RiuMdiSubWindow(QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr);
~RiuMdiSubWindow();
~RiuMdiSubWindow() override;
static RimMdiWindowGeometry windowGeometryForWidget(QWidget* widget);
protected:
virtual void closeEvent(QCloseEvent* event);
void closeEvent(QCloseEvent* event) override;
};

14
ApplicationCode/UserInterface/RiuMessagePanel.h
View File

@@ -40,7 +40,7 @@ public:
explicit RiuMessagePanel(QDockWidget* parent);
void addMessage(RILogLevel messageLevel, const QString& msg);
virtual QSize sizeHint () const;
QSize sizeHint () const override;
private slots:
void slotShowContextMenu(const QPoint& pos);
@@ -62,13 +62,13 @@ class RiuMessagePanelLogger : public RiaLogger
public:
explicit RiuMessagePanelLogger(RiuMessagePanel* messagePanel);
virtual int level() const override;
virtual void setLevel(int logLevel) override;
int level() const override;
void setLevel(int logLevel) override;
virtual void error( const char* message) override;
virtual void warning(const char* message) override;
virtual void info( const char* message) override;
virtual void debug( const char* message) override;
void error( const char* message) override;
void warning(const char* message) override;
void info( const char* message) override;
void debug( const char* message) override;
private:
void writeToMessagePanel(RILogLevel messageLevel, const char* message);

8
ApplicationCode/UserInterface/RiuMohrsCirclePlot.h
View File

@@ -45,7 +45,7 @@ class RiuMohrsCirclePlot : public QwtPlot
public:
RiuMohrsCirclePlot(QWidget* parent);
~RiuMohrsCirclePlot();
~RiuMohrsCirclePlot() override;
void appendSelection(const RiuSelectionItem* selectionItem);
void clearPlot();
@@ -84,9 +84,9 @@ private:
};
private:
virtual QSize sizeHint() const override;
virtual QSize minimumSizeHint() const override;
virtual void resizeEvent(QResizeEvent* e) override;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
void resizeEvent(QResizeEvent* e) override;
void idealAxesEndPoints(double* xMin, double* xMax, double* yMax) const;

4
ApplicationCode/UserInterface/RiuMultiCaseImportDialog.cpp
View File

@@ -38,7 +38,7 @@ public:
{
}
virtual Qt::ItemFlags flags (const QModelIndex& index) const
Qt::ItemFlags flags (const QModelIndex& index) const override
{
if (m_isItemsEditable)
return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
@@ -46,7 +46,7 @@ public:
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
}
virtual QVariant data ( const QModelIndex & index, int role ) const
QVariant data ( const QModelIndex & index, int role ) const override
{
if (role == Qt::DecorationRole)
{

2
ApplicationCode/UserInterface/RiuMultiCaseImportDialog.h
View File

@@ -38,7 +38,7 @@ class RiuMultiCaseImportDialog: public QDialog
public:
explicit RiuMultiCaseImportDialog(QWidget *parent = nullptr);
virtual ~RiuMultiCaseImportDialog();
~RiuMultiCaseImportDialog() override;
QStringList eclipseCaseFileNames() const;

4
ApplicationCode/UserInterface/RiuNightchartsWidget.h
View File

@@ -41,10 +41,10 @@ public:
void clear();
virtual QSize sizeHint() const override;
QSize sizeHint() const override;
protected:
virtual void paintEvent(QPaintEvent* e);
void paintEvent(QPaintEvent* e) override;
private:
void updateSizePolicy();

2
ApplicationCode/UserInterface/RiuProcessMonitor.h
View File

@@ -47,7 +47,7 @@ private:
public:
explicit RiuProcessMonitor(QDockWidget* pParent);
~RiuProcessMonitor();
~RiuProcessMonitor() override;
void startMonitorWorkProcess(caf::UiProcess* process);
void stopMonitorWorkProcess();

4
ApplicationCode/UserInterface/RiuPropertyViewTabWidget.h
View File

@@ -34,9 +34,9 @@ class RiuPropertyViewTabWidget : public QDialog
{
public:
RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObject* object, const QString& windowTitle, const QStringList& uiConfigNameForTabs);
~RiuPropertyViewTabWidget();
~RiuPropertyViewTabWidget() override;
virtual QSize sizeHint() const override;
QSize sizeHint() const override;
private:
std::vector<caf::PdmUiPropertyView*> m_pageWidgets;

6
ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp
View File

@@ -54,8 +54,8 @@ class PvtQwtPlot : public QwtPlot
{
public:
PvtQwtPlot(QWidget* parent) : QwtPlot(parent) {}
virtual QSize sizeHint() const { return QSize(100, 100); }
virtual QSize minimumSizeHint() const { return QSize(0, 0); }
QSize sizeHint() const override { return QSize(100, 100); }
QSize minimumSizeHint() const override { return QSize(0, 0); }
};
@@ -74,7 +74,7 @@ public:
setStateMachine(new QwtPickerTrackerMachine);
}
virtual QwtText trackerText(const QPoint&) const
QwtText trackerText(const QPoint&) const override
{
QwtText text(m_trackerTextProvider->trackerText());
text.setRenderFlags(Qt::AlignLeft);

4
ApplicationCode/UserInterface/RiuPvtPlotPanel.h
View File

@@ -69,7 +69,7 @@ private:
const QwtPlotCurve* closestCurveSample(const QPoint& cursorPosition, int* closestSampleIndex) const;
size_t indexOfQwtCurve(const QwtPlotCurve* qwtCurve) const;
void updateTrackerPlotMarkerAndLabelFromPicker();
virtual QString trackerText() const override;
QString trackerText() const override;
private slots:
void slotPickerActivated(bool);
@@ -119,7 +119,7 @@ public:
public:
RiuPvtPlotPanel(QDockWidget* parent);
virtual ~RiuPvtPlotPanel();
~RiuPvtPlotPanel() override;
void setPlotData(RiaEclipseUnitTools::UnitSystem unitSystem, const std::vector<RigFlowDiagSolverInterface::PvtCurve>& fvfCurveArr, const std::vector<RigFlowDiagSolverInterface::PvtCurve>& viscosityCurveArr, FvfDynProps fvfDynProps, ViscosityDynProps viscosityDynProps, CellValues cellValues, QString cellReferenceText);
void clearPlot();

6
ApplicationCode/UserInterface/RiuQwtCurvePointTracker.h
View File

@@ -34,14 +34,14 @@ class RiuQwtCurvePointTracker : public QwtPlotPicker
{
public:
explicit RiuQwtCurvePointTracker(QwtPlot* plot, bool isMainAxisHorizontal, IPlotCurveInfoTextProvider* curveInfoTextProvider = nullptr);
~RiuQwtCurvePointTracker();
~RiuQwtCurvePointTracker() override;
protected:
virtual bool eventFilter(QObject *, QEvent *) override;
bool eventFilter(QObject *, QEvent *) override;
void removeMarkerOnFocusLeave();
virtual QwtText trackerText(const QPoint& pos) const override;
QwtText trackerText(const QPoint& pos) const override;
QPointF closestCurvePoint(const QPoint& cursorPosition,
QString* curveInfoText,
QString* valueAxisValueString,

8
ApplicationCode/UserInterface/RiuQwtPlotCurve.h
View File

@@ -65,7 +65,7 @@ public:
public:
explicit RiuQwtPlotCurve(const QString &title = QString::null);
virtual ~RiuQwtPlotCurve();
~RiuQwtPlotCurve() override;
void setSamplesFromXValuesAndYValues(const std::vector<double>& xValues,
const std::vector<double>& yValues,
@@ -105,13 +105,13 @@ public:
const QColor& curveColor);
protected:
virtual void drawCurve(QPainter* p, int style,
void drawCurve(QPainter* p, int style,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect,
int from, int to) const;
int from, int to) const override;
virtual void drawSymbols(QPainter *p, const QwtSymbol &symbol,
void drawSymbols(QPainter *p, const QwtSymbol &symbol,
const QwtScaleMap &xMap,
const QwtScaleMap &yMap,
const QRectF &canvasRect,

10
ApplicationCode/UserInterface/RiuQwtPlotItemGroup.h
View File

@@ -32,15 +32,15 @@ class RiuQwtPlotItemGroup : public QwtPlotItem
{
public:
RiuQwtPlotItemGroup();
~RiuQwtPlotItemGroup();
~RiuQwtPlotItemGroup() override;
void addPlotItem(QwtPlotItem* plotItem);
void addLegendItem(QwtPlotItem* legendItem);
virtual int rtti() const override { return 5000; }
virtual void draw(QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap, const QRectF &canvasRect) const override;
virtual QRectF boundingRect() const override;
virtual QwtGraphic legendIcon(int index, const QSizeF &size) const override;
int rtti() const override { return 5000; }
void draw(QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap, const QRectF &canvasRect) const override;
QRectF boundingRect() const override;
QwtGraphic legendIcon(int index, const QSizeF &size) const override;
private:
std::vector<QwtPlotItem*> m_plotItems;

2
ApplicationCode/UserInterface/RiuQwtPlotWheelZoomer.h
View File

@@ -28,7 +28,7 @@ class RiuQwtPlotWheelZoomer : public QObject
public:
RiuQwtPlotWheelZoomer(QwtPlot* plot);
virtual bool eventFilter(QObject * watched, QEvent * event) override;
bool eventFilter(QObject * watched, QEvent * event) override;
signals:
void zoomUpdated();

2
ApplicationCode/UserInterface/RiuQwtPlotZoomer.h
View File

@@ -25,7 +25,7 @@ public:
RiuQwtPlotZoomer(QWidget * canvas, bool doReplot=true) : QwtPlotZoomer(canvas, doReplot) {}
protected:
virtual QSizeF minZoomSize() const override
QSizeF minZoomSize() const override
{
return QwtPlotZoomer::minZoomSize() / 10.0e6;
}

2
ApplicationCode/UserInterface/RiuQwtScalePicker.h
View File

@@ -14,7 +14,7 @@ class RiuQwtScalePicker : public QObject
public:
explicit RiuQwtScalePicker(QwtPlot *plot);
virtual bool eventFilter( QObject *, QEvent * );
bool eventFilter( QObject *, QEvent * ) override;
Q_SIGNALS:
void clicked( int axis, double value );

4
ApplicationCode/UserInterface/RiuQwtSymbol.h
View File

@@ -55,12 +55,12 @@ public:
RiuQwtSymbol(PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition = LabelAboveSymbol);
virtual void renderSymbols(QPainter *painter, const QPointF *points, int numPoints) const override;
void renderSymbols(QPainter *painter, const QPointF *points, int numPoints) const override;
void renderSymbolLabel(QPainter *painter, const QPointF& position) const;
QString label() const { return m_label; }
void setLabelPosition(LabelPosition labelPosition);
virtual QRect boundingRect() const override;
QRect boundingRect() const override;
private:
QRect labelBoundingRect(const QRect& symbolRect) const;

2
ApplicationCode/UserInterface/RiuRecentFileActionProvider.h
View File

@@ -36,7 +36,7 @@ class RiuRecentFileActionProvider : public QObject
public:
explicit RiuRecentFileActionProvider(int maxActionCount = 9);
~RiuRecentFileActionProvider();
~RiuRecentFileActionProvider() override;
void addFileName(const QString& fileName);
std::vector<QAction*> actions() const;

4
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp
View File

@@ -59,8 +59,8 @@ class RelPermQwtPlot : public QwtPlot
{
public:
RelPermQwtPlot(QWidget* parent) : QwtPlot(parent) {}
virtual QSize sizeHint() const { return QSize(100, 100); }
virtual QSize minimumSizeHint() const { return QSize(0, 0); }
QSize sizeHint() const override { return QSize(100, 100); }
QSize minimumSizeHint() const override { return QSize(0, 0); }
};

4
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.h
View File

@@ -44,7 +44,7 @@ class RiuRelativePermeabilityPlotPanel : public QWidget
public:
RiuRelativePermeabilityPlotPanel(QDockWidget* parent);
virtual ~RiuRelativePermeabilityPlotPanel();
~RiuRelativePermeabilityPlotPanel() override;
void setPlotData(RiaEclipseUnitTools::UnitSystem unitSystem,
const std::vector<RigFlowDiagSolverInterface::RelPermCurve>& relPermCurves,
@@ -108,7 +108,7 @@ private:
std::vector<RigFlowDiagSolverInterface::RelPermCurve> gatherUiSelectedCurves() const;
QString asciiDataForUiSelectedCurves() const;
virtual void contextMenuEvent(QContextMenuEvent* event) override;
void contextMenuEvent(QContextMenuEvent* event) override;
private slots:
void slotButtonInButtonGroupClicked(int);

2
ApplicationCode/UserInterface/RiuResultInfoPanel.h
View File

@@ -39,7 +39,7 @@ public:
void setInfo(const QString& info);
virtual QSize sizeHint () const;
QSize sizeHint () const override;
private:
static void convertStringToHTML(QString* str);

8
ApplicationCode/UserInterface/RiuResultQwtPlot.h
View File

@@ -45,7 +45,7 @@ class RiuResultQwtPlot : public QwtPlot
public:
explicit RiuResultQwtPlot(QWidget* parent = nullptr);
virtual ~RiuResultQwtPlot();
~RiuResultQwtPlot() override;
void addCurve(const RimCase* rimCase,
const QString& curveName,
@@ -61,9 +61,9 @@ public:
void deleteAllCurves();
protected:
virtual QSize sizeHint() const override;
virtual QSize minimumSizeHint() const override;
virtual void contextMenuEvent(QContextMenuEvent *) override;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
void contextMenuEvent(QContextMenuEvent *) override;
private:
void setDefaults();

4
ApplicationCode/UserInterface/RiuRmsNavigation.h
View File

@@ -26,7 +26,7 @@ class RiuRmsNavigation : public caf::TrackBallBasedNavigation
{
public:
RiuRmsNavigation();
virtual ~RiuRmsNavigation();
~RiuRmsNavigation() override;
protected:
virtual bool handleInputEvent(QInputEvent* inputEvent);
bool handleInputEvent(QInputEvent* inputEvent) override;
};

24
ApplicationCode/UserInterface/RiuSelectionManager.h
View File

@@ -139,9 +139,9 @@ public:
cvf::StructGridInterface::FaceType face,
const cvf::Vec3d& localIntersectionPointInDisplay);
virtual ~RiuEclipseSelectionItem() {};
~RiuEclipseSelectionItem() override {};
virtual RiuSelectionType type() const
RiuSelectionType type() const override
{
return ECLIPSE_SELECTION_OBJECT;
}
@@ -179,9 +179,9 @@ public:
int elementFace,
const cvf::Vec3d& localIntersectionPointInDisplay,
const std::array<cvf::Vec3f, 3>& intersectionTriangle );
virtual ~RiuGeoMechSelectionItem() {};
~RiuGeoMechSelectionItem() override {};
virtual RiuSelectionType type() const
RiuSelectionType type() const override
{
return GEOMECH_SELECTION_OBJECT;
}
@@ -208,9 +208,9 @@ class Riu2dIntersectionSelectionItem : public RiuSelectionItem
public:
explicit Riu2dIntersectionSelectionItem(Rim2dIntersectionView* view, RiuSelectionItem *selItem);
virtual ~Riu2dIntersectionSelectionItem();
~Riu2dIntersectionSelectionItem() override;
virtual RiuSelectionType type() const
RiuSelectionType type() const override
{
return INTERSECTION_SELECTION_OBJECT;
}
@@ -239,9 +239,9 @@ public:
const cvf::Vec3d& pipeCenterLineIntersectionInDomainCoords,
double measuredDepth);
virtual ~RiuWellPathSelectionItem() {};
~RiuWellPathSelectionItem() override {};
virtual RiuSelectionType type() const
RiuSelectionType type() const override
{
return WELLPATH_SELECTION_OBJECT;
}
@@ -265,9 +265,9 @@ public:
explicit RiuSimWellSelectionItem(RimSimWellInView* simwell, cvf::Vec3d domainCoord, size_t branchIndex);
virtual ~RiuSimWellSelectionItem() {};
~RiuSimWellSelectionItem() override {};
virtual RiuSelectionType type() const
RiuSelectionType type() const override
{
return SIMWELL_SELECTION_OBJECT;
}
@@ -289,9 +289,9 @@ class RiuGeneralSelectionItem : public RiuSelectionItem
public:
RiuGeneralSelectionItem(caf::PdmObject* object);
virtual ~RiuGeneralSelectionItem() {};
~RiuGeneralSelectionItem() override {};
virtual RiuSelectionType type() const
RiuSelectionType type() const override
{
return GENERAL_SELECTION_OBJECT;
}

2
ApplicationCode/UserInterface/RiuSimpleHistogramWidget.h
View File

@@ -37,7 +37,7 @@ public:
void setMean(double mean) {m_mean = mean;}
protected:
virtual void paintEvent(QPaintEvent* event);
void paintEvent(QPaintEvent* event) override;
private:
void draw(QPainter *painter,int x, int y, int width, int height );

12
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.h
View File

@@ -54,7 +54,7 @@ class RiuSummaryCurveDefSelection : public caf::PdmObject
public:
RiuSummaryCurveDefSelection();
virtual ~RiuSummaryCurveDefSelection();
~RiuSummaryCurveDefSelection() override;
void setSelectedCurveDefinitions(const std::vector<RiaSummaryCurveDefinition>& curveDefinitions);
std::vector<RiaSummaryCurveDefinition> allCurveDefinitionsFromSelection() const;
@@ -69,12 +69,12 @@ public:
void setDefaultSelection(const std::vector<SummarySource*>& defaultCases);
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;

2
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h
View File

@@ -37,7 +37,7 @@ class RiuSummaryCurveDefSelectionDialog : public QDialog
{
public:
RiuSummaryCurveDefSelectionDialog(QWidget* parent);
~RiuSummaryCurveDefSelectionDialog();
~RiuSummaryCurveDefSelectionDialog() override;
void setCaseAndAddress(RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& address);
void setEnsembleAndAddress(RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& address);

6
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h
View File

@@ -47,15 +47,15 @@ class RiuSummaryCurveDefSelectionEditor : public caf::PdmUiFormLayoutObjectEdito
{
public:
RiuSummaryCurveDefSelectionEditor();
~RiuSummaryCurveDefSelectionEditor();
~RiuSummaryCurveDefSelectionEditor() override;
RiuSummaryCurveDefSelection* summaryAddressSelection() const;
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;
void configureAndUpdateFields(int widgetStartIndex,
QBoxLayout* layout,

2
ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp
View File

@@ -75,7 +75,7 @@ public:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
virtual QString curveInfoText(QwtPlotCurve* curve) override
QString curveInfoText(QwtPlotCurve* curve) override
{
RiuRimQwtPlotCurve* riuCurve = dynamic_cast<RiuRimQwtPlotCurve*>(curve);
RimSummaryCurve* sumCurve = nullptr;

16
ApplicationCode/UserInterface/RiuSummaryQwtPlot.h
View File

@@ -49,10 +49,10 @@ class RiuSummaryQwtPlot : public QwtPlot, public RiuInterfaceToViewWindow
Q_OBJECT;
public:
RiuSummaryQwtPlot(RimSummaryPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuSummaryQwtPlot();
~RiuSummaryQwtPlot() override;
RimSummaryPlot* ownerPlotDefinition();
virtual RimViewWindow* ownerViewWindow() const override;
RimViewWindow* ownerViewWindow() const override;
void useDateBasedTimeAxis();
void useTimeBasedTimeAxis();
@@ -68,13 +68,13 @@ public:
static void enableDateBasedBottomXAxis(QwtPlot* plot);
protected:
virtual bool eventFilter(QObject* watched, QEvent* event) override;
virtual void keyPressEvent(QKeyEvent *) override;
bool eventFilter(QObject* watched, QEvent* event) override;
void keyPressEvent(QKeyEvent *) override;
virtual QSize sizeHint() const override;
virtual QSize minimumSizeHint() const override;
virtual void contextMenuEvent(QContextMenuEvent *) override;
virtual void updateLayout() override;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
void contextMenuEvent(QContextMenuEvent *) override;
void updateLayout() override;
private:
void setDefaults();

6
ApplicationCode/UserInterface/RiuTextDialog.h
View File

@@ -39,7 +39,7 @@ public:
explicit RiuQPlainTextEdit(QWidget *parent = nullptr) : QPlainTextEdit(parent) {}
protected:
virtual void keyPressEvent(QKeyEvent *e) override;
void keyPressEvent(QKeyEvent *e) override;
private slots:
void slotCopyContentToClipboard();
@@ -63,7 +63,7 @@ public:
private:
RiuQPlainTextEdit* m_textEdit;
protected:
virtual void contextMenuEvent(QContextMenuEvent *) override;
void contextMenuEvent(QContextMenuEvent *) override;
};
@@ -94,6 +94,6 @@ private slots:
void slotTabChanged(int index);
protected:
virtual void contextMenuEvent(QContextMenuEvent *) override;
void contextMenuEvent(QContextMenuEvent *) override;
};

8
ApplicationCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.h
View File

@@ -44,10 +44,10 @@ class RiuTofAccumulatedPhaseFractionsPlot : public QwtPlot, public RiuInterfaceT
public:
RiuTofAccumulatedPhaseFractionsPlot(RimTofAccumulatedPhaseFractionsPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuTofAccumulatedPhaseFractionsPlot();
~RiuTofAccumulatedPhaseFractionsPlot() override;
RimTofAccumulatedPhaseFractionsPlot* ownerPlotDefinition();
virtual RimViewWindow* ownerViewWindow() const override;
RimViewWindow* ownerViewWindow() const override;
void setSamples(std::vector<double> xSamples,
std::vector<double> watValues,
@@ -56,8 +56,8 @@ public:
int maxTofYears);
protected:
virtual QSize sizeHint() const override;
virtual int heightForWidth(int w) const override;
QSize sizeHint() const override;
int heightForWidth(int w) const override;
private:
void setDefaults();

2
ApplicationCode/UserInterface/RiuToolTipMenu.h
View File

@@ -28,5 +28,5 @@ class RiuToolTipMenu : public QMenu
public:
explicit RiuToolTipMenu(QWidget * parent);
bool event(QEvent* e);
bool event(QEvent* e) override;
};

2
ApplicationCode/UserInterface/RiuTreeViewEventFilter.h
View File

@@ -32,5 +32,5 @@ public:
explicit RiuTreeViewEventFilter(QObject* parent);
protected:
bool eventFilter(QObject *obj, QEvent *event);
bool eventFilter(QObject *obj, QEvent *event) override;
};

6
ApplicationCode/UserInterface/RiuViewer.h
View File

@@ -69,7 +69,7 @@ class RiuViewer : public caf::Viewer, public RiuInterfaceToViewWindow
public:
RiuViewer(const QGLFormat& format, QWidget* parent);
~RiuViewer();
~RiuViewer() override;
void setDefaultView();
cvf::Vec3d pointOfInterest();
@@ -124,8 +124,8 @@ public slots:
protected:
void optimizeClippingPlanes() override;
void resizeGL(int width, int height) override;
virtual void mouseMoveEvent(QMouseEvent* e) override;
virtual void leaveEvent(QEvent *) override;
void mouseMoveEvent(QMouseEvent* e) override;
void leaveEvent(QEvent *) override;
private:
void updateLegendLayout();

2
ApplicationCode/UserInterface/RiuViewerCommands.h
View File

@@ -53,7 +53,7 @@ class RiuViewerCommands: public QObject
public:
explicit RiuViewerCommands(RiuViewer* ownerViewer);
~RiuViewerCommands();
~RiuViewerCommands() override;
void setOwnerView(Rim3dView * owner);

10
ApplicationCode/UserInterface/RiuWellAllocationPlot.h
View File

@@ -46,10 +46,10 @@ class RiuWellAllocationPlot : public QFrame, public RiuInterfaceToViewWindow
Q_OBJECT;
public:
RiuWellAllocationPlot(RimWellAllocationPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuWellAllocationPlot();
~RiuWellAllocationPlot() override;
RimWellAllocationPlot* ownerPlotDefinition();
virtual RimViewWindow* ownerViewWindow() const override;
RimViewWindow* ownerViewWindow() const override;
void showTitle(const QString& title);
void hideTitle();
@@ -59,10 +59,10 @@ public:
protected:
virtual QSize sizeHint() const override;
virtual QSize minimumSizeHint() const override;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
virtual void contextMenuEvent(QContextMenuEvent *) override;
void contextMenuEvent(QContextMenuEvent *) override;
private:
void setDefaults();

16
ApplicationCode/UserInterface/RiuWellLogPlot.h
View File

@@ -48,10 +48,10 @@ class RiuWellLogPlot : public QWidget, public RiuInterfaceToViewWindow
public:
RiuWellLogPlot(RimWellLogPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuWellLogPlot();
~RiuWellLogPlot() override;
RimWellLogPlot* ownerPlotDefinition();
virtual RimViewWindow* ownerViewWindow() const override;
RimViewWindow* ownerViewWindow() const override;
void addTrackPlot(RiuWellLogTrack* trackPlot);
void insertTrackPlot(RiuWellLogTrack* trackPlot, size_t index);
@@ -64,14 +64,14 @@ public slots:
void updateChildrenLayout();
protected:
virtual void resizeEvent(QResizeEvent *event);
virtual void showEvent(QShowEvent *);
virtual void changeEvent(QEvent *);
virtual void contextMenuEvent(QContextMenuEvent *) override;
virtual QSize sizeHint() const override;
void resizeEvent(QResizeEvent *event) override;
void showEvent(QShowEvent *) override;
void changeEvent(QEvent *) override;
void contextMenuEvent(QContextMenuEvent *) override;
QSize sizeHint() const override;
virtual void keyPressEvent(QKeyEvent* keyEvent) override;
void keyPressEvent(QKeyEvent* keyEvent) override;
private:
void updateScrollBar(double minDepth, double maxDepth);

8
ApplicationCode/UserInterface/RiuWellLogTrack.h
View File

@@ -43,7 +43,7 @@ class RiuWellLogTrack : public QwtPlot
public:
RiuWellLogTrack(RimWellLogTrack* plotTrackDefinition, QWidget* parent = nullptr);
virtual ~RiuWellLogTrack();
~RiuWellLogTrack() override;
void setDepthZoom(double minDepth, double maxDepth);
void setDepthTitle(const QString& title);
@@ -61,9 +61,9 @@ public:
double getCurrentMajorTickInterval() const;
double getCurrentMinorTickInterval() const;
protected:
virtual bool eventFilter(QObject* watched, QEvent* event);
virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const;
bool eventFilter(QObject* watched, QEvent* event) override;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
private:
void setDefaults();

10
ApplicationCode/UserInterface/RiuWellPltPlot.h
View File

@@ -46,19 +46,19 @@ class RiuWellPltPlot : public QFrame, public RiuInterfaceToViewWindow
Q_OBJECT;
public:
RiuWellPltPlot(RimWellPltPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuWellPltPlot();
~RiuWellPltPlot() override;
RimWellPltPlot* ownerPlotDefinition();
virtual RimViewWindow* ownerViewWindow() const override;
RimViewWindow* ownerViewWindow() const override;
void showTitle(const QString& title);
void hideTitle();
protected:
virtual QSize sizeHint() const override;
virtual QSize minimumSizeHint() const override;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
virtual void contextMenuEvent(QContextMenuEvent *) override;
void contextMenuEvent(QContextMenuEvent *) override;
private:
void setDefaults();

10
ApplicationCode/UserInterface/RiuWellRftPlot.h
View File

@@ -46,19 +46,19 @@ class RiuWellRftPlot : public QFrame, public RiuInterfaceToViewWindow
Q_OBJECT;
public:
RiuWellRftPlot(RimWellRftPlot* plotDefinition, QWidget* parent = nullptr);
virtual ~RiuWellRftPlot();
~RiuWellRftPlot() override;
RimWellRftPlot* ownerPlotDefinition();
virtual RimViewWindow* ownerViewWindow() const override;
RimViewWindow* ownerViewWindow() const override;
void showTitle(const QString& title);
void hideTitle();
protected:
virtual QSize sizeHint() const override;
virtual QSize minimumSizeHint() const override;
QSize sizeHint() const override;
QSize minimumSizeHint() const override;
virtual void contextMenuEvent(QContextMenuEvent *) override;
void contextMenuEvent(QContextMenuEvent *) override;
private:
void setDefaults();

2
ApplicationCode/UserInterface/RiuWidgetDragger.h
View File

@@ -30,7 +30,7 @@ class RiuWidgetDragger : public QObject
public:
RiuWidgetDragger(QWidget* widgetToMove);
virtual bool eventFilter(QObject * watched, QEvent * event) override;
bool eventFilter(QObject * watched, QEvent * event) override;
private:
QPointer<QWidget> m_widgetToMove;