From fd12fbcf332878ab6a5b6ef8f09804b8598faced Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Fri, 5 Feb 2010 12:29:08 +0200 Subject: Whitespace/tab fixes. Reviewed-by: Trust me --- src/gui/kernel/qwidget_s60.cpp | 2 +- tests/auto/qwidget/tst_qwidget.cpp | 90 +++++++++++++++++++------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index c84e1cc..a844430 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -1083,7 +1083,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate) setGeometry(qApp->desktop()->screenGeometry(this)); else if (newstate & Qt::WindowMaximized) setGeometry(qApp->desktop()->availableGeometry(this)); - else + else setGeometry(normalGeometry); //restore normal geometry diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 88bdc72..80b693c 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -9700,50 +9700,50 @@ void tst_QWidget::fullScreenWindowModeTransitions() layout->addWidget(button); widget.setLayout(layout); widget.show(); - + const QRect normalGeometry = widget.normalGeometry(); const QRect fullScreenGeometry = qApp->desktop()->screenGeometry(&widget); const QRect maximumScreenGeometry = qApp->desktop()->availableGeometry(&widget); CEikStatusPane *statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane(); CEikButtonGroupContainer *buttonGroup = CEikonEnv::Static()->AppUiFactory()->Cba(); - - //Enter + + //Enter widget.showNormal(); widget.showFullScreen(); QCOMPARE(widget.geometry(), fullScreenGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); - + QVERIFY(!statusPane->IsVisible()); + widget.showMaximized(); widget.showFullScreen(); QCOMPARE(widget.geometry(), fullScreenGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); - + QVERIFY(!statusPane->IsVisible()); + widget.showMinimized(); widget.showFullScreen(); QCOMPARE(widget.geometry(), fullScreenGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); - - //Exit + QVERIFY(!statusPane->IsVisible()); + + //Exit widget.showFullScreen(); widget.showNormal(); QCOMPARE(widget.geometry(), normalGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); + QVERIFY(statusPane->IsVisible()); widget.showFullScreen(); widget.showMaximized(); QCOMPARE(widget.geometry(), maximumScreenGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); + QVERIFY(statusPane->IsVisible()); widget.showFullScreen(); widget.showMinimized(); QCOMPARE(widget.geometry(), fullScreenGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); + QVERIFY(!statusPane->IsVisible()); } void tst_QWidget::maximizedWindowModeTransitions() @@ -9760,38 +9760,38 @@ void tst_QWidget::maximizedWindowModeTransitions() const QRect maximumScreenGeometry = qApp->desktop()->availableGeometry(&widget); CEikStatusPane *statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane(); CEikButtonGroupContainer *buttonGroup = CEikonEnv::Static()->AppUiFactory()->Cba(); - + //Enter widget.showNormal(); widget.showMaximized(); QCOMPARE(widget.geometry(), maximumScreenGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); - + QVERIFY(statusPane->IsVisible()); + widget.showFullScreen(); widget.showMaximized(); QCOMPARE(widget.geometry(), maximumScreenGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); - + QVERIFY(statusPane->IsVisible()); + widget.showMinimized(); widget.showMaximized(); QCOMPARE(widget.geometry(), maximumScreenGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); - + QVERIFY(statusPane->IsVisible()); + //Exit widget.showMaximized(); widget.showNormal(); QCOMPARE(widget.geometry(), normalGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); + QVERIFY(statusPane->IsVisible()); widget.showMaximized(); widget.showFullScreen(); QCOMPARE(widget.geometry(), fullScreenGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); + QVERIFY(!statusPane->IsVisible()); widget.showMaximized(); widget.showMinimized(); @@ -9799,7 +9799,7 @@ void tst_QWidget::maximizedWindowModeTransitions() // than with decoration visible. Altual size does not really matter since widget is invisible. QCOMPARE(widget.geometry(), qApp->desktop()->availableGeometry(&widget)); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); + QVERIFY(!statusPane->IsVisible()); } void tst_QWidget::minimizedWindowModeTransitions() @@ -9810,52 +9810,52 @@ void tst_QWidget::minimizedWindowModeTransitions() layout->addWidget(button); widget.setLayout(layout); widget.show(); - + const QRect normalGeometry = widget.normalGeometry(); const QRect fullScreenGeometry = qApp->desktop()->screenGeometry(&widget); const QRect maximumScreenGeometry = qApp->desktop()->availableGeometry(&widget); CEikStatusPane *statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane(); CEikButtonGroupContainer *buttonGroup = CEikonEnv::Static()->AppUiFactory()->Cba(); - + //Enter widget.showNormal(); widget.showMinimized(); QCOMPARE(widget.geometry(), normalGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); - + QVERIFY(!statusPane->IsVisible()); + widget.showFullScreen(); widget.showMinimized(); QCOMPARE(widget.geometry(), fullScreenGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); - + QVERIFY(!statusPane->IsVisible()); + widget.showMaximized(); widget.showMinimized(); // Since showMinimized hides window decoration availableGeometry gives different value // than with decoration visible. Altual size does not really matter since widget is invisible. QCOMPARE(widget.geometry(), qApp->desktop()->availableGeometry(&widget)); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); + QVERIFY(!statusPane->IsVisible()); //Exit widget.showMinimized(); widget.showNormal(); QCOMPARE(widget.geometry(), normalGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); + QVERIFY(statusPane->IsVisible()); widget.showMinimized(); widget.showFullScreen(); QCOMPARE(widget.geometry(), fullScreenGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); + QVERIFY(!statusPane->IsVisible()); widget.showMinimized(); widget.showMaximized(); QCOMPARE(widget.geometry(), maximumScreenGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); + QVERIFY(statusPane->IsVisible()); } void tst_QWidget::normalWindowModeTransitions() @@ -9866,50 +9866,50 @@ void tst_QWidget::normalWindowModeTransitions() layout->addWidget(button); widget.setLayout(layout); widget.show(); - + const QRect normalGeometry = widget.normalGeometry(); const QRect fullScreenGeometry = qApp->desktop()->screenGeometry(&widget); const QRect maximumScreenGeometry = qApp->desktop()->availableGeometry(&widget); CEikStatusPane *statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane(); CEikButtonGroupContainer *buttonGroup = CEikonEnv::Static()->AppUiFactory()->Cba(); - + //Enter widget.showMaximized(); widget.showNormal(); QCOMPARE(widget.geometry(), normalGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); - + QVERIFY(statusPane->IsVisible()); + widget.showFullScreen(); widget.showNormal(); QCOMPARE(widget.geometry(), normalGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); - + QVERIFY(statusPane->IsVisible()); + widget.showMinimized(); widget.showNormal(); QCOMPARE(widget.geometry(), normalGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); - + QVERIFY(statusPane->IsVisible()); + //Exit widget.showNormal(); widget.showMaximized(); QCOMPARE(widget.geometry(), maximumScreenGeometry); QVERIFY(buttonGroup->IsVisible()); - QVERIFY(statusPane->IsVisible()); + QVERIFY(statusPane->IsVisible()); widget.showNormal(); widget.showFullScreen(); QCOMPARE(widget.geometry(), fullScreenGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); - + QVERIFY(!statusPane->IsVisible()); + widget.showNormal(); widget.showMinimized(); QCOMPARE(widget.geometry(), normalGeometry); QVERIFY(!buttonGroup->IsVisible()); - QVERIFY(!statusPane->IsVisible()); + QVERIFY(!statusPane->IsVisible()); } #endif -- cgit v0.12