11 files changed, 407 insertions, 406 deletions

diff --git a/src/declarative/canvas/qsimplecanvas.cpp b/src/declarative/canvas/qsimplecanvas.cpp
index 4d2cc5b..1911b35 100644
--- a/src/declarative/canvas/qsimplecanvas.cpp
+++ b/src/declarative/canvas/qsimplecanvas.cpp
@@ -73,7 +73,7 @@ public:
     {
         int entry = (_first + _size) % s;
         _array[entry] = t;
-        if(_size == s)
+        if (_size == s)
             _first = (_first + 1) % s;
         else
             _size++;
@@ -127,14 +127,14 @@ void QSimpleCanvasRootLayer::remDirty(QSimpleCanvasItem *i)
 
 void QSimpleCanvasPrivate::clearFocusPanel(QSimpleCanvasItem *panel)
 {
-    if(q->activeFocusPanel() == panel) {
+    if (q->activeFocusPanel() == panel) {
         focusPanels.pop();
 
         switchToFocusPanel(q->activeFocusPanel(), panel, Qt::OtherFocusReason);
         panel->activePanelOutEvent();
     } else {
-        for(int ii = 0; ii < focusPanels.count(); ++ii)
-            if(focusPanels.at(ii) == panel) {
+        for (int ii = 0; ii < focusPanels.count(); ++ii)
+            if (focusPanels.at(ii) == panel) {
                 focusPanels.remove(ii);
                 break;
             }
@@ -143,35 +143,35 @@ void QSimpleCanvasPrivate::clearFocusPanel(QSimpleCanvasItem *panel)
 
 void QSimpleCanvasPrivate::switchToFocusPanel(QSimpleCanvasItem *panel, QSimpleCanvasItem *wasPanel, Qt::FocusReason focusReason)
 {
-    if(panel)
+    if (panel)
         panel->activePanelInEvent();
 
     QSimpleCanvasItem *wasFocusRoot = focusPanelData.value(wasPanel);
-    if(wasFocusRoot)
+    if (wasFocusRoot)
         clearActiveFocusItem(wasFocusRoot, focusReason);
 
     QSimpleCanvasItem *newFocusRoot = focusPanelData.value(panel);
-    if(newFocusRoot)
+    if (newFocusRoot)
         setFocusItem(newFocusRoot, focusReason);
 }
 
 void QSimpleCanvasPrivate::setActiveFocusPanel(QSimpleCanvasItem *panel, Qt::FocusReason focusReason)
 {
-    if(q->activeFocusPanel() == panel)
+    if (q->activeFocusPanel() == panel)
         return;
 
-    if(panel) {
-        for(int ii = 0; ii < focusPanels.count(); ++ii)
-            if(focusPanels.at(ii) == panel) {
+    if (panel) {
+        for (int ii = 0; ii < focusPanels.count(); ++ii)
+            if (focusPanels.at(ii) == panel) {
                 focusPanels.remove(ii);
                 break;
             }
     }
     QSimpleCanvasItem *old = q->activeFocusPanel();
-    if(panel)
+    if (panel)
         focusPanels << panel;
     switchToFocusPanel(panel, old, focusReason);
-    if(old)
+    if (old)
         old->activePanelOutEvent();
 }
 
@@ -181,13 +181,13 @@ void QSimpleCanvasPrivate::clearActiveFocusItem(QSimpleCanvasItem *item,
     if (!item || !item->d_func())
         return;
 
-    if(!item->d_func()->hasActiveFocus)
+    if (!item->d_func()->hasActiveFocus)
         return;
 
     item->d_func()->hasActiveFocus = false;
-    if(item->options() & QSimpleCanvasItem::IsFocusRealm) {
+    if (item->options() & QSimpleCanvasItem::IsFocusRealm) {
         QSimpleCanvasItem *newItem = focusPanelData.value(item);
-        if(newItem) {
+        if (newItem) {
             clearActiveFocusItem(newItem, focusReason);
         } else {
             focusItem = 0;
@@ -200,8 +200,8 @@ void QSimpleCanvasPrivate::clearActiveFocusItem(QSimpleCanvasItem *item,
         item->focusOutEvent(&event);
     }
 
-    if(item->options() & QSimpleCanvasItem::AcceptsInputMethods){
-        if(q->testAttribute(Qt::WA_InputMethodEnabled))
+    if (item->options() & QSimpleCanvasItem::AcceptsInputMethods){
+        if (q->testAttribute(Qt::WA_InputMethodEnabled))
             q->setAttribute(Qt::WA_InputMethodEnabled,false);
     }
     item->activeFocusChanged(true);
@@ -213,9 +213,9 @@ void QSimpleCanvasPrivate::setActiveFocusItem(QSimpleCanvasItem *item,
     while(true) {
         item->d_func()->setActiveFocus(true);
         item->activeFocusChanged(true);
-        if(item->options() & QSimpleCanvasItem::IsFocusRealm) {
+        if (item->options() & QSimpleCanvasItem::IsFocusRealm) {
             QSimpleCanvasItem *newItem = focusPanelData.value(item);
-            if(newItem)
+            if (newItem)
                 item = newItem;
             else
                 break;
@@ -224,8 +224,8 @@ void QSimpleCanvasPrivate::setActiveFocusItem(QSimpleCanvasItem *item,
         }
     }
 
-    if(item->options() & QSimpleCanvasItem::AcceptsInputMethods){
-        if(!q->testAttribute(Qt::WA_InputMethodEnabled))
+    if (item->options() & QSimpleCanvasItem::AcceptsInputMethods){
+        if (!q->testAttribute(Qt::WA_InputMethodEnabled))
             q->setAttribute(Qt::WA_InputMethodEnabled,true);
     }
     focusItem = item;
@@ -244,9 +244,9 @@ void QSimpleCanvasPrivate::clearFocusItem(QSimpleCanvasItem *item)
     QSimpleCanvasItem *scope = 0;
     QSimpleCanvasItem *citem = item;
     while(citem && !scope) {
-        if(citem->options() & QSimpleCanvasItem::IsFocusPanel) 
+        if (citem->options() & QSimpleCanvasItem::IsFocusPanel) 
             scope = citem;
-        else if(citem != item && citem->options() & QSimpleCanvasItem::IsFocusRealm)
+        else if (citem != item && citem->options() & QSimpleCanvasItem::IsFocusRealm)
             scope = citem;
         citem = citem->parent();
     }
@@ -254,23 +254,23 @@ void QSimpleCanvasPrivate::clearFocusItem(QSimpleCanvasItem *item)
 
    bool isActive = false;
 
-   if(scope->options() & QSimpleCanvasItem::IsFocusPanel) 
+   if (scope->options() & QSimpleCanvasItem::IsFocusPanel) 
        isActive = (scope == q->activeFocusPanel());
-   else if(scope->options() & QSimpleCanvasItem::IsFocusRealm)
+   else if (scope->options() & QSimpleCanvasItem::IsFocusRealm)
        isActive = scope->hasActiveFocus();
 
-   if(isActive) clearActiveFocusItem(item, Qt::OtherFocusReason);
+   if (isActive) clearActiveFocusItem(item, Qt::OtherFocusReason);
    item->d_func()->setFocus(false);
    item->focusChanged(false);
 
    focusPanelData.insert(scope, 0);
 
-   if(lastFocusItem == item)
+   if (lastFocusItem == item)
        lastFocusItem = 0;
-   if(focusItem == item)
+   if (focusItem == item)
        focusItem = 0;
 
-   if(scope->options() & QSimpleCanvasItem::IsFocusRealm && scope->hasActiveFocus()) {
+   if (scope->options() & QSimpleCanvasItem::IsFocusRealm && scope->hasActiveFocus()) {
        setActiveFocusItem(scope, Qt::OtherFocusReason);
    } else {
        QSimpleCanvasItem *item = QSimpleCanvasItem::findNextFocus(scope);
@@ -291,21 +291,21 @@ void QSimpleCanvasPrivate::setFocusItem(QSimpleCanvasItem *item,
         item = item->focusProxy();
 #endif
 
-    if(item == focusItem)
+    if (item == focusItem)
         return;
 
     QSimpleCanvasItem *scope = 0;
     QSimpleCanvasItem *citem = item;
     while(citem && !scope) {
-        if(citem->options() & QSimpleCanvasItem::IsFocusPanel) 
+        if (citem->options() & QSimpleCanvasItem::IsFocusPanel) 
             scope = citem;
-        else if(citem != item && citem->options() & QSimpleCanvasItem::IsFocusRealm)
+        else if (citem != item && citem->options() & QSimpleCanvasItem::IsFocusRealm)
             scope = citem;
         citem = citem->parent();
     }
     Q_ASSERT(scope); // At the very least we'll find the canvas root
 
-   if(!overwrite && focusPanelData.contains(scope)) {
+   if (!overwrite && focusPanelData.contains(scope)) {
        item->d_func()->setFocus(false);
        item->focusChanged(false);
        return;
@@ -314,26 +314,26 @@ void QSimpleCanvasPrivate::setFocusItem(QSimpleCanvasItem *item,
    QSimpleCanvasItem *oldFocus = focusPanelData.value(scope);
    bool isActive = false;
 
-   if(scope->options() & QSimpleCanvasItem::IsFocusPanel) 
+   if (scope->options() & QSimpleCanvasItem::IsFocusPanel) 
        isActive = (scope == q->activeFocusPanel());
-   else if(scope->options() & QSimpleCanvasItem::IsFocusRealm)
+   else if (scope->options() & QSimpleCanvasItem::IsFocusRealm)
        isActive = scope->hasActiveFocus();
 
-   if(oldFocus) {
-       if(isActive) clearActiveFocusItem(oldFocus, focusReason);
+   if (oldFocus) {
+       if (isActive) clearActiveFocusItem(oldFocus, focusReason);
        oldFocus->d_func()->setFocus(false);
        oldFocus->focusChanged(false);
    }
 
    focusPanelData.insert(scope, item);
 
-   if(isActive)
+   if (isActive)
        lastFocusItem = item;
 
    if (item) {
        item->d_func()->setFocus(true);
        item->focusChanged(true);
-       if(isActive)
+       if (isActive)
            setActiveFocusItem(item, focusReason);
    }
 }
@@ -351,8 +351,8 @@ bool QSimpleCanvas::eventFilter(QObject *obj, QEvent *event)
         case QEvent::GraphicsSceneMousePress:
         case QEvent::GraphicsSceneMouseRelease: {
             //same logic as filter() function
-            for(int ii = 0; ii < d->mouseFilters.count(); ++ii) {
-                if(d->mouseFilters.at(ii)->mouseFilter((QGraphicsSceneMouseEvent*)event))
+            for (int ii = 0; ii < d->mouseFilters.count(); ++ii) {
+                if (d->mouseFilters.at(ii)->mouseFilter((QGraphicsSceneMouseEvent*)event))
                     return true;
             }
             break;
@@ -375,12 +375,12 @@ void QSimpleCanvasPrivate::removeMouseFilter(QSimpleCanvasItem *item)
 
 bool QSimpleCanvasPrivate::filter(QMouseEvent *e)
 {
-    if(mouseFilters.isEmpty())
+    if (mouseFilters.isEmpty())
         return false;
 
     QGraphicsSceneMouseEvent *me = mouseEventToSceneMouseEvent(e, e->pos());
-    for(int ii = 0; ii < mouseFilters.count(); ++ii) {
-        if(mouseFilters.at(ii)->mouseFilter(me)) {
+    for (int ii = 0; ii < mouseFilters.count(); ++ii) {
+        if (mouseFilters.at(ii)->mouseFilter(me)) {
             delete me;
             return true;
         }
@@ -411,6 +411,7 @@ QGraphicsSceneMouseEvent *QSimpleCanvasPrivate::mouseEventToSceneMouseEvent(QMou
     QGraphicsSceneMouseEvent *me = new QGraphicsSceneMouseEvent(t);
     me->setButton(e->button());
     me->setButtons(e->buttons());
+    me->setModifiers(e->modifiers());
     me->setPos(item);
     me->setScreenPos(e->pos());
     me->setScenePos(e->pos());
@@ -419,36 +420,36 @@ QGraphicsSceneMouseEvent *QSimpleCanvasPrivate::mouseEventToSceneMouseEvent(QMou
 
 bool QSimpleCanvasPrivate::deliverMousePress(QSimpleCanvasItem *base, QMouseEvent *e, bool seenChildFilter)
 {
-    if(base->clipType()) {
+    if (base->clipType()) {
         QRectF br = base->boundingRect();
         QPointF pos = base->mapFromScene(e->pos());
-        if(!br.contains(pos.toPoint()))
+        if (!br.contains(pos.toPoint()))
             return false;
     }
 
     const QList<QSimpleCanvasItem *> &children = base->d_func()->children;
 
-    if(base->options() & QSimpleCanvasItem::ChildMouseFilter) 
+    if (base->options() & QSimpleCanvasItem::ChildMouseFilter) 
         seenChildFilter = true;
 
-    for(int ii = children.count() - 1; ii >= 0; --ii) {
-        if(children.at(ii)->visible() != 0.)
-            if(deliverMousePress(children.at(ii), e, seenChildFilter))
+    for (int ii = children.count() - 1; ii >= 0; --ii) {
+        if (children.at(ii)->visible() != 0.)
+            if (deliverMousePress(children.at(ii), e, seenChildFilter))
                 return true;
     }
 
-    if(base->acceptedMouseButtons() & e->button() || base->options() & QSimpleCanvasItem::ChildMouseFilter) {
+    if (base->acceptedMouseButtons() & e->button() || base->options() & QSimpleCanvasItem::ChildMouseFilter) {
 
         QRectF br = base->boundingRect();
         QPoint pos = base->mapFromScene(e->pos()).toPoint();
 
-        if(br.contains(pos)) {
+        if (br.contains(pos)) {
             QGraphicsSceneMouseEvent *me = mouseEventToSceneMouseEvent(e, pos);
 
             sendMouseEvent(base, me);
             bool isAccepted = me->isAccepted();
             delete me;
-            if(isAccepted) {
+            if (isAccepted) {
                 lastMouseItem = base;
                 return true;
             }
@@ -462,8 +463,8 @@ void QSimpleCanvasPrivate::sendMouseEvent(QSimpleCanvasItem *item, QGraphicsScen
 {
     QSimpleCanvasItem *p = item->parent();
     while(p) {
-        if(p->options() & QSimpleCanvasItem::ChildMouseFilter) {
-            if(p->mouseFilter(e))
+        if (p->options() & QSimpleCanvasItem::ChildMouseFilter) {
+            if (p->mouseFilter(e))
                 return;
         }
         p = p->parent();
@@ -532,7 +533,7 @@ void QSimpleCanvasGraphicsView::paintEvent(QPaintEvent *pe)
     int frametimer = canvas->frameTimer.elapsed();
     gfxCanvasTiming.append(QSimpleCanvasTiming(r, frametimer, canvas->lrpTime, tbf));
     canvas->lrpTime = 0;
-    if(canvas->canvasServer)
+    if (canvas->canvasServer)
         canvas->canvasServer->addTiming(canvas->lrpTime, frametimer, tbf);
 }
 
@@ -562,20 +563,20 @@ void QSimpleCanvasPrivate::init(QSimpleCanvas::CanvasMode mode)
 {
     this->mode = mode;
 
-    if(mode == QSimpleCanvas::SimpleCanvas)
+    if (mode == QSimpleCanvas::SimpleCanvas)
         qWarning("QSimpleCanvas: Using simple canvas");
     else
         qWarning("QSimpleCanvas: Using GraphicsView canvas");
 
-    if(fullUpdate())
+    if (fullUpdate())
         qWarning("QSimpleCanvas: Full update enabled");
-    if(continuousUpdate())
+    if (continuousUpdate())
         qWarning("QSimpleCanvas: Continuous update enabled");
 
     QByteArray env = qgetenv("GFX_CANVAS_SERVER_PORT");
-    if(!env.isEmpty()){ 
+    if (!env.isEmpty()){ 
         int port = env.toInt();
-        if(port >= 1024)
+        if (port >= 1024)
             canvasServer = new QSimpleCanvasServer(port, q);
     }
 
@@ -583,7 +584,7 @@ void QSimpleCanvasPrivate::init(QSimpleCanvas::CanvasMode mode)
     root->setActiveFocusPanel(true);
     q->setFocusPolicy(Qt::StrongFocus);
 
-    if(mode == QSimpleCanvas::GraphicsView) {
+    if (mode == QSimpleCanvas::GraphicsView) {
         view = new QSimpleCanvasGraphicsView(this);
         QHBoxLayout *layout = new QHBoxLayout(q); 
         layout->setSpacing(0);
@@ -620,7 +621,7 @@ QSimpleCanvas::~QSimpleCanvas()
 void QSimpleCanvasPrivate::paint(QPainter &p)
 {
 #if defined(QFX_RENDER_QPAINTER)
-    if(!isSetup)
+    if (!isSetup)
         root->d_func()->setupPainting(0, q->rect());
 
     lrpTimer.start();
@@ -659,7 +660,7 @@ void QSimpleCanvas::keyReleaseEvent(QKeyEvent *event)
 
 void QSimpleCanvas::inputMethodEvent(QInputMethodEvent *event)
 {
-    if(d->focusItem)
+    if (d->focusItem)
         d->focusItem->inputMethodEvent(event);
     else
         QWidget::inputMethodEvent(event);
@@ -667,14 +668,14 @@ void QSimpleCanvas::inputMethodEvent(QInputMethodEvent *event)
 
 QVariant QSimpleCanvas::inputMethodQuery(Qt::InputMethodQuery query) const
 {
-    if(d->focusItem)
+    if (d->focusItem)
         return d->focusItem->inputMethodQuery(query);
     return QWidget::inputMethodQuery(query);
 }
 
 void QSimpleCanvas::mousePressEvent(QMouseEvent *e)
 {
-    if(d->isSimpleCanvas() && 
+    if (d->isSimpleCanvas() && 
        (d->filter(e) || d->deliverMousePress(d->root, e))) {
         e->accept();
     } else {
@@ -684,7 +685,7 @@ void QSimpleCanvas::mousePressEvent(QMouseEvent *e)
 
 void QSimpleCanvas::mouseDoubleClickEvent(QMouseEvent *e)
 {
-    if(d->isSimpleCanvas() && 
+    if (d->isSimpleCanvas() && 
        (d->filter(e) || d->deliverMousePress(d->root, e))) {
         e->accept();
     } else {
@@ -694,9 +695,9 @@ void QSimpleCanvas::mouseDoubleClickEvent(QMouseEvent *e)
 
 void QSimpleCanvas::mouseMoveEvent(QMouseEvent *e)
 {
-    if(d->isSimpleCanvas() && d->filter(e)) {
+    if (d->isSimpleCanvas() && d->filter(e)) {
         e->accept();
-    } else if(d->isSimpleCanvas() && d->lastMouseItem) {
+    } else if (d->isSimpleCanvas() && d->lastMouseItem) {
         QPoint p = d->lastMouseItem->mapFromScene(e->pos()).toPoint();
         QGraphicsSceneMouseEvent *me = d->mouseEventToSceneMouseEvent(e, p);
         d->sendMouseEvent(d->lastMouseItem, me);
@@ -709,9 +710,9 @@ void QSimpleCanvas::mouseMoveEvent(QMouseEvent *e)
 
 void QSimpleCanvas::mouseReleaseEvent(QMouseEvent *e)
 {
-    if(d->isSimpleCanvas() && d->filter(e)) {
+    if (d->isSimpleCanvas() && d->filter(e)) {
         e->accept();
-    } else if(d->isSimpleCanvas() && d->lastMouseItem) {
+    } else if (d->isSimpleCanvas() && d->lastMouseItem) {
         QPoint p = d->lastMouseItem->mapFromScene(e->pos()).toPoint();
         QGraphicsSceneMouseEvent *me = d->mouseEventToSceneMouseEvent(e, p);
         d->sendMouseEvent(d->lastMouseItem, me);
@@ -733,7 +734,7 @@ void QSimpleCanvas::focusInEvent(QFocusEvent *event)
     } else {
         QSimpleCanvasItem *panel = activeFocusPanel();
         QSimpleCanvasItem *focusItem = 0;
-        if(panel->isFocusable())
+        if (panel->isFocusable())
             focusItem = panel;
         else
             focusItem = QSimpleCanvasItem::findNextFocus(panel);
@@ -774,7 +775,7 @@ bool QSimpleCanvas::focusNextPrevChild(bool)
 
     QSimpleCanvasItem *panel = activeFocusPanel();
     QSimpleCanvasItem *item = 0;
-    if(panel->isFocusable())
+    if (panel->isFocusable())
         item = panel;
     else
         item = next ? QSimpleCanvasItem::findNextFocus(panel) : QSimpleCanvasItem::findPrevFocus(panel);
@@ -797,7 +798,7 @@ void QSimpleCanvas::showEvent(QShowEvent *e)
 #if defined(QFX_RENDER_OPENGL)
     d->egl.resize(width(), height());
 #endif
-    if(d->isGraphicsView())
+    if (d->isGraphicsView())
         d->view->setSceneRect(rect());
 
     QWidget::showEvent(e);
@@ -808,7 +809,7 @@ void QSimpleCanvas::resizeEvent(QResizeEvent *e)
 #if defined(QFX_RENDER_OPENGL)
     d->egl.resize(width(), height());
 #endif
-    if(d->isGraphicsView())
+    if (d->isGraphicsView())
         d->view->setSceneRect(rect());
     QWidget::resizeEvent(e);
 }
@@ -821,7 +822,7 @@ void QSimpleCanvas::remDirty(QSimpleCanvasItem *c)
 
 void QSimpleCanvas::queueUpdate()
 {
-    if(!d->timer)  {
+    if (!d->timer)  {
         QCoreApplication::postEvent(this, new QEvent(QEvent::User));
         d->timer = 1;
     }
@@ -830,15 +831,15 @@ void QSimpleCanvas::queueUpdate()
 void QSimpleCanvas::addDirty(QSimpleCanvasItem *c)
 {
     queueUpdate();
-    if(d->isSimpleCanvas()) {
+    if (d->isSimpleCanvas()) {
         d->oldDirty |= c->d_func()->data()->lastPaintRect;
 #if defined(QFX_RENDER_OPENGL)
         // Check for filters
         QSimpleCanvasItem *fi = c->parent();
         while(fi) {
-            if(fi->d_func()->data()->dirty) {
+            if (fi->d_func()->data()->dirty) {
                 break;
-            } else if(fi->filter()) {
+            } else if (fi->filter()) {
                 fi->update();
                 break;
             }
@@ -852,14 +853,14 @@ void QSimpleCanvas::addDirty(QSimpleCanvasItem *c)
 QRect QSimpleCanvasPrivate::dirtyItemClip() const
 {
     QRect rv;
-    if(isSimpleCanvas()) {
+    if (isSimpleCanvas()) {
 #if defined(QFX_RENDER_OPENGL)
         QRectF r;
-        for(int ii = 0; ii < dirtyItems.count(); ++ii)
+        for (int ii = 0; ii < dirtyItems.count(); ++ii)
             r |= dirtyItems.at(ii)->d_func()->data()->lastPaintRect;
         rv = egl.map(r);
 #else
-        for(int ii = 0; ii < dirtyItems.count(); ++ii)
+        for (int ii = 0; ii < dirtyItems.count(); ++ii)
             rv |= dirtyItems.at(ii)->d_func()->data()->lastPaintRect;
 #endif
     }
@@ -868,7 +869,7 @@ QRect QSimpleCanvasPrivate::dirtyItemClip() const
 
 QRegion QSimpleCanvasPrivate::resetDirty()
 {
-    if(isSimpleCanvas()) {
+    if (isSimpleCanvas()) {
 #if defined(QFX_RENDER_OPENGL)
         QRect r = egl.map(oldDirty) |  dirtyItemClip();
 #else
@@ -876,12 +877,12 @@ QRegion QSimpleCanvasPrivate::resetDirty()
 #endif
         if (!r.isEmpty())
             r.adjust(-1,-1,2,2);    //make sure we get everything (since we rounded from floats to ints)
-        for(int ii = 0; ii < dirtyItems.count(); ++ii)
+        for (int ii = 0; ii < dirtyItems.count(); ++ii)
             static_cast<QSimpleCanvasItemPrivate*>(dirtyItems.at(ii)->d_ptr)->data()->dirty = false;
         dirtyItems.clear();
         oldDirty = QRect();
 
-        if(fullUpdate())
+        if (fullUpdate())
             return QRegion();
         else
             return QRegion(r);
@@ -897,7 +898,7 @@ QSimpleCanvasItem *QSimpleCanvas::focusItem() const
 
 QSimpleCanvasItem *QSimpleCanvas::activeFocusPanel() const
 {
-    if(d->focusPanels.isEmpty())
+    if (d->focusPanels.isEmpty())
         return 0;
     else
         return d->focusPanels.top();
@@ -905,7 +906,7 @@ QSimpleCanvasItem *QSimpleCanvas::activeFocusPanel() const
 
 bool QSimpleCanvas::event(QEvent *e)
 {
-    if(e->type() == QEvent::User && d->isSimpleCanvas()) {
+    if (e->type() == QEvent::User && d->isSimpleCanvas()) {
         d->timer = 0;
         d->isSetup = true;
 #if defined(QFX_RENDER_OPENGL1)
@@ -920,7 +921,7 @@ bool QSimpleCanvas::event(QEvent *e)
         int tbf = d->frameTimer.restart();
 
 #if defined(QFX_RENDER_QPAINTER)
-        if(r.isEmpty() || fullUpdate())
+        if (r.isEmpty() || fullUpdate())
             repaint();
         else 
             repaint(r);
@@ -929,7 +930,7 @@ bool QSimpleCanvas::event(QEvent *e)
         QRect br = r.boundingRect();
         QRect nr(br.x(), height() - br.y() - br.height(), br.width(), br.height());
 
-        if(r.isEmpty() || fullUpdate())
+        if (r.isEmpty() || fullUpdate())
             d->egl.updateGL();
         else
             d->egl.updateGL(nr);
@@ -939,10 +940,10 @@ bool QSimpleCanvas::event(QEvent *e)
 
         int frametimer = d->frameTimer.elapsed();
         gfxCanvasTiming.append(QSimpleCanvasTiming(r, frametimer, d->lrpTime, tbf));
-        if(d->canvasServer)
+        if (d->canvasServer)
             d->canvasServer->addTiming(d->lrpTime, frametimer, tbf);
         d->lrpTime = 0;
-        if(continuousUpdate())
+        if (continuousUpdate())
             queueUpdate();
 
         return true;
@@ -954,7 +955,7 @@ bool QSimpleCanvas::event(QEvent *e)
 void QSimpleCanvas::paintEvent(QPaintEvent *)
 {
 #if defined(QFX_RENDER_QPAINTER)
-    if(d->mode == SimpleCanvas) {
+    if (d->mode == SimpleCanvas) {
         QPainter p(this);
         d->paint(p);
     }
@@ -963,7 +964,7 @@ void QSimpleCanvas::paintEvent(QPaintEvent *)
 
 void QSimpleCanvas::dumpTiming()
 {
-    for(int ii = 0; ii < gfxCanvasTiming.size(); ++ii) {
+    for (int ii = 0; ii < gfxCanvasTiming.size(); ++ii) {
         const QSimpleCanvasTiming &t = gfxCanvasTiming[ii];
 
         qreal repaintFps = 1000. / qreal(t.time);
@@ -984,9 +985,9 @@ void QSimpleCanvas::dumpItems()
 
 void QSimpleCanvas::checkState()
 {
-    if(d->isSimpleCanvas()) {
+    if (d->isSimpleCanvas()) {
         QSimpleCanvasItemPrivate::FocusStateCheckRDatas r;
-        if(d->root->d_func()->checkFocusState(0, &r))
+        if (d->root->d_func()->checkFocusState(0, &r))
             qWarning() << "State OK";
     }
 }
@@ -996,7 +997,7 @@ void QSimpleCanvas::checkState()
 */
 QImage QSimpleCanvas::asImage() const
 { 
-    if(d->isSimpleCanvas()) {
+    if (d->isSimpleCanvas()) {
 #if defined(QFX_RENDER_QPAINTER)
         QImage img(width(),height(),QImage::Format_RGB32);
         QPainter p(&img);
diff --git a/src/declarative/canvas/qsimplecanvas.h b/src/declarative/canvas/qsimplecanvas.h
index 3da7251..a35cbf5 100644
--- a/src/declarative/canvas/qsimplecanvas.h
+++ b/src/declarative/canvas/qsimplecanvas.h
@@ -100,7 +100,7 @@ namespace QSimpleCanvasConfig
                  (type == Translucent && f == QImage::Format_ARGB32_Premultiplied));
     }
     inline Image convert(ImageType type, const Image &img) {
-        if(type == Opaque)
+        if (type == Opaque)
             return img.convertToFormat(QImage::Format_RGB16);
         else
             return img.convertToFormat(QImage::Format_ARGB32_Premultiplied);
diff --git a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp
index e3cdf19..dd4012b 100644
--- a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp
+++ b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp
@@ -90,8 +90,8 @@ void QSimpleGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     QSimpleCanvasItem *p = owner->parent();
     while(p) {
-        if(p->options() & QSimpleCanvasItem::ChildMouseFilter) {
-            if(p->mouseFilter(event))
+        if (p->options() & QSimpleCanvasItem::ChildMouseFilter) {
+            if (p->mouseFilter(event))
                 return;
         }
         p = p->parent();
@@ -103,8 +103,8 @@ void QSimpleGraphicsItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     QSimpleCanvasItem *p = owner->parent();
     while(p) {
-        if(p->options() & QSimpleCanvasItem::ChildMouseFilter) {
-            if(p->mouseFilter(event))
+        if (p->options() & QSimpleCanvasItem::ChildMouseFilter) {
+            if (p->mouseFilter(event))
                 return;
         }
         p = p->parent();
@@ -117,8 +117,8 @@ void QSimpleGraphicsItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
     QSimpleCanvasItem *p = owner->parent();
     while(p) {
-        if(p->options() & QSimpleCanvasItem::ChildMouseFilter) {
-            if(p->mouseFilter(event))
+        if (p->options() & QSimpleCanvasItem::ChildMouseFilter) {
+            if (p->mouseFilter(event))
                 return;
         }
         p = p->parent();
@@ -130,8 +130,8 @@ void QSimpleGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     QSimpleCanvasItem *p = owner->parent();
     while(p) {
-        if(p->options() & QSimpleCanvasItem::ChildMouseFilter) {
-            if(p->mouseFilter(event))
+        if (p->options() & QSimpleCanvasItem::ChildMouseFilter) {
+            if (p->mouseFilter(event))
                 return;
         }
         p = p->parent();
@@ -142,14 +142,14 @@ void QSimpleGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 bool QSimpleGraphicsItem::sceneEvent(QEvent *event)
 {
     bool rv = QGraphicsItem::sceneEvent(event);
-    if(event->type() == QEvent::UngrabMouse)
+    if (event->type() == QEvent::UngrabMouse)
         owner->mouseUngrabEvent();
     return rv;
 }
 
 QVariant QSimpleGraphicsItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
-    if(change == ItemSceneHasChanged) {
+    if (change == ItemSceneHasChanged) {
         QSimpleCanvasItemPrivate *owner_d = static_cast<QSimpleCanvasItemPrivate*>(owner->d_ptr);
         QSimpleCanvas *oldCanvas = owner_d->canvas;
         owner_d->canvas = sceneMap[scene()];
@@ -164,13 +164,13 @@ QVariant QSimpleGraphicsItem::itemChange(GraphicsItemChange change, const QVaria
                 }
             }
         }
-        if(owner->options() & QSimpleCanvasItem::MouseFilter)
+        if (owner->options() & QSimpleCanvasItem::MouseFilter)
             owner_d->gvRemoveMouseFilter();
 
         if (oldCanvas != owner_d->canvas)
             owner->canvasChanged();
 
-        if(owner->options() & QSimpleCanvasItem::MouseFilter)
+        if (owner->options() & QSimpleCanvasItem::MouseFilter)
             owner_d->gvAddMouseFilter();
     } 
 
@@ -198,7 +198,7 @@ void QSimpleGraphicsItem::focusInEvent(QFocusEvent *)
 void QSimpleCanvasItemPrivate::gvRemoveMouseFilter()
 {
     QGraphicsScene *scene = graphicsItem->scene();
-    if(!scene) return;
+    if (!scene) return;
 
     scene->removeEventFilter(q_ptr);
 }
@@ -206,7 +206,7 @@ void QSimpleCanvasItemPrivate::gvRemoveMouseFilter()
 void QSimpleCanvasItemPrivate::gvAddMouseFilter()
 {
     QGraphicsScene *scene = graphicsItem->scene();
-    if(!scene) return;
+    if (!scene) return;
 
     scene->installEventFilter(q_ptr);
 }
diff --git a/src/declarative/canvas/qsimplecanvas_opengl.cpp b/src/declarative/canvas/qsimplecanvas_opengl.cpp
index f508aea..98f92d7 100644
--- a/src/declarative/canvas/qsimplecanvas_opengl.cpp
+++ b/src/declarative/canvas/qsimplecanvas_opengl.cpp
@@ -66,7 +66,7 @@ void CanvasEGLWidget::updateGL()
 
 void CanvasEGLWidget::updateGL(const QRect &r)
 {
-    if(r.isEmpty())
+    if (r.isEmpty())
         return;
 
     _clip = r;
@@ -117,7 +117,7 @@ void QSimpleCanvasPrivate::paintGL()
     p.stencilValue = 0;
     p.opacity = 1;
     p.forceParamRefresh = false;
-    if(!isSetup)
+    if (!isSetup)
         root->d_func()->setupPainting(0, QRect());
     root->d_func()->paint(p);
 
@@ -126,12 +126,12 @@ void QSimpleCanvasPrivate::paintGL()
 
 QGLFramebufferObject *QSimpleCanvasPrivate::acquire(int w, int h)
 {
-    if(w <= 0 || h <= 0)
+    if (w <= 0 || h <= 0)
         return 0;
 
     int size = qMax(w, h);
-    for(int ii = 0; ii < frameBuffers.count(); ++ii) {
-        if(frameBuffers.at(ii)->width() >= size) {
+    for (int ii = 0; ii < frameBuffers.count(); ++ii) {
+        if (frameBuffers.at(ii)->width() >= size) {
             QGLFramebufferObject *rv = frameBuffers.at(ii);
             frameBuffers.removeAt(ii);
             return rv;
@@ -154,8 +154,8 @@ QGLFramebufferObject *QSimpleCanvasPrivate::acquire(int w, int h)
 void QSimpleCanvasPrivate::release(QGLFramebufferObject *buf)
 {
     int size = qMax(buf->width(), buf->height());
-    for(int ii = 0; ii < frameBuffers.count(); ++ii) {
-        if(frameBuffers.at(ii)->width() >= size) {
+    for (int ii = 0; ii < frameBuffers.count(); ++ii) {
+        if (frameBuffers.at(ii)->width() >= size) {
             frameBuffers.insert(ii, buf);
             return;
         }
@@ -178,7 +178,7 @@ QSimpleCanvas::Matrix QSimpleCanvasItemPrivate::localTransform() const
     trans.translate(to.x(), to.y());
     trans.scale(q->scale(), q->scale());
     trans.translate(-to.x(), -to.y());
-    if(data()->transformUser)
+    if (data()->transformUser)
         trans *= *data()->transformUser;
     return trans;
 }
@@ -188,13 +188,13 @@ void QSimpleCanvasItemPrivate::simplePaintChild(const GLPaintParameters &params,
     Q_Q(QSimpleCanvasItem);
 
     GLPaintParameters childParams = params;
-    if(clip)
+    if (clip)
         ++childParams.stencilValue;
 
-    if(child->d_func()->data()->activeOpacity != 0) {
+    if (child->d_func()->data()->activeOpacity != 0) {
         childParams.boundingRect = child->boundingRect();
 
-        if(child->filter() && child->filter()->enabled()) {
+        if (child->filter() && child->filter()->enabled()) {
             QSimpleCanvasItem::GLPainter painter(q);
             painter.activeTransform = child->d_func()->data()->transformActive;
             painter.activeOpacity = child->d_func()->data()->activeOpacity;
@@ -209,7 +209,7 @@ void QSimpleCanvasItemPrivate::simplePaintChild(const GLPaintParameters &params,
 void QSimpleCanvasItemPrivate::paintChild(const GLPaintParameters &params, 
                                        QSimpleCanvasItem *child)
 {
-    if(params.forceParamRefresh) {
+    if (params.forceParamRefresh) {
         QSimpleCanvas::Matrix t = child->d_func()->data()->transformActive;
         qreal o = child->d_func()->data()->activeOpacity;
         setupChildState(child);
@@ -226,10 +226,10 @@ void QSimpleCanvasItemPrivate::setupChildState(QSimpleCanvasItem *child)
 {
     qreal visible = child->visible();
     child->d_func()->data()->activeOpacity = data()->activeOpacity;
-    if(visible != 1)
+    if (visible != 1)
         child->d_func()->data()->activeOpacity *= visible;
 
-    if(child->d_func()->data()->activeOpacity != 0) {
+    if (child->d_func()->data()->activeOpacity != 0) {
         // Calculate child's transform
         qreal x = child->x();
         qreal y = child->y();
@@ -238,19 +238,19 @@ void QSimpleCanvasItemPrivate::setupChildState(QSimpleCanvasItem *child)
 
         QSimpleCanvas::Matrix &am = child->d_func()->data()->transformActive;
         am = data()->transformActive;
-        if(x != 0 || y != 0)
+        if (x != 0 || y != 0)
             am.translate(x, y);
-        if(scale != 1) {
+        if (scale != 1) {
             QPointF to = child->d_func()->transformOrigin();
-            if(to.x() != 0. || to.y() != 0.)
+            if (to.x() != 0. || to.y() != 0.)
                 am.translate(to.x(), to.y());
             am.scale(scale, scale);
-            if(to.x() != 0. || to.y() != 0.)
+            if (to.x() != 0. || to.y() != 0.)
                 am.translate(-to.x(), -to.y());
         }
-        if(child->d_func()->data()->transformUser)
+        if (child->d_func()->data()->transformUser)
             am *= *child->d_func()->data()->transformUser;
-        if(flip) {
+        if (flip) {
             QRectF br = child->boundingRect();
             am.translate(br.width() / 2., br.height() / 2);
             am.rotate(180, (flip & QSimpleCanvasItem::VerticalFlip)?1:0, (flip & QSimpleCanvasItem::HorizontalFlip)?1:0, 0);
@@ -265,15 +265,15 @@ QRectF QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &boundin
     Q_Q(QSimpleCanvasItem);
 
     QRectF filteredBoundRect = q->boundingRect();
-    if(filter)
+    if (filter)
         filteredBoundRect = filter->itemBoundingRect(filteredBoundRect);
     QRectF rv = data()->transformActive.mapRect(filteredBoundRect);
 
-    for(int ii = 0; ii < children.count(); ++ii) {
+    for (int ii = 0; ii < children.count(); ++ii) {
         QSimpleCanvasItem *child = children.at(ii);
         setupChildState(child);
 
-        if(child->d_func()->data()->activeOpacity != 0) 
+        if (child->d_func()->data()->activeOpacity != 0) 
             rv |= child->d_func()->setupPainting(version, bounding);
     } 
 
@@ -283,7 +283,7 @@ QRectF QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &boundin
 
 void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvasFilter::Layer layer)
 {
-    if(!layer)
+    if (!layer)
         return;
 
     Q_Q(QSimpleCanvasItem);
@@ -299,8 +299,8 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvas
                            width, 0 };
 
     // XXX Handle separate cliping modes
-    if(clip) {
-        if(params.stencilValue == 255) 
+    if (clip) {
+        if (params.stencilValue == 255) 
             qWarning() 
                 << "OpenGL: Clip recursion greater than 255 not permitted.";
         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
@@ -341,17 +341,17 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvas
     zOrderChildren();
 
     int upto = 0;
-    for(upto = 0; upto < children.count(); ++upto) {
+    for (upto = 0; upto < children.count(); ++upto) {
         QSimpleCanvasItem *c = children.at(upto);
-        if(c->z() < 0) {
-            if(layer & QSimpleCanvasFilter::ChildrenUnderItem) 
+        if (c->z() < 0) {
+            if (layer & QSimpleCanvasFilter::ChildrenUnderItem) 
                 paintChild(params, c);
         } else {
             break;
         }
     }
 
-    if(layer & QSimpleCanvasFilter::Item && 
+    if (layer & QSimpleCanvasFilter::Item && 
        q->options() & QSimpleCanvasItem::HasContents) {
         QSimpleCanvasItem::GLPainter painter(q);
         painter.activeTransform = data()->transformActive;
@@ -361,14 +361,14 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvas
         q->paintGLContents(painter);
     }
 
-    if(layer & QSimpleCanvasFilter::ChildrenAboveItem) {
-        for(; upto < children.count(); ++upto) {
+    if (layer & QSimpleCanvasFilter::ChildrenAboveItem) {
+        for (; upto < children.count(); ++upto) {
             QSimpleCanvasItem *c = children.at(upto);
             paintChild(params, c);
         }
     }
 
-    if(clip) {
+    if (clip) {
         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
         glStencilFunc(GL_EQUAL, params.stencilValue + 1, 0xFFFFFFFF);
         glStencilOp(GL_KEEP, GL_KEEP, GL_DECR);
@@ -389,7 +389,7 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvas
 
 QGLShaderProgram *QSimpleCanvasItem::GLPainter::useTextureShader()
 {
-    if(activeOpacity == 1.) {
+    if (activeOpacity == 1.) {
         item->basicShaders()->singleTexture()->enable();
         item->basicShaders()->singleTexture()->setTransform(activeTransform);
         return item->basicShaders()->singleTexture();
@@ -406,7 +406,7 @@ QGLShaderProgram *QSimpleCanvasItem::GLPainter::useColorShader(const QColor &col
 {
 	QColor c = color;
     item->basicShaders()->constantColor()->enable();
-	if(activeOpacity != 1.) {
+	if (activeOpacity != 1.) {
         c.setAlpha(int(c.alpha() * activeOpacity));
     }
 
diff --git a/src/declarative/canvas/qsimplecanvas_opengl1.cpp b/src/declarative/canvas/qsimplecanvas_opengl1.cpp
index ad21c77..3fd8490 100644
--- a/src/declarative/canvas/qsimplecanvas_opengl1.cpp
+++ b/src/declarative/canvas/qsimplecanvas_opengl1.cpp
@@ -57,7 +57,7 @@ void CanvasEGLWidget::updateGL()
 
 void CanvasEGLWidget::updateGL(const QRect &r)
 {
-    if(r.isEmpty())
+    if (r.isEmpty())
         return;
 
     _clip = r;
@@ -66,7 +66,7 @@ void CanvasEGLWidget::updateGL(const QRect &r)
 
 void CanvasEGLWidget::paintGL()
 {
-    if(!_clip.isEmpty()) {
+    if (!_clip.isEmpty()) {
         glEnable(GL_SCISSOR_TEST);
         glScissor(_clip.x(), _clip.y(), _clip.width(), _clip.height());
     } else {
@@ -124,7 +124,7 @@ void QSimpleCanvasPrivate::paintGL()
     p.clipRect = p.sceneRect;
     p.opacity = 1;
     p.forceParamRefresh = false;
-    if(!isSetup) {
+    if (!isSetup) {
         unsigned int zero = 0;
         root->d_func()->setupPainting(0, QRect(), &zero);
     }
@@ -151,7 +151,7 @@ void QSimpleCanvasItemPrivate::simplePaintChild(const GLPaintParameters &params,
 {
     GLPaintParameters childParams = params;
 
-    if(child->d_func()->activeOpacity != 0) {
+    if (child->d_func()->activeOpacity != 0) {
         childParams.boundingRect = child->boundingRect();
         child->d_func()->paint(childParams);
     }
@@ -160,7 +160,7 @@ void QSimpleCanvasItemPrivate::simplePaintChild(const GLPaintParameters &params,
 void QSimpleCanvasItemPrivate::paintChild(const GLPaintParameters &params, 
                                        QSimpleCanvasItem *child)
 {
-    if(params.forceParamRefresh) {
+    if (params.forceParamRefresh) {
         QSimpleCanvas::Matrix t = child->d_func()->transformActive;
         qreal o = child->d_func()->activeOpacity;
         setupChildState(child);
@@ -177,10 +177,10 @@ void QSimpleCanvasItemPrivate::setupChildState(QSimpleCanvasItem *child)
 {
     qreal visible = child->visible().value();
     child->d_func()->activeOpacity = activeOpacity;
-    if(visible != 1)
+    if (visible != 1)
         child->d_func()->activeOpacity *= visible;
 
-    if(child->d_func()->activeOpacity != 0) {
+    if (child->d_func()->activeOpacity != 0) {
         // Calculate child's transform
         qreal x = child->x();
         qreal y = child->y();
@@ -189,19 +189,19 @@ void QSimpleCanvasItemPrivate::setupChildState(QSimpleCanvasItem *child)
 
         QSimpleCanvas::Matrix &am = child->d_func()->transformActive;
         am = transformActive;
-        if(x != 0 || y != 0)
+        if (x != 0 || y != 0)
             am.translate(x, y);
-        if(scale != 1) {
+        if (scale != 1) {
             QPointF to = child->d_func()->transformOrigin();
-            if(to.x() != 0. || to.y() != 0.)
+            if (to.x() != 0. || to.y() != 0.)
                 am.translate(to.x(), to.y());
             am.scale(scale, scale);
-            if(to.x() != 0. || to.y() != 0.)
+            if (to.x() != 0. || to.y() != 0.)
                 am.translate(-to.x(), -to.y());
         }
-        if(child->d_func()->transformUserSet)
+        if (child->d_func()->transformUserSet)
             am *= child->d_func()->transformUser;
-        if(flip) {
+        if (flip) {
             QRectF br = child->boundingRect();
             am.translate(br.width() / 2., br.height() / 2);
             am.rotate(180, (flip & QSimpleCanvasItem::VerticalFlip)?1:0, (flip & QSimpleCanvasItem::HorizontalFlip)?1:0, 0);
@@ -218,15 +218,15 @@ QRectF QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &boundin
 
     unsigned int oldZero = *zero;
 
-    for(int ii = 0; ii < children.count(); ++ii) {
+    for (int ii = 0; ii < children.count(); ++ii) {
         QSimpleCanvasItem *child = children.at(ii);
         setupChildState(child);
 
-        if(child->d_func()->activeOpacity != 0) 
+        if (child->d_func()->activeOpacity != 0) 
             rv |= child->d_func()->setupPainting(version, bounding, zero);
     } 
 
-    if(clip || oldZero != *zero)
+    if (clip || oldZero != *zero)
         (*zero)++;
     transformActive.translate(0, 0, *zero);
 
@@ -241,17 +241,17 @@ void QSimpleCanvasItemPrivate::paintNoClip(GLPaintParameters &params, QSimpleCan
     zOrderChildren();
 
     int upto = 0;
-    for(upto = 0; upto < children.count(); ++upto) {
+    for (upto = 0; upto < children.count(); ++upto) {
         QSimpleCanvasItem *c = children.at(upto);
-        if(c->zValue().value() < 0) {
-            if(layer & QSimpleCanvasFilter::ChildrenUnderItem) 
+        if (c->zValue().value() < 0) {
+            if (layer & QSimpleCanvasFilter::ChildrenUnderItem) 
                 paintChild(params, c);
         } else {
             break;
         }
     }
 
-    if(layer & QSimpleCanvasFilter::Item && 
+    if (layer & QSimpleCanvasFilter::Item && 
        q->options() & QSimpleCanvasItem::HasContents) {
         QSimpleCanvasItem::GLPainter painter(q);
         painter.activeTransform = transformActive;
@@ -261,8 +261,8 @@ void QSimpleCanvasItemPrivate::paintNoClip(GLPaintParameters &params, QSimpleCan
         q->paintGLContents(painter);
     }
 
-    if(layer & QSimpleCanvasFilter::ChildrenAboveItem) {
-        for(; upto < children.count(); ++upto) {
+    if (layer & QSimpleCanvasFilter::ChildrenAboveItem) {
+        for (; upto < children.count(); ++upto) {
             QSimpleCanvasItem *c = children.at(upto);
             paintChild(params, c);
         }
@@ -271,11 +271,11 @@ void QSimpleCanvasItemPrivate::paintNoClip(GLPaintParameters &params, QSimpleCan
 
 void QSimpleCanvasItemPrivate::paint(GLPaintParameters &params, QSimpleCanvasFilter::Layer layer)
 {
-    if(!layer)
+    if (!layer)
         return;
 
     // XXX Handle separate cliping modes
-    if(clip) {
+    if (clip) {
 
         GLSaveScissor ss;
         qreal width = params.boundingRect.width();
@@ -331,7 +331,7 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters &params, QSimpleCanvasFil
         int sr_height = ::ceilf(r.bottom()) - sr_y;
 
         QRect sr(sr_x, sr_y, sr_width, sr_height);
-        if(ss.wasEnabled())
+        if (ss.wasEnabled())
             sr &= ss.rect();
 
         glScissor(sr.x(), sr.y(), sr.width(), sr.height());
diff --git a/src/declarative/canvas/qsimplecanvas_p.h b/src/declarative/canvas/qsimplecanvas_p.h
index 44e5a7e..7bc7330 100644
--- a/src/declarative/canvas/qsimplecanvas_p.h
+++ b/src/declarative/canvas/qsimplecanvas_p.h
@@ -176,7 +176,7 @@ public:
     GLBasicShaders *basicShaders() const
     {
 #if defined(QFX_RENDER_OPENGL2)
-        if(!basicShadersInstance)
+        if (!basicShadersInstance)
             basicShadersInstance = new GLBasicShaders;
         return basicShadersInstance;
 #else
diff --git a/src/declarative/canvas/qsimplecanvas_software.cpp b/src/declarative/canvas/qsimplecanvas_software.cpp
index 06e221e..c130a62 100644
--- a/src/declarative/canvas/qsimplecanvas_software.cpp
+++ b/src/declarative/canvas/qsimplecanvas_software.cpp
@@ -52,18 +52,18 @@ QRect QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &bounding
     QRect rv = 
         data()->transformActive.mapRect(boundingRectActive).toAlignedRect() & bounding;
     QRect myBounding = bounding;
-    if(q->clip())
+    if (q->clip())
         myBounding &= rv;
 
-    for(int ii = 0; ii < children.count(); ++ii) {
+    for (int ii = 0; ii < children.count(); ++ii) {
         QSimpleCanvasItem *child = children.at(ii);
 
         qreal visible = child->visible();
         child->d_func()->data()->activeOpacity = data()->activeOpacity;
-        if(visible != 1)
+        if (visible != 1)
             child->d_func()->data()->activeOpacity *= visible;
 
-        if(child->d_func()->data()->activeOpacity != 0) {
+        if (child->d_func()->data()->activeOpacity != 0) {
             // Calculate child's transform
             qreal x = child->x();
             qreal y = child->y();
@@ -72,21 +72,21 @@ QRect QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &bounding
 
             QSimpleCanvas::Matrix &am = child->d_func()->data()->transformActive;
             am = data()->transformActive;
-            if(x != 0 || y != 0)
+            if (x != 0 || y != 0)
                 am.translate(x, y);
-            if(scale != 1) {
+            if (scale != 1) {
                 QPointF to = child->d_func()->transformOrigin();
-                if(to.x() != 0. || to.y() != 0.)
+                if (to.x() != 0. || to.y() != 0.)
                     am.translate(to.x(), to.y());
                 am.scale(scale, scale);
-                if(to.x() != 0. || to.y() != 0.)
+                if (to.x() != 0. || to.y() != 0.)
                     am.translate(-to.x(), -to.y());
             }
 
-            if(child->d_func()->data()->transformUser)
+            if (child->d_func()->data()->transformUser)
                 am = *child->d_func()->data()->transformUser * am;
 
-            if(flip) {
+            if (flip) {
                 QRectF br = child->boundingRect();
                 am.translate(br.width() / 2., br.height() / 2);
                 am.scale((flip & QSimpleCanvasItem::HorizontalFlip)?-1:1,
@@ -107,7 +107,7 @@ void QSimpleCanvasItemPrivate::paint(QPainter &p)
     Q_Q(QSimpleCanvasItem);
 
     QRect oldUcr;
-    if(clip) {
+    if (clip) {
 
         p.save();
         QRectF boundingRectActive = q->boundingRect();
@@ -138,13 +138,13 @@ void QSimpleCanvasItemPrivate::paint(QPainter &p)
         }
 
         p.setWorldTransform(data()->transformActive);
-        if(p.clipRegion().isEmpty()) {
+        if (p.clipRegion().isEmpty()) {
             p.setClipRect(cr);
         } else {
             p.setClipRect(cr, Qt::IntersectClip);
         }
 
-        if(p.clipRegion().isEmpty()) {
+        if (p.clipRegion().isEmpty()) {
             p.restore();
             return;
         }
@@ -153,9 +153,9 @@ void QSimpleCanvasItemPrivate::paint(QPainter &p)
     zOrderChildren();
 
     int upto = 0;
-    for(upto = 0; upto < children.count(); ++upto) {
+    for (upto = 0; upto < children.count(); ++upto) {
         QSimpleCanvasItem *c = children.at(upto);
-        if(c->z() < 0) {
+        if (c->z() < 0) {
             paintChild(p, c);
         } else {
             break;
@@ -165,18 +165,18 @@ void QSimpleCanvasItemPrivate::paint(QPainter &p)
     p.setWorldTransform(data()->transformActive);
     q->paintContents(p);
 
-    for(; upto < children.count(); ++upto) {
+    for (; upto < children.count(); ++upto) {
         QSimpleCanvasItem *c = children.at(upto);
         paintChild(p, c);
     }
 
-    if(clip) 
+    if (clip) 
         p.restore();
 }
 
 void QSimpleCanvasItemPrivate::paintChild(QPainter &p, QSimpleCanvasItem *c)
 {
-    if(c->d_func()->data()->activeOpacity != 0) {
+    if (c->d_func()->data()->activeOpacity != 0) {
 
         qreal op = p.opacity();
         p.setOpacity(c->d_func()->data()->activeOpacity);
diff --git a/src/declarative/canvas/qsimplecanvasfilter.cpp b/src/declarative/canvas/qsimplecanvasfilter.cpp
index 00c88c5..5bc6b35 100644
--- a/src/declarative/canvas/qsimplecanvasfilter.cpp
+++ b/src/declarative/canvas/qsimplecanvasfilter.cpp
@@ -64,7 +64,7 @@ QSimpleCanvasFilter::QSimpleCanvasFilter(QObject *parent)
 
 QSimpleCanvasFilter::~QSimpleCanvasFilter()
 {
-    if(d->item) d->item->setFilter(0);
+    if (d->item) d->item->setFilter(0);
     delete d; d = 0;
 }
 
@@ -80,7 +80,7 @@ bool QSimpleCanvasFilter::enabled() const
 
 void QSimpleCanvasFilter::setEnabled(bool e) 
 {
-    if(e == d->enabled)
+    if (e == d->enabled)
         return;
     d->enabled = e;
     emit enabledChanged();
@@ -96,7 +96,7 @@ QGLFramebufferObject *QSimpleCanvasFilter::renderToFBO(float scale, const QRectF
 
     QSimpleCanvasItem *item = d->item;
     QRect br = item->itemBoundingRect();
-    if(br.isEmpty())
+    if (br.isEmpty())
         return 0;
     QGLFramebufferObject *fbo = 
         item->canvas()->d->acquire(int(br.width() * scale), int(br.height() * scale));
@@ -141,7 +141,7 @@ QGLFramebufferObject *QSimpleCanvasFilter::renderToFBO(const QRectF &src, const
 
     QSimpleCanvasItem *item = d->item;
     QRect br = item->itemBoundingRect();
-    if(br.isEmpty())
+    if (br.isEmpty())
         return 0;
     QGLFramebufferObject *fbo = 
         item->canvas()->d->acquire(br.width(), br.height());
@@ -181,7 +181,7 @@ QGLFramebufferObject *QSimpleCanvasFilter::acquireFBO(const QSize &s)
 #if defined(QFX_RENDER_OPENGL2)
     QSize size;
     QSimpleCanvasItem *item = d->item;
-    if(size.isNull()) {
+    if (size.isNull()) {
         QRect br = item->itemBoundingRect();
         size = br.size();
     } else {
@@ -245,14 +245,14 @@ QSimpleCanvasItem *QSimpleCanvasFilter::item() const
 
 void QSimpleCanvasFilter::setItem(QSimpleCanvasItem *i)
 {
-    if(d->item == i)
+    if (d->item == i)
         return;
-    if(d->item) {
+    if (d->item) {
         d->item->setFilter(0);
         d->item = 0;
     }
 
-    if(i->filter() != this) {
+    if (i->filter() != this) {
         i->setFilter(this);
     } else {
         d->item = i;
@@ -283,23 +283,23 @@ void QSimpleCanvasFilter::filter(QPainter &)
 
 void QSimpleCanvasFilter::update()
 {
-    if(d->item)
+    if (d->item)
         d->item->update();
 }
 
 #if defined(QFX_RENDER_OPENGL2)
 bool QSimpleCanvasFilterPrivate::isSimpleItem(QSimpleCanvasItem *item, QSimpleCanvasItem **out, QSimpleCanvas::Matrix *mout)
 {
-    if(item->options() & QSimpleCanvasItem::SimpleItem && !item->hasChildren()) {
+    if (item->options() & QSimpleCanvasItem::SimpleItem && !item->hasChildren()) {
         *out = item;
         return true;
-    } else if(!(item->options() & QSimpleCanvasItem::HasContents) && 
+    } else if (!(item->options() & QSimpleCanvasItem::HasContents) && 
                 item->children().count() == 1) {
         QSimpleCanvasItem *child = item->children().first();
-        if(child->filter() && child->filter()->enabled())
+        if (child->filter() && child->filter()->enabled())
             return false;
         bool rv = isSimpleItem(child, out, mout);
-        if(rv)
+        if (rv)
             *mout *= child->d_func()->localTransform();
         return rv;
     } else {
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;
diff --git a/src/declarative/canvas/qsimplecanvasitem_p.h b/src/declarative/canvas/qsimplecanvasitem_p.h
index 7a90c24..27a75bd 100644
--- a/src/declarative/canvas/qsimplecanvasitem_p.h
+++ b/src/declarative/canvas/qsimplecanvasitem_p.h
@@ -156,7 +156,7 @@ public:
 
     QSimpleGraphicsItem *graphicsItem;
     inline QSimpleCanvasItemData *data() const { 
-        if(!data_ptr) data_ptr = new QSimpleCanvasItemData;
+        if (!data_ptr) data_ptr = new QSimpleCanvasItemData;
         return data_ptr; 
     }
     mutable QSimpleCanvasItemData *data_ptr;
diff --git a/src/declarative/canvas/qsimplecanvasserver.cpp b/src/declarative/canvas/qsimplecanvasserver.cpp
index 7eebe65..4d4adda 100644
--- a/src/declarative/canvas/qsimplecanvasserver.cpp
+++ b/src/declarative/canvas/qsimplecanvasserver.cpp
@@ -55,7 +55,7 @@ QSimpleCanvasServer::QSimpleCanvasServer(int port, QObject *parent)
 
     _time.start();
 
-    if(!_tcpServer->listen(QHostAddress::Any, port)) {
+    if (!_tcpServer->listen(QHostAddress::Any, port)) {
         qWarning() << "QSimpleCanvasServer: Cannot listen on port" << port;
         return;
     }
@@ -85,7 +85,7 @@ void QSimpleCanvasServer::addTiming(quint32 paint,
     QByteArray ba = d.toLatin1();
 
     // XXX
-    for(int ii = 0; ii < _tcpClients.count(); ++ii) 
+    for (int ii = 0; ii < _tcpClients.count(); ++ii) 
 //        _tcpClients.at(ii)->write((const char *)data, 12);
         _tcpClients.at(ii)->write(ba.constData(), ba.length());
 }
@@ -94,8 +94,8 @@ void QSimpleCanvasServer::disconnected()
 {
     QTcpSocket *socket = static_cast<QTcpSocket *>(sender());
 
-    for(int ii = 0; ii < _tcpClients.count(); ++ii) {
-        if(_tcpClients.at(ii) == socket) {
+    for (int ii = 0; ii < _tcpClients.count(); ++ii) {
+        if (_tcpClients.at(ii) == socket) {
             socket->disconnect();
             socket->deleteLater();
             _tcpClients.removeAt(ii);