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>

2 files changed, 28 insertions, 28 deletions

diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp
index 27a926eca2..cd7237e4b4 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.cpp
+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
@@ -396,7 +396,7 @@ void QXcbDrag::move(const QMouseEvent *me)
     QXcbWindow *w = 0;
     if (target) {
         w = connection()->platformWindowFromId(target);
-        if (w && (w->window()->windowType() == Qt::Desktop) /*&& !w->acceptDrops()*/)
+        if (w && (w->window()->type() == Qt::Desktop) /*&& !w->acceptDrops()*/)
             w = 0;
     } else {
         w = 0;
@@ -507,7 +507,7 @@ void QXcbDrag::drop(const QMouseEvent *event)
 
     QXcbWindow *w = connection()->platformWindowFromId(current_proxy_target);
 
-    if (w && (w->window()->windowType() == Qt::Desktop) /*&& !w->acceptDrops()*/)
+    if (w && (w->window()->type() == Qt::Desktop) /*&& !w->acceptDrops()*/)
         w = 0;
 
     Transaction t = {
@@ -722,7 +722,7 @@ void QXcbDrag::handle_xdnd_position(QWindow *w, const xcb_client_message_event_t
 
     p -= geometry.topLeft();
 
-    if (!w || (w->windowType() == Qt::Desktop))
+    if (!w || (w->type() == Qt::Desktop))
         return;
 
     if (e->data.data32[0] != xdnd_dragsource) {
@@ -912,7 +912,7 @@ void QXcbDrag::send_leave()
 
     QXcbWindow *w = connection()->platformWindowFromId(current_proxy_target);
 
-    if (w && (w->window()->windowType() == Qt::Desktop) /*&& !w->acceptDrops()*/)
+    if (w && (w->window()->type() == Qt::Desktop) /*&& !w->acceptDrops()*/)
         w = 0;
 
     if (w)
@@ -1157,7 +1157,7 @@ bool QXcbDrag::dndEnable(QXcbWindow *w, bool on)
     DNDDEBUG << "xdndEnable" << w << on;
     if (on) {
         QXcbWindow *xdnd_widget = 0;
-        if ((w->window()->windowType() == Qt::Desktop)) {
+        if ((w->window()->type() == Qt::Desktop)) {
             if (desktop_proxy) // *WE* already have one.
                 return false;
 
@@ -1191,7 +1191,7 @@ bool QXcbDrag::dndEnable(QXcbWindow *w, bool on)
             return false;
         }
     } else {
-        if ((w->window()->windowType() == Qt::Desktop)) {
+        if ((w->window()->type() == Qt::Desktop)) {
             xcb_delete_property(xcb_connection(), w->xcb_window(), atom(QXcbAtom::XdndProxy));
             delete desktop_proxy;
             desktop_proxy = 0;
@@ -1225,7 +1225,7 @@ QVariant QXcbDropData::xdndObtainData(const QByteArray &format, QVariant::Type r
 
     QXcbConnection *c = drag->connection();
     QXcbWindow *xcb_window = c->platformWindowFromId(drag->xdnd_dragsource);
-    if (xcb_window && drag->currentDrag() && xcb_window->window()->windowType() != Qt::Desktop) {
+    if (xcb_window && drag->currentDrag() && xcb_window->window()->type() != Qt::Desktop) {
         QMimeData *data = drag->currentDrag()->mimeData();
         if (data->hasFormat(QLatin1String(format)))
             result = data->data(QLatin1String(format));
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index e29218d951..81ab3fe4ee 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -121,13 +121,13 @@ QT_BEGIN_NAMESPACE
 // Returns true if we should set WM_TRANSIENT_FOR on \a w
 static inline bool isTransient(const QWindow *w)
 {
-    return w->windowType() == Qt::Dialog
-           || w->windowType() == Qt::Sheet
-           || w->windowType() == Qt::Tool
-           || w->windowType() == Qt::SplashScreen
-           || w->windowType() == Qt::ToolTip
-           || w->windowType() == Qt::Drawer
-           || w->windowType() == Qt::Popup;
+    return w->type() == Qt::Dialog
+           || w->type() == Qt::Sheet
+           || w->type() == Qt::Tool
+           || w->type() == Qt::SplashScreen
+           || w->type() == Qt::ToolTip
+           || w->type() == Qt::Drawer
+           || w->type() == Qt::Popup;
 }
 
 static inline QImage::Format imageFormatForDepth(int depth)
@@ -175,7 +175,7 @@ void QXcbWindow::create()
     m_configureNotifyPending = true;
     m_windowState = Qt::WindowNoState;
 
-    Qt::WindowType type = window()->windowType();
+    Qt::WindowType type = window()->type();
 
     if (type == Qt::Desktop) {
         m_window = m_screen->root();
@@ -309,7 +309,7 @@ void QXcbWindow::create()
     if (m_screen->syncRequestSupported())
         properties[propertyCount++] = atom(QXcbAtom::_NET_WM_SYNC_REQUEST);
 
-    if (window()->windowFlags() & Qt::WindowContextHelpButtonHint)
+    if (window()->flags() & Qt::WindowContextHelpButtonHint)
         properties[propertyCount++] = atom(QXcbAtom::_NET_WM_CONTEXT_HELP);
 
     Q_XCB_CALL(xcb_change_property(xcb_connection(),
@@ -347,7 +347,7 @@ void QXcbWindow::create()
     memset(&hints, 0, sizeof(hints));
     xcb_wm_hints_set_normal(&hints);
 
-    xcb_wm_hints_set_input(&hints, !(window()->windowFlags() & Qt::WindowDoesNotAcceptFocus));
+    xcb_wm_hints_set_input(&hints, !(window()->flags() & Qt::WindowDoesNotAcceptFocus));
 
     xcb_set_wm_hints(xcb_connection(), m_window, &hints);
 
@@ -375,11 +375,11 @@ void QXcbWindow::create()
     connection()->xi2Select(m_window);
 #endif
 
-    setWindowFlags(window()->windowFlags());
-    setWindowTitle(window()->windowTitle());
     setWindowState(window()->windowState());
+    setWindowFlags(window()->flags());
+    setWindowTitle(window()->title());
 
-    if (window()->windowFlags() & Qt::WindowTransparentForInput)
+    if (window()->flags() & Qt::WindowTransparentForInput)
         setTransparentForMouseEvents(true);
 
 #ifndef QT_NO_DRAGANDDROP
@@ -534,7 +534,7 @@ void QXcbWindow::show()
         else
             xcb_wm_hints_set_normal(&hints);
 
-        xcb_wm_hints_set_input(&hints, !(window()->windowFlags() & Qt::WindowDoesNotAcceptFocus));
+        xcb_wm_hints_set_input(&hints, !(window()->flags() & Qt::WindowDoesNotAcceptFocus));
 
         xcb_set_wm_hints(xcb_connection(), m_window, &hints);
 
@@ -943,8 +943,8 @@ void QXcbWindow::updateMotifWmHintsBeforeMap()
 {
     QtMotifWmHints mwmhints = getMotifWmHints(connection(), m_window);
 
-    if (window()->windowModality() != Qt::NonModal) {
-        switch (window()->windowModality()) {
+    if (window()->modality() != Qt::NonModal) {
+        switch (window()->modality()) {
         case Qt::WindowModal:
             mwmhints.input_mode = MWM_INPUT_PRIMARY_APPLICATION_MODAL;
             break;
@@ -979,17 +979,17 @@ void QXcbWindow::updateMotifWmHintsBeforeMap()
         }
     }
 
-    if (window()->windowFlags() & Qt::WindowMinimizeButtonHint) {
+    if (window()->flags() & Qt::WindowMinimizeButtonHint) {
         mwmhints.flags |= MWM_HINTS_DECORATIONS;
         mwmhints.decorations |= MWM_DECOR_MINIMIZE;
         mwmhints.functions |= MWM_FUNC_MINIMIZE;
     }
-    if (window()->windowFlags() & Qt::WindowMaximizeButtonHint) {
+    if (window()->flags() & Qt::WindowMaximizeButtonHint) {
         mwmhints.flags |= MWM_HINTS_DECORATIONS;
         mwmhints.decorations |= MWM_DECOR_MAXIMIZE;
         mwmhints.functions |= MWM_FUNC_MAXIMIZE;
     }
-    if (window()->windowFlags() & Qt::WindowCloseButtonHint)
+    if (window()->flags() & Qt::WindowCloseButtonHint)
         mwmhints.functions |= MWM_FUNC_CLOSE;
 
     setMotifWmHints(connection(), m_window, mwmhints);
@@ -999,7 +999,7 @@ void QXcbWindow::updateNetWmStateBeforeMap()
 {
     NetWmStates states(0);
 
-    const Qt::WindowFlags flags = window()->windowFlags();
+    const Qt::WindowFlags flags = window()->flags();
     if (flags & Qt::WindowStaysOnTopHint) {
         states |= NetWmStateAbove;
         states |= NetWmStateStaysOnTop;
@@ -1015,7 +1015,7 @@ void QXcbWindow::updateNetWmStateBeforeMap()
         states |= NetWmStateMaximizedVert;
     }
 
-    if (window()->windowModality() != Qt::NonModal)
+    if (window()->modality() != Qt::NonModal)
         states |= NetWmStateModal;
 
     setNetWmStates(states);