diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-07-19 22:45:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-21 00:53:35 +0200 |
| commit | 55640cd3eeae4e9b9589b1a7463190fa4c227b2b (patch) | |
| tree | 6c5528aa4eafa147d3eda01a92c952f8db817ee9 /src/corelib/global/qflags.h | |
| parent | 761e4876f649e7b300b0d9ebe4f6bb7344f2e51a (diff) | |
QFlags: complete constexpr'ifcation
Change-Id: Ie7c33bc1e3abaa9100093a84e65bee5f3b80fe0f
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qflags.h')
| -rw-r--r-- | src/corelib/global/qflags.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index b578177aaf..010d746a46 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -53,7 +53,7 @@ class QFlag int i; public: Q_DECL_CONSTEXPR inline QFlag(int i); - inline operator int() const { return i; } + Q_DECL_CONSTEXPR inline operator int() const { return i; } }; Q_DECL_CONSTEXPR inline QFlag::QFlag(int ai) : i(ai) {} @@ -63,7 +63,7 @@ class QIncompatibleFlag int i; public: Q_DECL_CONSTEXPR inline explicit QIncompatibleFlag(int i); - inline operator int() const { return i; } + Q_DECL_CONSTEXPR inline operator int() const { return i; } }; Q_DECL_CONSTEXPR inline QIncompatibleFlag::QIncompatibleFlag(int ai) : i(ai) {} @@ -85,7 +85,7 @@ public: #endif Q_DECL_CONSTEXPR inline QFlags(Enum f) : i(f) {} Q_DECL_CONSTEXPR inline QFlags(Zero = 0) : i(0) {} - inline QFlags(QFlag f) : i(f) {} + Q_DECL_CONSTEXPR inline QFlags(QFlag f) : i(f) {} inline QFlags &operator&=(int mask) { i &= mask; return *this; } inline QFlags &operator&=(uint mask) { i &= mask; return *this; } @@ -107,7 +107,7 @@ public: Q_DECL_CONSTEXPR inline bool operator!() const { return !i; } - inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == int(f) ); } + Q_DECL_CONSTEXPR inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == int(f) ); } }; #define Q_DECLARE_FLAGS(Flags, Enum)\ |