summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2024-05-14 09:18:16 +0300
committerTomi Korpipaa <tomi.korpipaa@qt.io>2024-05-14 13:57:14 +0300
commit571a3e3337aa1a32d44e33b00135c274aaf05b0b (patch)
tree9c9e92ec31f7313f4b16ad1d7e37f5cc22f41127
parent19ea5745e85067e385511bbe3ea36699466f66e3 (diff)
API: Fix public header includes in 3D
- style to use should be "#include <QtModule/qheader.h>" Change-Id: I6f4a8a1cfd39c55929745b649530d6623bcb68b3 Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/graphs3d/axis/qabstract3daxis.h6
-rw-r--r--src/graphs3d/axis/qvalue3daxisformatter.h10
-rw-r--r--src/graphs3d/data/qabstract3dseries.h10
-rw-r--r--src/graphs3d/data/qabstractdataproxy.h4
-rw-r--r--src/graphs3d/data/qbar3dseries.h2
-rw-r--r--src/graphs3d/data/qbardataproxy.h4
-rw-r--r--src/graphs3d/data/qcustom3ditem.h8
-rw-r--r--src/graphs3d/data/qcustom3dlabel.h10
-rw-r--r--src/graphs3d/data/qcustom3dvolume.h6
-rw-r--r--src/graphs3d/data/qheightmapsurfacedataproxy.h4
-rw-r--r--src/graphs3d/data/qitemmodelbardataproxy.h4
-rw-r--r--src/graphs3d/data/qitemmodelscatterdataproxy.h6
-rw-r--r--src/graphs3d/data/qitemmodelsurfacedataproxy.h6
-rw-r--r--src/graphs3d/data/qscatterdataitem.h2
-rw-r--r--src/graphs3d/data/qsurfacedataitem.h2
-rw-r--r--src/graphs3d/engine/q3dscene.h4
-rw-r--r--src/graphs3d/engine/qabstract3dgraph.h4
-rw-r--r--src/graphs3d/global/qgraphsglobal.h2
-rw-r--r--src/graphs3d/utils/qutils.h4
19 files changed, 49 insertions, 49 deletions
diff --git a/src/graphs3d/axis/qabstract3daxis.h b/src/graphs3d/axis/qabstract3daxis.h
index aea6ce4..8c8dcf9 100644
--- a/src/graphs3d/axis/qabstract3daxis.h
+++ b/src/graphs3d/axis/qabstract3daxis.h
@@ -4,9 +4,9 @@
#ifndef QABSTRACT3DAXIS_H
#define QABSTRACT3DAXIS_H
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QStringList>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qstringlist.h>
#include <QtCore/qtclasshelpermacros.h>
#include <QtGraphs/qgraphsglobal.h>
diff --git a/src/graphs3d/axis/qvalue3daxisformatter.h b/src/graphs3d/axis/qvalue3daxisformatter.h
index 264557a..a861033 100644
--- a/src/graphs3d/axis/qvalue3daxisformatter.h
+++ b/src/graphs3d/axis/qvalue3daxisformatter.h
@@ -4,11 +4,11 @@
#ifndef QVALUE3DAXISFORMATTER_H
#define QVALUE3DAXISFORMATTER_H
-#include <QtCore/QList>
-#include <QtCore/QLocale>
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QStringList>
+#include <QtCore/qlist.h>
+#include <QtCore/qlocale.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qstringlist.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qabstract3dseries.h b/src/graphs3d/data/qabstract3dseries.h
index 8e7ad1c..2179878 100644
--- a/src/graphs3d/data/qabstract3dseries.h
+++ b/src/graphs3d/data/qabstract3dseries.h
@@ -4,12 +4,12 @@
#ifndef QABSTRACT3DSERIES_H
#define QABSTRACT3DSERIES_H
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QString>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qstring.h>
#include <QtGraphs/qgraphstheme.h>
-#include <QtGui/QLinearGradient>
-#include <QtGui/QQuaternion>
+#include <QtGui/qbrush.h>
+#include <QtGui/qquaternion.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qabstractdataproxy.h b/src/graphs3d/data/qabstractdataproxy.h
index b68cdda..05456b5 100644
--- a/src/graphs3d/data/qabstractdataproxy.h
+++ b/src/graphs3d/data/qabstractdataproxy.h
@@ -4,8 +4,8 @@
#ifndef QABSTRACTDATAPROXY_H
#define QABSTRACTDATAPROXY_H
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qbar3dseries.h b/src/graphs3d/data/qbar3dseries.h
index 3eb288e..589bed6 100644
--- a/src/graphs3d/data/qbar3dseries.h
+++ b/src/graphs3d/data/qbar3dseries.h
@@ -4,7 +4,7 @@
#ifndef QBAR3DSERIES_H
#define QBAR3DSERIES_H
-#include <QtCore/QPoint>
+#include <QtCore/qpoint.h>
#include <QtGraphs/qabstract3dseries.h>
#include <QtGraphs/qbardataproxy.h>
diff --git a/src/graphs3d/data/qbardataproxy.h b/src/graphs3d/data/qbardataproxy.h
index 9f46a70..0c71a3b 100644
--- a/src/graphs3d/data/qbardataproxy.h
+++ b/src/graphs3d/data/qbardataproxy.h
@@ -4,8 +4,8 @@
#ifndef QBARDATAPROXY_H
#define QBARDATAPROXY_H
-#include <QtCore/QList>
-#include <QtCore/QStringList>
+#include <QtCore/qlist.h>
+#include <QtCore/qstringlist.h>
#include <QtGraphs/qabstractdataproxy.h>
#include <QtGraphs/qbardataitem.h>
diff --git a/src/graphs3d/data/qcustom3ditem.h b/src/graphs3d/data/qcustom3ditem.h
index a2ae2cc..fab735a 100644
--- a/src/graphs3d/data/qcustom3ditem.h
+++ b/src/graphs3d/data/qcustom3ditem.h
@@ -4,11 +4,11 @@
#ifndef QCUSTOM3DITEM_H
#define QCUSTOM3DITEM_H
-#include <QtCore/QObject>
+#include <QtCore/qobject.h>
#include <QtGraphs/qgraphsglobal.h>
-#include <QtGui/QImage>
-#include <QtGui/QQuaternion>
-#include <QtGui/QVector3D>
+#include <QtGui/qimage.h>
+#include <QtGui/qquaternion.h>
+#include <QtGui/qvector3d.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qcustom3dlabel.h b/src/graphs3d/data/qcustom3dlabel.h
index 1a00b76..ca1c3d1 100644
--- a/src/graphs3d/data/qcustom3dlabel.h
+++ b/src/graphs3d/data/qcustom3dlabel.h
@@ -4,12 +4,12 @@
#ifndef QCUSTOMLABELITEM_H
#define QCUSTOMLABELITEM_H
-#include <QtGraphs/QCustom3DItem>
+#include <QtGraphs/qcustom3ditem.h>
#include <QtGraphs/qgraphsglobal.h>
-#include <QtGui/QColor>
-#include <QtGui/QFont>
-#include <QtGui/QQuaternion>
-#include <QtGui/QVector3D>
+#include <QtGui/qcolor.h>
+#include <QtGui/qfont.h>
+#include <QtGui/qquaternion.h>
+#include <QtGui/qvector3d.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qcustom3dvolume.h b/src/graphs3d/data/qcustom3dvolume.h
index 032b12e..e8edf04 100644
--- a/src/graphs3d/data/qcustom3dvolume.h
+++ b/src/graphs3d/data/qcustom3dvolume.h
@@ -4,10 +4,10 @@
#ifndef QCUSTOM3DVOLUME_H
#define QCUSTOM3DVOLUME_H
-#include <QtGraphs/QCustom3DItem>
+#include <QtGraphs/qcustom3ditem.h>
#include <QtGraphs/qgraphsglobal.h>
-#include <QtGui/QColor>
-#include <QtGui/QImage>
+#include <QtGui/qcolor.h>
+#include <QtGui/qimage.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qheightmapsurfacedataproxy.h b/src/graphs3d/data/qheightmapsurfacedataproxy.h
index 9176eb5..7b3bbaa 100644
--- a/src/graphs3d/data/qheightmapsurfacedataproxy.h
+++ b/src/graphs3d/data/qheightmapsurfacedataproxy.h
@@ -4,9 +4,9 @@
#ifndef QHEIGHTMAPSURFACEDATAPROXY_H
#define QHEIGHTMAPSURFACEDATAPROXY_H
-#include <QtCore/QString>
+#include <QtCore/qstring.h>
#include <QtGraphs/qsurfacedataproxy.h>
-#include <QtGui/QImage>
+#include <QtGui/qimage.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qitemmodelbardataproxy.h b/src/graphs3d/data/qitemmodelbardataproxy.h
index 7dc2a45..1a2bc5c 100644
--- a/src/graphs3d/data/qitemmodelbardataproxy.h
+++ b/src/graphs3d/data/qitemmodelbardataproxy.h
@@ -4,8 +4,8 @@
#ifndef QITEMMODELBARDATAPROXY_H
#define QITEMMODELBARDATAPROXY_H
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QRegularExpression>
+#include <QtCore/qabstractitemmodel.h>
+#include <QtCore/qregularexpression.h>
#include <QtGraphs/qbardataproxy.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qitemmodelscatterdataproxy.h b/src/graphs3d/data/qitemmodelscatterdataproxy.h
index e68b35e..c8b347e 100644
--- a/src/graphs3d/data/qitemmodelscatterdataproxy.h
+++ b/src/graphs3d/data/qitemmodelscatterdataproxy.h
@@ -4,9 +4,9 @@
#ifndef QITEMMODELSCATTERDATAPROXY_H
#define QITEMMODELSCATTERDATAPROXY_H
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QRegularExpression>
-#include <QtCore/QString>
+#include <QtCore/qabstractitemmodel.h>
+#include <QtCore/qregularexpression.h>
+#include <QtCore/qstring.h>
#include <QtGraphs/qscatterdataproxy.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qitemmodelsurfacedataproxy.h b/src/graphs3d/data/qitemmodelsurfacedataproxy.h
index 70dc1b2..8aa02df 100644
--- a/src/graphs3d/data/qitemmodelsurfacedataproxy.h
+++ b/src/graphs3d/data/qitemmodelsurfacedataproxy.h
@@ -4,9 +4,9 @@
#ifndef QITEMMODELSURFACEDATAPROXY_H
#define QITEMMODELSURFACEDATAPROXY_H
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QRegularExpression>
-#include <QtCore/QStringList>
+#include <QtCore/qabstractitemmodel.h>
+#include <QtCore/qregularexpression.h>
+#include <QtCore/qstringlist.h>
#include <QtGraphs/qsurfacedataproxy.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qscatterdataitem.h b/src/graphs3d/data/qscatterdataitem.h
index 8b2d030..969e547 100644
--- a/src/graphs3d/data/qscatterdataitem.h
+++ b/src/graphs3d/data/qscatterdataitem.h
@@ -5,7 +5,7 @@
#define QSCATTERDATAITEM_H
#include <QtGraphs/qgraphsglobal.h>
-#include <QtGui/QQuaternion>
+#include <QtGui/qquaternion.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/data/qsurfacedataitem.h b/src/graphs3d/data/qsurfacedataitem.h
index 0b40e15..34e26ca 100644
--- a/src/graphs3d/data/qsurfacedataitem.h
+++ b/src/graphs3d/data/qsurfacedataitem.h
@@ -5,7 +5,7 @@
#define QSURFACEDATAITEM_H
#include <QtGraphs/qgraphsglobal.h>
-#include <QtGui/QVector3D>
+#include <QtGui/qvector3d.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/engine/q3dscene.h b/src/graphs3d/engine/q3dscene.h
index 822184c..e119889 100644
--- a/src/graphs3d/engine/q3dscene.h
+++ b/src/graphs3d/engine/q3dscene.h
@@ -4,8 +4,8 @@
#ifndef Q3DSCENE_H
#define Q3DSCENE_H
-#include <QtCore/QObject>
-#include <QtCore/QRect>
+#include <QtCore/qobject.h>
+#include <QtCore/qrect.h>
#include <QtGraphs/qgraphsglobal.h>
#include <QtQmlIntegration/qqmlintegration.h>
diff --git a/src/graphs3d/engine/qabstract3dgraph.h b/src/graphs3d/engine/qabstract3dgraph.h
index 656850a..3656d30 100644
--- a/src/graphs3d/engine/qabstract3dgraph.h
+++ b/src/graphs3d/engine/qabstract3dgraph.h
@@ -6,10 +6,10 @@
#include <QtCore/qlocale.h>
#include <QtGraphs/q3dscene.h>
-#include <QtGraphs/QGraphsTheme>
#include <QtGraphs/qgraphsglobal.h>
-#include <QtQuickWidgets/qquickwidget.h>
+#include <QtGraphs/qgraphstheme.h>
#include <QtQuick/qquickitemgrabresult.h>
+#include <QtQuickWidgets/qquickwidget.h>
QT_BEGIN_NAMESPACE
diff --git a/src/graphs3d/global/qgraphsglobal.h b/src/graphs3d/global/qgraphsglobal.h
index 22c1306..e34f149 100644
--- a/src/graphs3d/global/qgraphsglobal.h
+++ b/src/graphs3d/global/qgraphsglobal.h
@@ -4,7 +4,7 @@
#ifndef GRAPHSGLOBAL_H
#define GRAPHSGLOBAL_H
-#include <QtCore/QtGlobal>
+#include <QtCore/qglobal.h>
#include <QtGraphs/qtgraphsexports.h>
#endif
diff --git a/src/graphs3d/utils/qutils.h b/src/graphs3d/utils/qutils.h
index 8421ab5..c324ca3 100644
--- a/src/graphs3d/utils/qutils.h
+++ b/src/graphs3d/utils/qutils.h
@@ -4,8 +4,8 @@
#ifndef QUTILS_H
#define QUTILS_H
-#include <QtCore/QCoreApplication>
-#include <QtGui/QSurfaceFormat>
+#include <QtCore/qcoreapplication.h>
+#include <QtGui/qsurfaceformat.h>
QT_BEGIN_NAMESPACE