From 6a87189bba4b4eb9e0a58ab47cbb42f8794d6347 Mon Sep 17 00:00:00 2001
From: Tobias Knopff <t.knopff@fz-juelich.de>
Date: Mon, 28 Jun 2021 08:54:47 +0200
Subject: [PATCH] Replaced Q_DECL_OVERRIDE with override and some 0 with
nullptr
---
GUI/Models/FitParameterProxyModel.cpp | 6 ++---
GUI/Models/FitParameterProxyModel.h | 32 +++++++++++++--------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/GUI/Models/FitParameterProxyModel.cpp b/GUI/Models/FitParameterProxyModel.cpp
index c2601d7faa3..78dd9e57744 100644
--- a/GUI/Models/FitParameterProxyModel.cpp
+++ b/GUI/Models/FitParameterProxyModel.cpp
@@ -42,7 +42,7 @@ FitParameterProxyModel::FitParameterProxyModel(FitParameterContainerItem* fitPar
throw Error("FitParameterProxyModel::FitParameterProxyModel() -> Error. "
"Wrong item reported.");
}
- m_root_item = 0;
+ m_root_item = nullptr;
},
this);
}
@@ -376,13 +376,13 @@ QModelIndex FitParameterProxyModel::indexOfItem(SessionItem* item) const
SessionItem* FitParameterProxyModel::itemForIndex(const QModelIndex& index) const
{
if (!m_root_item)
- return 0;
+ return nullptr;
if (index.isValid()) {
SessionItem* item = static_cast<SessionItem*>(index.internalPointer());
if (item) {
if (!isValidSourceItem(item)) {
- return 0;
+ return nullptr;
}
return item;
}
diff --git a/GUI/Models/FitParameterProxyModel.h b/GUI/Models/FitParameterProxyModel.h
index eca5c2baf22..b0502eaec09 100644
--- a/GUI/Models/FitParameterProxyModel.h
+++ b/GUI/Models/FitParameterProxyModel.h
@@ -31,30 +31,30 @@ class FitParameterProxyModel : public QAbstractItemModel {
public:
explicit FitParameterProxyModel(FitParameterContainerItem* fitParContainer,
- QObject* parent = 0);
+ QObject* parent = nullptr);
~FitParameterProxyModel();
enum EColumn { COL_NAME, COL_TYPE, COL_VALUE, COL_MIN, COL_MAX, NUM_COLUMNS };
- Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
- QModelIndex index(int row, int column, const QModelIndex& parent) const Q_DECL_OVERRIDE;
- QModelIndex parent(const QModelIndex& child) const Q_DECL_OVERRIDE;
- int rowCount(const QModelIndex& parent) const Q_DECL_OVERRIDE;
- int columnCount(const QModelIndex& parent) const Q_DECL_OVERRIDE;
- QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
- bool setData(const QModelIndex& index, const QVariant& value, int role) Q_DECL_OVERRIDE;
-
- QStringList mimeTypes() const Q_DECL_OVERRIDE;
- Qt::DropActions supportedDragActions() const Q_DECL_OVERRIDE;
- Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
- QMimeData* mimeData(const QModelIndexList& indexes) const Q_DECL_OVERRIDE;
+ Qt::ItemFlags flags(const QModelIndex& index) const override;
+ QModelIndex index(int row, int column, const QModelIndex& parent) const override;
+ QModelIndex parent(const QModelIndex& child) const override;
+ int rowCount(const QModelIndex& parent) const override;
+ int columnCount(const QModelIndex& parent) const override;
+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+ bool setData(const QModelIndex& index, const QVariant& value, int role) override;
+
+ QStringList mimeTypes() const override;
+ Qt::DropActions supportedDragActions() const override;
+ Qt::DropActions supportedDropActions() const override;
+ QMimeData* mimeData(const QModelIndexList& indexes) const override;
bool canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column,
- const QModelIndex& parent) const Q_DECL_OVERRIDE;
+ const QModelIndex& parent) const override;
bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column,
- const QModelIndex& parent) Q_DECL_OVERRIDE;
+ const QModelIndex& parent) override;
- QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE;
+ QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
QModelIndex indexOfItem(SessionItem* item) const;
SessionItem* itemForIndex(const QModelIndex& index) const;
--
GitLab