diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2014-12-26 21:12:48 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-01-08 00:44:24 +0100 |
| commit | 5b720fbf5db29381393c3fd82c832d47c7793d5d (patch) | |
| tree | b8a924a31924f8abb18c5419e35cb950c2b9d7a1 /src/widgets/kernel/qsizepolicy.h | |
| parent | bac0796308e0cd76519ac76dfe06e7a749c20c0a (diff) | |
QSizePolicy: prepare for constexpr'ifcation
...by bringing expandingDirections() into a (C++11) constexpr'able form.
Change-Id: I1922329a6f579df2b3504c8ae048224f9b229d6c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets/kernel/qsizepolicy.h')
| -rw-r--r-- | src/widgets/kernel/qsizepolicy.h | 8 |
1 files changed, 2 insertions, 6 deletions
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; } |