1 files changed, 18 insertions, 14 deletions
diff --git a/src/declarative/items/qsgitem_p.h b/src/declarative/items/qsgitem_p.h
index cf1a9d9725..a13fd6a85a 100644
--- a/src/declarative/items/qsgitem_p.h
+++ b/src/declarative/items/qsgitem_p.h
@@ -60,7 +60,9 @@
 #include "qsganchors_p_p.h"
 #include "qsgitemchangelistener_p.h"
 
-#include "node.h"
+#include "qsgcanvas_p.h"
+
+#include "qsgnode.h"
 #include "qsgclipnode_p.h"
 
 #include <private/qpodvector_p.h>
@@ -255,6 +257,8 @@ public:
     quint32 dummy:2;
 
     QSGCanvas *canvas;
+    QSGContext *sceneGraphContext() const { return static_cast<QSGCanvasPrivate *>(QObjectPrivate::get(canvas))->context; }
+
     QSGItem *parentItem;
     QList<QSGItem *> childItems;
     QList<QSGItem *> paintOrderChildItems() const;
@@ -364,11 +368,11 @@ public:
     QSGItem *nextDirtyItem;
     QSGItem**prevDirtyItem;
 
-    inline TransformNode *itemNode();
-    inline Node *childContainerNode();
+    inline QSGTransformNode *itemNode();
+    inline QSGNode *childContainerNode();
 
     /*
-      Node order is:
+      QSGNode order is:
          - itemNode
          - (opacityNode)
          - (clipNode)
@@ -376,15 +380,15 @@ public:
          - groupNode
      */
 
-    TransformNode *itemNodeInstance;
-    OpacityNode *opacityNode;
-    QSGClipNode *clipNode;
-    RootNode *rootNode;
-    Node *groupNode;
-    Node *paintNode;
+    QSGTransformNode *itemNodeInstance;
+    QSGOpacityNode *opacityNode;
+    QSGDefaultClipNode *clipNode;
+    QSGRootNode *rootNode;
+    QSGNode *groupNode;
+    QSGNode *paintNode;
     int paintNodeIndex;
 
-    virtual TransformNode *createTransformNode();
+    virtual QSGTransformNode *createTransformNode();
 
     // A reference from an effect item means that this item is used by the effect, so
     // it should insert a root node.
@@ -661,7 +665,7 @@ private:
     static const SigMap sigMap[];
 };
 
-TransformNode *QSGItemPrivate::itemNode() 
+QSGTransformNode *QSGItemPrivate::itemNode()
 { 
     if (!itemNodeInstance) {
         itemNodeInstance = createTransformNode();
@@ -673,10 +677,10 @@ TransformNode *QSGItemPrivate::itemNode()
     return itemNodeInstance; 
 }
 
-Node *QSGItemPrivate::childContainerNode()
+QSGNode *QSGItemPrivate::childContainerNode()
 {
     if (!groupNode) {
-        groupNode = new Node();
+        groupNode = new QSGNode();
         if (rootNode)
             rootNode->appendChildNode(groupNode);
         else if (clipNode)