From f92b4e1912aca04ad0f5892b19db20d75e9824a7 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 29 Jun 2021 14:13:17 +0200 Subject: Migrate to autogenerated cpp exports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the hardcoded cpp exports with a generated one where it's applicable. Change the cpp export macro name to the autogenerated one. Task-number: QTBUG-90492 Change-Id: Iff6fbff102297feffd443b8b6fef61f5e8f135e5 Reviewed-by: Qt CI Bot Reviewed-by: Tomi Korpipää Reviewed-by: Sami Varanka Reviewed-by: Joerg Bornemann --- src/datavisualization/data/qabstract3dseries.h | 2 +- src/datavisualization/data/qabstractdataproxy.h | 2 +- src/datavisualization/data/qbar3dseries.h | 2 +- src/datavisualization/data/qbardataitem.h | 2 +- src/datavisualization/data/qbardataproxy.h | 2 +- src/datavisualization/data/qcustom3ditem.h | 2 +- src/datavisualization/data/qcustom3dlabel.h | 2 +- src/datavisualization/data/qcustom3dvolume.h | 2 +- src/datavisualization/data/qheightmapsurfacedataproxy.h | 2 +- src/datavisualization/data/qitemmodelbardataproxy.h | 2 +- src/datavisualization/data/qitemmodelscatterdataproxy.h | 2 +- src/datavisualization/data/qitemmodelsurfacedataproxy.h | 2 +- src/datavisualization/data/qscatter3dseries.h | 2 +- src/datavisualization/data/qscatterdataitem.h | 2 +- src/datavisualization/data/qscatterdataproxy.h | 2 +- src/datavisualization/data/qsurface3dseries.h | 2 +- src/datavisualization/data/qsurfacedataitem.h | 2 +- src/datavisualization/data/qsurfacedataproxy.h | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/datavisualization/data') diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index c9f355e1..73c95c50 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE class QAbstract3DSeriesPrivate; -class QT_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject +class Q_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject { Q_OBJECT Q_ENUMS(SeriesType) diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h index 89d73bce..08fa4053 100644 --- a/src/datavisualization/data/qabstractdataproxy.h +++ b/src/datavisualization/data/qabstractdataproxy.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class QAbstractDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QAbstractDataProxy : public QObject +class Q_DATAVISUALIZATION_EXPORT QAbstractDataProxy : public QObject { Q_OBJECT Q_ENUMS(DataType) diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h index c3a71205..99fbad77 100644 --- a/src/datavisualization/data/qbar3dseries.h +++ b/src/datavisualization/data/qbar3dseries.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class QBar3DSeriesPrivate; -class QT_DATAVISUALIZATION_EXPORT QBar3DSeries : public QAbstract3DSeries +class Q_DATAVISUALIZATION_EXPORT QBar3DSeries : public QAbstract3DSeries { Q_OBJECT Q_PROPERTY(QBarDataProxy *dataProxy READ dataProxy WRITE setDataProxy NOTIFY dataProxyChanged) diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h index 11a8e471..d287868c 100644 --- a/src/datavisualization/data/qbardataitem.h +++ b/src/datavisualization/data/qbardataitem.h @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE class QBarDataItemPrivate; -class QT_DATAVISUALIZATION_EXPORT QBarDataItem +class Q_DATAVISUALIZATION_EXPORT QBarDataItem { public: QBarDataItem(); diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h index 80e5f063..daf9366e 100644 --- a/src/datavisualization/data/qbardataproxy.h +++ b/src/datavisualization/data/qbardataproxy.h @@ -45,7 +45,7 @@ class QBar3DSeries; typedef QList QBarDataRow; typedef QList QBarDataArray; -class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy +class Q_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy { Q_OBJECT diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h index 8d6d905f..8e65a7f5 100644 --- a/src/datavisualization/data/qcustom3ditem.h +++ b/src/datavisualization/data/qcustom3ditem.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QCustom3DItemPrivate; -class QT_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject +class Q_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject { Q_OBJECT Q_PROPERTY(QString meshFile READ meshFile WRITE setMeshFile NOTIFY meshFileChanged) diff --git a/src/datavisualization/data/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h index 9ca68fe9..768c3fbf 100644 --- a/src/datavisualization/data/qcustom3dlabel.h +++ b/src/datavisualization/data/qcustom3dlabel.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE class QCustom3DLabelPrivate; -class QT_DATAVISUALIZATION_EXPORT QCustom3DLabel : public QCustom3DItem +class Q_DATAVISUALIZATION_EXPORT QCustom3DLabel : public QCustom3DItem { Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h index 886019d0..16ecc714 100644 --- a/src/datavisualization/data/qcustom3dvolume.h +++ b/src/datavisualization/data/qcustom3dvolume.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QCustom3DVolumePrivate; -class QT_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem +class Q_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem { Q_OBJECT Q_PROPERTY(int textureWidth READ textureWidth WRITE setTextureWidth NOTIFY textureWidthChanged) diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h index f1eff075..a22cb685 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.h +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class QHeightMapSurfaceDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDataProxy +class Q_DATAVISUALIZATION_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDataProxy { Q_OBJECT diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h index 501d77fe..7340fa82 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.h +++ b/src/datavisualization/data/qitemmodelbardataproxy.h @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class QItemModelBarDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QItemModelBarDataProxy : public QBarDataProxy +class Q_DATAVISUALIZATION_EXPORT QItemModelBarDataProxy : public QBarDataProxy { Q_OBJECT Q_ENUMS(MultiMatchBehavior) diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index 5d66b12e..6cabcb01 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QItemModelScatterDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy +class Q_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy { Q_OBJECT Q_PROPERTY(QAbstractItemModel* itemModel READ itemModel WRITE setItemModel NOTIFY itemModelChanged) diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h index 7a3abbb9..b0128777 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QItemModelSurfaceDataProxyPrivate; -class QT_DATAVISUALIZATION_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy +class Q_DATAVISUALIZATION_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy { Q_OBJECT Q_ENUMS(MultiMatchBehavior) diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h index e94aed85..62efebc6 100644 --- a/src/datavisualization/data/qscatter3dseries.h +++ b/src/datavisualization/data/qscatter3dseries.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QScatter3DSeriesPrivate; -class QT_DATAVISUALIZATION_EXPORT QScatter3DSeries : public QAbstract3DSeries +class Q_DATAVISUALIZATION_EXPORT QScatter3DSeries : public QAbstract3DSeries { Q_OBJECT Q_PROPERTY(QScatterDataProxy *dataProxy READ dataProxy WRITE setDataProxy NOTIFY dataProxyChanged) diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h index 6fe749d0..ea1d81a6 100644 --- a/src/datavisualization/data/qscatterdataitem.h +++ b/src/datavisualization/data/qscatterdataitem.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QScatterDataItemPrivate; -class QT_DATAVISUALIZATION_EXPORT QScatterDataItem +class Q_DATAVISUALIZATION_EXPORT QScatterDataItem { public: QScatterDataItem(); diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h index 790e37c3..8fd0f695 100644 --- a/src/datavisualization/data/qscatterdataproxy.h +++ b/src/datavisualization/data/qscatterdataproxy.h @@ -42,7 +42,7 @@ class QScatter3DSeries; typedef QList QScatterDataArray; -class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy +class Q_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy { Q_OBJECT diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h index 4b2c44f0..508cbba0 100644 --- a/src/datavisualization/data/qsurface3dseries.h +++ b/src/datavisualization/data/qsurface3dseries.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QSurface3DSeriesPrivate; -class QT_DATAVISUALIZATION_EXPORT QSurface3DSeries : public QAbstract3DSeries +class Q_DATAVISUALIZATION_EXPORT QSurface3DSeries : public QAbstract3DSeries { Q_OBJECT Q_FLAGS(DrawFlag DrawFlags) diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h index a4685e3d..6670bc20 100644 --- a/src/datavisualization/data/qsurfacedataitem.h +++ b/src/datavisualization/data/qsurfacedataitem.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE class QSurfaceDataItemPrivate; -class QT_DATAVISUALIZATION_EXPORT QSurfaceDataItem +class Q_DATAVISUALIZATION_EXPORT QSurfaceDataItem { public: QSurfaceDataItem(); diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index 0b652d97..769b1fe8 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -43,7 +43,7 @@ class QSurface3DSeries; typedef QList QSurfaceDataRow; typedef QList QSurfaceDataArray; -class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy +class Q_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy { Q_OBJECT -- cgit v1.2.3