summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qplatformwindow.cpp2
-rw-r--r--src/gui/kernel/qwindow.cpp4
-rw-r--r--src/gui/kernel/qwindow.h5
3 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index edd9a3d436..3bf06c6ab1 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -478,7 +478,7 @@ bool QPlatformWindow::frameStrutEventsEnabled() const
it is the grabbing window.
When any grab ends, the window under cursor will receive an enter event unless it
was the grabbing window.
- \li Window positioning: When calling \c{QWindow::setFramePos()}, the flag
+ \li Window positioning: When calling \c{QWindow::setFramePosition()}, the flag
\c{QWindowPrivate::positionPolicy} is set to \c{QWindowPrivate::WindowFrameInclusive}.
This means the position includes the window frame, whose size is at this point
unknown and the geometry's topleft point is the position of the window frame.
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 1b02eb586f..24ba92fe8d 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1176,7 +1176,7 @@ QRect QWindow::frameGeometry() const
\sa geometry(), frameGeometry()
*/
-QPoint QWindow::framePos() const
+QPoint QWindow::framePosition() const
{
Q_D(const QWindow);
if (d->platformWindow) {
@@ -1191,7 +1191,7 @@ QPoint QWindow::framePos() const
\sa setGeometry(), frameGeometry()
*/
-void QWindow::setFramePos(const QPoint &point)
+void QWindow::setFramePosition(const QPoint &point)
{
Q_D(QWindow);
d->positionPolicy = QWindowPrivate::WindowFrameInclusive;
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index b2889539ef..e6c9a3736f 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -224,8 +224,8 @@ public:
QMargins frameMargins() const;
QRect frameGeometry() const;
- QPoint framePos() const;
- void setFramePos(const QPoint &point);
+ QPoint framePosition() const;
+ void setFramePosition(const QPoint &point);
inline int width() const { return geometry().width(); }
inline int height() const { return geometry().height(); }
@@ -240,6 +240,7 @@ public:
// Temporary backwards-compatible accessors for the benefit of Declarative
// to be removed ASAP
+ inline void setFramePos(const QPoint &pt) { setFramePosition(pt); }
inline void setPos(const QPoint &pt) { setPosition(pt); }
inline void setPos(int posx, int posy) { setPosition(posx, posy); }
// end of temporary accessors