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>

2 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 6e1f22161b..55d8ceedf6 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/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
 
diff --git a/tests/manual/windowgeometry/controllerwidget.cpp b/tests/manual/windowgeometry/controllerwidget.cpp
index d37322e938..2338c6fd2b 100644
--- a/tests/manual/windowgeometry/controllerwidget.cpp
+++ b/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();