1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add default argument to QPlatformWindow::isEmbedded()

Browse Source 
Removes magic 0-pointers at the call sites.

Change-Id: I6740f6b8cc75004ab5f2ebcb3b3c95cbbdc43153
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Tor Arne Vestbø 2015-10-08 14:29:13 +02:00
parent 26a89e7bf7
commit 233d0a6b8d
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qguiapplication.cpp
View File

@ -870,7 +870,7 @@ QWindowList QGuiApplication::topLevelWindows()
if (!list.at(i)->parent() && list.at(i)->type() != Qt::Desktop) { if (!list.at(i)->parent() && list.at(i)->type() != Qt::Desktop) {
// Top windows of embedded QAxServers do not have QWindow parents, // Top windows of embedded QAxServers do not have QWindow parents,
// but they are not true top level windows, so do not include them. // but they are not true top level windows, so do not include them.
const bool embedded = list.at(i)->handle() && list.at(i)->handle()->isEmbedded(0); const bool embedded = list.at(i)->handle() && list.at(i)->handle()->isEmbedded();
if (!embedded) if (!embedded)
topLevelWindows.prepend(list.at(i)); topLevelWindows.prepend(list.at(i));
} }

2
src/gui/kernel/qplatformwindow.h
View File

@ -95,7 +95,7 @@ public:
virtual bool isExposed() const; virtual bool isExposed() const;
virtual bool isActive() const; virtual bool isActive() const;
virtual bool isEmbedded(const QPlatformWindow *parentWindow) const; virtual bool isEmbedded(const QPlatformWindow *parentWindow = 0) const;
virtual QPoint mapToGlobal(const QPoint &pos) const; virtual QPoint mapToGlobal(const QPoint &pos) const;
virtual QPoint mapFromGlobal(const QPoint &pos) const; virtual QPoint mapFromGlobal(const QPoint &pos) const;

4
src/gui/kernel/qwindow.cpp
View File

@ -2292,7 +2292,7 @@ QPoint QWindow::mapToGlobal(const QPoint &pos) const
Q_D(const QWindow); Q_D(const QWindow);
// QTBUG-43252, prefer platform implementation for foreign windows. // QTBUG-43252, prefer platform implementation for foreign windows.
if (d->platformWindow if (d->platformWindow
&& (type() == Qt::ForeignWindow || d->platformWindow->isEmbedded(0))) { && (type() == Qt::ForeignWindow || d->platformWindow->isEmbedded())) {
return d->platformWindow->mapToGlobal(pos); return d->platformWindow->mapToGlobal(pos);
} }
return pos + d->globalPosition(); return pos + d->globalPosition();
@ -2312,7 +2312,7 @@ QPoint QWindow::mapFromGlobal(const QPoint &pos) const
Q_D(const QWindow); Q_D(const QWindow);
// QTBUG-43252, prefer platform implementation for foreign windows. // QTBUG-43252, prefer platform implementation for foreign windows.
if (d->platformWindow if (d->platformWindow
&& (type() == Qt::ForeignWindow || d->platformWindow->isEmbedded(0))) { && (type() == Qt::ForeignWindow || d->platformWindow->isEmbedded())) {
return d->platformWindow->mapFromGlobal(pos); return d->platformWindow->mapFromGlobal(pos);
} }
return pos - d->globalPosition(); return pos - d->globalPosition();

4
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -1062,7 +1062,7 @@ QWindow *QWindowsWindow::topLevelOf(QWindow *w)
if (const QPlatformWindow *handle = w->handle()) { if (const QPlatformWindow *handle = w->handle()) {
const QWindowsWindow *ww = static_cast<const QWindowsWindow *>(handle); const QWindowsWindow *ww = static_cast<const QWindowsWindow *>(handle);
if (ww->isEmbedded(0)) { if (ww->isEmbedded()) {
HWND parentHWND = GetAncestor(ww->handle(), GA_PARENT); HWND parentHWND = GetAncestor(ww->handle(), GA_PARENT);
const HWND desktopHwnd = GetDesktopWindow(); const HWND desktopHwnd = GetDesktopWindow();
const QWindowsContext *ctx = QWindowsContext::instance(); const QWindowsContext *ctx = QWindowsContext::instance();
@ -1140,7 +1140,7 @@ bool QWindowsWindow::isEmbedded(const QPlatformWindow *parentWindow) const
} }
if (!m_data.embedded && parent()) if (!m_data.embedded && parent())
return parent()->isEmbedded(0); return parent()->isEmbedded();
return m_data.embedded; return m_data.embedded;
} }

2
src/plugins/platforms/windows/qwindowswindow.h
View File

@ -152,7 +152,7 @@ public:
bool isVisible() const; bool isVisible() const;
bool isExposed() const Q_DECL_OVERRIDE { return testFlag(Exposed); } bool isExposed() const Q_DECL_OVERRIDE { return testFlag(Exposed); }
bool isActive() const Q_DECL_OVERRIDE; bool isActive() const Q_DECL_OVERRIDE;
bool isEmbedded(const QPlatformWindow *parentWindow) const Q_DECL_OVERRIDE; bool isEmbedded(const QPlatformWindow *parentWindow = 0) const Q_DECL_OVERRIDE;
QPoint mapToGlobal(const QPoint &pos) const Q_DECL_OVERRIDE; QPoint mapToGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;
QPoint mapFromGlobal(const QPoint &pos) const Q_DECL_OVERRIDE; QPoint mapFromGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;

2
src/plugins/platforms/xcb/qxcbwindow.h
View File

@ -81,7 +81,7 @@ public:
void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE; void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE;
bool isExposed() const Q_DECL_OVERRIDE; bool isExposed() const Q_DECL_OVERRIDE;
bool isEmbedded(const QPlatformWindow *parentWindow) const Q_DECL_OVERRIDE; bool isEmbedded(const QPlatformWindow *parentWindow = 0) const Q_DECL_OVERRIDE;
QPoint mapToGlobal(const QPoint &pos) const Q_DECL_OVERRIDE; QPoint mapToGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;
QPoint mapFromGlobal(const QPoint &pos) const Q_DECL_OVERRIDE; QPoint mapFromGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;