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

Don't use d_func in QWindow::mapToGlobal

Browse Source 
We initialize the variable d at the top using Q_D(const QWindow);

Change-Id: I2de3b33c043024c5599b7cd1ebecae2db0b39d87
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Tor Arne Vestbø 2015-10-09 14:06:19 +02:00
parent 5d5e0a4e97
commit 26a89e7bf7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2295,7 +2295,7 @@ QPoint QWindow::mapToGlobal(const QPoint &pos) const
&& (type() == Qt::ForeignWindow || d->platformWindow->isEmbedded(0))) { && (type() == Qt::ForeignWindow || d->platformWindow->isEmbedded(0))) {
return d->platformWindow->mapToGlobal(pos); return d->platformWindow->mapToGlobal(pos);
} }
return pos + d_func()->globalPosition(); return pos + d->globalPosition();
} }
@ -2315,7 +2315,7 @@ QPoint QWindow::mapFromGlobal(const QPoint &pos) const
&& (type() == Qt::ForeignWindow || d->platformWindow->isEmbedded(0))) { && (type() == Qt::ForeignWindow || d->platformWindow->isEmbedded(0))) {
return d->platformWindow->mapFromGlobal(pos); return d->platformWindow->mapFromGlobal(pos);
} }
return pos - d_func()->globalPosition(); return pos - d->globalPosition();
} }