summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Hautakangas <ext-jani.hautakangas@nokia.com>2010-02-05 10:29:08 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-02-09 14:38:31 (GMT)
commita4e7084cca16845433ed6509732e05372cae4857 (patch)
tree769108f94480cbff6588a74333bda4a80b67831c
parentcfa5f6a59c22cad404327fed3cbbb276f5002410 (diff)
downloadQt-a4e7084cca16845433ed6509732e05372cae4857.zip
Qt-a4e7084cca16845433ed6509732e05372cae4857.tar.gz
Qt-a4e7084cca16845433ed6509732e05372cae4857.tar.bz2
Whitespace/tab fixes.
Reviewed-by: Trust me (cherry picked from commit fd12fbcf332878ab6a5b6ef8f09804b8598faced)
-rw-r--r--src/gui/kernel/qwidget_s60.cpp2
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp90
2 files changed, 46 insertions, 46 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 7d0a520..8e4757d 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 d257408..03eddee 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -9702,50 +9702,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()
@@ -9762,38 +9762,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();
@@ -9801,7 +9801,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()
@@ -9812,52 +9812,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()
@@ -9868,50 +9868,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