From 5b720fbf5db29381393c3fd82c832d47c7793d5d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 26 Dec 2014 21:12:48 +0100 Subject: QSizePolicy: prepare for constexpr'ifcation ...by bringing expandingDirections() into a (C++11) constexpr'able form. Change-Id: I1922329a6f579df2b3504c8ae048224f9b229d6c Reviewed-by: Thiago Macieira --- src/widgets/kernel/qsizepolicy.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/widgets/kernel/qsizepolicy.h') diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index 5b236d6e44..3a4fa80ba7 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -101,12 +101,8 @@ public: void setControlType(ControlType type); Qt::Orientations expandingDirections() const { - Qt::Orientations result; - if (verticalPolicy() & ExpandFlag) - result |= Qt::Vertical; - if (horizontalPolicy() & ExpandFlag) - result |= Qt::Horizontal; - return result; + return ( (verticalPolicy() & ExpandFlag) ? Qt::Vertical : Qt::Orientations() ) + | ( (horizontalPolicy() & ExpandFlag) ? Qt::Horizontal : Qt::Orientations() ) ; } void setHeightForWidth(bool b) { bits.hfw = b; } -- cgit v1.2.3