From 999ce9a4d34fa09cecb095205a96e9af4d738015 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Mon, 24 Mar 2025 08:49:05 +0100 Subject: [PATCH] refactor: Fix clang-tidy warnings --- src/gui/models/listmodelbase.h | 34 +++++++++++------------ src/gui/models/listmodelbasenontemplate.h | 19 ++++++------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/gui/models/listmodelbase.h b/src/gui/models/listmodelbase.h index 91c61d978..70421128b 100644 --- a/src/gui/models/listmodelbase.h +++ b/src/gui/models/listmodelbase.h @@ -41,47 +41,47 @@ namespace swift::gui::models using ObjectType = typename T::value_type; //! Destructor - virtual ~CListModelBase() override {} + ~CListModelBase() override = default; //! \name Functions from QStandardItemModel //! @{ //! \copydoc QStandardItemModel::data - virtual QVariant data(const QModelIndex &index, int role) const override; + QVariant data(const QModelIndex &index, int role) const override; //! \copydoc QStandardItemModel::setData - virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) final override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) final; //! \copydoc QStandardItemModel::mimeData - virtual QMimeData *mimeData(const QModelIndexList &indexes) const final override; + QMimeData *mimeData(const QModelIndexList &indexes) const final; //! \copydoc QStandardItemModel::sort - virtual void sort(int column, Qt::SortOrder order) final override; + void sort(int column, Qt::SortOrder order) final; //! \copydoc QStandardItemModel::rowCount - virtual int rowCount(const QModelIndex &parentIndex = QModelIndex()) const final override; + int rowCount(const QModelIndex &parentIndex = QModelIndex()) const final; //! \copydoc QStandardItemModel::canDropMimeData - virtual bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, - const QModelIndex &parent) const final override; + bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, + const QModelIndex &parent) const final; //! \copydoc QStandardItemModel::dropMimeData - virtual bool dropMimeData(const QMimeData *mimeData, Qt::DropAction action, int row, int column, - const QModelIndex &parent) final override; + bool dropMimeData(const QMimeData *mimeData, Qt::DropAction action, int row, int column, + const QModelIndex &parent) final; //! @} //! \name Functions from CListModelBaseNonTemplate //! @{ //! \copydoc swift::gui::models::CListModelBaseNonTemplate::toJson - virtual QJsonObject toJson(bool selectedOnly = false) const override; + QJsonObject toJson(bool selectedOnly = false) const override; //! \copydoc swift::gui::models::CListModelBaseNonTemplate::toJsonString - virtual QString toJsonString(QJsonDocument::JsonFormat format = QJsonDocument::Indented, - bool selectedOnly = false) const override; + QString toJsonString(QJsonDocument::JsonFormat format = QJsonDocument::Indented, + bool selectedOnly = false) const override; //! \copydoc swift::gui::models::CListModelBaseNonTemplate::isOrderable - virtual bool isOrderable() const override; + bool isOrderable() const override; //! @} //! Valid index (in range) @@ -196,11 +196,11 @@ namespace swift::gui::models //! @{ //! \copydoc swift::gui::models::CListModelBaseNonTemplate::onDataChanged - virtual void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomLeft, - const QVector &roles) override; + void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomLeft, + const QVector &roles) override; //! \copydoc swift::gui::models::CListModelBaseNonTemplate::onDataChanged - virtual void onChangedDigest() override; + void onChangedDigest() override; //! @} //! Update filtered container diff --git a/src/gui/models/listmodelbasenontemplate.h b/src/gui/models/listmodelbasenontemplate.h index 1fffa5794..157f10047 100644 --- a/src/gui/models/listmodelbasenontemplate.h +++ b/src/gui/models/listmodelbasenontemplate.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -42,33 +41,33 @@ namespace swift::gui::models static constexpr int asyncThreshold = 50; //! Destructor - virtual ~CListModelBaseNonTemplate() override {} + ~CListModelBaseNonTemplate() override = default; //! \name Functions from QStandardItemModel //! @{ //! \copydoc QStandardItemModel::columnCount - virtual int columnCount(const QModelIndex &modelIndex = QModelIndex()) const final override; + int columnCount(const QModelIndex &modelIndex = QModelIndex()) const final; //! \copydoc QStandardItemModel::headerData - virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const final override; + QVariant headerData(int section, Qt::Orientation orientation, int role) const final; //! \copydoc QStandardItemModel::index - virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const final override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const final; //! \copydoc QStandardItemModel::parent - virtual QModelIndex parent(const QModelIndex &child) const final override; + QModelIndex parent(const QModelIndex &child) const final; //! \copydoc QStandardItemModel::flags - virtual Qt::ItemFlags flags(const QModelIndex &index) const final override; + Qt::ItemFlags flags(const QModelIndex &index) const final; //! \copydoc QStandardItemModel::supportedDragActions - virtual Qt::DropActions supportedDragActions() const final override; + Qt::DropActions supportedDragActions() const final; //! \copydoc QStandardItemModel::supportedDropActions - virtual Qt::DropActions supportedDropActions() const final override; + Qt::DropActions supportedDropActions() const final; //! \copydoc QStandardItemModel::mimeTypes - virtual QStringList mimeTypes() const final override; + QStringList mimeTypes() const final; //! @} //! Column to property index