Renamed Flickable viewportXXX properties contentXXX

A viewport is the thing you look through, not what you look at.

4 files changed, 9 insertions, 10 deletions

diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
index 3e08359..4b82d5c 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Flickable {
     width: 100; height: 100
-    viewportWidth: row.width; viewportHeight: row.height
+    contentWidth: row.width; contentHeight: row.height
 
     Row {
         id: row
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
index 3ed173d..49eed5a 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Flickable {
     width: 100; height: 100
-    viewportWidth: column.width; viewportHeight: column.height
+    contentWidth: column.width; contentHeight: column.height
 
     Column {
         id: column
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
index 1425d85..40c4606 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Flickable {
     width: 100; height: 100
-    viewportWidth: column.width; viewportHeight: column.height
+    contentWidth: column.width; contentHeight: column.height
     pressDelay: 200; overShoot: false; interactive: false
     maximumFlickVelocity: 2000
 
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index 1c98c50..cb87977 100644
--- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -81,12 +81,11 @@ void tst_qdeclarativeflickable::create()
     QCOMPARE(obj->isAtXEnd(), false);
     QCOMPARE(obj->isAtYBeginning(), true);
     QCOMPARE(obj->isAtYEnd(), false);
-    QCOMPARE(obj->viewportX(), 0.);
-    QCOMPARE(obj->viewportY(), 0.);
+    QCOMPARE(obj->contentX(), 0.);
+    QCOMPARE(obj->contentY(), 0.);
 
     QCOMPARE(obj->horizontalVelocity(), 0.);
     QCOMPARE(obj->verticalVelocity(), 0.);
-    QCOMPARE(obj->reportedVelocitySmoothing(), 100.);
 
     QCOMPARE(obj->isInteractive(), true);
     QCOMPARE(obj->overShoot(), true);
@@ -103,8 +102,8 @@ void tst_qdeclarativeflickable::horizontalViewportSize()
     QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
 
     QVERIFY(obj != 0);
-    QCOMPARE(obj->viewportWidth(), 800.);
-    QCOMPARE(obj->viewportHeight(), 300.);
+    QCOMPARE(obj->contentWidth(), 800.);
+    QCOMPARE(obj->contentHeight(), 300.);
     QCOMPARE(obj->isAtXBeginning(), true);
     QCOMPARE(obj->isAtXEnd(), false);
     QCOMPARE(obj->isAtYBeginning(), true);
@@ -120,8 +119,8 @@ void tst_qdeclarativeflickable::verticalViewportSize()
     QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
 
     QVERIFY(obj != 0);
-    QCOMPARE(obj->viewportWidth(), 200.);
-    QCOMPARE(obj->viewportHeight(), 1200.);
+    QCOMPARE(obj->contentWidth(), 200.);
+    QCOMPARE(obj->contentHeight(), 1200.);
     QCOMPARE(obj->isAtXBeginning(), true);
     QCOMPARE(obj->isAtXEnd(), false);
     QCOMPARE(obj->isAtYBeginning(), true);