From 6d04cd32a7e867e512c593764ee8f77efb9c44ce Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 17 Feb 2024 16:46:59 +0200 Subject: [PATCH] Sonar warnings. --- src/app/puzzle/layout/layoutdef.cpp | 4 ++-- src/app/puzzle/layout/layoutdef.h | 5 +++-- src/app/puzzle/vpapplication.cpp | 10 +++++----- src/app/puzzle/vptilefactory.h | 2 +- src/libs/ifc/xml/utils.h | 3 +-- src/libs/vmisc/compatibility.h | 12 ++++++------ .../vpropertyexplorer/vpropertyformwidget.cpp | 16 ++++++++-------- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/app/puzzle/layout/layoutdef.cpp b/src/app/puzzle/layout/layoutdef.cpp index 946b5f4b0..0d11c339f 100644 --- a/src/app/puzzle/layout/layoutdef.cpp +++ b/src/app/puzzle/layout/layoutdef.cpp @@ -83,13 +83,13 @@ auto StrToGrainlineType(const QString &string) -> GrainlineType return type; } +#if __cplusplus < 202002L //--------------------------------------------------------------------------------------------------------------------- auto VPTransformationOrigon::operator==(const VPTransformationOrigon &origin) const -> bool { - return this->origin == origin.origin && custom == origin.custom; + return origin == origin.origin && custom == origin.custom; } -#if __cplusplus < 202002L //--------------------------------------------------------------------------------------------------------------------- auto VPTransformationOrigon::operator!=(const VPTransformationOrigon &origin) const -> bool { diff --git a/src/app/puzzle/layout/layoutdef.h b/src/app/puzzle/layout/layoutdef.h index e316d142a..843268d9f 100644 --- a/src/app/puzzle/layout/layoutdef.h +++ b/src/app/puzzle/layout/layoutdef.h @@ -58,9 +58,10 @@ struct VPTransformationOrigon QPointF origin{}; // NOLINT(misc-non-private-member-variables-in-classes) bool custom{false}; // NOLINT(misc-non-private-member-variables-in-classes) +#if __cplusplus >= 202002L + auto operator==(const VPTransformationOrigon &origin) const -> bool = default; +#else auto operator==(const VPTransformationOrigon &origin) const -> bool; - -#if __cplusplus < 202002L auto operator!=(const VPTransformationOrigon &origin) const -> bool; #endif }; diff --git a/src/app/puzzle/vpapplication.cpp b/src/app/puzzle/vpapplication.cpp index badcefb61..1d2fea4ab 100644 --- a/src/app/puzzle/vpapplication.cpp +++ b/src/app/puzzle/vpapplication.cpp @@ -56,6 +56,11 @@ #include "../vmisc/compatibility.h" #endif +#if !defined(BUILD_REVISION) && defined(QBS_BUILD) +#include +#define BUILD_REVISION VCS_REPO_STATE_REVISION +#endif + using namespace Qt::Literals::StringLiterals; QT_WARNING_PUSH @@ -66,11 +71,6 @@ Q_LOGGING_CATEGORY(pApp, "p.application") // NOLINT QT_WARNING_POP -#if !defined(BUILD_REVISION) && defined(QBS_BUILD) -#include -#define BUILD_REVISION VCS_REPO_STATE_REVISION -#endif - //--------------------------------------------------------------------------------------------------------------------- inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) // NOLINT(readability-function-cognitive-complexity) diff --git a/src/app/puzzle/vptilefactory.h b/src/app/puzzle/vptilefactory.h index a5a729029..70d48cf0d 100644 --- a/src/app/puzzle/vptilefactory.h +++ b/src/app/puzzle/vptilefactory.h @@ -39,7 +39,7 @@ class QGraphicsScene; class VCommonSettings; class QPainter; -class VPTileFactory : QObject +class VPTileFactory : public QObject { Q_OBJECT // NOLINT diff --git a/src/libs/ifc/xml/utils.h b/src/libs/ifc/xml/utils.h index 35ed166bc..76e581f68 100644 --- a/src/libs/ifc/xml/utils.h +++ b/src/libs/ifc/xml/utils.h @@ -28,12 +28,11 @@ #ifndef UTILS_H #define UTILS_H -#include #include +#include class QMimeType; class QString; -class QMimeType; class QByteArray; #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) diff --git a/src/libs/vmisc/compatibility.h b/src/libs/vmisc/compatibility.h index 4e3ce163b..356f692a1 100644 --- a/src/libs/vmisc/compatibility.h +++ b/src/libs/vmisc/compatibility.h @@ -101,7 +101,7 @@ inline auto operator""_s(const char16_t *str, size_t size)Q_DECL_NOEXCEPT->QStri //--------------------------------------------------------------------------------------------------------------------- template class C> inline auto ConvertToList(const C &container) -> QList { - return QList(container.begin(), container.end()); + return QList(std::begin(container), std::end(container)); } //--------------------------------------------------------------------------------------------------------------------- @@ -113,25 +113,25 @@ template class C> inline auto ConvertToStringLi //--------------------------------------------------------------------------------------------------------------------- template class C> inline auto ConvertToSet(const C &container) -> QSet { - return QSet(container.begin(), container.end()); + return QSet(std::begin(container), std::end(container)); } //--------------------------------------------------------------------------------------------------------------------- template inline auto ConvertToSet(const C &container) -> QSet { - return QSet(container.begin(), container.end()); + return QSet(std::begin(container), std::end(container)); } //--------------------------------------------------------------------------------------------------------------------- template class C> inline auto ConvertToVector(const C &container) -> QVector { - return QVector(container.begin(), container.end()); + return QVector(std::begin(container), std::end(container)); } //--------------------------------------------------------------------------------------------------------------------- template inline auto ConvertToVector(const QSet &container) -> QVector { - return QVector(container.begin(), container.end()); + return QVector(std::begin(container), std::end(container)); } //--------------------------------------------------------------------------------------------------------------------- @@ -159,7 +159,7 @@ inline auto Reverse(const C &container) -> C } //--------------------------------------------------------------------------------------------------------------------- -template ::value, T>::type * = nullptr> +template , T> * = nullptr> inline auto Reverse(const T &container) -> T { return Reverse(container); diff --git a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp index 863b04afd..93a285eeb 100644 --- a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp +++ b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp @@ -78,16 +78,16 @@ void VPE::VPropertyFormWidget::build() { // Clear the old content, delete old widgets d_ptr->EditorWidgets.clear(); - if (layout()) + if (layout() != nullptr) { - QLayoutItem *child; - while (layout()->count() > 0 && (child = layout()->takeAt(0)) != nullptr) + while (layout()->count() > 0) { - if (child->widget()) + QLayoutItem *child = layout()->takeAt(0); + if (child != nullptr) { delete child->widget(); + delete child; } - delete child; } delete layout(); } @@ -98,7 +98,7 @@ void VPE::VPropertyFormWidget::build() return; //... only if there are properties } - QFormLayout *tmpFormLayout = new QFormLayout(this); + auto *tmpFormLayout = new QFormLayout(this); tmpFormLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); setLayout(tmpFormLayout); @@ -116,10 +116,10 @@ void VPE::VPropertyFormWidget::build() if (tmpProperty->propertyType() == Property::Complex) { buildEditor(tmpProperty, tmpFormLayout, Property::Complex); - QWidget *group = new QWidget(this); + auto *group = new QWidget(this); tmpFormLayout->addRow(group); - QFormLayout *subFormLayout = new QFormLayout(group); + auto *subFormLayout = new QFormLayout(group); subFormLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); QMargins margins = subFormLayout->contentsMargins(); margins.setTop(0);