diff options
author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-08-28 15:33:35 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-31 18:56:35 +0200 |
commit | 60783291ff967b1441518e749d2dcf4e7bc4b831 (patch) | |
tree | 1b187fadac7ce4e214039b9e9ecfd887a8dade16 /tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp | |
parent | 50e3da79bf15374cc6e2b7a108004a1b7b1c4126 (diff) |
auto tests: updated for new QStyle pure virtuals
QStyle::standardIconImplementation() & layoutSpacingImplementation()
are removed, and standardIcon() & layoutSpacing() made pure virtual.
Change-Id: If8ab6cfef0b639b7973be22dd630ba3e6f39a225
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Diffstat (limited to 'tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp')
-rw-r--r-- | tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index b0db1fe88d..48c786aa9d 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -85,8 +85,8 @@ private slots: void styleDependentSpacingsAndMargins_data(); void styleDependentSpacingsAndMargins(); - void layoutSpacingImplementation_data(); - void layoutSpacingImplementation(); + void layoutSpacing_data(); + void layoutSpacing(); void spacing(); void spacerWithSpacing(); void contentsRect(); @@ -944,12 +944,11 @@ public: int vspacing; bool reimplementSubelementRect; -protected slots: - int layoutSpacingImplementation(QSizePolicy::ControlType control1, - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption *option = 0, - const QWidget *widget = 0) const; + int layoutSpacing(QSizePolicy::ControlType control1, + QSizePolicy::ControlType control2, + Qt::Orientation orientation, + const QStyleOption *option = 0, + const QWidget *widget = 0) const; }; @@ -978,7 +977,7 @@ QRect CustomLayoutStyle::subElementRect(SubElement sr, const QStyleOption *opt, #define CT1(c) CT2(c, c) #define CT2(c1, c2) ((uint)c1 << 16) | (uint)c2 -int CustomLayoutStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1, +int CustomLayoutStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption * /*option = 0*/, @@ -1091,7 +1090,7 @@ void tst_QGridLayout::styleDependentSpacingsAndMargins() } } -void tst_QGridLayout::layoutSpacingImplementation_data() +void tst_QGridLayout::layoutSpacing_data() { QTest::addColumn<QWidget*>("widget"); // expected @@ -1103,7 +1102,7 @@ void tst_QGridLayout::layoutSpacingImplementation_data() CustomLayoutStyle *style = new CustomLayoutStyle(); { // If the layoutSpacing is negative, the layouting code will call - // layoutSpacingImplementation() + // layoutSpacing() style->hspacing = -1; style->vspacing = -1; style->reimplementSubelementRect = false; @@ -1441,7 +1440,7 @@ void tst_QGridLayout::layoutSpacingImplementation_data() } -void tst_QGridLayout::layoutSpacingImplementation() +void tst_QGridLayout::layoutSpacing() { QFETCH(QWidget *, widget); QFETCH(PointList, expectedpositions); |