diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-15 17:01:11 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-16 16:53:18 +0200 |
commit | 90295dcd030e731acfbcfe480cadfe84200b1a0a (patch) | |
tree | 1aff3c21fc3e1c5791b0b6742b6b81621fe38053 /tests | |
parent | fe4a5a27e09b8109381e52aa1b71135a916dff1a (diff) |
Remove deprecated QStyle enum values
Change-Id: I7eba336017844c06b2976df53d440e167abd7894
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp | 36 | ||||
-rw-r--r-- | tests/auto/widgets/styles/qstyle/tst_qstyle.cpp | 52 |
2 files changed, 18 insertions, 70 deletions
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 1d63d140fb..26dbab5e15 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -449,33 +449,33 @@ class Qt42Style : public QProxyStyle public: Qt42Style() : QProxyStyle(QStyleFactory::create("windows")) { - spacing = 6; - margin = 9; - margin_toplevel = 11; } - virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const; + virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr, + const QWidget * widget = nullptr ) const; - int spacing; - int margin; - int margin_toplevel; + int spacing = 6; + int margin = 9; + int margin_toplevel = 11; }; -int Qt42Style::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/, - const QWidget * widget /*= 0*/ ) const +int Qt42Style::pixelMetric(PixelMetric metric, const QStyleOption * option, + const QWidget * widget) const { switch (metric) { - case PM_DefaultLayoutSpacing: - return spacing; - break; - case PM_DefaultTopLevelMargin: - return margin_toplevel; - break; - case PM_DefaultChildMargin: + case PM_LayoutLeftMargin: + case PM_LayoutRightMargin: + case PM_LayoutTopMargin: + case PM_LayoutBottomMargin: + if (option && option->state & State_Window) + return margin_toplevel; + if (widget && widget->isWindow()) + return margin_toplevel; return margin; - break; + case PM_LayoutHorizontalSpacing: + case PM_LayoutVerticalSpacing: + return spacing; default: break; } diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index 4cec54856f..58dbfeb118 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -83,7 +83,6 @@ private slots: #endif void testStyleFactory(); void testProxyStyle(); - void pixelMetric(); #if !defined(QT_NO_STYLE_WINDOWS) && !defined(QT_NO_STYLE_FUSION) void progressBarChangeStyle(); #endif @@ -348,57 +347,6 @@ void MyWidget::paintEvent(QPaintEvent *) } -class Qt42Style : public QCommonStyle -{ - Q_OBJECT -public: - int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, - const QWidget *widget = nullptr) const override; - - int margin_toplevel = 10; - int margin = 5; - int spacing = 0; -}; - -int Qt42Style::pixelMetric(PixelMetric metric, const QStyleOption * /* option = 0*/, - const QWidget * /* widget = 0*/ ) const -{ - switch (metric) { - case QStyle::PM_DefaultTopLevelMargin: - return margin_toplevel; - case QStyle::PM_DefaultChildMargin: - return margin; - case QStyle::PM_DefaultLayoutSpacing: - return spacing; - default: - break; - } - return -1; -} - - -void tst_QStyle::pixelMetric() -{ - QScopedPointer<Qt42Style> style(new Qt42Style); - QCOMPARE(style->pixelMetric(QStyle::PM_DefaultTopLevelMargin), 10); - QCOMPARE(style->pixelMetric(QStyle::PM_DefaultChildMargin), 5); - QCOMPARE(style->pixelMetric(QStyle::PM_DefaultLayoutSpacing), 0); - - style->margin_toplevel = 0; - style->margin = 0; - style->spacing = 0; - QCOMPARE(style->pixelMetric(QStyle::PM_DefaultTopLevelMargin), 0); - QCOMPARE(style->pixelMetric(QStyle::PM_DefaultChildMargin), 0); - QCOMPARE(style->pixelMetric(QStyle::PM_DefaultLayoutSpacing), 0); - - style->margin_toplevel = -1; - style->margin = -1; - style->spacing = -1; - QCOMPARE(style->pixelMetric(QStyle::PM_DefaultTopLevelMargin), -1); - QCOMPARE(style->pixelMetric(QStyle::PM_DefaultChildMargin), -1); - QCOMPARE(style->pixelMetric(QStyle::PM_DefaultLayoutSpacing), -1); -} - #if !defined(QT_NO_STYLE_WINDOWS) && !defined(QT_NO_STYLE_FUSION) void tst_QStyle::progressBarChangeStyle() { |