Prepend QTDATAVIS3D_ to include guards

Datavis and Graphs have many duplicated files with same include guards.
Because QtGraphs has inherited many of its classes
from QtDataVisualization, the modules have many classes with the same
name. Therefore, mixing QtDataVisualization and QtGraphs headers in
the same TU violates ODR. This patch includes the check for that and
fails compilation with an error message.

Pick-to: 6.8
Change-Id: Ic21d18d976236c3104d32a0f7ff7dada1d721778
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 37df523a28)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

src/datavisualization/axis/qabstract3daxis.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QABSTRACT3DAXIS_H
-#define QABSTRACT3DAXIS_H
+#ifndef QTDATAVIS3D_QABSTRACT3DAXIS_H
+#define QTDATAVIS3D_QABSTRACT3DAXIS_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtCore/QObject>

src/datavisualization/axis/qcategory3daxis.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QCATEGORY3DAXIS_H
-#define QCATEGORY3DAXIS_H
+#ifndef QTDATAVIS3D_QCATEGORY3DAXIS_H
+#define QTDATAVIS3D_QCATEGORY3DAXIS_H
 
 #include <QtDataVisualization/qabstract3daxis.h>
 

src/datavisualization/axis/qlogvalue3daxisformatter.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QLOGVALUE3DAXISFORMATTER_H
-#define QLOGVALUE3DAXISFORMATTER_H
+#ifndef QTDATAVIS3D_QLOGVALUE3DAXISFORMATTER_H
+#define QTDATAVIS3D_QLOGVALUE3DAXISFORMATTER_H
 
 #include <QtDataVisualization/qvalue3daxisformatter.h>
 

src/datavisualization/axis/qvalue3daxis.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QVALUE3DAXIS_H
-#define QVALUE3DAXIS_H
+#ifndef QTDATAVIS3D_QVALUE3DAXIS_H
+#define QTDATAVIS3D_QVALUE3DAXIS_H
 
 #include <QtDataVisualization/qabstract3daxis.h>
 #include <QtDataVisualization/qvalue3daxisformatter.h>

src/datavisualization/axis/qvalue3daxisformatter.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QVALUE3DAXISFORMATTER_H
-#define QVALUE3DAXISFORMATTER_H
+#ifndef QTDATAVIS3D_QVALUE3DAXISFORMATTER_H
+#define QTDATAVIS3D_QVALUE3DAXISFORMATTER_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtCore/QList>

src/datavisualization/data/qabstract3dseries.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QABSTRACT3DSERIES_H
-#define QABSTRACT3DSERIES_H
+#ifndef QTDATAVIS3D_QABSTRACT3DSERIES_H
+#define QTDATAVIS3D_QABSTRACT3DSERIES_H
 
 #include <QtDataVisualization/q3dtheme.h>
 #include <QtCore/QObject>

src/datavisualization/data/qabstractdataproxy.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QABSTRACTDATAPROXY_H
-#define QABSTRACTDATAPROXY_H
+#ifndef QTDATAVIS3D_QABSTRACTDATAPROXY_H
+#define QTDATAVIS3D_QABSTRACTDATAPROXY_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtCore/QObject>

src/datavisualization/data/qbar3dseries.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QBAR3DSERIES_H
-#define QBAR3DSERIES_H
+#ifndef QTDATAVIS3D_QBAR3DSERIES_H
+#define QTDATAVIS3D_QBAR3DSERIES_H
 
 #include <QtDataVisualization/qabstract3dseries.h>
 #include <QtDataVisualization/qbardataproxy.h>

src/datavisualization/data/qbardataitem.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QBARDATAITEM_H
-#define QBARDATAITEM_H
+#ifndef QTDATAVIS3D_QBARDATAITEM_H
+#define QTDATAVIS3D_QBARDATAITEM_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 

src/datavisualization/data/qbardataproxy.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QBARDATAPROXY_H
-#define QBARDATAPROXY_H
+#ifndef QTDATAVIS3D_QBARDATAPROXY_H
+#define QTDATAVIS3D_QBARDATAPROXY_H
 
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qbardataitem.h>

src/datavisualization/data/qcustom3ditem.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QCUSTOM3DITEM_H
-#define QCUSTOM3DITEM_H
+#ifndef QTDATAVIS3D_QCUSTOM3DITEM_H
+#define QTDATAVIS3D_QCUSTOM3DITEM_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtGui/QImage>

src/datavisualization/data/qcustom3dlabel.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QCUSTOMLABELITEM_H
-#define QCUSTOMLABELITEM_H
+#ifndef QTDATAVIS3D_QCUSTOMLABELITEM_H
+#define QTDATAVIS3D_QCUSTOMLABELITEM_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtDataVisualization/QCustom3DItem>

src/datavisualization/data/qcustom3dvolume.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QCUSTOM3DVOLUME_H
-#define QCUSTOM3DVOLUME_H
+#ifndef QTDATAVIS3D_QCUSTOM3DVOLUME_H
+#define QTDATAVIS3D_QCUSTOM3DVOLUME_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtDataVisualization/QCustom3DItem>

src/datavisualization/data/qheightmapsurfacedataproxy.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QHEIGHTMAPSURFACEDATAPROXY_H
-#define QHEIGHTMAPSURFACEDATAPROXY_H
+#ifndef QTDATAVIS3D_QHEIGHTMAPSURFACEDATAPROXY_H
+#define QTDATAVIS3D_QHEIGHTMAPSURFACEDATAPROXY_H
 
 #include <QtDataVisualization/qsurfacedataproxy.h>
 #include <QtGui/QImage>

src/datavisualization/data/qitemmodelbardataproxy.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QITEMMODELBARDATAPROXY_H
-#define QITEMMODELBARDATAPROXY_H
+#ifndef QTDATAVIS3D_QITEMMODELBARDATAPROXY_H
+#define QTDATAVIS3D_QITEMMODELBARDATAPROXY_H
 
 #include <QtDataVisualization/qbardataproxy.h>
 #include <QtCore/QAbstractItemModel>

src/datavisualization/data/qitemmodelscatterdataproxy.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QITEMMODELSCATTERDATAPROXY_H
-#define QITEMMODELSCATTERDATAPROXY_H
+#ifndef QTDATAVIS3D_QITEMMODELSCATTERDATAPROXY_H
+#define QTDATAVIS3D_QITEMMODELSCATTERDATAPROXY_H
 
 #include <QtDataVisualization/qscatterdataproxy.h>
 #include <QtCore/QAbstractItemModel>

src/datavisualization/data/qitemmodelsurfacedataproxy.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QITEMMODELSURFACEDATAPROXY_H
-#define QITEMMODELSURFACEDATAPROXY_H
+#ifndef QTDATAVIS3D_QITEMMODELSURFACEDATAPROXY_H
+#define QTDATAVIS3D_QITEMMODELSURFACEDATAPROXY_H
 
 #include <QtDataVisualization/qsurfacedataproxy.h>
 #include <QtCore/QAbstractItemModel>

src/datavisualization/data/qscatter3dseries.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QSCATTER3DSERIES_H
-#define QSCATTER3DSERIES_H
+#ifndef QTDATAVIS3D_QSCATTER3DSERIES_H
+#define QTDATAVIS3D_QSCATTER3DSERIES_H
 
 #include <QtDataVisualization/qabstract3dseries.h>
 #include <QtDataVisualization/qscatterdataproxy.h>

src/datavisualization/data/qscatterdataitem.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QSCATTERDATAITEM_H
-#define QSCATTERDATAITEM_H
+#ifndef QTDATAVIS3D_QSCATTERDATAITEM_H
+#define QTDATAVIS3D_QSCATTERDATAITEM_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtGui/QQuaternion>

src/datavisualization/data/qscatterdataproxy.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QSCATTERDATAPROXY_H
-#define QSCATTERDATAPROXY_H
+#ifndef QTDATAVIS3D_QSCATTERDATAPROXY_H
+#define QTDATAVIS3D_QSCATTERDATAPROXY_H
 
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qscatterdataitem.h>

src/datavisualization/data/qsurface3dseries.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QSURFACE3DSERIES_H
-#define QSURFACE3DSERIES_H
+#ifndef QTDATAVIS3D_QSURFACE3DSERIES_H
+#define QTDATAVIS3D_QSURFACE3DSERIES_H
 
 #include <QtDataVisualization/qabstract3dseries.h>
 #include <QtDataVisualization/qsurfacedataproxy.h>

src/datavisualization/data/qsurfacedataitem.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QSURFACEDATAITEM_H
-#define QSURFACEDATAITEM_H
+#ifndef QTDATAVIS3D_QSURFACEDATAITEM_H
+#define QTDATAVIS3D_QSURFACEDATAITEM_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtGui/QVector3D>

src/datavisualization/data/qsurfacedataproxy.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QSURFACEDATAPROXY_H
-#define QSURFACEDATAPROXY_H
+#ifndef QTDATAVIS3D_QSURFACEDATAPROXY_H
+#define QTDATAVIS3D_QSURFACEDATAPROXY_H
 
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qsurfacedataitem.h>

src/datavisualization/engine/q3dbars.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef Q3DBARS_H
-#define Q3DBARS_H
+#ifndef QTDATAVIS3D_Q3DBARS_H
+#define QTDATAVIS3D_Q3DBARS_H
 
 #include <QtDataVisualization/qabstract3dgraph.h>
 #include <QtDataVisualization/qvalue3daxis.h>

src/datavisualization/engine/q3dcamera.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef Q3DCAMERA_H
-#define Q3DCAMERA_H
+#ifndef QTDATAVIS3D_Q3DCAMERA_H
+#define QTDATAVIS3D_Q3DCAMERA_H
 
 #include <QtDataVisualization/q3dobject.h>
 

src/datavisualization/engine/q3dlight.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef Q3DLIGHT_H
-#define Q3DLIGHT_H
+#ifndef QTDATAVIS3D_Q3DLIGHT_H
+#define QTDATAVIS3D_Q3DLIGHT_H
 
 #include <QtDataVisualization/q3dobject.h>
 

src/datavisualization/engine/q3dobject.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef Q3DOBJECT_H
-#define Q3DOBJECT_H
+#ifndef QTDATAVIS3D_Q3DOBJECT_H
+#define QTDATAVIS3D_Q3DOBJECT_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtCore/QObject>

src/datavisualization/engine/q3dscatter.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef Q3DSCATTER_H
-#define Q3DSCATTER_H
+#ifndef QTDATAVIS3D_Q3DSCATTER_H
+#define QTDATAVIS3D_Q3DSCATTER_H
 
 #include <QtDataVisualization/qabstract3dgraph.h>
 #include <QtDataVisualization/qvalue3daxis.h>

src/datavisualization/engine/q3dscene.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef Q3DSCENE_H
-#define Q3DSCENE_H
+#ifndef QTDATAVIS3D_Q3DSCENE_H
+#define QTDATAVIS3D_Q3DSCENE_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtDataVisualization/q3dcamera.h>

src/datavisualization/engine/q3dsurface.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef Q3DSURFACE_H
-#define Q3DSURFACE_H
+#ifndef QTDATAVIS3D_Q3DSURFACE_H
+#define QTDATAVIS3D_Q3DSURFACE_H
 
 #include <QtDataVisualization/qabstract3dgraph.h>
 #include <QtDataVisualization/qvalue3daxis.h>

src/datavisualization/engine/qabstract3dgraph.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QABSTRACT3DGRAPH_H
-#define QABSTRACT3DGRAPH_H
+#ifndef QTDATAVIS3D_QABSTRACT3DGRAPH_H
+#define QTDATAVIS3D_QABSTRACT3DGRAPH_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtDataVisualization/q3dtheme.h>

src/datavisualization/global/qdatavisualizationglobal.h

@@ -19,6 +19,13 @@ QT_BEGIN_NAMESPACE
 */
 #define QT_DATAVISUALIZATION_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 
+#ifdef QTGRAPHS_HEADERS
+#error Mixing QtDataVisualization and QtGraphs in the same TU is unsupported since they use\
+ the same class names.
+#endif
+
+#define QTDATAVIS3D_HEADERS
+
 QT_END_NAMESPACE
 
 #endif

src/datavisualization/input/q3dinputhandler.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef Q3DINPUTHANDLER_H
-#define Q3DINPUTHANDLER_H
+#ifndef QTDATAVIS3D_Q3DINPUTHANDLER_H
+#define QTDATAVIS3D_Q3DINPUTHANDLER_H
 
 #include <QtDataVisualization/qabstract3dinputhandler.h>
 

src/datavisualization/input/qabstract3dinputhandler.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QABSTRACT3DINPUTHANDLER_H
-#define QABSTRACT3DINPUTHANDLER_H
+#ifndef QTDATAVIS3D_QABSTRACT3DINPUTHANDLER_H
+#define QTDATAVIS3D_QABSTRACT3DINPUTHANDLER_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtDataVisualization/q3dscene.h>

src/datavisualization/input/qtouch3dinputhandler.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QTOUCH3DINPUTHANDLER_H
-#define QTOUCH3DINPUTHANDLER_H
+#ifndef QTDATAVIS3D_QTOUCH3DINPUTHANDLER_H
+#define QTDATAVIS3D_QTOUCH3DINPUTHANDLER_H
 
 #include <QtDataVisualization/q3dinputhandler.h>
 

src/datavisualization/theme/q3dtheme.h

@@ -1,8 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef Q3DTHEME_H
-#define Q3DTHEME_H
+#ifndef QTDATAVIS3D_Q3DTHEME_H
+#define QTDATAVIS3D_Q3DTHEME_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtCore/QObject>

src/datavisualization/utils/qutils.h

@@ -1,8 +1,13 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QUTILS_H
-#define QUTILS_H
+#ifdef QTGRAPHS_QUTILS_H
+#error Mixing QtDataVisualization and QtGraphs in the same TU is unsupported since they use\
+ the same class names.
+#endif
+
+#ifndef QTDATAVIS3D_QUTILS_H
+#define QTDATAVIS3D_QUTILS_H
 
 #include <QtGui/QSurfaceFormat>
 #include <QtGui/QOpenGLContext>