Avoid ambiguous include guards in SG classes

These include guards stem from the olden days before the QSG
prefix and many of them are conflict prone, which can lead
to pretty bisarrer errors for the user.

Change-Id: I0e76c68a588404b6e82be9ecc2e7afa3b9a48e78
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h
index ae759c0..6fba0d1 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLRENDERER_H
-#define QMLRENDERER_H
+#ifndef QSGDEFAULTRENDERER_P_H
+#define QSGDEFAULTRENDERER_P_H
 
 #include "qsgrenderer_p.h"
 

diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h
index 5effdbf..50e9c77 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgmaterial.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef MATERIAL_H
-#define MATERIAL_H
+#ifndef QSGMATERIAL_H
+#define QSGMATERIAL_H
 
 #include <QtQuick/qtquickglobal.h>
 #include <qopenglshaderprogram.h>

diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h
index 522546d..3fa2f7f 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgnode.h
+++ b/src/quick/scenegraph/coreapi/qsgnode.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef NODE_H
-#define NODE_H
+#ifndef QSGNODE_H
+#define QSGNODE_H
 
 #include <QtQuick/qsggeometry.h>
 #include <QtGui/QMatrix4x4>
@@ -333,4 +333,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags)
 
 QT_END_NAMESPACE
 
-#endif // NODE_H
+#endif // QSGNODE_H

diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h
index 7e57bf5..eb612ff 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h
+++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef NODEUPDATER_P_H
-#define NODEUPDATER_P_H
+#ifndef QSGNODEUPDATER_P_H
+#define QSGNODEUPDATER_P_H
 
 #include <private/qtquickglobal_p.h>
 #include <QtGui/private/qdatabuffer_p.h>
@@ -94,4 +94,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // NODEUPDATER_P_H
+#endif

diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
index 5dd5354..844e8b1 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef RENDERER_H
-#define RENDERER_H
+#ifndef QSGRENDERER_P_H
+#define QSGRENDERER_P_H
 
 #include <qset.h>
 #include <qhash.h>
@@ -239,4 +239,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // RENDERER_H
+#endif

diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h
index 85c1d2e..cc22bfa 100644 (file)
--- a/src/quick/scenegraph/qsgadaptationlayer_p.h
+++ b/src/quick/scenegraph/qsgadaptationlayer_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef ADAPTATIONINTERFACES_H
-#define ADAPTATIONINTERFACES_H
+#ifndef QSGADAPTATIONLAYER_P_H
+#define QSGADAPTATIONLAYER_P_H
 
 #include <QtQuick/qsgnode.h>
 #include <QtQuick/qsgtexture.h>

diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
index a1cd381..a3d5d7c 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.h
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEFAULT_GLYPHNODE_H
-#define DEFAULT_GLYPHNODE_H
+#ifndef QSGDEFAULTGLYPHNODE_P_H
+#define QSGDEFAULTGLYPHNODE_P_H
 
 #include <private/qsgadaptationlayer_p.h>
 #include <QtQuick/qsgnode.h>
@@ -78,4 +78,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // DEFAULT_GLYPHNODE_H
+#endif

diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
index efa96a1..2635232 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef TEXTMASKMATERIAL_H
-#define TEXTMASKMATERIAL_H
+#ifndef QSGDEFAULTGLYPHNODE_P_P_H
+#define QSGDEFAULTGLYPHNODE_P_P_H
 
 #include <qcolor.h>
 #include <QtQuick/qsgmaterial.h>
@@ -93,4 +93,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // TEXTMASKMATERIAL_H
+#endif

diff --git a/src/quick/scenegraph/qsgdefaultimagenode_p.h b/src/quick/scenegraph/qsgdefaultimagenode_p.h
index d2b3baa..7d299fa 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultimagenode_p.h
+++ b/src/quick/scenegraph/qsgdefaultimagenode_p.h
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 
-#ifndef DEFAULT_PIXMAPNODE_H
-#define DEFAULT_PIXMAPNODE_H
+#ifndef QSGDEFAULTIMAGENODE_P_H
+#define QSGDEFAULTIMAGENODE_P_H
 
 #include <private/qsgadaptationlayer_p.h>
 #include <QtQuick/qsgtexturematerial.h>

diff --git a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
index e456078..24bdbb3 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
+++ b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 
-#ifndef DEFAULT_RECTANGLENODE_H
-#define DEFAULT_RECTANGLENODE_H
+#ifndef QSGDEFAULTRECTANGLENODE_P_H
+#define QSGDEFAULTRECTANGLENODE_P_H
 
 #include <private/qsgadaptationlayer_p.h>
 

diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h
index b75a123..4f03ab5 100644 (file)
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef DISTANCEFIELD_GLYPHNODE_H
-#define DISTANCEFIELD_GLYPHNODE_H
+#ifndef QSGDISTANCEFIELDGLYPHNODE_P_H
+#define QSGDISTANCEFIELDGLYPHNODE_P_H
 
 #include <private/qsgadaptationlayer_p.h>
 #include <QtQuick/qsgtexture.h>
@@ -112,4 +112,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // DISTANCEFIELD_GLYPHNODE_H
+#endif

diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
index fe66776..d6aa38a 100644 (file)
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef DISTANCEFIELDTEXTMATERIAL_H
-#define DISTANCEFIELDTEXTMATERIAL_H
+#ifndef QSGDISTANCEFIELDGLYPHNODE_P_P_H
+#define QSGDISTANCEFIELDGLYPHNODE_P_P_H
 
 #include <QtQuick/qsgmaterial.h>
 #include "qsgdistancefieldglyphnode_p.h"
@@ -141,4 +141,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // DISTANCEFIELDTEXTMATERIAL_H
+#endif

diff --git a/src/quick/scenegraph/util/qsgareaallocator_p.h b/src/quick/scenegraph/util/qsgareaallocator_p.h
index 4ec6282..1255001 100644 (file)
--- a/src/quick/scenegraph/util/qsgareaallocator_p.h
+++ b/src/quick/scenegraph/util/qsgareaallocator_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef AREAALLOCATOR_H
-#define AREAALLOCATOR_H
+#ifndef QSGAREAALLOCATOR_P_H
+#define QSGAREAALLOCATOR_P_H
 
 #include <private/qtquickglobal_p.h>
 #include <QtCore/qsize.h>

diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.h b/src/quick/scenegraph/util/qsgflatcolormaterial.h
index 27cf256..f0a3a37 100644 (file)
--- a/src/quick/scenegraph/util/qsgflatcolormaterial.h
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef FLATCOLORMATERIAL_H
-#define FLATCOLORMATERIAL_H
+#ifndef QSGFLATCOLORMATERIAL_H
+#define QSGFLATCOLORMATERIAL_H
 
 #include <QtQuick/qsgmaterial.h>
 #include <qcolor.h>

diff --git a/src/quick/scenegraph/util/qsgsimplerectnode.h b/src/quick/scenegraph/util/qsgsimplerectnode.h
index 856e679..bed2d98 100644 (file)
--- a/src/quick/scenegraph/util/qsgsimplerectnode.h
+++ b/src/quick/scenegraph/util/qsgsimplerectnode.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef SOLIDRECTNODE_H
-#define SOLIDRECTNODE_H
+#ifndef QSGSIMPLERECTNODE_H
+#define QSGSIMPLERECTNODE_H
 
 #include <QtQuick/qsgnode.h>
 #include <QtQuick/qsgflatcolormaterial.h>

diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h
index cbc4f7d..ee4f7cc 100644 (file)
--- a/src/quick/scenegraph/util/qsgtexturematerial.h
+++ b/src/quick/scenegraph/util/qsgtexturematerial.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef TEXTUREMATERIAL_H
-#define TEXTUREMATERIAL_H
+#ifndef QSGTEXTUREMATERIAL_H
+#define QSGTEXTUREMATERIAL_H
 
 #include <QtQuick/qsgmaterial.h>
 #include <QtQuick/qsgtexture.h>
@@ -92,4 +92,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // TEXTUREMATERIAL_H
+#endif

diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.h b/src/quick/scenegraph/util/qsgvertexcolormaterial.h
index a3ffa48..81da065 100644 (file)
--- a/src/quick/scenegraph/util/qsgvertexcolormaterial.h
+++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef VERTEXCOLORMATERIAL_H
-#define VERTEXCOLORMATERIAL_H
+#ifndef QSGVERTEXCOLORMATERIAL_H
+#define QSGVERTEXCOLORMATERIAL_H
 
 #include <QtQuick/qsgmaterial.h>