From 600b7bfa89e560cd23a7586e8f8c4393dd5aca05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Fri, 13 Nov 2020 01:12:27 +0100 Subject: [PATCH] Remove some code checker issues (L218 & L243) An addition, avoid code duplication. Change-Id: I26d1d8d65ba330a2024eb5c17c3bceb21e014200 Reviewed-by: Volker Hilsheimer --- src/gui/util/qgridlayoutengine_p.h | 43 +++++------------------------- 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h index 1ca12dfdf7..17b65b6220 100644 --- a/src/gui/util/qgridlayoutengine_p.h +++ b/src/gui/util/qgridlayoutengine_p.h @@ -194,53 +194,24 @@ public: qreal q_minimumAscent; inline qreal &q_sizes(int which) { - qreal *t; - switch (which) { - case Qt::MinimumSize: - t = &q_minimumSize; - break; - case Qt::PreferredSize: - t = &q_preferredSize; - break; - case Qt::MaximumSize: - t = &q_maximumSize; - break; - case Qt::MinimumDescent: - t = &q_minimumDescent; - break; - case (Qt::MinimumDescent + 1): - t = &q_minimumAscent; - break; - default: - t = nullptr; - break; - } - return *t; + return const_cast(static_cast(this)->q_sizes(which)); } inline const qreal &q_sizes(int which) const { - const qreal *t; switch (which) { case Qt::MinimumSize: - t = &q_minimumSize; - break; + return q_minimumSize; case Qt::PreferredSize: - t = &q_preferredSize; - break; + return q_preferredSize; case Qt::MaximumSize: - t = &q_maximumSize; - break; + return q_maximumSize; case Qt::MinimumDescent: - t = &q_minimumDescent; - break; + return q_minimumDescent; case (Qt::MinimumDescent + 1): - t = &q_minimumAscent; - break; + return q_minimumAscent; default: - t = nullptr; - break; + Q_UNREACHABLE(); } - return *t; } }; Q_DECLARE_TYPEINFO(QGridLayoutBox, Q_MOVABLE_TYPE); // cannot be Q_PRIMITIVE_TYPE, as q_maximumSize, say, is != 0