diff options
-rw-r--r-- | src/gui/kernel/qplatformwindow.cpp | 9 | ||||
-rw-r--r-- | src/gui/kernel/qplatformwindow.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.cpp | 5 | ||||
-rw-r--r-- | src/platformsupport/fbconvenience/qfbwindow.cpp | 3 | ||||
-rw-r--r-- | src/platformsupport/fbconvenience/qfbwindow_p.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 3 | ||||
-rw-r--r-- | src/plugins/platforms/directfb/qdirectfbwindow.cpp | 3 | ||||
-rw-r--r-- | src/plugins/platforms/directfb/qdirectfbwindow.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 3 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 4 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.h | 2 |
13 files changed, 17 insertions, 25 deletions
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 755fd8a652..27dfd7cf40 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -142,17 +142,16 @@ void QPlatformWindow::setVisible(bool visible) QWindowSystemInterface::handleExposeEvent(window(), rect); QWindowSystemInterface::flushWindowSystemEvents(); } + /*! Requests setting the window flags of this surface - to \a type. Returns the actual flags set. + to \a flags. */ -Qt::WindowFlags QPlatformWindow::setWindowFlags(Qt::WindowFlags flags) +void QPlatformWindow::setWindowFlags(Qt::WindowFlags flags) { - return flags; + Q_UNUSED(flags); } - - /*! Returns if this window is exposed in the windowing system. diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h index 7ea17d05aa..2b2d227fcf 100644 --- a/src/gui/kernel/qplatformwindow.h +++ b/src/gui/kernel/qplatformwindow.h @@ -90,7 +90,7 @@ public: virtual QMargins frameMargins() const; virtual void setVisible(bool visible); - virtual Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags); + virtual void setWindowFlags(Qt::WindowFlags flags); virtual Qt::WindowState setWindowState(Qt::WindowState state); virtual WId winId() const; diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 79927cbc71..27e1571184 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -514,9 +514,8 @@ void QWindow::setWindowFlags(Qt::WindowFlags flags) { Q_D(QWindow); if (d->platformWindow) - d->windowFlags = d->platformWindow->setWindowFlags(flags); - else - d->windowFlags = flags; + d->platformWindow->setWindowFlags(flags); + d->windowFlags = flags; } /*! diff --git a/src/platformsupport/fbconvenience/qfbwindow.cpp b/src/platformsupport/fbconvenience/qfbwindow.cpp index fd89e1b559..598e96886d 100644 --- a/src/platformsupport/fbconvenience/qfbwindow.cpp +++ b/src/platformsupport/fbconvenience/qfbwindow.cpp @@ -76,11 +76,10 @@ void QFbWindow::setGeometry(const QRect &rect) QPlatformWindow::setGeometry(rect); } -Qt::WindowFlags QFbWindow::setWindowFlags(Qt::WindowFlags flags) +void QFbWindow::setWindowFlags(Qt::WindowFlags flags) { mWindowFlags = flags; platformScreen()->invalidateRectCache(); - return mWindowFlags; } Qt::WindowFlags QFbWindow::windowFlags() const diff --git a/src/platformsupport/fbconvenience/qfbwindow_p.h b/src/platformsupport/fbconvenience/qfbwindow_p.h index 67b2ef87cd..e440e04e39 100644 --- a/src/platformsupport/fbconvenience/qfbwindow_p.h +++ b/src/platformsupport/fbconvenience/qfbwindow_p.h @@ -60,7 +60,7 @@ public: void setGeometry(const QRect &rect); - virtual Qt::WindowFlags setWindowFlags(Qt::WindowFlags type); + virtual void setWindowFlags(Qt::WindowFlags type); virtual Qt::WindowFlags windowFlags() const; WId winId() const { return mWindowId; } diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 4a146767d5..014db378e7 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -98,7 +98,7 @@ public: void setGeometry(const QRect &rect); void setCocoaGeometry(const QRect &rect); void setVisible(bool visible); - Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags); + void setWindowFlags(Qt::WindowFlags flags); Qt::WindowState setWindowState(Qt::WindowState state); void setWindowTitle(const QString &title); void setWindowFilePath(const QString &filePath); diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 26161b106e..f4a4936c28 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -387,7 +387,7 @@ void QCocoaWindow::setWindowShadow(Qt::WindowFlags flags) [m_nsWindow setHasShadow:(keepShadow ? YES : NO)]; } -Qt::WindowFlags QCocoaWindow::setWindowFlags(Qt::WindowFlags flags) +void QCocoaWindow::setWindowFlags(Qt::WindowFlags flags) { if (m_nsWindow) { NSUInteger styleMask = windowStyleMask(flags); @@ -398,7 +398,6 @@ Qt::WindowFlags QCocoaWindow::setWindowFlags(Qt::WindowFlags flags) } m_windowFlags = flags; - return m_windowFlags; } Qt::WindowState QCocoaWindow::setWindowState(Qt::WindowState state) diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.cpp b/src/plugins/platforms/directfb/qdirectfbwindow.cpp index 8b108eeaa2..630e4fd7a2 100644 --- a/src/plugins/platforms/directfb/qdirectfbwindow.cpp +++ b/src/plugins/platforms/directfb/qdirectfbwindow.cpp @@ -140,7 +140,7 @@ void QDirectFbWindow::setVisible(bool visible) QWindowSystemInterface::handleExposeEvent(window(), window()->geometry()); } -Qt::WindowFlags QDirectFbWindow::setWindowFlags(Qt::WindowFlags flags) +void QDirectFbWindow::setWindowFlags(Qt::WindowFlags flags) { switch (flags & Qt::WindowType_Mask) { case Qt::ToolTip: { @@ -154,7 +154,6 @@ Qt::WindowFlags QDirectFbWindow::setWindowFlags(Qt::WindowFlags flags) } m_dfbWindow->SetStackingClass(m_dfbWindow.data(), flags & Qt::WindowStaysOnTopHint ? DWSC_UPPER : DWSC_MIDDLE); - return flags; } void QDirectFbWindow::raise() diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.h b/src/plugins/platforms/directfb/qdirectfbwindow.h index cedd140809..3edee7c6b2 100644 --- a/src/plugins/platforms/directfb/qdirectfbwindow.h +++ b/src/plugins/platforms/directfb/qdirectfbwindow.h @@ -60,7 +60,7 @@ public: void setVisible(bool visible); - Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags); + void setWindowFlags(Qt::WindowFlags flags); bool setKeyboardGrabEnabled(bool grab); bool setMouseGrabEnabled(bool grab); void raise(); diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 2335870ea7..f3830eb962 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1178,7 +1178,7 @@ void QWindowsWindow::setWindowTitle(const QString &title) SetWindowText(m_data.hwnd, (const wchar_t*)title.utf16()); } -Qt::WindowFlags QWindowsWindow::setWindowFlags(Qt::WindowFlags flags) +void QWindowsWindow::setWindowFlags(Qt::WindowFlags flags) { if (QWindowsContext::verboseWindows) qDebug() << '>' << __FUNCTION__ << this << window() << "\n from: " @@ -1202,7 +1202,6 @@ Qt::WindowFlags QWindowsWindow::setWindowFlags(Qt::WindowFlags flags) qDebug() << '<' << __FUNCTION__ << "\n returns: " << QWindowsWindow::debugWindowFlags(m_data.flags) << " geometry " << oldGeometry << "->" << newGeometry; - return m_data.flags; } QWindowsWindow::WindowData QWindowsWindow::setWindowFlags_sys(Qt::WindowFlags wt, diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index 4b1792859f..3b7666cf32 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -159,7 +159,7 @@ public: virtual QPoint mapToGlobal(const QPoint &pos) const; virtual QPoint mapFromGlobal(const QPoint &pos) const; - virtual Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags); + virtual void setWindowFlags(Qt::WindowFlags flags); virtual Qt::WindowState setWindowState(Qt::WindowState state); HWND handle() const { return m_data.hwnd; } diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 64cb9afcc6..cefe1a7786 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -740,7 +740,7 @@ void QXcbWindow::setNetWmStates(NetWmStates states) xcb_flush(xcb_connection()); } -Qt::WindowFlags QXcbWindow::setWindowFlags(Qt::WindowFlags flags) +void QXcbWindow::setWindowFlags(Qt::WindowFlags flags) { Qt::WindowType type = static_cast<Qt::WindowType>(int(flags & Qt::WindowType_Mask)); @@ -763,8 +763,6 @@ Qt::WindowFlags QXcbWindow::setWindowFlags(Qt::WindowFlags flags) setTransparentForMouseEvents(flags & Qt::WindowTransparentForInput); updateDoesNotAcceptFocus(flags & Qt::WindowDoesNotAcceptFocus); - - return flags; } void QXcbWindow::setMotifWindowFlags(Qt::WindowFlags flags) diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index ab18b502be..e2f62401dc 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -81,7 +81,7 @@ public: QMargins frameMargins() const; void setVisible(bool visible); - Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags); + void setWindowFlags(Qt::WindowFlags flags); Qt::WindowState setWindowState(Qt::WindowState state); WId winId() const; void setParent(const QPlatformWindow *window); |