Fixed abbreviations in QWindow::framePos() and QWindow::setFramePos().

As 672e7c875e8680818e23d0aef98129d95eb7e91c did changing pos() to
position() and setPos() to setPosition().

Luckily there's not much code that uses these.

Change-Id: I1e1982f00412a22bd376e667a5e8c30b6149f9b5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

examples/qpa/windows/main.cpp

@@ -52,13 +52,13 @@ int main(int argc, char **argv)
     QGuiApplication app(argc, argv);
 
     Window a;
-    a.setFramePos(QPoint(10, 10));
+    a.setFramePosition(QPoint(10, 10));
     a.setTitle(QStringLiteral("Window A"));
     a.setObjectName(a.title());
     a.setVisible(true);
 
     Window b;
-    b.setFramePos(QPoint(100, 100));
+    b.setFramePosition(QPoint(100, 100));
     b.setTitle(QStringLiteral("Window B"));
     b.setObjectName(b.title());
     b.setVisible(true);

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.

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;

src/gui/kernel/qwindow.h

@@ -224,8 +224,8 @@ public:
     QMargins frameMargins() const;
     QRect frameGeometry() const;
 
-    QPoint framePos() const;
+    QPoint framePosition() const;
-    void setFramePos(const QPoint &point);
+    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

src/plugins/platforms/windows/qwindowswindow.cpp

@@ -997,7 +997,7 @@ void QWindowsWindow::handleHidden()
 void QWindowsWindow::setGeometry(const QRect &rectIn)
 {
     QRect rect = rectIn;
-    // This means it is a call from QWindow::setFramePos() and
+    // This means it is a call from QWindow::setFramePosition() and
     // the coordinates include the frame (size is still the contents rectangle).
     if (QWindowsGeometryHint::positionIncludesFrame(window())) {
         const QMargins margins = frameMargins();

tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

@@ -186,11 +186,11 @@ void tst_QWindow::positioning()
 
     QMargins originalMargins = window.frameMargins();
 
-    QCOMPARE(window.position(), window.framePos() + QPoint(originalMargins.left(), originalMargins.top()));
+    QCOMPARE(window.position(), window.framePosition() + QPoint(originalMargins.left(), originalMargins.top()));
     QVERIFY(window.frameGeometry().contains(window.geometry()));
 
     QPoint originalPos = window.position();
-    QPoint originalFramePos = window.framePos();
+    QPoint originalFramePos = window.framePosition();
 
     window.setWindowState(Qt::WindowFullScreen);
     QCoreApplication::processEvents();
@@ -201,7 +201,7 @@ void tst_QWindow::positioning()
     QTRY_COMPARE(window.received(QEvent::Resize), 3);
 
     QTRY_COMPARE(originalPos, window.position());
-    QTRY_COMPARE(originalFramePos, window.framePos());
+    QTRY_COMPARE(originalFramePos, window.framePosition());
     QTRY_COMPARE(originalMargins, window.frameMargins());
 
     // if our positioning is actually fully respected by the window manager
@@ -210,12 +210,12 @@ void tst_QWindow::positioning()
         QPoint framePos(40, 40);
 
         window.reset();
-        window.setFramePos(framePos);
+        window.setFramePosition(framePos);
 
         QTRY_VERIFY(window.received(QEvent::Move));
-        QTRY_COMPARE(framePos, window.framePos());
+        QTRY_COMPARE(framePos, window.framePosition());
         QTRY_COMPARE(originalMargins, window.frameMargins());
-        QCOMPARE(window.position(), window.framePos() + QPoint(originalMargins.left(), originalMargins.top()));
+        QCOMPARE(window.position(), window.framePosition() + QPoint(originalMargins.left(), originalMargins.top()));
 
         // and back to regular positioning
 

tests/manual/windowgeometry/controllerwidget.cpp

@@ -357,9 +357,9 @@ private:
     virtual void setObjectGeometry(QObject *o, const QRect &r) const
         { static_cast<QWindow *>(o)->setGeometry(r); }
     virtual QPoint objectFramePosition(const QObject *o) const
-        { return static_cast<const QWindow *>(o)->framePos(); }
+        { return static_cast<const QWindow *>(o)->framePosition(); }
     virtual void setObjectFramePosition(QObject *o, const QPoint &p) const
-        { static_cast<QWindow *>(o)->setFramePos(p); }
+        { static_cast<QWindow *>(o)->setFramePosition(p); }
     virtual QPoint objectMapToGlobal(const QObject *o, const QPoint &p) const
         { return static_cast<const QWindow *>(o)->mapToGlobal(p); }
     virtual Qt::WindowFlags objectWindowFlags(const QObject *o) const
@@ -457,7 +457,7 @@ ControllerWidget::ControllerWidget(QWidget *parent)
     m_testWindow->setWindowFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint
                                  | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint
                                  | Qt::WindowTitleHint);
-    m_testWindow->setFramePos(QPoint(x, y));
+    m_testWindow->setFramePosition(QPoint(x, y));
     m_testWindow->resize(200, 200);
     if (args.contains(QLatin1String("-windowminimized"), Qt::CaseInsensitive))
         m_testWindow->showMinimized();