Rename all QWindow properties that have "window" in them

windowTitle, windowModality, windowIcon and so on are named that way
to be similar to the ones in QWidget.  However QQuickWindow inherits
all of the declared properties, and we would like to have shorter
property names in QML.  If you are working with a Window then it's
obvious the title property is the window title.  Unfortunately,
there must be patches in many other modules which depend on this one.
In order to avoid the need to merge them all at the same time,
there is also patch https://codereview.qt-project.org/#change,39001
which temporarily adds backwards-compatible accessors, which can be
removed after the other modules are able to build without them.

We should not rename windowState to state, because in QML, state
usually drives the state machine for animation transitions etc.
(although QWindow is not an Item, a user might get confused about it).

Related patches are
https://codereview.qt-project.org/#change,39001
https://codereview.qt-project.org/#change,37764
https://codereview.qt-project.org/#change,37765
https://codereview.qt-project.org/#change,37766
https://codereview.qt-project.org/#change,37762

Change-Id: Ie4424ec15fbdef6b29b137f90a2ae33f173edd21
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

4 files changed, 33 insertions, 33 deletions

diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
index a7c38d6664..3417e18b7f 100644
--- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -111,7 +111,7 @@ void tst_QGuiApplication::focusObject()
 
 
     // verify active window focus propagates to qguiapplication
-    window1.requestActivateWindow();
+    window1.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window1));
     QCOMPARE(app.focusWindow(), &window1);
 
@@ -247,10 +247,10 @@ void tst_QGuiApplication::changeFocusWindow()
     window2.show();
     QVERIFY(QTest::qWaitForWindowExposed(&window1));
     QVERIFY(QTest::qWaitForWindowExposed(&window2));
-    window1.requestActivateWindow();
+    window1.requestActivate();
     QTRY_COMPARE(app.focusWindow(), &window1);
 
-    window2.requestActivateWindow();
+    window2.requestActivate();
     QTRY_COMPARE(app.focusWindow(), &window2);
     QCOMPARE(window1.windowDuringFocusAboutToChange, &window1);
     QCOMPARE(window1.windowDuringFocusOut, &window2);
@@ -381,14 +381,14 @@ void tst_QGuiApplication::modalWindow()
 
     BlockableWindow *windowModalWindow1 = new BlockableWindow;
     windowModalWindow1->setTransientParent(window1);
-    windowModalWindow1->setWindowModality(Qt::WindowModal);
+    windowModalWindow1->setModality(Qt::WindowModal);
 
     BlockableWindow *windowModalWindow2 = new BlockableWindow;
     windowModalWindow2->setTransientParent(windowModalWindow1);
-    windowModalWindow2->setWindowModality(Qt::WindowModal);
+    windowModalWindow2->setModality(Qt::WindowModal);
 
     BlockableWindow *applicationModalWindow1 = new BlockableWindow;
-    applicationModalWindow1->setWindowModality(Qt::ApplicationModal);
+    applicationModalWindow1->setModality(Qt::ApplicationModal);
 
     // show the 2 windows, nothing is blocked
     window1->show();
diff --git a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
index 21ed4c42b1..2697cdaa30 100644
--- a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
+++ b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
@@ -202,7 +202,7 @@ void tst_qinputmethod::cursorRectangle()
     DummyWindow window;
     window.show();
     QVERIFY(QTest::qWaitForWindowExposed(&window));
-    window.requestActivateWindow();
+    window.requestActivate();
     QTRY_COMPARE(qApp->focusWindow(), &window);
     window.setFocusObject(&m_inputItem);
 
@@ -300,7 +300,7 @@ void tst_qinputmethod::inputMethodAccepted()
     DummyWindow window;
     window.show();
     QVERIFY(QTest::qWaitForWindowExposed(&window));
-    window.requestActivateWindow();
+    window.requestActivate();
     QTRY_COMPARE(qApp->focusWindow(), &window);
     window.setFocusObject(&disabledItem);
 
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index f85e48022a..a3eeeb15c7 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -113,7 +113,7 @@ public:
     Window()
     {
         reset();
-        setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+        setFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
     }
 
     void reset()
@@ -268,7 +268,7 @@ void tst_QWindow::isActive()
 
     QTRY_VERIFY(child.isExposed());
 
-    child.requestActivateWindow();
+    child.requestActivate();
 
     QTRY_VERIFY(QGuiApplication::focusWindow() == &child);
     QVERIFY(child.isActive());
@@ -288,7 +288,7 @@ void tst_QWindow::isActive()
     dialog.setGeometry(110, 110, 300, 30);
     dialog.show();
 
-    dialog.requestActivateWindow();
+    dialog.requestActivate();
 
     QTRY_VERIFY(dialog.isExposed());
     QCoreApplication::processEvents();
@@ -302,7 +302,7 @@ void tst_QWindow::isActive()
     // parent is active
     QVERIFY(child.isActive());
 
-    window.requestActivateWindow();
+    window.requestActivate();
 
     QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
     QCoreApplication::processEvents();
@@ -731,9 +731,9 @@ void tst_QWindow::orientation()
     window.reportContentOrientationChange(Qt::PrimaryOrientation);
     QCOMPARE(window.contentOrientation(), Qt::PrimaryOrientation);
 
-    QVERIFY(!window.requestWindowOrientation(Qt::LandscapeOrientation) || window.windowOrientation() == Qt::LandscapeOrientation);
-    QVERIFY(!window.requestWindowOrientation(Qt::PortraitOrientation) || window.windowOrientation() == Qt::PortraitOrientation);
-    QVERIFY(!window.requestWindowOrientation(Qt::PrimaryOrientation) || window.windowOrientation() == Qt::PrimaryOrientation);
+    QVERIFY(!window.requestOrientation(Qt::LandscapeOrientation) || window.orientation() == Qt::LandscapeOrientation);
+    QVERIFY(!window.requestOrientation(Qt::PortraitOrientation) || window.orientation() == Qt::PortraitOrientation);
+    QVERIFY(!window.requestOrientation(Qt::PrimaryOrientation) || window.orientation() == Qt::PrimaryOrientation);
 
     QSignalSpy spy(&window, SIGNAL(contentOrientationChanged(Qt::ScreenOrientation)));
     window.reportContentOrientationChange(Qt::LandscapeOrientation);
@@ -812,7 +812,7 @@ void tst_QWindow::activateAndClose()
     for (int i = 0; i < 10; ++i)  {
        QWindow window;
        window.show();
-       window.requestActivateWindow();
+       window.requestActivate();
        QVERIFY(QTest::qWaitForWindowActive(&window));
        QCOMPARE(qGuiApp->focusWindow(), &window);
     }
@@ -914,29 +914,29 @@ void tst_QWindow::windowModality()
     qRegisterMetaType<Qt::WindowModality>("Qt::WindowModality");
 
     QWindow window;
-    QSignalSpy spy(&window, SIGNAL(windowModalityChanged(Qt::WindowModality)));
+    QSignalSpy spy(&window, SIGNAL(modalityChanged(Qt::WindowModality)));
 
-    QCOMPARE(window.windowModality(), Qt::NonModal);
-    window.setWindowModality(Qt::NonModal);
-    QCOMPARE(window.windowModality(), Qt::NonModal);
+    QCOMPARE(window.modality(), Qt::NonModal);
+    window.setModality(Qt::NonModal);
+    QCOMPARE(window.modality(), Qt::NonModal);
     QCOMPARE(spy.count(), 0);
 
-    window.setWindowModality(Qt::WindowModal);
-    QCOMPARE(window.windowModality(), Qt::WindowModal);
+    window.setModality(Qt::WindowModal);
+    QCOMPARE(window.modality(), Qt::WindowModal);
     QCOMPARE(spy.count(), 1);
-    window.setWindowModality(Qt::WindowModal);
-    QCOMPARE(window.windowModality(), Qt::WindowModal);
+    window.setModality(Qt::WindowModal);
+    QCOMPARE(window.modality(), Qt::WindowModal);
     QCOMPARE(spy.count(), 1);
 
-    window.setWindowModality(Qt::ApplicationModal);
-    QCOMPARE(window.windowModality(), Qt::ApplicationModal);
+    window.setModality(Qt::ApplicationModal);
+    QCOMPARE(window.modality(), Qt::ApplicationModal);
     QCOMPARE(spy.count(), 2);
-    window.setWindowModality(Qt::ApplicationModal);
-    QCOMPARE(window.windowModality(), Qt::ApplicationModal);
+    window.setModality(Qt::ApplicationModal);
+    QCOMPARE(window.modality(), Qt::ApplicationModal);
     QCOMPARE(spy.count(), 2);
 
-    window.setWindowModality(Qt::NonModal);
-    QCOMPARE(window.windowModality(), Qt::NonModal);
+    window.setModality(Qt::NonModal);
+    QCOMPARE(window.modality(), Qt::NonModal);
     QCOMPARE(spy.count(), 3);
 }
 
@@ -1050,13 +1050,13 @@ void tst_QWindow::windowModality_QTBUG27039()
     InputTestWindow modalA;
     modalA.setTransientParent(&parent);
     modalA.setGeometry(10, 10, 20, 20);
-    modalA.setWindowModality(Qt::ApplicationModal);
+    modalA.setModality(Qt::ApplicationModal);
     modalA.show();
 
     InputTestWindow modalB;
     modalB.setTransientParent(&parent);
     modalB.setGeometry(30, 10, 20, 20);
-    modalB.setWindowModality(Qt::ApplicationModal);
+    modalB.setModality(Qt::ApplicationModal);
     modalB.show();
 
     QPointF local(5, 5);
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index d8d98a4126..242dacb55e 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -813,7 +813,7 @@ void tst_QAccessibility::mainWindowTest()
     child.setGeometry(10, 10, 20, 20);
     child.show();
 
-    child.requestActivateWindow();
+    child.requestActivate();
     QTRY_VERIFY(QGuiApplication::focusWindow() == &child);
 
     QAccessibleStateChangeEvent deactivate(&window, activeState);