summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qsizepolicy.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-09-04 23:18:47 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-13 19:12:09 +0200
commitaef44c7970457cc2b673429f8e632e4ac2ee3510 (patch)
tree114d0fe88bdef4b92556c8c54d9323f68475e1ed /src/widgets/kernel/qsizepolicy.h
parentc1c715f800d3c79eed8305f4b4be9bff8a81fda3 (diff)
Don't use an extension to the C++ language in public headers
According to Clang 3.3, this is an extension: qpalette.h:178:9: error: anonymous types declared in an anonymous union are an extension [-Werror,-Wnested-anon-types] qsizepolicy.h:148:9: error: anonymous types declared in an anonymous union are an extension [-Werror,-Wnested-anon-types] If you try to simply give the struct a name, it complains with: qpalette.h:178:16: error: types cannot be declared in an anonymous union Change-Id: I61c69b8e42a1f4c4a15a0733f2d7efa0b3e44864 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/widgets/kernel/qsizepolicy.h')
-rw-r--r--src/widgets/kernel/qsizepolicy.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h
index 9c6d67410a..8c3724affb 100644
--- a/src/widgets/kernel/qsizepolicy.h
+++ b/src/widgets/kernel/qsizepolicy.h
@@ -144,17 +144,18 @@ private:
#endif
QSizePolicy(int i) : data(i) { }
+ struct Bits {
+ quint32 horStretch : 8;
+ quint32 verStretch : 8;
+ quint32 horPolicy : 4;
+ quint32 verPolicy : 4;
+ quint32 ctype : 5;
+ quint32 hfw : 1;
+ quint32 wfh : 1;
+ quint32 retainSizeWhenHidden : 1;
+ };
union {
- struct {
- quint32 horStretch : 8;
- quint32 verStretch : 8;
- quint32 horPolicy : 4;
- quint32 verPolicy : 4;
- quint32 ctype : 5;
- quint32 hfw : 1;
- quint32 wfh : 1;
- quint32 retainSizeWhenHidden : 1;
- } bits;
+ Bits bits;
quint32 data;
};
};