added properties for x,y and z. Removed the notify for the pos property,

add auto tests for QGraphicsObject

FX items are better off with property notifications on each component
rather than on the position.

Added some basic testing for QGraphicsObject and fixed the failures
exposed.

Reviewed-by: Andreas

6 files changed, 315 insertions, 13 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 6d87c36..3622c82 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1789,6 +1789,9 @@ void QGraphicsItemPrivate::setVisibleHelper(bool newVisible, bool explicitly, bo
 
     // Deliver post-change notification.
     q_ptr->itemChange(QGraphicsItem::ItemVisibleHasChanged, newVisibleVariant);
+
+    if (isObject)
+        emit static_cast<QGraphicsObject *>(q_ptr)->visibleChanged();
 }
 
 /*!
@@ -1821,9 +1824,6 @@ void QGraphicsItemPrivate::setVisibleHelper(bool newVisible, bool explicitly, bo
 void QGraphicsItem::setVisible(bool visible)
 {
     d_ptr->setVisibleHelper(visible, /* explicit = */ true);
-
-    if (d_ptr->isObject)
-        emit static_cast<QGraphicsObject *>(this)->visibleChanged();
 }
 
 /*!
@@ -1912,6 +1912,9 @@ void QGraphicsItemPrivate::setEnabledHelper(bool newEnabled, bool explicitly, bo
 
     // Deliver post-change notification.
     q_ptr->itemChange(QGraphicsItem::ItemEnabledHasChanged, newEnabledVariant);
+
+    if (isObject)
+        emit static_cast<QGraphicsObject *>(q_ptr)->enabledChanged();
 }
 
 /*!
@@ -1945,9 +1948,6 @@ void QGraphicsItemPrivate::setEnabledHelper(bool newEnabled, bool explicitly, bo
 void QGraphicsItem::setEnabled(bool enabled)
 {
     d_ptr->setEnabledHelper(enabled, /* explicitly = */ true);
-
-    if (d_ptr->isObject)
-        emit static_cast<QGraphicsObject *>(this)->enabledChanged();
 }
 
 /*!
@@ -2110,6 +2110,7 @@ void QGraphicsItem::setOpacity(qreal opacity)
                                           /*maybeDirtyClipPath=*/false,
                                           /*force=*/false,
                                           /*ignoreOpacity=*/true);
+
     if (d_ptr->isObject)
         emit static_cast<QGraphicsObject *>(this)->opacityChanged();
 }
@@ -2520,6 +2521,17 @@ QPointF QGraphicsItem::pos() const
     \sa y()
 */
 
+/*
+  Set's the x coordinate of the item's position. Equivalent to
+  calling setPos(x, y()).
+
+  \sa x(), setPos()
+*/
+void QGraphicsItem::setX(qreal x)
+{
+    d_ptr->setPosHelper(QPointF(x, d_ptr->pos.y()));
+}
+
 /*!
     \fn QGraphicsItem::y() const
 
@@ -2528,6 +2540,17 @@ QPointF QGraphicsItem::pos() const
     \sa x()
 */
 
+/*
+  Set's the y coordinate of the item's position. Equivalent to
+  calling setPos(x(), y).
+
+  \sa x(), setPos()
+*/
+void QGraphicsItem::setY(qreal y)
+{
+    d_ptr->setPosHelper(QPointF(d_ptr->pos.x(), y));
+}
+
 /*!
     Returns the item's position in scene coordinates. This is
     equivalent to calling \c mapToScene(0, 0).
@@ -2551,11 +2574,16 @@ void QGraphicsItemPrivate::setPosHelper(const QPointF &pos)
     updateCachedClipPathFromSetPosHelper(pos);
     if (scene)
         q->prepareGeometryChange();
+    QPointF oldPos = this->pos;
     this->pos = pos;
     dirtySceneTransform = 1;
     inSetPosHelper = 0;
-    if (isObject)
-        emit static_cast<QGraphicsObject *>(q)->positionChanged();
+    if (isObject) {
+        if (pos.x() != oldPos.x())
+            emit static_cast<QGraphicsObject *>(q_ptr)->xChanged();
+        if (pos.y() != oldPos.y())
+            emit static_cast<QGraphicsObject *>(q_ptr)->yChanged();
+    }
 }
 
 /*!
@@ -3535,6 +3563,9 @@ void QGraphicsItem::setZValue(qreal z)
     }
 
     itemChange(ItemZValueHasChanged, newZVariant);
+
+    if (d_ptr->isObject)
+        emit static_cast<QGraphicsObject *>(this)->zChanged();
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index a5ccef2..a69eced 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -227,7 +227,9 @@ public:
     // Positioning in scene coordinates
     QPointF pos() const;
     inline qreal x() const { return pos().x(); }
+    void setX(qreal x);
     inline qreal y() const { return pos().y(); }
+    void setY(qreal y);
     QPointF scenePos() const;
     void setPos(const QPointF &pos);
     inline void setPos(qreal x, qreal y);
@@ -492,11 +494,13 @@ inline QRectF QGraphicsItem::mapRectFromScene(qreal ax, qreal ay, qreal w, qreal
 class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem
 {
     Q_OBJECT
-    Q_INTERFACES(QGraphicsItem)
     Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
-    Q_PROPERTY(QPointF pos READ pos WRITE setPos NOTIFY positionChanged)
+    Q_PROPERTY(QPointF pos READ pos WRITE setPos)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
+    Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged)
+    Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged)
+    Q_PROPERTY(qreal z READ zValue WRITE setZValue NOTIFY zChanged)
 public:
     QGraphicsObject(QGraphicsItem *parent = 0);
 
@@ -504,12 +508,15 @@ Q_SIGNALS:
     void opacityChanged();
     void visibleChanged();
     void enabledChanged();
-    void positionChanged();
+    void xChanged();
+    void yChanged();
+    void zChanged();
 
 protected:
     QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent, QGraphicsScene *scene);
 private:
     friend class QGraphicsItem;
+    friend class QGraphicsItemPrivate;
 };
 
 
diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h
index e19513d..337490c 100644
--- a/src/gui/graphicsview/qgraphicswidget.h
+++ b/src/gui/graphicsview/qgraphicswidget.h
@@ -69,7 +69,6 @@ class QGraphicsWidgetPrivate;
 class Q_GUI_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLayoutItem
 {
     Q_OBJECT
-    Q_INTERFACES(QGraphicsLayoutItem)
     Q_PROPERTY(QPalette palette READ palette WRITE setPalette)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection RESET unsetLayoutDirection)
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index a65c172..d5803bc 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -141,9 +141,17 @@ SUBDIRS += _networkselftest \
            qglobal \
            qgraphicsitem \
            qgraphicsitemanimation \
+           qgraphicslayout \
+           qgraphicslayoutitem \
+           qgraphicslinearlayout \
+           qgraphicsobject \
+           qgraphicspixmapitem \
+	   qgraphicspolygonitem \
+	   qgraphicsproxywidget \
            qgraphicsscene \
            qgraphicsview \
-           qgridlayout \
+           qgraphicswidget \
+	   qgridlayout \
            qgroupbox \
            qguivariant \
            qhash \
diff --git a/tests/auto/qgraphicsobject/qgraphicsobject.pro b/tests/auto/qgraphicsobject/qgraphicsobject.pro
new file mode 100644
index 0000000..965b319
--- /dev/null
+++ b/tests/auto/qgraphicsobject/qgraphicsobject.pro
@@ -0,0 +1,2 @@
+load(qttest_p4)
+SOURCES  += tst_qgraphicsobject.cpp
diff --git a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp
new file mode 100644
index 0000000..eb12c48
--- /dev/null
+++ b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp
@@ -0,0 +1,255 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <qgraphicsitem.h>
+#include <qgraphicsscene.h>
+#include <qgraphicssceneevent.h>
+#include <qgraphicsview.h>
+#include <qstyleoption.h>
+#include "../../shared/util.h"
+
+class tst_QGraphicsObject : public QObject {
+    Q_OBJECT
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+private slots:
+    void pos();
+    void x();
+    void y();
+    void z();
+    void opacity();
+    void enabled();
+    void visible();
+};
+
+
+// This will be called before the first test function is executed.
+// It is only called once.
+void tst_QGraphicsObject::initTestCase()
+{
+}
+
+// This will be called after the last test function is executed.
+// It is only called once.
+void tst_QGraphicsObject::cleanupTestCase()
+{
+}
+
+// This will be called before each test function is executed.
+void tst_QGraphicsObject::init()
+{
+}
+
+// This will be called after every test function.
+void tst_QGraphicsObject::cleanup()
+{
+}
+
+
+class MyGraphicsObject : public QGraphicsObject
+{
+public:
+    MyGraphicsObject() : QGraphicsObject() {}
+    virtual QRectF boundingRect() const { return QRectF(); }
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}
+};
+
+void tst_QGraphicsObject::pos()
+{
+    MyGraphicsObject object;
+    QSignalSpy xSpy(&object, SIGNAL(xChanged()));
+    QSignalSpy ySpy(&object, SIGNAL(yChanged()));
+    QVERIFY(object.pos() == QPointF(0, 0));
+    object.setPos(10, 10);
+    QCOMPARE(xSpy.count(), 1);
+    QCOMPARE(ySpy.count(), 1);
+
+    QVERIFY(object.pos() == QPointF(10,10));
+
+    object.setPos(10, 10);
+    QCOMPARE(xSpy.count(), 1);
+    QCOMPARE(ySpy.count(), 1);
+
+    object.setProperty("pos", QPointF(0, 0));
+    QCOMPARE(xSpy.count(), 2);
+    QCOMPARE(ySpy.count(), 2);
+    QVERIFY(object.property("pos") == QPointF(0,0));
+
+    object.setProperty("pos", QPointF(10, 0));
+    QCOMPARE(xSpy.count(), 3);
+    QCOMPARE(ySpy.count(), 2);
+    QVERIFY(object.property("pos") == QPointF(10,0));
+
+    object.setProperty("pos", QPointF(10, 10));
+    QCOMPARE(xSpy.count(), 3);
+    QCOMPARE(ySpy.count(), 3);
+    QVERIFY(object.property("pos") == QPointF(10, 10));
+}
+
+void tst_QGraphicsObject::x()
+{
+    MyGraphicsObject object;
+    QSignalSpy xSpy(&object, SIGNAL(xChanged()));
+    QSignalSpy ySpy(&object, SIGNAL(yChanged()));
+    QVERIFY(object.pos() == QPointF(0, 0));
+    object.setX(10);
+    QCOMPARE(xSpy.count(), 1);
+    QCOMPARE(ySpy.count(), 0);
+
+    QVERIFY(object.pos() == QPointF(10, 0));
+    QVERIFY(object.x() == 10);
+
+    object.setX(10);
+    QCOMPARE(xSpy.count(), 1);
+    QCOMPARE(ySpy.count(), 0);
+
+    object.setProperty("x", 0);
+    QCOMPARE(xSpy.count(), 2);
+    QCOMPARE(ySpy.count(), 0);
+    QVERIFY(object.property("x") == 0);
+}
+
+void tst_QGraphicsObject::y()
+{
+    MyGraphicsObject object;
+    QSignalSpy xSpy(&object, SIGNAL(xChanged()));
+    QSignalSpy ySpy(&object, SIGNAL(yChanged()));
+    QVERIFY(object.pos() == QPointF(0, 0));
+    object.setY(10);
+    QCOMPARE(xSpy.count(), 0);
+    QCOMPARE(ySpy.count(), 1);
+
+    QVERIFY(object.pos() == QPointF(0, 10));
+    QVERIFY(object.y() == 10);
+
+    object.setY(10);
+    QCOMPARE(xSpy.count(), 0);
+    QCOMPARE(ySpy.count(), 1);
+
+    object.setProperty("y", 0);
+    QCOMPARE(xSpy.count(), 0);
+    QCOMPARE(ySpy.count(), 2);
+    QVERIFY(object.property("y") == 0);
+}
+
+void tst_QGraphicsObject::z()
+{
+    MyGraphicsObject object;
+    QSignalSpy zSpy(&object, SIGNAL(zChanged()));
+    QVERIFY(object.zValue() == 0);
+    object.setZValue(10);
+    QCOMPARE(zSpy.count(), 1);
+
+    QVERIFY(object.zValue() == 10);
+
+    object.setZValue(10);
+    QCOMPARE(zSpy.count(), 1);
+
+    object.setProperty("z", 0);
+    QCOMPARE(zSpy.count(), 2);
+    QVERIFY(object.property("z") == 0);
+}
+
+void tst_QGraphicsObject::opacity()
+{
+    MyGraphicsObject object;
+    QSignalSpy spy(&object, SIGNAL(opacityChanged()));
+    QVERIFY(object.opacity() == 1.);
+    object.setOpacity(0);
+    QCOMPARE(spy.count(), 1);
+
+    QVERIFY(object.opacity() == 0.);
+
+    object.setOpacity(0);
+    QCOMPARE(spy.count(), 1);
+
+    object.setProperty("opacity", .5);
+    QCOMPARE(spy.count(), 2);
+    QVERIFY(object.property("opacity") == .5);
+}
+
+void tst_QGraphicsObject::enabled()
+{
+    MyGraphicsObject object;
+    QSignalSpy spy(&object, SIGNAL(enabledChanged()));
+    QVERIFY(object.isEnabled() == true);
+    object.setEnabled(false);
+    QCOMPARE(spy.count(), 1);
+
+    QVERIFY(object.isEnabled() == false);
+
+    object.setEnabled(false);
+    QCOMPARE(spy.count(), 1);
+
+    object.setProperty("enabled", true);
+    QCOMPARE(spy.count(), 2);
+    QVERIFY(object.property("enabled") == true);
+}
+
+void tst_QGraphicsObject::visible()
+{
+    MyGraphicsObject object;
+    QSignalSpy spy(&object, SIGNAL(visibleChanged()));
+    QVERIFY(object.isVisible() == true);
+    object.setVisible(false);
+    QCOMPARE(spy.count(), 1);
+
+    QVERIFY(object.isVisible() == false);
+
+    object.setVisible(false);
+    QCOMPARE(spy.count(), 1);
+
+    object.setProperty("visible", true);
+    QCOMPARE(spy.count(), 2);
+    QVERIFY(object.property("visible") == true);
+}
+
+
+QTEST_MAIN(tst_QGraphicsObject)
+#include "tst_qgraphicsobject.moc"
+