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>

9 files changed, 60 insertions, 60 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm
index 8434cb75e9..bae52c91b8 100644
--- a/src/plugins/platforms/cocoa/qcocoamenubar.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm
@@ -219,7 +219,7 @@ QList<QCocoaMenuItem*> QCocoaMenuBar::merged() const
 
 bool QCocoaMenuBar::shouldDisable(QCocoaWindow *active) const
 {
-    if (active && (active->window()->windowModality() == Qt::NonModal))
+    if (active && (active->window()->modality() == Qt::NonModal))
         return false;
 
     if (m_window == active) {
@@ -232,7 +232,7 @@ bool QCocoaMenuBar::shouldDisable(QCocoaWindow *active) const
     // the menubar should be disabled. The exception in Qt is that if the
     // modal window is the only window on screen, then we enable the menu bar.
     foreach (QWindow *w, topWindows) {
-        if (w->isVisible() && w->windowModality() == Qt::ApplicationModal) {
+        if (w->isVisible() && w->modality() == Qt::ApplicationModal) {
             // check for other visible windows
             foreach (QWindow *other, topWindows) {
                 if ((w != other) && (other->isVisible())) {
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index b9c5a401d0..c1c5f49d3f 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -149,9 +149,9 @@ static bool isMouseEvent(NSEvent *ev)
 - (BOOL)canBecomeKeyWindow
 {
     // Most panels can be come the key window. Exceptions are:
-    if (m_cocoaPlatformWindow->window()->windowType() == Qt::ToolTip)
+    if (m_cocoaPlatformWindow->window()->type() == Qt::ToolTip)
         return NO;
-    if (m_cocoaPlatformWindow->window()->windowType() == Qt::SplashScreen)
+    if (m_cocoaPlatformWindow->window()->type() == Qt::SplashScreen)
         return NO;
     return YES;
 }
@@ -252,7 +252,7 @@ void QCocoaWindow::setVisible(bool visible)
 #endif
     if (visible) {
         // We need to recreate if the modality has changed as the style mask will need updating
-        if (m_windowModality != window()->windowModality())
+        if (m_windowModality != window()->modality())
             recreateWindow(parent());
         QCocoaWindow *parentCocoaWindow = 0;
         if (window()->transientParent()) {
@@ -264,8 +264,8 @@ void QCocoaWindow::setVisible(bool visible)
 
             // Register popup windows so that the parent window can
             // close them when needed.
-            if (window()->windowType() == Qt::Popup) {
-                // qDebug() << "transientParent and popup" << window()->windowType() << Qt::Popup << (window()->windowType() & Qt::Popup);
+            if (window()->type() == Qt::Popup) {
+                // qDebug() << "transientParent and popup" << window()->type() << Qt::Popup << (window()->type() & Qt::Popup);
                 parentCocoaWindow->m_activePopupWindow = window();
             }
 
@@ -281,12 +281,12 @@ void QCocoaWindow::setVisible(bool visible)
             syncWindowState(window()->windowState());
 
             if (window()->windowState() != Qt::WindowMinimized) {
-                if ((window()->windowModality() == Qt::WindowModal
-                     || window()->windowType() == Qt::Sheet)
+                if ((window()->modality() == Qt::WindowModal
+                     || window()->type() == Qt::Sheet)
                         && parentCocoaWindow) {
                     // show the window as a sheet
                     [NSApp beginSheet:m_nsWindow modalForWindow:parentCocoaWindow->m_nsWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
-                } else if (window()->windowModality() != Qt::NonModal) {
+                } else if (window()->modality() != Qt::NonModal) {
                     // show the window as application modal
                     QCocoaEventDispatcher *cocoaEventDispatcher = qobject_cast<QCocoaEventDispatcher *>(QGuiApplication::instance()->eventDispatcher());
                     Q_ASSERT(cocoaEventDispatcher != 0);
@@ -300,7 +300,7 @@ void QCocoaWindow::setVisible(bool visible)
                 }
 
                 // We want the events to properly reach the popup
-                if (window()->windowType() == Qt::Popup)
+                if (window()->type() == Qt::Popup)
                     [(NSPanel *)m_nsWindow setWorksWhenModal:YES];
             }
         }
@@ -366,7 +366,7 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags)
                  Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint;
         if (flags == Qt::Window) {
             styleMask = (NSResizableWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSTitledWindowMask);
-        } else if ((flags & Qt::Dialog) && (window()->windowModality() != Qt::NonModal)) {
+        } else if ((flags & Qt::Dialog) && (window()->modality() != Qt::NonModal)) {
             styleMask = NSTitledWindowMask;
         } else if (!(flags & Qt::FramelessWindowHint)) {
             if (flags & Qt::WindowMaximizeButtonHint)
@@ -435,7 +435,7 @@ void QCocoaWindow::setWindowIcon(const QIcon &icon)
 
     NSButton *iconButton = [m_nsWindow standardWindowButton:NSWindowDocumentIconButton];
     if (iconButton == nil) {
-        NSString *title = QCFString::toNSString(window()->windowTitle());
+        NSString *title = QCFString::toNSString(window()->title());
         [m_nsWindow setRepresentedURL:[NSURL fileURLWithPath:title]];
         iconButton = [m_nsWindow standardWindowButton:NSWindowDocumentIconButton];
     }
@@ -596,7 +596,7 @@ void QCocoaWindow::windowWillClose()
 bool QCocoaWindow::windowIsPopupType(Qt::WindowType type) const
 {
     if (type == Qt::Widget)
-        type = window()->windowType();
+        type = window()->type();
     if (type == Qt::Tool)
         return false; // Qt::Tool has the Popup bit set but isn't, at least on Mac.
 
@@ -632,8 +632,8 @@ void QCocoaWindow::recreateWindow(const QPlatformWindow *parentWindow)
 
         // QPlatformWindow subclasses must sync up with QWindow on creation:
         propagateSizeHints();
-        setWindowFlags(window()->windowFlags());
-        setWindowTitle(window()->windowTitle());
+        setWindowFlags(window()->flags());
+        setWindowTitle(window()->title());
         setWindowState(window()->windowState());
     } else {
         // Child windows have no NSWindow, link the NSViews instead.
@@ -648,8 +648,8 @@ NSWindow * QCocoaWindow::createNSWindow()
 
     NSRect frame = qt_mac_flipRect(window()->geometry(), window());
 
-    Qt::WindowType type = window()->windowType();
-    Qt::WindowFlags flags = window()->windowFlags();
+    Qt::WindowType type = window()->type();
+    Qt::WindowFlags flags = window()->flags();
 
     NSUInteger styleMask = windowStyleMask(flags);
     NSWindow *createdWindow = 0;
@@ -695,7 +695,7 @@ NSWindow * QCocoaWindow::createNSWindow()
 
     NSInteger level = windowLevel(flags);
     [createdWindow setLevel:level];
-    m_windowModality = window()->windowModality();
+    m_windowModality = window()->modality();
     return createdWindow;
 }
 
diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.cpp b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
index 592586fde0..04fe558541 100644
--- a/src/plugins/platforms/windows/qwindowsbackingstore.cpp
+++ b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
@@ -87,7 +87,7 @@ void QWindowsBackingStore::flush(QWindow *window, const QRegion &region,
     QWindowsWindow *rw = QWindowsWindow::baseWindowOf(window);
 
 #ifndef Q_OS_WINCE
-    if (rw->format().hasAlpha() && (window->windowFlags() & Qt::FramelessWindowHint)) {
+    if (rw->format().hasAlpha() && (window->flags() & Qt::FramelessWindowHint)) {
         const long wl = GetWindowLong(rw->handle(), GWL_EXSTYLE);
         if ((wl & WS_EX_LAYERED) == 0)
             SetWindowLong(rw->handle(), GWL_EXSTYLE, wl | WS_EX_LAYERED);
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index a0749388f9..aaa5573899 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -374,7 +374,7 @@ void QWindowsContext::setKeyGrabber(QWindow *w)
 
 QString QWindowsContext::registerWindowClass(const QWindow *w, bool isGL)
 {
-    const Qt::WindowFlags flags = w ? w->windowFlags() : (Qt::WindowFlags)0;
+    const Qt::WindowFlags flags = w ? w->flags() : (Qt::WindowFlags)0;
     const Qt::WindowFlags type = flags & Qt::WindowType_Mask;
 
     uint style = 0;
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index a02f0cd494..f6011ae082 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -354,10 +354,10 @@ QPlatformPixmap *QWindowsIntegration::createPlatformPixmap(QPlatformPixmap::Pixe
 QPlatformWindow *QWindowsIntegration::createPlatformWindow(QWindow *window) const
 {
     QWindowsWindow::WindowData requested;
-    requested.flags = window->windowFlags();
+    requested.flags = window->flags();
     requested.geometry = window->geometry();
     const QWindowsWindow::WindowData obtained
-            = QWindowsWindow::WindowData::create(window, requested, window->windowTitle());
+            = QWindowsWindow::WindowData::create(window, requested, window->title());
     if (QWindowsContext::verboseIntegration || QWindowsContext::verboseWindows)
         qDebug().nospace()
             << __FUNCTION__ << '<' << window << '\n'
@@ -372,7 +372,7 @@ QPlatformWindow *QWindowsIntegration::createPlatformWindow(QWindow *window) cons
     if (!obtained.hwnd)
         return 0;
     if (requested.flags != obtained.flags)
-        window->setWindowFlags(obtained.flags);
+        window->setFlags(obtained.flags);
     return new QWindowsWindow(window, obtained);
 }
 
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp
index c11bd8c53c..993a8d4228 100644
--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
+++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
@@ -682,16 +682,16 @@ static void showSystemMenu(QWindow* w)
 #define enabled (MF_BYCOMMAND | MF_ENABLED)
 #define disabled (MF_BYCOMMAND | MF_GRAYED)
 
-    EnableMenuItem(menu, SC_MINIMIZE, (topLevel->windowFlags() & Qt::WindowMinimizeButtonHint)?enabled:disabled);
+    EnableMenuItem(menu, SC_MINIMIZE, (topLevel->flags() & Qt::WindowMinimizeButtonHint)?enabled:disabled);
     bool maximized = IsZoomed(topLevelHwnd);
 
-    EnableMenuItem(menu, SC_MAXIMIZE, ! (topLevel->windowFlags() & Qt::WindowMaximizeButtonHint) || maximized?disabled:enabled);
+    EnableMenuItem(menu, SC_MAXIMIZE, ! (topLevel->flags() & Qt::WindowMaximizeButtonHint) || maximized?disabled:enabled);
     EnableMenuItem(menu, SC_RESTORE, maximized?enabled:disabled);
 
     // We should _not_ check with the setFixedSize(x,y) case here, since Windows is not able to check
     // this and our menu here would be out-of-sync with the menu produced by mouse-click on the
     // System Menu, or right-click on the title bar.
-    EnableMenuItem(menu, SC_SIZE, (topLevel->windowFlags() & Qt::MSWindowsFixedSizeDialogHint) || maximized?disabled:enabled);
+    EnableMenuItem(menu, SC_SIZE, (topLevel->flags() & Qt::MSWindowsFixedSizeDialogHint) || maximized?disabled:enabled);
     EnableMenuItem(menu, SC_MOVE, maximized?disabled:enabled);
     EnableMenuItem(menu, SC_CLOSE, enabled);
     // Set bold on close menu item
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 9aada91e73..25aae11d87 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -715,7 +715,7 @@ QWindowsWindow::QWindowsWindow(QWindow *aWindow, const WindowData &data) :
         setFlag(OpenGLSurface);
     QWindowsContext::instance()->addWindow(m_data.hwnd, this);
     if (aWindow->isTopLevel()) {
-        switch (aWindow->windowType()) {
+        switch (aWindow->type()) {
         case Qt::Window:
         case Qt::Dialog:
         case Qt::Sheet:
@@ -893,8 +893,8 @@ void QWindowsWindow::show_sys() const
     int sm = SW_SHOWNORMAL;
     bool fakedMaximize = false;
     const QWindow *w = window();
-    const Qt::WindowFlags flags = w->windowFlags();
-    const Qt::WindowType type = w->windowType();
+    const Qt::WindowFlags flags = w->flags();
+    const Qt::WindowType type = w->type();
     if (w->isTopLevel()) {
         const Qt::WindowState state = w->windowState();
         if (state & Qt::WindowMinimized) {
@@ -931,7 +931,7 @@ void QWindowsWindow::show_sys() const
 // partially from QWidgetPrivate::hide_sys()
 void QWindowsWindow::hide_sys() const
 {
-    const Qt::WindowFlags flags = window()->windowFlags();
+    const Qt::WindowFlags flags = window()->flags();
     if (flags != Qt::Desktop) {
         if (flags & Qt::Popup)
             ShowWindow(m_data.hwnd, SW_HIDE);
@@ -979,7 +979,7 @@ void QWindowsWindow::setParent_sys(const QPlatformWindow *parent) const
         // to dialog frames, etc (see  SetParent() ) if the top level state changes.
         if (wasTopLevel != isTopLevel) {
             const unsigned flags = isTopLevel ? unsigned(0) : unsigned(WindowCreationData::ForceChild);
-            setWindowFlags_sys(window()->windowFlags(), flags);
+            setWindowFlags_sys(window()->flags(), flags);
         }
     }
 }
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);