Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	src/declarative/fx/qfximageitem.cpp
	src/declarative/fx/qfxpathview.cpp
	src/declarative/util/qmllistmodel.cpp

1 files changed, 197 insertions, 197 deletions

diff --git a/src/declarative/canvas/qsimplecanvasitem.cpp b/src/declarative/canvas/qsimplecanvasitem.cpp
index 446e331..62a44e4 100644
--- a/src/declarative/canvas/qsimplecanvasitem.cpp
+++ b/src/declarative/canvas/qsimplecanvasitem.cpp
@@ -57,7 +57,7 @@ QSimpleCanvasItemData::QSimpleCanvasItemData()
 
 QSimpleCanvasItemData::~QSimpleCanvasItemData()
 {
-    if(transformUser)
+    if (transformUser)
         delete transformUser;
 }
 
@@ -265,7 +265,7 @@ QSimpleCanvasItem::TransformOrigin QSimpleCanvasItem::transformOrigin() const
 void QSimpleCanvasItem::setTransformOrigin(TransformOrigin origin)
 {
     Q_D(QSimpleCanvasItem);
-    if(origin != d->origin) {
+    if (origin != d->origin) {
         d->origin = origin;
         update();
     }
@@ -297,7 +297,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::parent() const
 
 void QSimpleCanvasItemPrivate::zOrderChildren()
 {
-    if(!needsZOrder || children.count() <= 1)
+    if (!needsZOrder || children.count() <= 1)
         return;
 
     needsZOrder = false;
@@ -310,10 +310,10 @@ void QSimpleCanvasItemPrivate::zOrderChildren()
         swap = false;
         QSimpleCanvasItem *item = children.first();
         qreal z = item->z();
-        for(int ii = 1; ii < children.count(); ++ii) {
+        for (int ii = 1; ii < children.count(); ++ii) {
             QSimpleCanvasItem *i2 = children.at(ii);
             qreal z2 = i2->z();
-            if(z2 < z) {
+            if (z2 < z) {
                 swap = true;
                 children[ii] = item;
                 children[ii - 1] = i2;
@@ -329,21 +329,21 @@ void QSimpleCanvasItemPrivate::canvasChanged(QSimpleCanvas *newCanvas, QSimpleCa
 {
     Q_Q(QSimpleCanvasItem);
     canvas = newCanvas;
-    if(options & QSimpleCanvasItem::MouseFilter) {
-        if(oldCanvas) oldCanvas->d->removeMouseFilter(q);
-        if(newCanvas) newCanvas->d->installMouseFilter(q);
+    if (options & QSimpleCanvasItem::MouseFilter) {
+        if (oldCanvas) oldCanvas->d->removeMouseFilter(q);
+        if (newCanvas) newCanvas->d->installMouseFilter(q);
     }
-    if(newCanvas) {
-       if(!oldCanvas && hasFocus) 
+    if (newCanvas) {
+       if (!oldCanvas && hasFocus) 
            newCanvas->d->setFocusItem(q, Qt::OtherFocusReason, false);
-       if(wantsActiveFocusPanelPendingCanvas) {
+       if (wantsActiveFocusPanelPendingCanvas) {
            hasBeenActiveFocusPanel = true;
            newCanvas->d->setActiveFocusPanel(q);
            wantsActiveFocusPanelPendingCanvas = false;
        }
     }
 
-    for(int ii = 0; ii < children.count(); ++ii)
+    for (int ii = 0; ii < children.count(); ++ii)
         children.at(ii)->d_func()->canvasChanged(newCanvas, oldCanvas);
     q->canvasChanged();
 }
@@ -351,12 +351,12 @@ void QSimpleCanvasItemPrivate::canvasChanged(QSimpleCanvas *newCanvas, QSimpleCa
 void QSimpleCanvasItem::setFocus(bool focus)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->hasFocus == focus)
+    if (d->hasFocus == focus)
         return;
     QSimpleCanvas *c = canvas();
 
-    if(c) {
-        if(focus)
+    if (c) {
+        if (focus)
             c->d->setFocusItem(this, Qt::OtherFocusReason);
         else 
             c->d->clearFocusItem(this);
@@ -369,9 +369,9 @@ void QSimpleCanvasItem::setFocus(bool focus)
 qreal QSimpleCanvasItem::x() const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return d->graphicsItem->x();
-    else if(d->data_ptr)
+    else if (d->data_ptr)
         return d->data()->x;
     else
         return 0;
@@ -380,9 +380,9 @@ qreal QSimpleCanvasItem::x() const
 qreal QSimpleCanvasItem::y() const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return d->graphicsItem->y();
-    else if(d->data_ptr)
+    else if (d->data_ptr)
         return d->data()->y;
     else
         return 0;
@@ -391,9 +391,9 @@ qreal QSimpleCanvasItem::y() const
 qreal QSimpleCanvasItem::z() const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return d->graphicsItem->zValue();
-    else if(d->data_ptr)
+    else if (d->data_ptr)
         return d->data()->z;
     else
         return 0;
@@ -402,12 +402,12 @@ qreal QSimpleCanvasItem::z() const
 void QSimpleCanvasItem::setX(qreal x)
 {
     Q_D(QSimpleCanvasItem);
-    if(x == this->x())
+    if (x == this->x())
         return;
 
     qreal oldX = this->x();
 
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         d->graphicsItem->setPos(x, y());
     } else {
         d->data()->x = x;
@@ -421,12 +421,12 @@ void QSimpleCanvasItem::setX(qreal x)
 void QSimpleCanvasItem::setY(qreal y)
 {
     Q_D(QSimpleCanvasItem);
-    if(y == this->y())
+    if (y == this->y())
         return;
 
     qreal oldY = this->y();
 
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         d->graphicsItem->setPos(x(), y);
     } else {
         d->data()->y = y;
@@ -440,12 +440,12 @@ void QSimpleCanvasItem::setY(qreal y)
 void QSimpleCanvasItem::setZ(qreal z)
 {
     Q_D(QSimpleCanvasItem);
-    if(z == this->z())
+    if (z == this->z())
         return;
 
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
 
-        if(z < 0)
+        if (z < 0)
             d->graphicsItem->setFlag(QGraphicsItem::ItemStacksBehindParent, 
                                      true);
         else
@@ -455,11 +455,11 @@ void QSimpleCanvasItem::setZ(qreal z)
         d->graphicsItem->setZValue(z);
 
     } else {
-        if(d->data()->z == z)
+        if (d->data()->z == z)
             return;
 
         d->data()->z = z;
-        if(parent())
+        if (parent())
             static_cast<QSimpleCanvasItemPrivate*>(parent()->d_ptr)->needsZOrder = true;
         update();
     }
@@ -475,7 +475,7 @@ void QSimpleCanvasItem::setWidth(qreal w)
 {
     Q_D(QSimpleCanvasItem);
     d->widthValid = true;
-    if(d->width == w)
+    if (d->width == w)
         return;
 
     qreal oldWidth = d->width;
@@ -490,7 +490,7 @@ void QSimpleCanvasItem::setWidth(qreal w)
 void QSimpleCanvasItem::setImplicitWidth(qreal w)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->width == w || widthValid())
+    if (d->width == w || widthValid())
         return;
 
     qreal oldWidth = d->width;
@@ -518,7 +518,7 @@ void QSimpleCanvasItem::setHeight(qreal h)
 {
     Q_D(QSimpleCanvasItem);
     d->heightValid = true;
-    if(d->height == h)
+    if (d->height == h)
         return;
 
     qreal oldHeight = d->height;
@@ -533,7 +533,7 @@ void QSimpleCanvasItem::setHeight(qreal h)
 void QSimpleCanvasItem::setImplicitHeight(qreal h)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->height == h || heightValid())
+    if (d->height == h || heightValid())
         return;
 
     qreal oldHeight = d->height;
@@ -557,7 +557,7 @@ void QSimpleCanvasItem::setPos(const QPointF &point)
     qreal oldX = x();
     qreal oldY = y();
 
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         d->graphicsItem->setPos(point);
     } else {
         d->data()->x = point.x();
@@ -579,13 +579,13 @@ void QSimpleCanvasItem::setScale(qreal s)
 {
     Q_D(QSimpleCanvasItem);
     d->scale = s;
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         QTransform t;
         QPointF to = transformOriginPoint();
-        if(to.x() != 0. || to.y() != 0.)
+        if (to.x() != 0. || to.y() != 0.)
             t.translate(to.x(), to.y());
         t.scale(s, s);
-        if(to.x() != 0. || to.y() != 0.)
+        if (to.x() != 0. || to.y() != 0.)
             t.translate(-to.x(), -to.y());
         d->graphicsItem->setTransform(t * d->graphicsItem->transform);
     } else {
@@ -595,9 +595,9 @@ void QSimpleCanvasItem::setScale(qreal s)
 
 bool QSimpleCanvasItem::isVisible() const
 {
-    if(visible() <= 0)
+    if (visible() <= 0)
         return false;
-    else if(!parent())
+    else if (!parent())
         return true;
     else
         return parent()->isVisible();
@@ -606,9 +606,9 @@ bool QSimpleCanvasItem::isVisible() const
 qreal QSimpleCanvasItem::visible() const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return d->graphicsItem->opacity();
-    else if(d->data_ptr)
+    else if (d->data_ptr)
         return d->data()->visible;
     else
         return 1;
@@ -617,17 +617,17 @@ qreal QSimpleCanvasItem::visible() const
 void QSimpleCanvasItem::setVisible(qreal v)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         d->graphicsItem->setOpacity(v);
     } else {
-        if(v == visible())
+        if (v == visible())
             return;
-        if(v == 0)
+        if (v == 0)
             update();
 
         d->data()->visible = v;
 
-        if(v != 0)
+        if (v != 0)
             update();
     }
 }
@@ -636,7 +636,7 @@ void QSimpleCanvasItem::addChild(QSimpleCanvasItem *c)
 {
     Q_D(QSimpleCanvasItem);
     d->children.append(c);
-    if(!d->graphicsItem) 
+    if (!d->graphicsItem) 
         d->needsZOrder = true;
     childrenChanged();
 }
@@ -660,11 +660,11 @@ QSimpleCanvasItem takes ownership of filter.
 void QSimpleCanvasItem::setFilter(QSimpleCanvasFilter *f)
 {
     Q_D(QSimpleCanvasItem);
-    if(!d || f == d->filter)
+    if (!d || f == d->filter)
         return;
 
     d->filter = f;
-    if(d->filter)
+    if (d->filter)
         d->filter->setItem(this);
     update();
 }
@@ -683,7 +683,7 @@ bool QSimpleCanvasItem::hasChildren() const
 
 QSimpleCanvasLayer *QSimpleCanvasItem::layer() 
 {
-    if(parent())
+    if (parent())
         return parent()->layer();
     else
         return 0;
@@ -692,18 +692,18 @@ QSimpleCanvasLayer *QSimpleCanvasItem::layer()
 void QSimpleCanvasItem::update()
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         d->graphicsItem->update();
     } else {
-        if(!parent())
+        if (!parent())
             return;
 
-        if(d->data()->dirty || 0. == d->data()->visible) return;
+        if (d->data()->dirty || 0. == d->data()->visible) return;
 
         QSimpleCanvasLayer *l = layer(); 
-        if(l == this && parent())
+        if (l == this && parent())
             l = parent()->layer();
-        if(l) {
+        if (l) {
             l->addDirty(this);
             d->data()->dirty = true;
             d->data()->transformValid = false;
@@ -720,10 +720,10 @@ bool QSimpleCanvasItem::clip() const
 void QSimpleCanvasItem::setClip(bool c)
 {
     Q_D(const QSimpleCanvasItem);
-    if(bool(d->clip) == c)
+    if (bool(d->clip) == c)
         return;
 
-    if(c) 
+    if (c) 
         setClipType(ClipToRect);
     else 
         setClipType(NoClip);
@@ -741,7 +741,7 @@ void QSimpleCanvasItem::setClipType(ClipType c)
 {
     Q_D(QSimpleCanvasItem);
     d->clip = c;
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         d->graphicsItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape, bool(c));
     else
         update();
@@ -750,9 +750,9 @@ void QSimpleCanvasItem::setClipType(ClipType c)
 Qt::MouseButtons QSimpleCanvasItem::acceptedMouseButtons() const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return d->graphicsItem->acceptedMouseButtons();
-    else if(d->data_ptr)
+    else if (d->data_ptr)
         return (Qt::MouseButtons)d->data()->buttons;
     else
         return Qt::NoButton;
@@ -761,7 +761,7 @@ Qt::MouseButtons QSimpleCanvasItem::acceptedMouseButtons() const
 void QSimpleCanvasItem::setAcceptedMouseButtons(Qt::MouseButtons buttons)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         d->graphicsItem->setAcceptedMouseButtons(buttons);
     else
         d->data()->buttons = buttons;
@@ -776,7 +776,7 @@ QRect QSimpleCanvasItem::itemBoundingRect()
 QPointF QSimpleCanvasItemPrivate::adjustFrom(const QPointF &p) const
 {
 #if defined(QFX_RENDER_OPENGL)
-    if(!canvas)
+    if (!canvas)
         return p;
 
     QPointF rv(-1. + 2. * p.x() / qreal(canvas->width()),
@@ -791,7 +791,7 @@ QPointF QSimpleCanvasItemPrivate::adjustFrom(const QPointF &p) const
 QRectF QSimpleCanvasItemPrivate::adjustFrom(const QRectF &r) const
 {
 #if defined(QFX_RENDER_OPENGL)
-    if(!canvas)
+    if (!canvas)
         return r;
 
     qreal width = r.width() * 2. / qreal(canvas->width());
@@ -808,7 +808,7 @@ QRectF QSimpleCanvasItemPrivate::adjustFrom(const QRectF &r) const
 QPointF QSimpleCanvasItemPrivate::adjustTo(const QPointF &p) const
 {
 #if defined(QFX_RENDER_OPENGL)
-    if(!canvas)
+    if (!canvas)
         return p;
 
     QPointF rv(0.5 * (p.x() + 1.) * qreal(canvas->width()),
@@ -823,7 +823,7 @@ QPointF QSimpleCanvasItemPrivate::adjustTo(const QPointF &p) const
 QRectF QSimpleCanvasItemPrivate::adjustTo(const QRectF &r) const
 {
 #if defined(QFX_RENDER_OPENGL)
-    if(!canvas)
+    if (!canvas)
         return r;
 
     qreal width = 0.5 * r.width() * qreal(canvas->width());
@@ -840,7 +840,7 @@ QRectF QSimpleCanvasItemPrivate::adjustTo(const QRectF &r) const
 QPointF QSimpleCanvasItem::mapFromScene(const QPointF &p) const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         return d->graphicsItem->mapFromScene(p);
     } else {
         QPointF mp = d->adjustFrom(p);
@@ -865,7 +865,7 @@ QPointF QSimpleCanvasItem::mapFromScene(const QPointF &p) const
 QRectF QSimpleCanvasItem::mapFromScene(const QRectF &r) const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         return d->graphicsItem->mapFromScene(r).boundingRect();
     } else {
         QRectF mr = d->adjustFrom(r);
@@ -902,7 +902,7 @@ QRectF QSimpleCanvasItem::mapFromScene(const QRectF &r) const
 QPointF QSimpleCanvasItem::mapToScene(const QPointF &p) const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         return d->graphicsItem->mapToScene(p);
     } else {
         d->freshenTransforms();
@@ -914,7 +914,7 @@ QPointF QSimpleCanvasItem::mapToScene(const QPointF &p) const
 QRectF QSimpleCanvasItem::mapToScene(const QRectF &r) const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         return d->graphicsItem->mapToScene(r).boundingRect();
     } else {
         d->freshenTransforms();
@@ -927,7 +927,7 @@ int QSimpleCanvasItemPrivate::nextTransformVersion = 1;
 
 void QSimpleCanvasItemPrivate::freshenTransforms() const
 {
-    if(freshenNeeded()) 
+    if (freshenNeeded()) 
         doFreshenTransforms();
 }
 
@@ -941,9 +941,9 @@ bool QSimpleCanvasItemPrivate::freshenNeeded() const
 #else
     const QSimpleCanvasItemPrivate *me = this;
     while(me) {
-        if(me->data_ptr && !me->data_ptr->transformValid)
+        if (me->data_ptr && !me->data_ptr->transformValid)
             return true;
-        if(me->parent)
+        if (me->parent)
             me = me->parent->d_func();
         else
             me = 0;
@@ -955,31 +955,31 @@ bool QSimpleCanvasItemPrivate::freshenNeeded() const
 void QSimpleCanvasItemPrivate::doFreshenTransforms() const
 {
     Q_Q(const QSimpleCanvasItem);
-    if(parent)
+    if (parent)
         parent->d_func()->doFreshenTransforms();
 
-    if(freshenNeeded()) {
-        if(parent)
+    if (freshenNeeded()) {
+        if (parent)
             data()->transformActive = parent->d_func()->data()->transformActive;
         else
             data()->transformActive = QSimpleCanvas::Matrix();
         data()->transformActive.translate(q->x(), q->y());
-        if(scale != 1.) {
+        if (scale != 1.) {
             QPointF to = transformOrigin();
-            if(to.x() != 0. || to.y() != 0.)
+            if (to.x() != 0. || to.y() != 0.)
                 data()->transformActive.translate(to.x(), to.y());
             data()->transformActive.scale(scale, scale);
-            if(to.x() != 0. || to.y() != 0.)
+            if (to.x() != 0. || to.y() != 0.)
                 data()->transformActive.translate(-to.x(), -to.y());
         }
 
         Q_Q(const QSimpleCanvasItem);
 #if defined(QFX_RENDER_OPENGL)
-        if(q->d_func()->data()->transformUser)
+        if (q->d_func()->data()->transformUser)
             data()->transformActive *= *q->d_func()->data()->transformUser;
 #endif
 
-        if(data()->flip) {
+        if (data()->flip) {
             QRectF br = q->boundingRect();
             data()->transformActive.translate(br.width() / 2., br.height() / 2);
 #if defined(QFX_RENDER_OPENGL)
@@ -996,9 +996,9 @@ void QSimpleCanvasItemPrivate::doFreshenTransforms() const
 QSimpleCanvas::Matrix QSimpleCanvasItem::transform() const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return QSimpleCanvasConfig::transformToMatrix(d->graphicsItem->transform);
-    else if(d->data()->transformUser)
+    else if (d->data()->transformUser)
         return *d->data()->transformUser;
     else
         return QSimpleCanvas::Matrix();
@@ -1007,11 +1007,11 @@ QSimpleCanvas::Matrix QSimpleCanvasItem::transform() const
 void QSimpleCanvasItem::setTransform(const QSimpleCanvas::Matrix &m)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         d->graphicsItem->transform = QSimpleCanvasConfig::matrixToTransform(m);
         d->graphicsItem->setTransform(QTransform::fromScale(d->scale, d->scale) * d->graphicsItem->transform);
     } else {
-        if(!d->data()->transformUser)
+        if (!d->data()->transformUser)
             d->data()->transformUser = new QSimpleCanvas::Matrix;
         *d->data()->transformUser = m;
         update();
@@ -1021,16 +1021,16 @@ void QSimpleCanvasItem::setTransform(const QSimpleCanvas::Matrix &m)
 QSimpleCanvasItem *QSimpleCanvasItem::mouseGrabberItem() const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         QGraphicsScene *s = d->graphicsItem->scene();
-        if(s) {
+        if (s) {
             QGraphicsItem *item = s->mouseGrabberItem();
             QSimpleGraphicsItem *dgi = static_cast<QSimpleGraphicsItem *>(item);
             return dgi?static_cast<QSimpleCanvasItem*>(dgi->owner):0;
         }
     } else {
         QSimpleCanvas *c = canvas();
-        if(c)
+        if (c)
             return c->d->lastMouseItem;
     }
     return 0;
@@ -1039,11 +1039,11 @@ QSimpleCanvasItem *QSimpleCanvasItem::mouseGrabberItem() const
 void QSimpleCanvasItem::ungrabMouse()
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         d->graphicsItem->ungrabMouse();
     } else {
         QSimpleCanvas *c = canvas();
-        if(c && c->d->lastMouseItem == this) {
+        if (c && c->d->lastMouseItem == this) {
             c->d->lastMouseItem->mouseUngrabEvent();
             c->d->lastMouseItem = 0;
         }
@@ -1053,13 +1053,13 @@ void QSimpleCanvasItem::ungrabMouse()
 void QSimpleCanvasItem::grabMouse()
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         d->graphicsItem->grabMouse();
     } else {
         QSimpleCanvas *c = canvas();
-        if(c) {
-            if(c->d->lastMouseItem != this) {
-                if(c->d->lastMouseItem)
+        if (c) {
+            if (c->d->lastMouseItem != this) {
+                if (c->d->lastMouseItem)
                     c->d->lastMouseItem->mouseUngrabEvent();
                 c->d->lastMouseItem = this;
             }
@@ -1094,7 +1094,7 @@ void QSimpleCanvasItemPrivate::setActiveFocus(bool f)
 {
     hasActiveFocus = f;
 
-    if(graphicsItem) {
+    if (graphicsItem) {
         if (f) {
             if (!(graphicsItem->flags() & QGraphicsItem::ItemIsFocusable))
                 graphicsItem->setFlag(QGraphicsItem::ItemIsFocusable);
@@ -1111,9 +1111,9 @@ void QSimpleCanvasItemPrivate::setActiveFocus(bool f)
 QSimpleCanvasItem::Flip QSimpleCanvasItem::flip() const
 {
     Q_D(const QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return NoFlip;
-    else if(d->data_ptr)
+    else if (d->data_ptr)
         return d->data()->flip;
     else
         return NoFlip;
@@ -1122,10 +1122,10 @@ QSimpleCanvasItem::Flip QSimpleCanvasItem::flip() const
 void QSimpleCanvasItem::setFlip(Flip f)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return;
 
-    if(d->data()->flip == f)
+    if (d->data()->flip == f)
         return;
 
     d->data()->flip = f;
@@ -1142,15 +1142,15 @@ void QSimpleCanvasItem::setFlip(Flip f)
 void QSimpleCanvasItem::stackUnder(QSimpleCanvasItem *item)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return; // XXX
 
     QSimpleCanvasItem *p = parent();
-    if(!p || !item || item == this) return;
+    if (!p || !item || item == this) return;
 
     QSimpleCanvasItemPrivate *parent_d_ptr = static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr);
     int idx = parent_d_ptr->children.indexOf(item);
-    if(idx == -1) return;
+    if (idx == -1) return;
 
     parent_d_ptr->children.removeAll(this);
     idx = parent_d_ptr->children.indexOf(item);
@@ -1170,15 +1170,15 @@ void QSimpleCanvasItem::stackUnder(QSimpleCanvasItem *item)
 void QSimpleCanvasItem::stackOver(QSimpleCanvasItem *item)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return; // XXX
 
     QSimpleCanvasItem *p = parent();
-    if(!p || !item || item == this) return;
+    if (!p || !item || item == this) return;
 
     QSimpleCanvasItemPrivate *parent_d_ptr = static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr);
     int idx = parent_d_ptr->children.indexOf(item);
-    if(idx == -1) return;
+    if (idx == -1) return;
 
     parent_d_ptr->children.removeAll(this);
     idx = parent_d_ptr->children.indexOf(item);
@@ -1200,17 +1200,17 @@ void QSimpleCanvasItem::stackOver(QSimpleCanvasItem *item)
 void QSimpleCanvasItem::stackAt(int index)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem)
+    if (d->graphicsItem)
         return; // XXX
 
     QSimpleCanvasItem *p = parent();
-    if(!p) return;
+    if (!p) return;
 
     QSimpleCanvasItemPrivate *parent_d_ptr = static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr);
     parent_d_ptr->children.removeAll(this);
 
-    if(index < 0) index = 0;
-    if(index > parent_d_ptr->children.size()) index = parent_d_ptr->children.size();
+    if (index < 0) index = 0;
+    if (index > parent_d_ptr->children.size()) index = parent_d_ptr->children.size();
 
     parent_d_ptr->children.insert(index, this);
     parent_d_ptr->needsZOrder = true;
@@ -1233,13 +1233,13 @@ int QSimpleCanvasItem::indexForChild(QSimpleCanvasItem *item)
 bool QSimpleCanvasItem::eventFilter(QObject *o, QEvent *e)
 {
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         switch(e->type()) {
         case QEvent::GraphicsSceneMouseDoubleClick:
         case QEvent::GraphicsSceneMouseMove:
         case QEvent::GraphicsSceneMousePress:
         case QEvent::GraphicsSceneMouseRelease:
-            if(mouseFilter(static_cast<QGraphicsSceneMouseEvent *>(e))) 
+            if (mouseFilter(static_cast<QGraphicsSceneMouseEvent *>(e))) 
                 return true;
             break;
         default:
@@ -1255,44 +1255,44 @@ void QSimpleCanvasItem::setOptions(Options options, bool set)
     Q_D(QSimpleCanvasItem);
     Options old = (Options)d->options;
 
-    if(options & IsFocusPanel) {
-        if(!set) {
+    if (options & IsFocusPanel) {
+        if (!set) {
             qWarning("QSimpleCanvasItem::setOptions: Cannot unset IsFocusPanel");
             return;
-        } else if(hasChildren()) {
+        } else if (hasChildren()) {
             qWarning("QSimpleCanvasItem::setOptions: Cannot set IsFocusPanel once item has children");
             return;
         }
     }
 
-    if(options & IsFocusRealm) {
-        if(!set) {
+    if (options & IsFocusRealm) {
+        if (!set) {
             qWarning("QSimpleCanvasItem::setOptions: Cannot unset IsFocusRealm");
             return;
         } 
     }
 
-    if(set)
+    if (set)
         d->options |= options;
     else
         d->options &= ~options;
 
-    if((d->options & IsFocusPanel) && (d->options & IsFocusRealm)) {
+    if ((d->options & IsFocusPanel) && (d->options & IsFocusRealm)) {
         qWarning("QSimpleCanvasItem::setOptions: Cannot set both IsFocusPanel and IsFocusRealm.  IsFocusRealm will be unset.");
         d->options &= ~IsFocusRealm;
     }
 
-    if((old & MouseFilter) != (d->options & MouseFilter)) {
-        if(d->graphicsItem) {
-            if(d->options & MouseFilter)
+    if ((old & MouseFilter) != (d->options & MouseFilter)) {
+        if (d->graphicsItem) {
+            if (d->options & MouseFilter)
                 d->gvAddMouseFilter();
             else
                 d->gvRemoveMouseFilter();
 
         } else {
             QSimpleCanvas *c = canvas();
-            if(c) {
-                if(d->options & MouseFilter)
+            if (c) {
+                if (d->options & MouseFilter)
                     c->d->installMouseFilter(this);
                 else
                     c->d->removeMouseFilter(this);
@@ -1314,7 +1314,7 @@ QSimpleCanvasItem::QSimpleCanvasItem(QSimpleCanvasItem *p)
 QSimpleCanvasItem::~QSimpleCanvasItem()
 { 
     Q_D(QSimpleCanvasItem);
-    if(d->graphicsItem) {
+    if (d->graphicsItem) {
         if ((d->options & (IsFocusPanel|IsFocusRealm)) && d->canvas)
             d->canvas->d->focusPanelData.remove(this);
         if (d->hasFocus && d->canvas) {
@@ -1324,24 +1324,24 @@ QSimpleCanvasItem::~QSimpleCanvasItem()
             if (prnt && d->canvas->d->focusPanelData.value(prnt) == this)
                 d->canvas->d->focusPanelData.remove(prnt);
         }
-        if(d->filter)
+        if (d->filter)
             delete d->filter;
 
         qDeleteAll(children());
-        if(parent())
+        if (parent())
             parent()->remChild(this);
         delete d->graphicsItem;
     } else {
         setOptions(MouseFilter, false);
 
-        if(d->canvas){
-            if(d->canvas->focusItem() == this)
+        if (d->canvas){
+            if (d->canvas->focusItem() == this)
                 d->canvas->d->focusItem = 0;
-            if(d->canvas->d->lastFocusItem == this)
+            if (d->canvas->d->lastFocusItem == this)
                 d->canvas->d->lastFocusItem = 0;
-            if(d->hasBeenActiveFocusPanel) 
+            if (d->hasBeenActiveFocusPanel) 
                 d->canvas->d->clearFocusPanel(this);
-            if(d->hasFocus)
+            if (d->hasFocus)
                 d->canvas->d->clearFocusItem(this);
         }
 
@@ -1354,7 +1354,7 @@ QSimpleCanvasItem::~QSimpleCanvasItem()
 
         if (parent() && d->data_ptr && d->data()->dirty) {
             QSimpleCanvasLayer *l = parent()->layer();
-            if(l) {
+            if (l) {
                 l->remDirty(this);
             }
         }
@@ -1362,7 +1362,7 @@ QSimpleCanvasItem::~QSimpleCanvasItem()
             d->parent->remChild(this);
 
 
-        if(d->data_ptr)
+        if (d->data_ptr)
             delete d->data_ptr;
     }
 }
@@ -1370,8 +1370,8 @@ QSimpleCanvasItem::~QSimpleCanvasItem()
 QSimpleCanvasItem::operator QGraphicsItem *()
 {
     Q_D(QSimpleCanvasItem);
-    if(!d->graphicsItem) {
-        if(parent()) {
+    if (!d->graphicsItem) {
+        if (parent()) {
             qWarning("QSimpleCanvasItem: Only the root item can be converted into a QGraphicsItem");
             return 0;
         }
@@ -1413,42 +1413,42 @@ void QSimpleCanvasItemPrivate::setParentInternal(QSimpleCanvasItem *p)
 {
     Q_Q(QSimpleCanvasItem);
     QSimpleCanvasItem *oldParent = parent;
-    if(graphicsItem) {
-        if(oldParent)
+    if (graphicsItem) {
+        if (oldParent)
             oldParent->remChild(q);
 
         parent = p;
         graphicsItem->setParentItem(p->d_func()->graphicsItem);
 
-        if(parent)
+        if (parent)
             p->addChild(q);
 
     } else {
         bool canvasChange = false;
-        if(p)
+        if (p)
             canvasChange = (p->d_func()->canvas != canvas);
         QSimpleCanvas *old = canvas;
 
         QSimpleCanvasLayer *o = q->layer();
-        if(q->parent()) {
+        if (q->parent()) {
             q->update();
             q->parent()->remChild(q);
         }
         parent = p;
         QSimpleCanvasLayer *n = 0;
-        if(q->parent()) {
+        if (q->parent()) {
             q->parent()->addChild(q);
             n = q->layer();
         }
 
-        if(o != n) {
+        if (o != n) {
             data()->dirty = false;
             data()->transformValid = false;
-            if(o) o->remDirty(q);
-            if(n) n->addDirty(q);
+            if (o) o->remDirty(q);
+            if (n) n->addDirty(q);
         }
 
-        if(canvasChange)
+        if (canvasChange)
             canvasChanged(p->d_func()->canvas, old);
 
         q->update();
@@ -1460,25 +1460,25 @@ void QSimpleCanvasItemPrivate::convertToGraphicsItem(QGraphicsItem *parent)
     Q_Q(QSimpleCanvasItem);
     Q_ASSERT(!graphicsItem);
     graphicsItem = new QSimpleGraphicsItem(q);
-    if(parent)
+    if (parent)
         graphicsItem->setParentItem(parent);
 
     QSimpleCanvasItemData *old = data_ptr;
     data_ptr = 0;
 
-    if(old) {
+    if (old) {
         q->QSimpleCanvasItem::setX(old->x);
         q->QSimpleCanvasItem::setY(old->y);
         q->QSimpleCanvasItem::setZ(old->z);
         q->QSimpleCanvasItem::setVisible(old->visible);
-        if(old->transformUser)
+        if (old->transformUser)
             q->QSimpleCanvasItem::setTransform(*old->transformUser);
         q->QSimpleCanvasItem::setFlip(old->flip);
         q->QSimpleCanvasItem::setAcceptedMouseButtons((Qt::MouseButtons)old->buttons);
         delete old;
     }
 
-    if(scale != 1) {
+    if (scale != 1) {
         qreal s = scale;
         scale = 1;
         q->QSimpleCanvasItem::setScale(s);
@@ -1486,9 +1486,9 @@ void QSimpleCanvasItemPrivate::convertToGraphicsItem(QGraphicsItem *parent)
 
     q->setClipType(clip);
 
-    for(int ii = 0; ii < children.count(); ++ii) {
+    for (int ii = 0; ii < children.count(); ++ii) {
         static_cast<QSimpleCanvasItemPrivate*>(children.at(ii)->d_ptr)->convertToGraphicsItem(graphicsItem);
-        if(children.at(ii)->z() == 0)
+        if (children.at(ii)->z() == 0)
             children.at(ii)->setZ(ii);
     }
 }
@@ -1501,14 +1501,14 @@ void QSimpleCanvasItemPrivate::convertToGraphicsItem(QGraphicsItem *parent)
 void QSimpleCanvasItem::setParent(QSimpleCanvasItem *p)
 {
     Q_D(QSimpleCanvasItem);
-    if(p == parent() || !p) return;
+    if (p == parent() || !p) return;
 
     QObject::setParent(p);
 
-    if(d->graphicsItem && !static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr)->graphicsItem)
+    if (d->graphicsItem && !static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr)->graphicsItem)
         qWarning("QSimpleCanvasItem: Cannot reparent a QGraphicsView item to a QSimpleCanvas item");
 
-    if(static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr)->graphicsItem && !d->graphicsItem) {
+    if (static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr)->graphicsItem && !d->graphicsItem) {
         d->setParentInternal(0);
         d->convertToGraphicsItem();
     }
@@ -1524,45 +1524,45 @@ int QSimpleCanvasItemPrivate::dump(int indent)
     QByteArray ba(indent * 2, ' ');
 
     QByteArray state;
-    if(options & QSimpleCanvasItem::MouseFilter)
+    if (options & QSimpleCanvasItem::MouseFilter)
         state.append("i");
     else
         state.append("-");
-    if(options & QSimpleCanvasItem::HoverEvents)
+    if (options & QSimpleCanvasItem::HoverEvents)
         state.append("h");
     else
         state.append("-");
-    if(options & QSimpleCanvasItem::MouseEvents)
+    if (options & QSimpleCanvasItem::MouseEvents)
         state.append("m");
     else
         state.append("-");
-    if(options & QSimpleCanvasItem::HasContents)
+    if (options & QSimpleCanvasItem::HasContents)
         state.append("c");
     else
         state.append("-");
-    if(options & QSimpleCanvasItem::SimpleItem)
+    if (options & QSimpleCanvasItem::SimpleItem)
         state.append("s");
     else
         state.append("-");
-    if(options & QSimpleCanvasItem::IsFocusPanel) {
-        if(q->activeFocusPanel())
+    if (options & QSimpleCanvasItem::IsFocusPanel) {
+        if (q->activeFocusPanel())
             state.append("P");
         else
             state.append("p");
     } else {
         state.append("-");
     }
-    if(options & QSimpleCanvasItem::IsFocusRealm)
+    if (options & QSimpleCanvasItem::IsFocusRealm)
         state.append("r");
     else
         state.append("-");
-    if(q->hasFocus()) {
-        if(q->hasActiveFocus())
+    if (q->hasFocus()) {
+        if (q->hasActiveFocus())
             state.append("F");
         else
             state.append("f");
     } else {
-        if(q->hasActiveFocus())
+        if (q->hasActiveFocus())
             state.append("X");
         else
             state.append("-");
@@ -1570,13 +1570,13 @@ int QSimpleCanvasItemPrivate::dump(int indent)
 
     QByteArray name;
     QFxItem *i = qobject_cast<QFxItem *>(q);
-    if(i)
+    if (i)
         name = i->id().toLatin1();
     qWarning().nospace() << ba.constData() << state.constData() << " " << children.count() << " " << q << " " << name.constData();
 
     int rv = 0;
 
-    for(int ii = 0; ii < children.count(); ++ii)
+    for (int ii = 0; ii < children.count(); ++ii)
         rv += children.at(ii)->d_func()->dump(indent + 1);
 
     return rv + 1;
@@ -1591,10 +1591,10 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d,
     bool isRealm = (options & QSimpleCanvasItem::IsFocusPanel ||
                     options & QSimpleCanvasItem::IsFocusRealm);
 
-    if(options & QSimpleCanvasItem::IsFocusPanel) {
+    if (options & QSimpleCanvasItem::IsFocusPanel) {
 
-        if(q->activeFocusPanel()) {
-            if(d & InActivePanel) {
+        if (q->activeFocusPanel()) {
+            if (d & InActivePanel) {
                 qWarning() << "State ERROR: Nested active focus panels";
                 rv = false;
             }
@@ -1606,23 +1606,23 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d,
 
     }
 
-    if(q->hasActiveFocus()) {
-        if(!(d & InActivePanel)) {
+    if (q->hasActiveFocus()) {
+        if (!(d & InActivePanel)) {
             qWarning() << "State ERROR: Active focus in non-active panel";
             rv = false;
         }
 
-        if(d & InRealm && !(d & InActiveFocusedRealm)) {
+        if (d & InRealm && !(d & InActiveFocusedRealm)) {
             qWarning() << "State ERROR: Active focus in non-active-focused realm";
             rv = false;
         }
 
-        if(!q->hasFocus()) {
+        if (!q->hasFocus()) {
             qWarning() << "State ERROR: Active focus on element that does not have focus";
             rv = false;
         }
 
-        if(*r & SeenActiveFocus) {
+        if (*r & SeenActiveFocus) {
             qWarning() << "State ERROR: Two active focused elements in same realm";
             rv = false;
         }
@@ -1630,8 +1630,8 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d,
         *r |= SeenActiveFocus;
     }
 
-    if(q->hasFocus()) {
-        if(*r & SeenFocus) {
+    if (q->hasFocus()) {
+        if (*r & SeenFocus) {
             qWarning() << "State ERROR: Two focused elements in same realm";
             rv = false;
         }
@@ -1639,20 +1639,20 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d,
         *r |= SeenFocus;
     }
 
-    if(options & QSimpleCanvasItem::IsFocusRealm) {
+    if (options & QSimpleCanvasItem::IsFocusRealm) {
         d |= InRealm;
 
-        if(q->hasActiveFocus())
+        if (q->hasActiveFocus())
             d |= InActiveFocusedRealm;
         else
             d &= ~InActiveFocusedRealm;
     }
 
     FocusStateCheckRDatas newR = NoCheckRData;
-    if(isRealm) 
+    if (isRealm) 
         r = &newR;
 
-    for(int ii = 0; ii < children.count(); ++ii)
+    for (int ii = 0; ii < children.count(); ++ii)
         rv &= children.at(ii)->d_func()->checkFocusState(d, r);
 
     return rv;
@@ -1661,7 +1661,7 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d,
 bool QSimpleCanvasItem::activeFocusPanel() const
 {
     QSimpleCanvas *c = canvas();
-    if(!c) {
+    if (!c) {
         Q_D(const QSimpleCanvasItem);
         return d->wantsActiveFocusPanelPendingCanvas;
     } else {
@@ -1671,18 +1671,18 @@ bool QSimpleCanvasItem::activeFocusPanel() const
 
 void QSimpleCanvasItem::setActiveFocusPanel(bool b)
 {
-    if(!(options() & IsFocusPanel)) {
+    if (!(options() & IsFocusPanel)) {
         qWarning("QSimpleCanvasItem::setActiveFocusPanel: Item is not a focus panel");
         return;
     }
 
     QSimpleCanvas *c = canvas();
     Q_D(QSimpleCanvasItem);
-    if(c) {
-        if(b) {
+    if (c) {
+        if (b) {
             d->hasBeenActiveFocusPanel = true;
             c->d->setActiveFocusPanel(this);
-        } else if(d->hasBeenActiveFocusPanel) {
+        } else if (d->hasBeenActiveFocusPanel) {
             d->hasBeenActiveFocusPanel = false;
             c->d->clearFocusPanel(this);
         }
@@ -1705,7 +1705,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::findFirstFocusChild() const
 
     for (int i = 0; i < children.count(); ++i) {
         QSimpleCanvasItem *child = children.at(i);
-        if(child->options() & IsFocusPanel)
+        if (child->options() & IsFocusPanel)
             continue;
 
         if (child->isFocusable())
@@ -1727,7 +1727,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::findLastFocusChild() const
 
     for (int i = children.count()-1; i >= 0; --i) {
         QSimpleCanvasItem *child = children.at(i);
-        if(child->options() & IsFocusPanel)
+        if (child->options() & IsFocusPanel)
             continue;
 
         if (child->isFocusable())
@@ -1746,8 +1746,8 @@ QSimpleCanvasItem *QSimpleCanvasItem::findPrevFocus(QSimpleCanvasItem *item)
     if (focusChild)
         return focusChild;
 
-    if(item->options() & IsFocusPanel) {
-        if(item->isFocusable())
+    if (item->options() & IsFocusPanel) {
+        if (item->isFocusable())
             return item;
         else
             return 0;
@@ -1762,7 +1762,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::findPrevFocus(QSimpleCanvasItem *item)
         if (idx > 0) {
             while (--idx >= 0) {
                 testFocus = children.at(idx);
-                if(testFocus->options() & IsFocusPanel)
+                if (testFocus->options() & IsFocusPanel)
                     continue;
                 if (testFocus->isFocusable())
                     return testFocus;
@@ -1771,8 +1771,8 @@ QSimpleCanvasItem *QSimpleCanvasItem::findPrevFocus(QSimpleCanvasItem *item)
                     return testFocus;
             }
         }
-        if(parent->options() & IsFocusPanel) {
-            if(parent->isFocusable())
+        if (parent->options() & IsFocusPanel) {
+            if (parent->isFocusable())
                 return parent;
             else
                 return 0;
@@ -1790,8 +1790,8 @@ QSimpleCanvasItem *QSimpleCanvasItem::findNextFocus(QSimpleCanvasItem *item)
     if (focusChild)
         return focusChild;
 
-    if(item->options() & IsFocusPanel) {
-        if(item->isFocusable())
+    if (item->options() & IsFocusPanel) {
+        if (item->isFocusable())
             return item;
         else
             return 0;
@@ -1806,7 +1806,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::findNextFocus(QSimpleCanvasItem *item)
         if (idx >= 0) {
             while (++idx < children.count()) {
                 testFocus = children.at(idx);
-                if(testFocus->options() & IsFocusPanel)
+                if (testFocus->options() & IsFocusPanel)
                     continue;
                 if (testFocus->isFocusable())
                     return testFocus;
@@ -1815,8 +1815,8 @@ QSimpleCanvasItem *QSimpleCanvasItem::findNextFocus(QSimpleCanvasItem *item)
                     return testFocus;
             }
         }
-        if(parent->options() & IsFocusPanel) {
-            if(parent->isFocusable())
+        if (parent->options() & IsFocusPanel) {
+            if (parent->isFocusable())
                 return parent;
             else
                 return 0;