whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some code checker issues (L218 & L243) 

An addition, avoid code duplication.

Change-Id: I26d1d8d65ba330a2024eb5c17c3bceb21e014200
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Jan Arve Sæther 2020-11-13 01:12:27 +01:00
parent 2bce62a318
commit 600b7bfa89
1 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/gui/util/qgridlayoutengine_p.h
View File

@ -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<qreal&>(static_cast<const QGridLayoutBox*>(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