summaryrefslogtreecommitdiffstats
path: root/tests/manual/windowgeometry/controllerwidget.cpp
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2012-11-27 14:57:19 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-27 15:24:31 +0100
commit7a7102ad07c82c460bbe393931c13f95efd741fe (patch)
tree40a4a26787c4c890404edeedbcb08a4f3a23cba9 /tests/manual/windowgeometry/controllerwidget.cpp
parentfe3fa346fdb794e2e3ae59c68b5ae0d4a26a084a (diff)
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>
Diffstat (limited to 'tests/manual/windowgeometry/controllerwidget.cpp')
-rw-r--r--tests/manual/windowgeometry/controllerwidget.cpp6
1 files changed, 3 insertions, 3 deletions
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();