QmlDesigner.NodeInstances: Rename SG to Quick

Change-Id: I2180704df244a715a078385a7ecbf852f41ca68f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

9 files changed, 9 insertions, 14 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
index 8407e0da16..8dc3d80a4b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
@@ -5,7 +5,7 @@ HEADERS += $$PWD/qt5informationnodeinstanceserver.h
 HEADERS += $$PWD/qt5rendernodeinstanceserver.h
 HEADERS += $$PWD/qt5previewnodeinstanceserver.h
 HEADERS += $$PWD/qt5nodeinstanceclientproxy.h
-HEADERS += $$PWD/sgitemnodeinstance.h
+HEADERS += $$PWD/quickitemnodeinstance.h
 HEADERS += $$PWD/behaviornodeinstance.h
 HEADERS += $$PWD/dummycontextobject.h
 HEADERS += $$PWD/childrenchangeeventfilter.h
@@ -27,7 +27,7 @@ SOURCES += $$PWD/qt5informationnodeinstanceserver.cpp
 SOURCES += $$PWD/qt5rendernodeinstanceserver.cpp
 SOURCES += $$PWD/qt5previewnodeinstanceserver.cpp
 SOURCES += $$PWD/qt5nodeinstanceclientproxy.cpp
-SOURCES += $$PWD/sgitemnodeinstance.cpp
+SOURCES += $$PWD/quickitemnodeinstance.cpp
 SOURCES +=  $$PWD/behaviornodeinstance.cpp
 SOURCES +=  $$PWD/dummycontextobject.cpp
 SOURCES +=  $$PWD/childrenchangeeventfilter.cpp
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
index d6905d0e83..b154447f97 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -190,7 +190,7 @@ bool ObjectNodeInstance::isPositioner() const
     return false;
 }
 
-bool ObjectNodeInstance::isSGItem() const
+bool ObjectNodeInstance::isQuickItem() const
 {
     return false;
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
index 157cf82b6b..6d4e7179cb 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
@@ -100,7 +100,7 @@ public:
     virtual bool isGraphicsObject() const;
     virtual bool isTransition() const;
     virtual bool isPositioner() const;
-    virtual bool isSGItem() const;
+    virtual bool isQuickItem() const;
 
     virtual bool equalGraphicsItem(QGraphicsItem *item) const;
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
index 88c31b9bfd..ff52cadfd7 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
@@ -58,7 +58,7 @@
 #include "completecomponentcommand.h"
 #include "componentcompletedcommand.h"
 #include "createscenecommand.h"
-#include "sgitemnodeinstance.h"
+#include "quickitemnodeinstance.h"
 #include "removesharedmemorycommand.h"
 
 #include "dummycontextobject.h"
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
index 6f9455dfb2..634b274126 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
@@ -28,7 +28,7 @@
 **
 **************************************************************************/
 
-#include "sgitemnodeinstance.h"
+#include "quickitemnodeinstance.h"
 
 #include "qt5nodeinstanceserver.h"
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
index c14f85ea20..c14f85ea20 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
index 68abd113b6..975c61e906 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
@@ -38,12 +38,7 @@
 #include "qmlstatenodeinstance.h"
 #include "anchorchangesnodeinstance.h"
 
-#if QT_VERSION >= 0x050000
-#include "sgitemnodeinstance.h"
-#else
-#include "qmlgraphicsitemnodeinstance.h"
-#include "positionernodeinstance.h"
-#endif
+#include "quickitemnodeinstance.h"
 
 #include "nodeinstanceserver.h"
 #include "instancecontainer.h"
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
index 9162b39f3e..9b1b63f379 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
@@ -190,7 +190,7 @@ bool ObjectNodeInstance::isPositioner() const
     return false;
 }
 
-bool ObjectNodeInstance::isSGItem() const
+bool ObjectNodeInstance::isQuickItem() const
 {
     return false;
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
index b77fef3e85..c92bef69de 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
@@ -100,7 +100,7 @@ public:
     virtual bool isGraphicsObject() const;
     virtual bool isTransition() const;
     virtual bool isPositioner() const;
-    virtual bool isSGItem() const;
+    virtual bool isQuickItem() const;
 
     virtual bool equalGraphicsItem(QGraphicsItem *item) const;