diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-27 14:48:51 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 03:18:16 +0200 |
commit | a85d343a39577cdf953d0759e356c59a77ae743f (patch) | |
tree | fdbd9229902d5efc0ca637dc79d6aa7cc5645635 /src/widgets/kernel/qsizepolicy.h | |
parent | 3b6bb13e6a197bb4ba85b397ae9d2b8c659d6b26 (diff) |
Widgets: Remove QT3_SUPPPORT.
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077
Reviewed-on: http://codereview.qt-project.org/5629
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qsizepolicy.h')
-rw-r--r-- | src/widgets/kernel/qsizepolicy.h | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index 76067604f9..826991ceb3 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -148,51 +148,6 @@ public: void transpose(); -#ifdef QT3_SUPPORT - typedef Policy SizeType; -#ifndef qdoc - typedef Qt::Orientations ExpandData; - enum { - NoDirection = 0, - Horizontally = 1, - Vertically = 2, - BothDirections = Horizontally | Vertically - }; -#else - enum ExpandData { - NoDirection = 0x0, - Horizontally = 0x1, - Vertically = 0x2, - BothDirections = 0x3 - }; -#endif // qdoc - - inline QT3_SUPPORT bool mayShrinkHorizontally() const - { return horizontalPolicy() & ShrinkFlag; } - inline QT3_SUPPORT bool mayShrinkVertically() const { return verticalPolicy() & ShrinkFlag; } - inline QT3_SUPPORT bool mayGrowHorizontally() const { return horizontalPolicy() & GrowFlag; } - inline QT3_SUPPORT bool mayGrowVertically() const { return verticalPolicy() & GrowFlag; } - inline QT3_SUPPORT Qt::Orientations expanding() const { return expandingDirections(); } - - QT3_SUPPORT_CONSTRUCTOR QSizePolicy(Policy hor, Policy ver, bool hfw) - : data(hor | (ver<<HSize) | (hfw ? (1U<<2*HSize) : 0)) { } - - QT3_SUPPORT_CONSTRUCTOR QSizePolicy(Policy hor, Policy ver, uchar hors, uchar vers, bool hfw = false) - : data(hor | (ver<<HSize) | (hfw ? (1U<<2*HSize) : 0)) { - setHorizontalStretch(hors); - setVerticalStretch(vers); - } - - inline QT3_SUPPORT Policy horData() const { return static_cast<Policy>(data & HMask); } - inline QT3_SUPPORT Policy verData() const { return static_cast<Policy>((data & VMask) >> HSize); } - inline QT3_SUPPORT void setHorData(Policy d) { setHorizontalPolicy(d); } - inline QT3_SUPPORT void setVerData(Policy d) { setVerticalPolicy(d); } - - inline QT3_SUPPORT uint horStretch() const { return horizontalStretch(); } - inline QT3_SUPPORT uint verStretch() const { return verticalStretch(); } - inline QT3_SUPPORT void setHorStretch(uchar sf) { setHorizontalStretch(sf); } - inline QT3_SUPPORT void setVerStretch(uchar sf) { setVerticalStretch(sf); } -#endif private: #ifndef QT_NO_DATASTREAM |